ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

68 files changed, 214 insertions, 203 deletions

diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 3545f350bfa..5f43c5681ad 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,15 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami {
+project(*Server): messaging, taoserver, ami {
   Source_Files {
     test_i.cpp
     server.cpp
-  }  
+  }
 }
- 
+
 project(*Client): messaging, taoexe, portableserver, ami {
   Source_Files {
     client.cpp
-  }  
+  }
 }
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index f6bafad3fd3..4377ad161f0 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, messaging {
+project(*Server): taoserver, messaging {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, messaging {
+project(*Client): taoclient, messaging {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 7f62ba20434..37723082d44 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Callback_Quoter notifier): namingexe, naming_serv {
+project(Callback_Quoter notifier): namingexe, naming_serv, utils {
   Source_Files {
     Notifier_i.cpp
     Notifier_Input_Handler.cpp
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index 9a0cd8b6c22..ebd8581071e 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -30,7 +30,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 9f5279a815b..6073b6e7662 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -21,7 +21,7 @@
 
 #include "Notifier_i.h"
 #include "NotifierS.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index ed4397b76bd..d40647a2274 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -27,7 +27,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ConsumerC.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index fd6298eee08..5920a1b56b4 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*notifier): namingexe, naming_serv {
+project(*notifier): namingexe, naming_serv, utils {
   Source_Files {
     Event_Comm_i.cpp
     Notifier_Server.cpp
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index bbb1880c33a..dc801cc8f3c 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -18,7 +18,7 @@
 #define _NOTIFIER_SERVER_H
 
 #include "Event_Comm_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 2b6f34dfc15..45e9eccb633 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -107,7 +107,7 @@ EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingPara
                     EDF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                                                               TAO_DEFAULT_MINOR_CODE,
+                                                                               TAO::VMCID,
                                                                                ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -446,7 +446,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
       ACE_OS::memcpy (&int_guid,
 		      guid.get_buffer (),
 		      guid.length ());
-  
+
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
@@ -476,7 +476,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
   record the entering dispatcher time on the server side.
   Tenth Time.
 */
-#ifdef KOKYU_HAS_RELEASE_GUARD 
+#ifdef KOKYU_HAS_RELEASE_GUARD
   this->kokyu_dispatcher_->release_guard (guid, qos);
 #else
   this->kokyu_dispatcher_->schedule (guid, qos);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 92039e6c7b1..a3994d8248d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -45,20 +45,20 @@ FP_Segment_Sched_Param_Policy::value (
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 FP_Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Segment_Sched_Param_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 FP_Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -97,7 +97,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   ACE_CHECK;
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     orb->resolve_initial_references ("CodecFactory"
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -140,13 +140,13 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (
         CORBA::SystemException
       ))
 {
-  FP_Scheduling::SegmentSchedulingParameterPolicy_ptr 
+  FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     segment_sched_param_policy;
   ACE_NEW_THROW_EX (segment_sched_param_policy,
                     FP_Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -166,8 +166,8 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -188,8 +188,8 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -524,7 +524,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -575,7 +575,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -605,7 +605,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
       ACE_DEBUG ((LM_DEBUG,
                   "(%t): Desired_Priority = %d in recvd service context\n",
                   desired_priority));
-#endif                  
+#endif
     }
 
   FP_Scheduler_Traits::QoSDescriptor_t qos;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index c29054aa439..4873f12ae51 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -36,21 +36,21 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Sched_Param_Policy* tmp = 0;
-  ACE_NEW_THROW_EX (tmp, 
+  ACE_NEW_THROW_EX (tmp,
 		    MIF_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 MIF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -86,7 +86,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   this->current_ =
     RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   IOP::CodecFactory_var codec_factory;
   CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory"
                                                            ACE_ENV_ARG_PARAMETER);
@@ -129,7 +129,7 @@ MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingPara
                     MIF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -149,8 +149,8 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -171,8 +171,8 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -318,7 +318,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       sc.context_data =
         reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
-      
+
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n")));
@@ -465,7 +465,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   if (CORBA::is_nil (sched_policy))
   {
 #ifdef KOKYU_DSRT_LOGGING
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "(%t|%T): sched_policy nil. ",
                 "importance not set in sched params\n"));
 #endif
@@ -474,7 +474,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   else
     {
 #ifdef KOKYU_DSRT_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t|%T):sched_policy not nil. ",
                   "importance set in sched params\n"));
 #endif
@@ -503,7 +503,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -564,7 +564,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index c70de4a578b..81b6020bf9f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -36,21 +36,21 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 MUF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Sched_Param_Policy* tmp;
-  ACE_NEW_THROW_EX (tmp, 
+  ACE_NEW_THROW_EX (tmp,
 		    MUF_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 MUF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -88,7 +88,7 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   ACE_CHECK;
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     orb->resolve_initial_references ("CodecFactory"
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -130,7 +130,7 @@ MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingPara
                     MUF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -150,8 +150,8 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -175,8 +175,8 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -333,7 +333,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       sc.context_data =
         reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
-      
+
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n")));
@@ -505,7 +505,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   if (CORBA::is_nil (sched_policy))
   {
 #ifdef KOKYU_DSRT_LOGGING
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "(%t|%T): sched_policy nil.\n "));
 #endif
     //24 hrs from now - infinity
@@ -517,7 +517,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   else
     {
 #ifdef KOKYU_DSRT_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t|%T):sched_policy not nil. ",
                   "sched params set\n"));
 #endif
@@ -550,7 +550,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -602,7 +602,7 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index 371c41c17bd..0275dd47847 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -22,7 +22,7 @@
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index 5b9249f8fac..1f4c411a44e 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -21,7 +21,7 @@
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Load_BalancerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index b2bb9e124aa..736a82ad8ed 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoserver {
+project(*server): taoserver, utils {
   avoids += repo
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(*server): taoserver {
   }
 }
 
-project(*Client): taoclient, portableserver {
+project(*Client): taoclient, utils, portableserver {
   avoids += repo
 
   IDL_Files {
@@ -33,7 +33,7 @@ project(*Client): taoclient, portableserver {
   }
 }
 
-project(*Balancer): taoexe, portableserver {
+project(*Balancer): taoexe, utils, portableserver {
   exename = load_balancer
   avoids += repo
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index eb42bb8375a..229e17d760c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -20,7 +20,7 @@
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index ceafcc5067f..94565ef6278 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -22,7 +22,7 @@
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index d9f69946a5d..36cdc386f62 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -21,7 +21,7 @@
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Load_BalancerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index e25661d9bd5..0ea8c460e6d 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -20,7 +20,7 @@
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 84bdfb0f588..f93b076aa74 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*balancer): taoexe, portableserver, minimum_corba {
+project(*balancer): taoexe, utils, portableserver, minimum_corba {
   avoids += repo
   exename = load_balancer
 
@@ -17,7 +17,7 @@ project(*balancer): taoexe, portableserver, minimum_corba {
   }
 }
 
-project(*server): taoserver, minimum_corba {
+project(*server): taoserver, utils, minimum_corba {
   avoids += repo
 
   Source_Files {
@@ -29,7 +29,7 @@ project(*server): taoserver, minimum_corba {
   }
 }
 
-project(*client): taoclient, portableserver, minimum_corba {
+project(*client): taoclient, utils, portableserver, minimum_corba {
   avoids += repo
   exename = client
 
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 60513e19345..e014cd68c0a 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Service): namingexe, naming_serv, lifecycle {
+project(*Service): namingexe, naming_serv, lifecycle, utils {
   Source_Files {
     Logger_i.cpp
     Logging_Service.cpp
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index e0916ad81ed..becd042d403 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -31,7 +31,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "Logger_i.h"
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 352049e88d0..380dc749dc6 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -23,7 +23,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index ce1d87be55f..9431556642e 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, valuetype, minimum_corba {
+project(*server): taoexe, utils, portableserver, valuetype, minimum_corba {
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
@@ -10,7 +10,7 @@ project(*server): taoexe, portableserver, valuetype, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, valuetype, minimum_corba {
+project(*client): taoexe, utils, portableserver, valuetype, minimum_corba {
   Source_Files {
     Client_i.cpp
     Event_Types_impl.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 7f01d95962a..89d427ced0e 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 9d8c221b6e7..b58c313ebe5 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -26,6 +26,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 
 ACE_RCSID(Adapter_Activator, server, "$Id$")
 
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 25c120a7b0e..70a0f306963 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -7,6 +7,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 #include "ace/Singleton.h"
 #include "ace/Malloc.h"
 
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 04d3e67fc42..62a433a23c3 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,11 +1,12 @@
 //$Id$
-project(*Client) : taoexe, messaging, portableserver, minimum_corba {
+project(*Client) : taoclient, messaging, minimum_corba {
   source_files {
+    DatabaseC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba {
+project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba {
   source_files {
     Database_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 3289d6f8bac..56145e39158 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID(Default_Servant, File_i, "$Id$")
 
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 779807622d3..52883cadbcd 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,13 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoclient, minimum_corba {
   source_files {
+    FileC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoserver, minimum_corba {
   source_files {
     File_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index a5247ede801..8d96c04e54c 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -17,12 +17,14 @@
 //===========================================================================
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Adapter_Activator.h"
 
 #include "tao/ORB.h"
+#include "ace/Log_Msg.h"
+#include "ace/SString.h"
 
-ACE_RCSID (FindPOA, 
-           FindPOA, 
+ACE_RCSID (FindPOA,
+           FindPOA,
            "$Id$")
 
 void
@@ -92,7 +94,7 @@ main (int argc, char **argv)
 
       // Get a TAO_Adapter_Activator reference
       PortableServer::AdapterActivator_var activator =
-        new TAO_Adapter_Activator (poa_manager.in ());
+        new TAO::Portable_Server::Adapter_Activator (poa_manager.in ());
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index e5743eb768c..6be6fb2148f 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, minimum_corba {
+project: taoserver, minimum_corba {
 }
 
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index b70c23e05f8..7c307fc26aa 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -23,6 +23,7 @@
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index 5fb4927d770..72bcf90edb6 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 5f3b6401c3c..969787a3a02 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -22,6 +22,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 81b5ebb88be..a5e5725e2bd 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -22,6 +22,7 @@
 #define SERVANT_LOCATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index b330e9a825f..c94b12f94dd 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,3 +1,3 @@
 //$Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoserver, minimum_corba {
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index 043dacf4d79..8f2d7afd85f 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -17,6 +17,7 @@
 // ================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index 33a332bb163..14982781d69 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -18,6 +18,7 @@
 //==================================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index dc03fcbe513..53e6316101c 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -23,6 +23,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator_i : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 397dc9d87fb..bdd85a2f07e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -24,6 +24,7 @@
 #include "ace/DLL.h"
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 class ServantLocator_i : public PortableServer::ServantLocator
 {
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
index 4d89c0f8aca..1e8e3f687b4 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
@@ -24,9 +24,11 @@
 #include "ace/Containers.h"
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Active_Object_Map.h"
 
 #include "tao/ORB.h"
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 368e062cbc6..98e7b408cf3 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, bidir_giop, minimum_corba {
+project: taoserver, bidir_giop, minimum_corba {
 }
diff --git a/TAO/examples/POA/RootPOA/RootPOA.mpc b/TAO/examples/POA/RootPOA/RootPOA.mpc
index 1ed2fb1882d..7860ab129f4 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.mpc
+++ b/TAO/examples/POA/RootPOA/RootPOA.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     RootPOA.cpp
   }
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 4636150a15e..d4d326d3fc1 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver, utils {
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver {
   }
 }
 
-project(*client): taoexe, portableserver {
+project(*client): taoexe, utils, portableserver {
   Source_Files {
     GridC.cpp
     Simple_util.cpp
@@ -18,7 +18,7 @@ project(*client): taoexe, portableserver {
   }
 }
 
-project(*persistent client): taoexe, portableserver {
+project(*persistent client): taoexe, utils, portableserver {
   Source_Files {
     GridC.cpp
     Simple_util.cpp
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index f1491f00151..c5bcc8fa47a 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -19,7 +19,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 3d9e89ca85d..2bed421dc17 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Factory_Finder_i.h"
 
 #ifndef QUOTER_FACTORY_FINDER_H
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 1d5950ebb27..8e20a97cba0 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Generic_Factory_i.h"
 
 #ifndef GENERIC_FACTORY_H
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index f972a2040d5..8f7dea8f1f6 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -4,7 +4,7 @@
 // todo : Once MPC is used for everything, we should consider
 //        removing the includes += lines below, and updating
 //        the source code instead.
-project(*server): namingexe, lifecycle, minimum_corba {
+project(*server): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -21,7 +21,7 @@ project(*client): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle, minimum_corba {
+project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -30,7 +30,7 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle, minimum_corba {
+project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 1e3851293a6..17caadc1bc1 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -15,13 +15,11 @@
 
 #include "Quoter_i.h"
 
-#include "tao/PortableServer/POA.h"
-
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Quoter, 
-           Quoter_i, 
+ACE_RCSID (Quoter,
+           Quoter_i,
            "$Id$")
 
 // Constructor.  Create all the quoter factories.
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 880be8f44c6..26a0540be88 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -30,7 +30,7 @@
 #include "ace/Log_Msg.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Quoter_i.h"
 #include "QuoterC.h"
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 91ae7e1ed28..2bf8311319e 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -7,14 +7,14 @@
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
-RTCORBA::Priority 
+RTCORBA::Priority
 Segment_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
-void 
+void
 Segment_Sched_Param_Policy::value (RTCORBA::Priority value
                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -27,10 +27,10 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTScheduler_Current" 
+        orb->resolve_initial_references ("RTScheduler_Current"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       this->current_ =
         RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -47,7 +47,7 @@ Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
 {
 }
 
-FP_Scheduling::SegmentSchedulingParameterPolicy_ptr 
+FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
 Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority
                                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -57,7 +57,7 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
 				      CORBA::SystemException::_tao_minor_code (
-                                                                               TAO_DEFAULT_MINOR_CODE,
+                                                                               TAO::VMCID,
                                                                                ENOMEM),
 				      CORBA::COMPLETED_NO));
 
@@ -67,8 +67,8 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority
 
 }
 
-  
-void 
+
+void
 Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &,
 							const char *,
 							CORBA::Policy_ptr /*sched_policy*/,
@@ -79,13 +79,13 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
 							   const char *name,
 							   CORBA::Policy_ptr sched_param,
 							   CORBA::Policy_ptr implicit_sched_param
 							   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, 
+  ACE_THROW_SPEC ((CORBA::SystemException,
 		   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
@@ -96,7 +96,7 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C
   ACE_CHECK;
 }
 
-void 
+void
 Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &guid,
 						     const char *name,
 						     CORBA::Policy_ptr sched_param,
@@ -111,10 +111,10 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
 				      implicit_sched_param
 				      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
                                                   const char *
                                                   ACE_ENV_ARG_DECL_NOT_USED)
@@ -122,18 +122,18 @@ Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::I
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
 							 const char *,
 							 CORBA::Policy_ptr
 							 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  
+
 }
-  
 
-void 
+
+void
 Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
 					ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -145,13 +145,13 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "Request thread priority is %d %d\n",
 	      priority,
 	      ACE_DEFAULT_THREAD_PRIORITY));
-  
-  
+
+
   IOP::ServiceContext* srv_con = new IOP::ServiceContext;
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
   srv_con->context_data.length (sizeof (long));
@@ -163,10 +163,10 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
 					     0
 					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr request_info,
 					   RTScheduling::Current::IdType_out guid_out,
 					   CORBA::String_out /*name*/,
@@ -176,52 +176,52 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
-  IOP::ServiceContext* serv_cxt = 
+  IOP::ServiceContext* serv_cxt =
     request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
 					       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   if (serv_cxt != 0)
     {
       int gu_id;
       ACE_OS::memcpy (&gu_id,
 		      serv_cxt->context_data.get_buffer (),
 		      serv_cxt->context_data.length ());
-      
+
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg,"The Guid is %d\n", gu_id);
       DT_TEST::instance ()->dt_creator ()->log_msg (msg);
-      
+
       RTScheduling::Current::IdType* guid;
       ACE_NEW (guid,
 	       RTScheduling::Current::IdType);
-      
-      
+
+
       // Generate GUID.
       guid->length (sizeof(long));
-      
+
       ACE_OS::memcpy (guid->get_buffer (),
 		      &gu_id,
 		      sizeof(long));
-      
+
       if (TAO_debug_level > 0)
 	ACE_DEBUG ((LM_DEBUG,
 		    "Receive request The Guid is %d\n",
 		    gu_id));
-      
+
       guid_out.ptr () = guid;
     }
 
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -229,7 +229,7 @@ Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -237,7 +237,7 @@ Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
 				     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -245,14 +245,14 @@ Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -260,50 +260,50 @@ Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestI
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &
                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-CORBA::PolicyList* 
+CORBA::PolicyList*
 Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &
                                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
-      
-CORBA::PolicyList* 
+
+CORBA::PolicyList*
 Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-char * 
+
+char *
 Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-RTScheduling::ResourceManager_ptr 
+
+RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
                                                    CORBA::Policy_ptr
                                                    ACE_ENV_ARG_DECL_NOT_USED)
@@ -311,8 +311,8 @@ Fixed_Priority_Scheduler::create_resource_manager (const char *,
 {
   return 0;
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                                     const char *,
                                                     CORBA::Policy_ptr
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 16d15ab8021..08cccbfbab9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -55,11 +55,11 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
         orb->resolve_initial_references ("RTScheduler_Current"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       this->current_ =
         RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       wait_ = 0;
     }
   ACE_CATCHANY
@@ -113,7 +113,7 @@ MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
 				      CORBA::SystemException::_tao_minor_code (
-				       TAO_DEFAULT_MINOR_CODE,
+               TAO::VMCID,
 				       ENOMEM),
 				      CORBA::COMPLETED_NO));
 
@@ -331,7 +331,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       ACE_Thread::self (current);
       if (ACE_Thread::getprio (current, priority) == -1)
 	return;
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "Initial thread priority is %d %d\n",
 		  priority,
@@ -348,8 +348,8 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       ACE_DEBUG ((LM_DEBUG,
 		  "Bumped thread priority is %d\n",
 		  priority));
-      
-      
+
+
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
@@ -379,10 +379,10 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
     request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   if (serv_cxt != 0)
-    { 
+    {
       ACE_DEBUG ((LM_DEBUG,
 		  "Got scheduling info\n"));
-      
+
       RTScheduling::Current::IdType* guid;
       ACE_NEW (guid,
 	       RTScheduling::Current::IdType);
@@ -570,7 +570,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -610,13 +610,13 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
 
   lock_.acquire ();
   ready_que_.enqueue_prio (new_dt);
-  
+
   int priority;
   ACE_hthread_t current;
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -662,7 +662,7 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 543f6dca5e0..d2c00aa066e 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -19,7 +19,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index e4085e59f6c..13e605ef568 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -3,6 +3,7 @@
 #include "AccountManager_i.h"
 #include "Account_i.h"
 #include "tao/debug.h"
+#include "tao/Utils/ORB_Manager.h"
 
 ACE_RCSID(AccountManager, AccountManager_i, "$Id$")
 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 55e39733d18..21321e449c3 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -27,7 +27,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Account_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/OS.h"
@@ -35,6 +34,8 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+class TAO_ORB_Manager;
+
 class AccountManager_i : public POA_Bank::AccountManager
 {
   // = TITLE
@@ -87,9 +88,6 @@ private:
   PortableServer::POA_ptr poa_;
   // POA pointer.
 
-  //TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
   ACE_Hash_Map_Manager<ACE_CString,
                        Account_i *,
                        ACE_Null_Mutex> hash_map_;
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 600979a6a74..908b6de0262 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Account_i.cpp
     AccountManager_i.cpp
@@ -10,7 +10,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index cbe7272ad33..666f8ab66c7 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -22,7 +22,7 @@
 
 #include "BroadcasterS.h"
 #include "ReceiverC.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index a5f0535b7b8..b42c0514823 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -31,7 +31,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 class Client_i : public ACE_Event_Handler
 {
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 9214585fea1..03fdd200b37 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -22,7 +22,7 @@
 #define SERVER_I_H
 
 #include "Broadcaster_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 class Server_i
 {
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index ff927cbff1f..d5a6f5699f6 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,10 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server) : taoexe, portableserver, iortable {
+project(*server) : taoserver, utils, iortable {
   IDL_Files {
     Receiver.idl
-    Broadcaster.idl 
+    Broadcaster.idl
   }
   Source_Files {
     Broadcaster_i.cpp
@@ -13,7 +13,7 @@ project(*server) : taoexe, portableserver, iortable {
   }
 }
 
-project(*client): taoexe, portableserver {
+project(*client): taoexe, portableserver, utils {
   IDL_Files {
     Receiver.idl
     Broadcaster.idl
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 737aaab2d22..6bb4e4dc783 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Echo_i.cpp
     ../Simple_util.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index 32af3e12220..b94387ec91b 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Grid_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index bab89530e80..176bc335f8d 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Time_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index e95c8c82581..6e4bebb7597 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -30,15 +30,15 @@
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Event_Supplier, 
-           DualEC_Sup, 
+ACE_RCSID (Event_Supplier,
+           DualEC_Sup,
            "$Id$")
 
 static const char usage [] =
@@ -699,7 +699,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_hi, deps_out_hi, 
+             infos_out_hi, deps_out_hi,
              configs_out_hi, anomalies_out_hi ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -712,7 +712,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_lo, deps_out_lo, 
+             infos_out_lo, deps_out_lo,
              configs_out_lo, anomalies_out_lo ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -734,7 +734,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             this->infos_lo_.out (), 
+             this->infos_lo_.out (),
              this->deps_hi_.out (),
              this->configs_lo_.out (),
              this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 792eba220c4..834f47ccb98 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -25,7 +25,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -35,8 +35,8 @@
 
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (Event_Supplier, 
-           Event_Sup, 
+ACE_RCSID (Event_Supplier,
+           Event_Sup,
            "$Id$")
 
 static const char usage [] =
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index bb4348b6d0c..0deff2e4ad1 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Event_Sup): rtoldevent, namingexe {
+project(*Event_Sup): rtoldevent, namingexe, utils {
   exename = Event_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
@@ -28,7 +28,7 @@ project(*Event_Con): rtoldevent, namingexe {
   }
 }
 
-project(*Logging_Sup): rtoldevent, namingexe {
+project(*Logging_Sup): rtoldevent, namingexe, utils {
   exename = Logging_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
@@ -43,7 +43,7 @@ project(*Logging_Sup): rtoldevent, namingexe {
   }
 }
 
-project(*DualEC_Sup): rtoldevent, namingexe {
+project(*DualEC_Sup): rtoldevent, namingexe, utils {
   exename = DualEC_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index a9df0f2e9b2..02335e137ff 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -29,7 +29,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -39,8 +39,8 @@
 
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (Event_Supplier, 
-           Logging_Sup, 
+ACE_RCSID (Event_Supplier,
+           Logging_Sup,
            "$Id$")
 
 static const char usage [] =