5 files changed, 13 insertions, 9 deletions
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 12516fcb83a..340bb6d7e78 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -15,7 +15,7 @@
 
 #include "Generic_Factory.h"
 
-#include "orbsvcs/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceC.h"
 
 ACE_RCSID (Quoter, 
            Generic_Factory, 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index f972a2040d5..c48f1565830 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -4,7 +4,8 @@
 // todo : Once MPC is used for everything, we should consider
 //        removing the includes += lines below, and updating
 //        the source code instead.
-project(*server): namingexe, lifecycle, minimum_corba {
+project(*server): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -13,7 +14,8 @@ project(*server): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*client): namingexe, lifecycle, minimum_corba {
+project(*client): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -21,7 +23,8 @@ project(*client): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle, minimum_corba {
+project(*Factory Finder): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -30,7 +33,8 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle, minimum_corba {
+project(*Generic Factory): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 7dec1d90a22..be51846ebe7 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Read_Buffer.h"
 
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
 
 #include "client.h"
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index d5014c872c8..f171180c031 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -28,7 +28,7 @@
 
 #include "QuoterC.h"
 
-#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/orbsvcs/CosLifeCycleC.h"
 
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 880be8f44c6..1b3362e8c1d 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -28,8 +28,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 #include "tao/PortableServer/ORB_Manager.h"
 #include "Quoter_i.h"
 #include "QuoterC.h"