ChangeLogTag: Wed Feb 4 13:58:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

44 files changed, 125 insertions, 59 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index fadfee54085..f50410449d4 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,57 @@
+Wed Feb  4 13:58:36 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ciao/CCM_Base.idl:
+        * ciao/CCM_Container.idl:
+        * ciao/CCM_Core.mpc:
+        * ciao/CCM_Deployment.idl:
+        * examples/Hello/Hello_Base/Hello_Base.idl:
+        * examples/OEP/BasicSP/BasicSP.idl:
+        * examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp:
+        * examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp:
+        * examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp:
+        * examples/OEP/Display/HUDisplay.idl:
+        * examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp:
+        * performance-tests/Benchmark/Benchmark.mpc:
+        * performance-tests/Benchmark/server.cpp:
+        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc:
+        * performance-tests/Benchmark/RoundTrip/RoundTrip.idl:
+        * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp:
+        * performance-tests/Benchmark/RoundTrip/client.cpp:
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl:
+        * performance-tests/Benchmark/RoundTripServer/server.cpp:
+        * tests/temp/assembly/client.cpp:
+        * tests/temp/assembly/control.idl:
+        * tests/temp/assembly/control.mpc:
+        * tests/temp/assembly/server.cpp:
+        * tools/Assembly_Deployer/Assembly_Deployer.cpp:
+        * tools/Assembly_Deployer/Assembly_Impl.cpp:
+        * tools/Assembly_Deployer/Assembly_Impl.h:
+        * tools/Assembly_Deployer/Assembly_Manager.cpp:
+        * tools/Assembly_Deployer/Assembly_Service.idl:
+        * tools/Assembly_Deployer/Assembly_Visitors.h:
+        * tools/Assembly_Deployer/Deployment_Configuration.h:
+        * tools/ComponentServer/ComponentServer.cpp:
+        * tools/ComponentServer/ComponentServer_test_client.cpp:
+        * tools/Daemon/CIAO_Daemon.cpp:
+        * tools/Daemon/Daemon_Commands.cpp:
+        * tools/Daemon/CIAO_Daemon.cpp:
+        * tools/Daemon/Daemon_Commands.cpp:
+        * tools/ServerActivator/ServerActivator.cpp:
+        * tools/ServerActivator/ServerActivator_test_client.cpp:
+        * tools/XML_Helpers/XMLHelpers.mpc:
+        * tools/XML_Helpers/XML_Utils.h:
+
+		- Removed all include paths except TAO_ROOT and CIAO_ROOT
+		  for C++ and IDL compilers, from MPC files.
+
+		- Modified includes in source and header files as necessary,
+		  per the above changes.
+
+		- Added missing ACE_ROOT/ace includes.
+
+		- Made other modifications as necessary to MPC files to
+		  eliminate build errors.
+
 Mon Feb  2 20:07:41 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
  	* tools/XML_Helpers/Makefile.XML_Helpers:
