10 files changed, 38 insertions, 26 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 14bff5925b2..7b6b3cb0345 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -3,11 +3,13 @@
 #include "Counting_Supplier.h"
 #include "Counting_Consumer.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID(CEC_Tests, Disconnect, "$Id$")
+ACE_RCSID (CEC_Tests, 
+           Disconnect, 
+           "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 5587b6584fd..a31c7a75652 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -4,10 +4,12 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$")
+ACE_RCSID (CEC_Tests, 
+           MT_Disconnect, 
+           "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 06a263e9178..a6e077c91cc 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -18,7 +18,7 @@
 #define CEC_MT_DISCONNECT_H
 
 #include "ace/Task.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 9f117d025b3..c2a6af2ac0c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -2,10 +2,12 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID(CEC_Tests_Basic, Pull_Push_Event, "$Id$")
+ACE_RCSID (CEC_Tests_Basic, 
+           Pull_Push_Event, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index f4fffebd1ad..48bc4698622 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -2,10 +2,12 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID(CEC_Tests_Basic, Push_Event, "$Id$")
+ACE_RCSID (CEC_Tests_Basic, 
+           Push_Event, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 7d9019d5bba..e63f132d34e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
 #include "Random.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(CEC_Tests, Random, "$Id$")
+ACE_RCSID (CEC_Tests, 
+           Random, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 450fe418668..d40b29ab84a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -17,8 +17,8 @@
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index b69af879380..2a63a37184c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -2,10 +2,12 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
 
-ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$")
+ACE_RCSID( CEC_Tests_Basic, 
+           Shutdown, 
+           "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int with_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index d3ec2cbbb33..fbcc070662d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -23,8 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
 class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 5f557db27ee..c33b963a13e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -23,8 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
 #include "ace/Task.h"
 
 class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier