summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/LoadBalancing
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing')
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h2
29 files changed, 51 insertions, 51 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index d680e65932a..ce0e3b6e62c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index fab93d1af5f..6ad66ee8ada 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -17,13 +17,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 224294591bc..4d960d74884 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/LB_ORTC.h"
+#include "orbsvcs/LB_ORTC.h"
#include "ace/Service_Object.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 374198c8aac..fd3240d0bcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,6 +1,6 @@
#include "LB_ClientRequestInterceptor.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
ACE_RCSID (LoadBalancing,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 166d3037734..0f290d8412b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/LB_ORTC.h"
+#include "orbsvcs/LB_ORTC.h"
#include "ace/Service_Object.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 537a3dcbdaf..7252318027a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#include "tao/LocalObject.h"
#include "tao/IORInterceptor/IORInterceptorC.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 97b11bfb4df..11c0c402b90 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -2,7 +2,7 @@
#include "LB_LoadMap.h"
#include "LB_Random.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 0ae1886cd3b..478b6d22b63 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -22,7 +22,7 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#include "ace/Synch_Traits.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index bec59e2725f..5c356ef3b41 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
class TAO_LoadBalancing_Export TAO_LB_LoadAlert
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 8b4effbc06d..78eeeb187f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,5 +1,5 @@
#include "LB_LoadAlertInfo.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/PortableGroup/PG_Operators.h"
ACE_RCSID (LoadBalancing,
LB_LoadAlertInfo,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 069c924c021..6736448e92c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
index de57de3dc2a..620ec2d3acb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
@@ -24,8 +24,8 @@
#include "LB_LoadAlertInfo.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 00ca3154c3d..0768f411ac2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -13,7 +13,7 @@
#ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
#define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index d6da83152c8..a9865acf8b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -2,7 +2,7 @@
#include "LB_LoadMap.h"
#include "LB_Random.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 8f50a617e19..fc69de65e4a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -23,7 +23,7 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#include "ace/Synch_Traits.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
index 1ca35de22bf..ebfbb3b6cb7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
@@ -16,16 +16,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index e70d2ef5c7c..32d63b54f0f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -8,8 +8,8 @@
#include "LB_LeastLoaded.h"
#include "LB_conf.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
#include "tao/Messaging/Messaging.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index fc9477c0cb2..06b190c4e4b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
@@ -28,11 +28,11 @@
#include "LB_LoadListMap.h"
#include "LB_Pull_Handler.h"
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
+#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
class TAO_LoadBalancing_Export TAO_LB_LoadManager
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
index 1ff00d58bc6..6e5778f4a55 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
@@ -16,16 +16,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index a247293b071..8f0cc83f219 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -3,7 +3,7 @@
#include "LB_LoadMap.h"
#include "LB_Random.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index 1587d889b3f..522d574ea3c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -23,7 +23,7 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
#include "ace/Synch_Traits.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
index 9bda59cc806..b99c5437779 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/PortableGroupC.h"
+#include "orbsvcs/PortableGroupC.h"
#include "ace/Functor.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
index 46dd23539e5..02b8f12adeb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
@@ -16,14 +16,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 9f59c099b0f..245fc0552b1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -2,7 +2,7 @@
#include "LB_IORInterceptor.h"
#include "LB_ServerRequestInterceptor.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 6ca2b5b8597..d7bab7a8e98 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LB_ORTC.h"
+#include "orbsvcs/LB_ORTC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -28,7 +28,7 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#include "ace/Array_Base.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 7eb9eb88c72..2f03027c78a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 82e408654ff..6e8c1db4288 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -2,7 +2,7 @@
#include "LB_RoundRobin.h"
-#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index 934e92a7d1c..c244a697157 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -22,9 +22,9 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
+#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
/**
* @class TAO_LB_RoundRobin_Strategy
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index 4a7d114122e..a03a561f291 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -18,7 +18,7 @@
#include "ace/config-all.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once