Thu Mar 18 08:58:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

	* MPC/config/dds4ccm.mpb:
	  Added default includes

	* connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
	* connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
	* connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
	* connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
	* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
	* connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
	* connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
	* connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
	* connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
	* connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc
	* connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc
	* connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
	* connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
	* connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
	* connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
	* connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
	* connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
	* connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
	* connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
	* connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
	* connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
	* connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
	* connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
	* connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
	* connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
	* connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
	* connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
	* connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
	* connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
	* connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
	* connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
	* connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
	* connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
	* connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
	* connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
	* connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
	* connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
	* connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
	* connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
	* connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
	* connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
	* connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
	* connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
	* connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
	* connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
	* connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
	* connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
	* connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
	* connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
	  Simplified these projects

64 files changed, 162 insertions, 93 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 8f7c6a6bbb9..cab43a8b40f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,73 @@
+Thu Mar 18 08:58:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* MPC/config/dds4ccm.mpb:
+	  Added default includes
+
+	* connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+	* connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+	* connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+	* connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+	* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+	* connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+	* connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+	* connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
+	* connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
+	* connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc
+	* connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc
+	* connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+	* connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+	* connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+	* connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+	* connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+	* connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+	* connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
+	* connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+	* connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+	* connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+	* connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+	* connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+	* connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+	* connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+	* connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+	* connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+	* connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+	* connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+	* connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+	* connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+	* connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
+	* connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
+	* connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+	* connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+	* connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
+	* connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+	* connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+	* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+	* connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+	* connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+	* connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+	* connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+	* connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+	* connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+	* connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+	* connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+	* connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+	* connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+	* connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+	  Simplified these projects
+
 Wed Mar 17 07:46:27 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp:
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
index b8466329fdb..854617dc2f6 100644
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -3,19 +3,25 @@
 feature(dds4ccm_opendds) : taoidldefaults, dcps {
   macros += CIAO_DDS4CCM_OPENDDS=1
   idlflags += -DCIAO_DDS4CCM_OPENDDS=1 \
-              -Wb,dds_impl=opendds
+              -Wb,dds_impl=opendds \
+              -I $(CIAO_ROOT)/connectors \
+              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
 }
 
 feature(dds4ccm_splice) : taoidldefaults {
   macros += CIAO_DDS4CCM_SPLICE=1
   idlflags += -DCIAO_DDS4CCM_SPLICE=1 \
-              -Wb,dds_impl=opensplice
+              -Wb,dds_impl=opensplice \
+              -I $(CIAO_ROOT)/connectors \
+              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
 }
 
 feature(dds4ccm_ndds) : taoidldefaults {
   macros += CIAO_DDS4CCM_NDDS=1
   idlflags += -DCIAO_DDS4CCM_NDDS=1 \
-              -Wb,dds_impl=ndds
+              -Wb,dds_impl=ndds \
+              -I $(CIAO_ROOT)/connectors \
+              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
 }
 
 feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index 29cbfc5cbda..0bfe674d52a 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
 project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  avoids += ace_for_tao
   after  += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \
@@ -20,15 +19,12 @@ project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
 }
 
 project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  avoids += ace_for_tao
   custom_only = 1
   after += DDS_Hello_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. \
-              -I $(CIAO_ROOT)/connectors \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Hello_ConnectorE.idl
@@ -36,7 +32,6 @@ project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
   after  += DDS_Hello_Connector_lem_gen \
             DDS_Hello_Connector_stub \
             DDS_Hello_Base_stub \
@@ -68,7 +63,6 @@ project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
 }
 
 project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
-  avoids += ace_for_tao
   after  += DDS_Hello_Connector_idl_gen DDS_Hello_Base_stub
   libs   += DDS_Hello_Base_stub
   libpaths += ../lib
@@ -95,7 +89,6 @@ project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
-  avoids += ace_for_tao
   after  += DDS_Hello_Connector_lem_stub \
             DDS_Hello_Connector_stub \
             DDS4CCM_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
index 1ba474cd77e..9ad01da87be 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
@@ -18,7 +18,7 @@ project(Large_Connector_idl_gen) : connectoridldefaults , dds4ccm  {
   }
 }
 
