ChangeLogTag: Tue Aug 17 17:32:39 2004 J.T. Conklin <jtc@acorntoolworks.com>

32 files changed, 60 insertions, 54 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 18275be8849..26d7c00dc86 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 17 17:32:39 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* {docs,examples,orbsvcs,performance-tests,utils}/.../*.{cpp,h,idl}:
+
+	  Changed #include <orbsvcs/orbsvcs/...> to #include <orbsvcs/...>.
+
 Tue Aug 17 17:56:23 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_interface.cpp:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 3d54c9ff404..819c4ed0cb5 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
 #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
 
-#include <orbsvcs/orbsvcs/CosEventCommS.h>
-#include <orbsvcs/orbsvcs/CosEventChanneAdminC.h>
+#include <orbsvcs/CosEventCommS.h>
+#include <orbsvcs/CosEventChanneAdminC.h>
 
 class Stock_Consumer : public POA_CosEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index b880122709a..d5de84958cd 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
 #define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
 
-#include <orbsvcs/orbsvcs/CosEventCommS.h>
-#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h>
+#include <orbsvcs/CosEventCommS.h>
+#include <orbsvcs/CosEventChannelAdminC.h>
 
 class Stock_Consumer : public POA_CosEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
index fe92edb307e..47ac82f0003 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
@@ -6,7 +6,7 @@
 #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_FACTORY_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/orbsvcs/CosEventChannelAdminS.h>
+#include <orbsvcs/CosEventChannelAdminS.h>
 
 class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index c273ff5a4c7..d6e82748c82 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -6,8 +6,8 @@
 #define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/orbsvcs/CosEventCommS.h>
-#include <orbsvcs/orbsvcs/CosEventChannelAdminC.h>
+#include <orbsvcs/CosEventCommS.h>
+#include <orbsvcs/CosEventChannelAdminC.h>
 
 class Quoter_Stock_i
   : public virtual POA_Quoter::Modify_Stock,
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index 0f1b5491cb3..43abc2992c9 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "Stock_Consumer.h"
-#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
 int main (int argc, char* argv[])
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index 992af2980af..c26cf41b26c 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "QuoterC.h"
-#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
 int main (int argc, char* argv[])
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 5761200e4e7..a82044836bc 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -5,8 +5,8 @@
 #ifndef TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
 #define TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
 
-#include <orbsvcs/orbsvcs/RtecEventCommS.h>
-#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h>
+#include <orbsvcs/RtecEventCommS.h>
+#include <orbsvcs/RtecEventChannelAdminC.h>
 
 class Stock_Consumer : public POA_RtecEventComm::PushConsumer {
 public:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
index 9ff5db1ac4f..c30c68e2a69 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
@@ -6,7 +6,7 @@
 #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_FACTORY_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/orbsvcs/RtecEventChannelAdminS.h>
+#include <orbsvcs/RtecEventChannelAdminS.h>
 
 class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index d793656d196..ea37a47f82b 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Stock_i.h"
-#include <orbsvcs/orbsvcs/Event_Utilities.h>
+#include <orbsvcs/Event_Utilities.h>
 
 ///derive a class from the tie template class to release itself by ref_count
 class MyTieStock:public POA_RtecEventComm::PushSupplier_tie<Quoter_Stock_i>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 996a4323f20..7ec530709eb 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -6,8 +6,8 @@
 #define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_I_H
 
 #include "QuoterS.h"
-#include <orbsvcs/orbsvcs/RtecEventCommS.h>
-#include <orbsvcs/orbsvcs/RtecEventChannelAdminC.h>
+#include <orbsvcs/RtecEventCommS.h>
+#include <orbsvcs/RtecEventChannelAdminC.h>
 
 class Quoter_Stock_i
   : public virtual POA_Quoter::Modify_Stock,
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index cdf17f1f5cf..95fc7a4ee53 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "Stock_Consumer.h"
-#include <orbsvcs/orbsvcs/CosNamingC.h>
-#include <orbsvcs/orbsvcs/Event_Utilities.h>
+#include <orbsvcs/CosNamingC.h>
+#include <orbsvcs/Event_Utilities.h>
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index dd8f18d4f50..3536274bd0d 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -22,16 +22,16 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/orbsvcs/FT_ReplicationManagerS.h>
+#include <orbsvcs/FT_ReplicationManagerS.h>
 //#include <orbsvcs/PortableGroup/PG_PropertyManager.h>
 //#include <orbsvcs/PortableGroup/PG_GenericFactory.h>
 //#include <orbsvcs/PortableGroup/PG_ObjectGroupManager.h>
 // Note: the new, improved versions...
 //#include <orbsvcs/PortableGroup/PG_Object_Group_Map.h>
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h>
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h>
+#include <orbsvcs/PortableGroup/PG_Properties_Support.h>
+#include <orbsvcs/PortableGroup/PG_Group_Factory.h>
 
-#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h>
+#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
 
 
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index c9d5b8e6398..ec7dd75f590 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -32,8 +32,8 @@ namespace TAO
 /////////////////////////////////
 // Includes needed by this header
 #include <ace/Vector_T.h>
-#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryS.h>
-#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/FT_FaultDetectorFactoryS.h>
+#include <orbsvcs/FT_ReplicationManagerC.h>
 #include <ace/Thread_Manager.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index 5f3e11e20d8..ab820df236c 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -34,9 +34,9 @@ namespace TAO
 }
 
 
-#include <orbsvcs/orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h>
+#include <orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/Notify/Notify_EventChannelFactory_i.h>
 #include <ace/Vector_T.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 810f444574a..46a592332ce 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -15,7 +15,7 @@
 #include "PG_conf.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "PG_Object_Group.h"
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h>
+#include <orbsvcs/PortableGroup/PG_Utils.h>
 
 ACE_RCSID (PortableGroup,
            PG_Group_Factory,
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 927ea184ddb..dd082d74960 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -40,8 +40,8 @@
 #endif /* _MSC_VER */
 
 #include "ace/SString.h"
