11 files changed, 12 insertions, 17 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index a81df69daa0..5c945b65f10 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -24,8 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "CC_tests.h"
 #include "CC_naming_service.h"
 #include "CC_command.h"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index fe4a1467fe1..e502874a740 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -20,8 +20,7 @@
 #include "CC_naming_service.h"
 #include "ace/ACE.h"
 #include "ace/Process.h"
-#include "ace/Log_Msg.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 735d38d7c21..9992d80c6f7 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_COMMAND_H_
 #define _CC_COMMAND_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 8a67df0eb67..2b161c63d94 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -30,7 +30,7 @@
 
 #include "CC_command.h"
 #include "ace/ACE.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 #include "ace/OS_NS_stdio.h"
 
 void ace_cc_yyerror (const char* s);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index d12cb0d1e94..fe0f28fef32 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -19,7 +19,6 @@
 
 #include "CC_naming_service.h"
 #include "ace/OS_NS_string.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 597a9696840..3dfbcff8b44 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 #ifndef _CC_NAMING_SERVICE_H_
 #define _CC_NAMING_SERVICE_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 8559173030b..baf8c02bdda 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -20,7 +20,6 @@
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
 #include "ace/OS.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index 4c1a643f863..95a4605d582 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 #ifndef _CC_TEST_UTILS_H_
 #define _CC_TEST_UTILS_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 01af67d07b7..d4e132a0617 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -19,8 +19,6 @@
 
 #include "CC_tests.h"
 #include "ace/OS.h"
-#include "ace/Log_Msg.h"
-
 ACE_RCSID(Concurrency, CC_tests, "$Id$")
 
 CC_Test::CC_Test (CC_naming_service *ns)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 9f0083fd2ad..7417c23235d 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 #include "CC_naming_service.h"
 
 #ifndef _CC_TESTS_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
index ecddc658428..3c8d0dcdd5f 100644
--- a/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/tmplinst.cpp
@@ -5,7 +5,7 @@
 // The contents of this file REALLY should be generated by the IDL
 // compiler, but that functionality isn't available yet.
 
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
 
 ACE_RCSID(Concurrency, tmplinst, "$Id$")