diff --git a/TAO/CIAO/ciao/CCM_Base.idl b/TAO/CIAO/ciao/CCM_Base.idl
index 1c9fff4ddb6..7c7460eed58 100644
--- a/TAO/CIAO/ciao/CCM_Base.idl
+++ b/TAO/CIAO/ciao/CCM_Base.idl
@@ -3,8 +3,8 @@
 /**
  * @@ Compile this file with:
  *
- *     tao_idl -Gv -I W:/ACE_wrappers/TAO -I W:/ACE_wrappers/TAO/orbsvcs/orbsvcs Component_Base.idl
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
+ *     tao_idl -I W:/ACE_wrappers/TAO Component_Base.idl
+ *     tao_idl -I ../.. \
  *          -Wb,export_macro=CIAO_Export \
  *          -Wb,export_include=CIAO_export.h \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/CIAO/ciao/CCM_Container.idl b/TAO/CIAO/ciao/CCM_Container.idl
index accd0402e81..64ce9b3bbf1 100644
--- a/TAO/CIAO/ciao/CCM_Container.idl
+++ b/TAO/CIAO/ciao/CCM_Container.idl
@@ -17,7 +17,7 @@
 #define CCM_CONTAINER_IDL
 
 #include "CCM_Component.idl"
-#include "SecurityLevel2.idl"
+#include "orbsvcs/orbsvcs/SecurityLevel2.idl"
 #include "CCM_Transaction.idl"
 
 // *************** Basic Container interfaces ***************
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index ce2a246c9ec..1edfefbaea1 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -3,7 +3,7 @@
 
 project (CIAO_Client) : taolib_with_idl, valuetype, ifr_client {
   sharedname  = CIAO_Client
-  idlflags  += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
+  idlflags  += -Wb,stub_export_include=CIAO_Client_Export.h -Wb,stub_export_macro=CIAO_CLIENT_Export -Wb,skel_export_include=CIAO_Container_Export.h -Wb,skel_export_macro=CIAO_CONTAINER_Export
   dynamicflags    = CIAO_CLIENT_BUILD_DLL
 
   IDL_Files {
@@ -31,8 +31,7 @@ project (CIAO_Container) : orbsvcslib, portableserver, security, iorinterceptor,
   after += CIAO_Client
   sharedname  = CIAO_Container
   libs       += CIAO_Client
-  includes   += $(TAO_ROOT)/orbsvcs/orbsvcs
-  idlflags  += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export
+  idlflags  += -Wb,export_include=CIAO_Container_Export.h -Wb,export_macro=CIAO_CONTAINER_Export
   dynamicflags = CIAO_CONTAINER_BUILD_DLL
 
   IDL_Files {
@@ -58,8 +57,7 @@ project (CIAO_Server) : orbsvcslib, portableserver, iorinterceptor, objreftempla
   after += CIAO_Container
   sharedname  = CIAO_Server
   libs       +=  CIAO_Client
-  includes   += $(TAO_ROOT)/orbsvcs/orbsvcs
-  idlflags  += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
+  idlflags  += -Wb,export_include=CIAO_Server_Export.h -Wb,export_macro=CIAO_SERVER_Export
 
   dynamicflags    = CIAO_SERVER_BUILD_DLL
 
diff --git a/TAO/CIAO/ciao/CCM_Deployment.idl b/TAO/CIAO/ciao/CCM_Deployment.idl
index 441466de3e5..c2325864898 100644
--- a/TAO/CIAO/ciao/CCM_Deployment.idl
+++ b/TAO/CIAO/ciao/CCM_Deployment.idl
@@ -3,7 +3,7 @@
 /**
  * @@ Compile this file with:
  *
- *     tao_idl -Gv -I ../.. -I ../../orbsvcs/orbsvcs \
+ *     tao_idl -I ../.. \
  *          -Wb,export_macro=CIAO_Export \
  *          -Wb,export_include=CIAO_export.h \
  *          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
index 0ac19ea2276..f7baa1f6a87 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
@@ -9,7 +9,7 @@
 #ifndef HELLO_IDL
 #define HELLO_IDL
 
-#include <Components.idl>
+#include <ciao/Components.idl>
 
 module Hello
 {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
index f367b943094..b744fb7aa0b 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CIAO_common.h"
+#include "ciao/CIAO_common.h"
 #include "BMClosedED_exec.h"
 
 #define DISPLACEMENT 256
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
index bbf76602d1b..f04e75cc07b 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CIAO_common.h"
+#include "ciao/CIAO_common.h"
 #include "BMDevice_exec.h"
 
 #define DISPLACEMENT 256
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
index cb6091000f9..95f24d5d5ac 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CIAO_common.h"
+#include "ciao/CIAO_common.h"
 #include "BMDisplay_exec.h"
 
 /// Default constructor.
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.idl b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.idl
index e8e0bf2ae2a..b0b0efd2d72 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BasicSP.idl
+++ b/TAO/CIAO/examples/OEP/BasicSP/BasicSP.idl
@@ -12,7 +12,7 @@
 #ifndef CIAO_BASIC_SP_IDL
 #define CIAO_BASIC_SP_IDL
 
-#include <Components.idl>
+#include <ciao/Components.idl>
 
 // @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO..
 // #pragma prefix ""
diff --git a/TAO/CIAO/examples/OEP/Display/HUDisplay.idl b/TAO/CIAO/examples/OEP/Display/HUDisplay.idl
index 58b02bacded..a61812a127e 100644
--- a/TAO/CIAO/examples/OEP/Display/HUDisplay.idl
+++ b/TAO/CIAO/examples/OEP/Display/HUDisplay.idl
@@ -11,7 +11,7 @@
 #ifndef HUDISPLAY_IDL
 #define HUDISPLAY_IDL
 
-#include <Components.idl>
+#include <ciao/Components.idl>
 
 module HUDisplay
 {
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
index 9ef2eee7fb8..dca3bf4ca2f 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CIAO_common.h"
+#include "ciao/CIAO_common.h"
 #include "NavDisplay_exec.h"
 
 /// Default constructor.
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 6ea0e510368..cd9f23e7f7c 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -29,8 +29,17 @@ project(Benchmark_svnt) : ciao_server {
 }
 
 project (*server) : taoserver, strategies {
+  after += Benchmark_svnt
+  libs += Benchmark_svnt Benchmark_stub
+
   Source_Files {
     server.cpp
     LatencyTest.cpp
+    BenchmarkEC.cpp
+    BenchmarkES.cpp
+  }
+  
+  IDL_Files {
+	BenchmarkE.idl
   }
 }
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
index 06ad7231ce7..6d8f33460ea 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc
@@ -11,6 +11,7 @@ project (Multi_Threaded_client) : ciao_client, valuetype , strategies{
   }
 
   Source_Files {
-    client.cpp, Client_Task.cpp
+    client.cpp
+    Client_Task.cpp
   }
 }
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
index 73a00422297..0f762958998 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
@@ -12,7 +12,7 @@
 #define CIAO_ROUNDTRIP_IDL
 
 #include "../Benchmark.idl"
-#include <Components.idl>
+#include <ciao/Components.idl>
 
 module Benchmark
 {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
index 7ad730343c9..f1dbfc2a0ef 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
@@ -5,6 +5,8 @@
 //-- ACE Scheduling Params
 #include "ace/Sched_Params.h"
 
+#include "ace/OS_NS_errno.h"
+
 //=================================================================
 
 void
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 97dd0bbcd3b..828dd3e5575 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -20,6 +20,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
+#include "ace/OS_NS_errno.h"
 
 const char *ior = "file://test.ior";
 int niterations = 100;
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
index 3f891ce00d3..8ddde6a2aa4 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
@@ -11,7 +11,7 @@
 #ifndef CIAO_ROUNDTRIPCLIENT_IDL
 #define CIAO_ROUNDTRIPCLIENT_IDL
 
-#include <Components.idl>
+#include <ciao/Components.idl>
 #include "../Benchmark.idl"
 
 module Benchmark
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index dda5a49e1d4..c6f2f81ae0c 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -2,6 +2,7 @@
 
 #include "LatencyTest.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_errno.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp
index 43ecd5c3594..345610c1eb2 100644
--- a/TAO/CIAO/performance-tests/Benchmark/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp
@@ -1,7 +1,9 @@
 // $Id$ 
 
 #include "LatencyTest.h"
+
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_errno.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/CIAO/tests/temp/assembly/client.cpp b/TAO/CIAO/tests/temp/assembly/client.cpp
index 078e743ea79..6aedb89181e 100644
--- a/TAO/CIAO/tests/temp/assembly/client.cpp
+++ b/TAO/CIAO/tests/temp/assembly/client.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "controlC.h"
-#include "Client_init.h"
+#include "ciao/Client_init.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID(Hello, client, "$Id$")
diff --git a/TAO/CIAO/tests/temp/assembly/control.idl b/TAO/CIAO/tests/temp/assembly/control.idl
index 328d93980c9..3c0a34a42b3 100644
--- a/TAO/CIAO/tests/temp/assembly/control.idl
+++ b/TAO/CIAO/tests/temp/assembly/control.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CCM_Deployment.idl"
+#include "ciao/CCM_Deployment.idl"
 
 module ATest
 {
diff --git a/TAO/CIAO/tests/temp/assembly/control.mpc b/TAO/CIAO/tests/temp/assembly/control.mpc
index 1e4bb78c778..34e2c72036b 100644
--- a/TAO/CIAO/tests/temp/assembly/control.mpc
+++ b/TAO/CIAO/tests/temp/assembly/control.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project : ciao_server, server {
-  idlflags += -I$(TAO_ROOT) -I../../../ciao -I../../../..
 
   Source_Files {
     controlS.cpp
@@ -12,7 +11,6 @@ project : ciao_server, server {
 }
 
 project : ciao_server, client {
-  idlflags += -I$(TAO_ROOT) -I../../../ciao -I../../../..
 
   Source_Files {
     controlC.cpp
diff --git a/TAO/CIAO/tests/temp/assembly/server.cpp b/TAO/CIAO/tests/temp/assembly/server.cpp
index 3bc4079490d..c65df7b8403 100644
--- a/TAO/CIAO/tests/temp/assembly/server.cpp
+++ b/TAO/CIAO/tests/temp/assembly/server.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
-#include "Assembly_Impl.h"
-#include "Server_init.h"
+#include "tools/Assembly_Deployer/Assembly_Impl.h"
+#include "ciao/Server_init.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
 #include "controlS.h"
 
 class control_impl
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
index 661c95c585a..119697ed7d9 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CCM_DeploymentC.h"
+#include "ciao/CCM_DeploymentC.h"
 #include "Assembly_ServiceC.h"
-#include "Client_init.h"
+#include "ciao/Client_init.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
index ad3ee54c7ec..2280bbf6670 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
@@ -1,8 +1,7 @@
 // $Id$
 
 #include "Assembly_Impl.h"
-//#include "ACtive_Objref_Map.h"
-#include "Cookies.h"
+#include "ciao/Cookies.h"
 #include "../XML_Helpers/Assembly_Spec.h"
 #include "../XML_Helpers/XML_Utils.h"
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
index bcb48e687cb..4723f70db85 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
@@ -26,7 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Active_Map_Manager_T.h"
-#include "CCM_DeploymentS.h"
+#include "ciao/CCM_DeploymentS.h"
 #include "../XML_Helpers/Assembly_Spec.h"
 #include "Deployment_Configuration.h"
 #include "Assembly_Visitors.h"
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
index 37b28888baa..2ca9e611cdc 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp
@@ -9,8 +9,8 @@
 
 #include "Assembly_Impl.h"
 #include "Assembly_Service_Impl.h"
-#include "CIAO_ServersC.h"
-#include "Server_init.h"
+#include "ciao/CIAO_ServersC.h"
+#include "ciao/Server_init.h"
 #include "tao/IORTable/IORTable.h"
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service.idl b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service.idl
index c471e67c83e..b9644330095 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service.idl
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Service.idl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CCM_Deployment.idl"
+#include "ciao/CCM_Deployment.idl"
 
 module CIAO
 {
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
index c0b83f7f463..8a44cf746a7 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CCM_DeploymentS.h"
+#include "ciao/CCM_DeploymentS.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "../XML_Helpers/Assembly_Spec.h"
 #include "Deployment_Configuration.h"
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
index 5279ad2cb7b..7db20158de1 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Deployment_Configuration.h
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CCM_DeploymentC.h"
+#include "ciao/CCM_DeploymentC.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
index 960c64c4cf2..5364dc2cc15 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
@@ -7,9 +7,9 @@
  *
  */
 