-#include <orbsvcs/orbsvcs/RTCosSchedulingC.h>
-#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/RTCosSchedulingC.h>
+#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/RTCORBA/Linear_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 68736e46743..e14252adbee 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -28,8 +28,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SString.h"
-#include <orbsvcs/orbsvcs/RTCosSchedulingS.h>
-#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/RTCosSchedulingS.h>
+#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
 #include "RTCosScheduling_PCP_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
index 38534a3432e..4f165fde1ed 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
@@ -6,7 +6,7 @@
 #ifndef _SECURITY_LEVEL_1_IDL_
 #define _SECURITY_LEVEL_1_IDL_
 
-#include <orbsvcs/orbsvcs/Security.idl>
+#include <orbsvcs/Security.idl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
index ca3cfaa0d08..4826c449ed4 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
@@ -6,7 +6,7 @@
 #ifndef _SECURITY_LEVEL_2_IDL_
 #define _SECURITY_LEVEL_2_IDL_
 
-#include <orbsvcs/orbsvcs/SecurityLevel1.idl>
+#include <orbsvcs/SecurityLevel1.idl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 29e711b4ac1..db1f0cd28a2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -15,7 +15,7 @@
 #include "FT_Creator.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
 
 #include <ace/Get_Opt.h>
 #include <ace/OS_NS_stdio.h>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 0db1f6d948c..a2bc85e5f80 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -30,7 +30,7 @@ class  FT_ReplicaFactory_i;
 #include <ace/Vector_T.h>
 #include "FT_TestReplicaS.h"
 #include <ace/Thread_Manager.h>
-#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/FT_ReplicationManagerC.h>
 
 /////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index b06a41469cb..0d0833f7755 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -10,8 +10,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
-#include <orbsvcs/orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
 
 /////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index d7183f6c7f0..d81d9fa061c 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -10,8 +10,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/orbsvcs/CosNotifyChannelAdminS.h>
-#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/CosNotifyChannelAdminS.h>
+#include <orbsvcs/FT_NotifierC.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index d617e9c4845..7da34e52cba 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -12,8 +12,8 @@
 
 #include "StubFaultConsumer.h"
 #include "StubBatchConsumer.h"
-#include <orbsvcs/orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/FT_FaultDetectorFactoryC.h>
 
 #include "ace/Vector_T.h"
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index da989823fb9..374b2e7b588 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -11,7 +11,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/FT_NotifierC.h>
 
 //////////////////////
 // Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 32e738a8b92..b939dbdf74b 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -11,8 +11,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include  /**/ <ace/pre.h>
 
-#include <orbsvcs/orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/FT_FaultDetectorFactoryC.h>
 #include <ace/Vector_T.h>
 
 //////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index b82140602e6..3939bb548ac 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -14,9 +14,9 @@
 
 #include "TAO_Object_Group_Creator.h"
 #include <ace/OS_NS_stdio.h>
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
-#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
-#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h>
+#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/PortableGroup/PG_Operators.h>
 
 #include <ace/Get_Opt.h>
 
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index f987d0b45ac..5bf6c6aae58 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -20,8 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/orbsvcs/PortableGroupC.h>
+#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/PortableGroupC.h>
 #include <ace/SString.h>
 #include <ace/Vector_T.h>
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index bf7a29af1e4..4f48407b6af 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -3,9 +3,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
-#include <orbsvcs/orbsvcs/CosNamingC.h>
-#include <orbsvcs/orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h>
+#include <orbsvcs/CosNamingC.h>
+#include <orbsvcs/CosNotifyCommC.h>
+#include <orbsvcs/CosNotifyChannelAdminC.h>
 
 #include "LifeCycle.h"
 
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 1ad8bfc30f2..5ee39f1c23a 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -12,7 +12,7 @@
 
 
 #include "testSchedC.h"
-#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
+#include <orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
 #include "tao/Version.h"
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index 7df823caafc..ae46946ce65 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -11,7 +11,7 @@
 //=============================================================================
 
 #include "Object1_i.h"
-#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
+#include <orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
 
 #include "tao/Version.h"