-project(Large_Connector_lem_gen) : ciaoidldefaults , dds4ccm_base  {
+project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base  {
   after += Large_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_LEM_STUB_Export \
@@ -30,7 +30,7 @@ project(Large_Connector_lem_gen) : ciaoidldefaults , dds4ccm_base  {
   }
 }
 
-project(Large_Connector_lem_stub) : ccm_svnt , dds4ccm_base  {
+project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_base  {
   after += Large_Connector_lem_gen Large_Connector_stub_stub Large_Deployment_stub
   libs  +=  Large_Connector_stub Large_Deployment_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -56,7 +56,7 @@ project(Large_Connector_lem_stub) : ccm_svnt , dds4ccm_base  {
   }
 }
 
-project(Large_Connector_stub) : ccm_stub , dds4ccm_base  {
+project(Large_Connector_stub) : ccm_stub, dds4ccm_base  {
   after += Large_Connector_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
index d5576737370..59ede26a448 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
@@ -28,9 +28,9 @@ project(Large_DDS_Pub_lem_gen) : ciaoidldefaults , dds4ccm  {
   }
 }
 
-project(Large_DDS_Pub_lem_stub) : ccm_svnt , dds4ccm_base  {
+project(Large_DDS_Pub_lem_stub) : ccm_svnt, dds4ccm_base  {
   after += Large_DDS_Pub_lem_gen Large_DDS_Pub_stub  Large_Deployment_stub
-  libs  +=  DDS_Pub_stub Large_Deployment_stub 
+  libs  +=  DDS_Pub_stub Large_Deployment_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -54,7 +54,7 @@ project(Large_DDS_Pub_lem_stub) : ccm_svnt , dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Pub_stub) : ccm_stub , dds4ccm_base  {
+project(Large_DDS_Pub_stub) : ccm_stub, dds4ccm_base  {
   after += Large_DDS_Pub_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
@@ -80,10 +80,10 @@ project(Large_DDS_Pub_stub) : ccm_stub , dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Pub_exec) : ciao_executor , dds4ccm_base  {
+project(Large_DDS_Pub_exec) : ciao_executor, dds4ccm_base  {
   after   += Large_DDS_Pub_lem_stub Large_DDS_Pub_stub Large_Connector_stub
   sharedname = DDS_Pub_exec
-  libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub 
+  libs += DDS_Pub_stub DDS_Pub_lem_stub Large_Deployment_stub Large_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -106,7 +106,7 @@ project(Large_DDS_Pub_exec) : ciao_executor , dds4ccm_base  {
 }
 
 
-project(Large_DDS_Pub_svnt) : ciao_servant , dds4ccm_base  {
+project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base  {
   after      +=   Large_DDS_Pub_lem_stub Large_Connector_stub
   sharedname  = DDS_Pub_svnt
   libs       += DDS_Pub_stub DDS_Pub_lem_stub  Large_Deployment_stub
@@ -115,7 +115,7 @@ project(Large_DDS_Pub_svnt) : ciao_servant , dds4ccm_base  {
   libout = ../lib
   includes += ..
   dynamicflags = DDS_PUB_SVNT_BUILD_DLL
-  
+
   IDL_Files {
   }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
index 979fa9d420d..4894d08eeff 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
@@ -28,9 +28,9 @@ project(Large_DDS_Sub_lem_gen) : ciaoidldefaults , dds4ccm  {
   }
 }
 
-project(Large_DDS_Sub_lem_stub) : ccm_svnt , dds4ccm_base  {
+project(Large_DDS_Sub_lem_stub) : ccm_svnt, dds4ccm_base  {
   after += Large_DDS_Sub_lem_gen Large_DDS_Sub_stub Large_Deployment_stub
-  libs  +=  DDS_Sub_stub Large_Deployment_stub 
+  libs  +=  DDS_Sub_stub Large_Deployment_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -54,7 +54,7 @@ project(Large_DDS_Sub_lem_stub) : ccm_svnt , dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Sub_stub) : ccm_stub , dds4ccm_base  {
+project(Large_DDS_Sub_stub) : ccm_stub, dds4ccm_base  {
   after += Large_DDS_Sub_idl_gen Large_Deployment_stub
   libs  += Large_Deployment_stub
   libpaths += ../lib
@@ -80,7 +80,7 @@ project(Large_DDS_Sub_stub) : ccm_stub , dds4ccm_base  {
   }
 }
 
-project(Large_DDS_Sub_exec) : ciao_executor , dds4ccm_base  {
+project(Large_DDS_Sub_exec) : ciao_executor, dds4ccm_base  {
   after   += Large_DDS_Sub_lem_stub Large_DDS_Sub_stub Large_Connector_stub
   sharedname = DDS_Sub_exec
   libs += DDS_Sub_stub DDS_Sub_lem_stub Large_Deployment_stub Large_Connector_stub
@@ -106,7 +106,7 @@ project(Large_DDS_Sub_exec) : ciao_executor , dds4ccm_base  {
 }
 
 
-project(Large_DDS_Sub_svnt) : ciao_servant , dds4ccm_base  {
+project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base  {
   after      +=   Large_DDS_Sub_lem_stub Large_Connector_stub
   sharedname  = DDS_Sub_svnt
   libs       += DDS_Sub_stub DDS_Sub_lem_stub  Large_Deployment_stub Large_Connector_stub
@@ -114,7 +114,7 @@ project(Large_DDS_Sub_svnt) : ciao_servant , dds4ccm_base  {
   libout = ../lib
   includes += ..
   dynamicflags = DDS_SUB_SVNT_BUILD_DLL
-  
+
   IDL_Files {
   }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index 67eadefb5ba..d6cfea2cde1 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Quoter_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Quoter_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index a91758a3efd..b35a729923c 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Shapes_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Shapes_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index afa92e6a20c..db7eb1cc6e5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Perf_Keyed_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Perf_Keyed_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
index 1ec88bff520..9887d2c423f 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Latency_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LATENCY_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Latency_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Latency_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc
index afa6b1e326f..f6a85b8b7ab 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Connector/LatencyTT_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_LatencyTT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=LatencyTT_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     LatencyTT_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc
index ccd65e87ab7..8517aaaf285 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/SecConnector/LatencyTT_TestSec_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_LTT_TestSec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LATENCYTT_TESTSEC_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=LatencyTT_TestSec_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     LatencyTT_TestSec_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index 520f2c0c924..5ec42ccda2e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CSL_DeadlineTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CSL_DeadlineTest_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
index 69e9c5ad3e0..65082f10cc9 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CSL_QoSTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CSL_QoSTest_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
index 42a7770bb7c..eba1bec9072 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CSL_SRTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CSL_SRTest_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
index 0eb13d956d3..c59804238f9 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CSL_USTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CSL_USTest_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
index ceaa216724f..cdb14074760 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(CoherentUpdate_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CoherentUpdate_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CoherentUpdate_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
index b05a815d4ee..e1f0128a57d 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CoherentWrite_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     CoherentWrite_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
index 36d588708cb..80b36b1213e 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
index 2cad614e78b..9a78c3acff8 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=DNM_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     DNM_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
index 3db8009e6ef..a4a974acfc6 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Event_Connection_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Event_Connection_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
index 0da1b2b71b0..6e4dde9f70a 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=FSS_Event_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     FSS_Event_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
index 6852ed65347..12bf238e623 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=FSS_State_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     FSS_State_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
index 66398ad591f..4aeb2ae819f 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Getter_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Getter_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index eaf896a44af..30334e43706 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index 600419c57dc..e6b7ac4140b 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Keyed_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Keyed_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index 3da46b66869..69710098f04 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
index 909ce5b59b6..bd0e8ad78fd 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=LMBM_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     LMBM_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
index da90e01ab6f..e9da9237f41 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=LNE_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     LNE_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
index d428cb604f8..170148e5fbf 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=LOBO_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     LOBO_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
index 98eaa6b63be..4e08d54a005 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
@@ -30,8 +30,8 @@ project(NoModule_Connector_lem_gen) : ciaoidldefaults , dds4ccm  {
 project(NoModule_Connector_lem_stub) : ccm_svnt , dds4ccm_lem_stub  {
   after += NoModule_Connector_lem_gen NoModule_Connector_stub
   libs  +=  NoModule_Connector_stub
-  
-    
+
+
   sharedname = NoModule_Connector_lem_stub
   dynamicflags   = NOMODULE_CONNECTOR_LEM_STUB_BUILD_DLL
 
@@ -52,11 +52,11 @@ project(NoModule_Connector_lem_stub) : ccm_svnt , dds4ccm_lem_stub  {
   }
 }
 
-project(NoModule_Connector_stub) : ccm_stub , dds4ccm_base  {
+project(NoModule_Connector_stub) : ccm_stub, dds4ccm_base  {
   after += NoModule_Connector_idl_gen NoModule_stub
   libs  += NoModule_stub
-  
-  
+
+
   sharedname = NoModule_Connector_stub
   dynamicflags   = NOMODULE_CONNECTOR_STUB_BUILD_DLL
 
@@ -81,7 +81,7 @@ project(NoModule_Connector_exec) : ciao_executor , dds4ccm_impl  {
   after   += NoModule_Connector_lem_stub NoModule_Connector_stub
   sharedname = NoModule_Connector_exec
   libs += NoModule_Connector_stub NoModule_Connector_lem_stub NoModule_stub
-  
+
   dynamicflags   = NOMODULE_CONNECTOR_CONN_BUILD_DLL
 
   IDL_Files {
@@ -105,10 +105,10 @@ project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl, dds4ccm_lem_stub
   after      += NoModule_Connector_lem_stub
   sharedname  = NoModule_Connector_svnt
   libs       += NoModule_Connector_stub NoModule_Connector_lem_stub  NoModule_stub
-  
-  
+
+
   dynamicflags = NOMODULE_CONNECTOR_SVNT_BUILD_DLL
-  
+
   IDL_Files {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index 43fce05d8bf..5d2d62fdf80 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=NONCHANGEABLE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=NonChangeable_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     NonChangeable_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
index e25544272bf..cb001ae688d 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_OIT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=ConnectorStatusListener_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     ConnectorStatusListener_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
index 2babbd644f8..e694a992fe5 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_OIT_TestSec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=ConnectorStatusListener_TestSec_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     ConnectorStatusListener_TestSec_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
index 036a1c19cbb..c9c99037a5c 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=PSL_DeadlineTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     PSL_DeadlineTest_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
index 5163c759a9b..8f19bdab3bc 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=PSL_SampleLost_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     PSL_SampleLost_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
index 7b89644b000..babfda6364f 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=QueryFilter_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     QueryFilter_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
index 6f5085d706d..bf511b1341b 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Reader_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Reader_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
index 10358979cc9..7b56d2276f5 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=SL_Disabled_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     SL_Disabled_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
index 62a73316511..77df887a47d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=SL_ManyByMany_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     SL_ManyByMany_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index f1213f4f2bb..381ffe38c3e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=SL_OneByOne_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     SL_OneByOne_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index b5b6cf6eba2..6f913842f95 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=SetConnectorAttribute_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     SetConnectorAttribute_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index b93bc91bfa1..7a369c45ae9 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -24,7 +24,7 @@ project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
               -Wb,stub_export_include=Connector1_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Connector1E.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index f1e2dc87137..2a5abfef8d6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -24,7 +24,7 @@ project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
               -Wb,stub_export_include=Connector2_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Connector2E.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index ad8d9ad0eea..2e7e85481aa 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -24,7 +24,7 @@ project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
               -Wb,stub_export_include=Connector3_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Connector3E.idl
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index 7f3b173b1e4..8e7678a41fc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index 6aab30884a2..6e02d6eea27 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=State_Connection_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     State_Connection_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
index baaa0cf09fb..e5c8961f372 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     TwoTopics_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
index 3764b7ee0ef..38666186695 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
@@ -26,7 +26,7 @@ project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
index daf5747ca7f..1953801f39b 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Unkeyed_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Unkeyed_Test_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index 511459c884e..302e2adb3b8 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Writer_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index a5dc883e437..af19013fa69 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Updater_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     Updater_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
index db5fab8544d..6b59865630a 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VT_Array_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VT_Array_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
index a94c92eecc2..82fbfe90d15 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VT_Seq_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VT_Seq_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
index 4d5468ae4a6..3e805c1127b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VT_String_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VT_String_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
index 57aab371f78..eeadc56b29c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VT_Union_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VT_Union_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
index 366e0745309..f3ebeff878f 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_VT_VALUETYPE_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_VALUETYPE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VT_Valuetype_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VT_Valuetype_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index 861bcd0e2e9..c96d76e6265 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTopic_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTopic_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
index 3cb46e8ebb7..839a9e5ef50 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTS_Array_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTS_Array_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index 9bb44c3f8fb..d11a8536328 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTS_Seq_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTS_Seq_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
index 02693e92602..35548bf3c23 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTS_String_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTS_String_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
index c0db9486cdd..90919833140 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTS_Union_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTS_Union_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
index e11d042eb6f..63d11365dd6 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
@@ -24,7 +24,7 @@ project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTS_Valuetype_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTS_Valuetype_ConnectorE.idl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index e8baf8482f8..c311d36e795 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -25,7 +25,7 @@ project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=VTopics_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I ..
 
   IDL_Files {
     VTopics_ConnectorE.idl