-#include "ComponentServer_Impl.h"
-#include "CIAO_ServersC.h"
-#include "Server_init.h"
+#include "ciao/ComponentServer_Impl.h"
+#include "ciao/CIAO_ServersC.h"
+#include "ciao/Server_init.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
index eb3bec82e70..2e3c6eda751 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "CCM_DeploymentC.h"
-#include "Client_init.h"
+#include "ciao/CCM_DeploymentC.h"
+#include "ciao/Client_init.h"
 #include "ace/Get_Opt.h"
 
 const char *ior = "file://test.ior";
diff --git a/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp b/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp
index 414058e594a..8b55acf5d32 100644
--- a/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp
+++ b/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp
@@ -11,10 +11,10 @@
  * the hosts that have ServerActivator install to function properly.
  */
 
-#include "ServerActivator_Impl.h"
-#include "ComponentInstallation_Impl.h"
+#include "ciao/ServerActivator_Impl.h"
+#include "ciao/ComponentInstallation_Impl.h"
 #include "Daemon_Impl.h"
-#include "Server_init.h"
+#include "ciao/Server_init.h"
 #include "tao/IORTable/IORTable.h"
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/CIAO/tools/Daemon/Daemon_Commands.cpp b/TAO/CIAO/tools/Daemon/Daemon_Commands.cpp
index 32502baaac1..b63c348cee4 100644
--- a/TAO/CIAO/tools/Daemon/Daemon_Commands.cpp
+++ b/TAO/CIAO/tools/Daemon/Daemon_Commands.cpp
@@ -2,7 +2,7 @@
 
 #include "Daemon_Commands.h"
 #include "ace/Get_Opt.h"
-#include "CCM_DeploymentC.h"
+#include "ciao/CCM_DeploymentC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Daemon_Commands.inl"
diff --git a/TAO/CIAO/tools/Daemon/Softpkg_Commands.cpp b/TAO/CIAO/tools/Daemon/Softpkg_Commands.cpp
index 54c722c5d3e..3d4aae45250 100644
--- a/TAO/CIAO/tools/Daemon/Softpkg_Commands.cpp
+++ b/TAO/CIAO/tools/Daemon/Softpkg_Commands.cpp
@@ -2,7 +2,7 @@
 
 #include "Softpkg_Commands.h"
 #include "ace/Get_Opt.h"
-#include "CCM_DeploymentC.h"
+#include "ciao/CCM_DeploymentC.h"
 #include "../XML_Helpers/XML_Utils.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/CIAO/tools/Daemon/controller_i.cpp b/TAO/CIAO/tools/Daemon/controller_i.cpp
index 3fb8010cc45..72884197f21 100644
--- a/TAO/CIAO/tools/Daemon/controller_i.cpp
+++ b/TAO/CIAO/tools/Daemon/controller_i.cpp
@@ -3,11 +3,11 @@
 #include "controller_i.h"
 #include "Daemon_Commands.h"
 #include "Softpkg_Commands.h"
-#include "Client_init.h"
+#include "ciao/Client_init.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_stdio.h"
-#include "CCM_DeploymentC.h"
+#include "ciao/CCM_DeploymentC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "controller_i.inl"
diff --git a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
index d3390ab69f5..b66bea9ff63 100644
--- a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
@@ -4,10 +4,10 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "RTServer_Impl.h"
 #include "ace/Null_Mutex.h"
-#include "Server_init.h"
-#include "CIAO_ServersC.h"
+#include "ciao/Server_init.h"
+#include "ciao/CIAO_ServersC.h"
 #include "../XML_Helpers/XML_Utils.h"
-#include "RTPortableServer/RTPortableServer.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
 
 #if !defined (__ACE_INLINE__)
 # include "ComponentServer_Task.inl"
diff --git a/TAO/CIAO/tools/RTComponentServer/RTComponentServer.cpp b/TAO/CIAO/tools/RTComponentServer/RTComponentServer.cpp
index 5454281b488..3693499ceb2 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTComponentServer.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTComponentServer.cpp
@@ -3,7 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ComponentServer_Task.h"
-#include "Server_init.h"
+#include "ciao/Server_init.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 /// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/
diff --git a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
index 3d545238505..a3edb82726d 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
+++ b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.h
@@ -32,9 +32,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ComponentServer_Impl.h"
-#include "Container_Impl.h"
-#include "Container_Base.h"
+#include "ciao/ComponentServer_Impl.h"
+#include "ciao/Container_Impl.h"
+#include "ciao/Container_Base.h"
 #include "RTConfig_Manager.h"
 
 namespace CIAO
diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator.cpp b/TAO/CIAO/tools/ServerActivator/ServerActivator.cpp
index a40f7832d72..dbe5216a6ed 100644
--- a/TAO/CIAO/tools/ServerActivator/ServerActivator.cpp
+++ b/TAO/CIAO/tools/ServerActivator/ServerActivator.cpp
@@ -11,7 +11,7 @@
  * the hosts that have ServerActivator install to function properly.
  */
 
-#include "ServerActivator_Impl.h"
+#include "ciao/ServerActivator_Impl.h"
 #include "tao/IORTable/IORTable.h"
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp b/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
index 62a9cb9526d..1d451b9d565 100644
--- a/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
+++ b/TAO/CIAO/tools/ServerActivator/ServerActivator_test_client.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "CCM_DeploymentC.h"
-#include "Client_init.h"
+#include "ciao/CCM_DeploymentC.h"
+#include "ciao/Client_init.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index 24ae49fdaa8..29000314edc 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(XML_Helpers): taolib_with_idl, rtcorba, acexml {
+project(XML_Helpers): taolib_with_idl, rtcorba, portableserver, acexml {
   sharedname    = CIAO_XML_Helpers
   idlflags     += -Sc -Wb,export_include=XML_Helpers_Export.h \
                   -Wb,export_macro=CIAO_XML_HELPERS_Export
diff --git a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
index 5fef0483761..22d75a3b72e 100644
--- a/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
+++ b/TAO/CIAO/tools/XML_Helpers/XML_Utils.h
@@ -16,7 +16,7 @@
 #include "XML_Helpers_Export.h"
 #include "Softpkg_Handlers.h"
 #include "Assembly_Spec.h"
-#include "RTCORBA/RTCORBA.h"
+#include "tao/RTCORBA/RTCORBA.h"
 #include "RTConfigurationC.h"
 
 namespace CIAO