Mon Jun 28 13:32:27 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * MPC/config/dds4ccm.mpb:
        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl:
        * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl:
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
        * connectors/dds4ccm/idl/ccm_dds.idl:
        * connectors/dds4ccm/idl/dds4ccm_Connector.idl:
        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl:
        * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl:
        * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl:
        * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl:
        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl:
        * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl:
        * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl:
        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl:
        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/Derived/Derived_Connector.idl:
        * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl:
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl:
        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl:
        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl:
        * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl:
        * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl:
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl:
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl:
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl:
        * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl:
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl:
        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl:
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl:
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl:
        * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl:
        * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl:
        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl:
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl:
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl:
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl:
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl:
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl:
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl:
        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl:
        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl:
        * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
          ccm_dds.idl has become a system file.

81 files changed, 227 insertions, 151 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
index f7cf81d392c..d52ed3883c7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef HELLO_CONNECTOR_IDL_
 #define HELLO_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Hello_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Hello_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
index 4aa09cea162..7d10d0ab5a3 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
@@ -4,8 +4,9 @@
 #define LARGE_CONNECTOR_IDL
 
 #include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Common/Common.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Large_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
index e6780ddc620..90c3831e0fd 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
@@ -9,8 +9,9 @@
 #define QUOTER_CONNECTOR_IDL_
 
 #include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Quoter_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Quoter_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index f6ff6eab9dd..fc2a9693413 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef SHAPES_CONNECTOR_IDL_
 #define SHAPES_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Shapes_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Shapes_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
index 23374609ffc..e3045db3092 100644
--- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
+++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
@@ -3,7 +3,7 @@
 #ifndef CCM_DDS_BASE_IDL
 #define CCM_DDS_BASE_IDL
 
-#include  <Components.idl>
+#include <Components.idl>
 #include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl"
 #include "connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl"
 #include "connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl"
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
index 54e27004051..b56754a4643 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
@@ -3,7 +3,7 @@
 #ifndef DDS4CCM_CONNECTOR_IDL
 #define DDS4CCM_CONNECTOR_IDL
 
-#include  <Components.idl>
+#include <Components.idl>
 #include "connectors/dds4ccm/idl/dds4ccm_Base.idl"
 #include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
index d56c9631f78..864f5503c8f 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl
@@ -10,9 +10,10 @@
 #ifndef PERF_KEYED_TEST_CONNECTOR_IDL_
 #define PERF_KEYED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Perf_Keyed_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Perf_Keyed_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
index e7aa946a233..1fd8c4a131b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl
@@ -11,8 +11,9 @@
 #define LATENCYTT_TEST_CONNECTOR_IDL_
 
 #include  <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/LatencyTT_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/LatencyTT_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
index 6def63f0fd7..5d6b3672f8c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
@@ -10,9 +10,10 @@
 #ifndef THROUGHPUT_CONNECTOR_IDL_
 #define THROUGHPUT_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Throughput_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Throughput_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
index 6b3ee60468b..c7001ad6978 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl
@@ -10,9 +10,10 @@
 #ifndef THROUGHPUT_SEC_CONNECTOR_IDL_
 #define THROUGHPUT_SEC_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Throughput_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "SecConnector/Throughput_Sec_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
index 6bfec3f1a62..00f32d69e66 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CSL_DeadlineTest_CONNECTOR_IDL_
 #define CSL_DeadlineTest_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CSL_DeadlineTest_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
index 27d50bee6d4..31a1efc335c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CSL_QOSTEST_CONNECTOR_IDL_
 #define CSL_QOSTEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CSL_QoSTest_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
index 6e2e5a98aaf..3e93b98eb2e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CSL_SRTEST_CONNECTOR_IDL_
 #define CSL_SRTEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CSL_SRTest_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
index f349017d740..dc50dd006eb 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CSL_USTEST_CONNECTOR_IDL_
 #define CSL_USTEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CSL_USTest_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
index d20aefdd878..1f91a96ba2d 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef COHERENT_UPDATE_TEST_CONNECTOR_IDL_
 #define COHERENT_UPDATE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CoherentUpdate_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
index 73d5529567e..92aed6d4f48 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_
 #define COHERENT_WRITE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CoherentWrite_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
index ab33efa3780..fe7c04dd3b3 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
@@ -4,8 +4,9 @@
 #define DIFFDIR_CONNECTOR_IDL
 
 #include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "DiffDir.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "DiffDir_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
index c3d29c38a46..c47d72c5a82 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
 #define CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CFT_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CFT_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
index af834d46a57..90d1a087880 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
 #define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CFTLE_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CFTLE_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
index 7f9aaa1f922..bad6c8b9916 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CFT_EXCEPTION_TEST_CONNECTOR_IDL_
 #define CFT_EXCEPTION_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Exception_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Exception_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
index 370ba27eaaa..3dc9bbad390 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
 #define QUERY_CONDITION_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/ReadGet_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
index 3a5a3c8bbfe..d9f78b5593b 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
 #define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/CFTLS_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/CFTLS_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl
index 46a2a3adaba..b5ed2dfe1c8 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef WRITER_CONNECTOR_IDL_
 #define WRITER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Writer_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
index 7db5a8947f6..35229360f09 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
@@ -4,8 +4,9 @@
 #define NOMODULE_CONNECTOR_IDL
 
 #include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Derived.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Derived_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
index e49f2b151dc..c1de1c25691 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
 #define DOUBLE_NESTED_MODULE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/DNM_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/DNM_ConnectorE.idl"
 #pragma ndds typesupport "Base/DNM_BaseSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
index 6d37b890925..2e62dab9c3b 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef KEYED_TEST_CONNECTOR_IDL_
 #define KEYED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Event_Connection_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
index b1103fbb564..50cc32c7acc 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
 #define FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/FSS_Event_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
 #pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
index a11d45bd189..63e9ef6e624 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
 #define FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/FSS_State_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
 #pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
index 5327e1df0f3..0e3bc7abdc7 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
 #define GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/GCE_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/GCE_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
index 95bc2f891a6..191e741c110 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
 #define GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/GCS_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/GCS_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
index 5b61bc87887..fc18ed06eaf 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef GETTER_TEST_CONNECTOR_IDL_
 #define GETTER_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
 #include "Base/Getter_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
+
+#include <ccm_dds.idl>
 
 #pragma ciao lem "Connector/Getter_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
index 46a2a3adaba..b5ed2dfe1c8 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef WRITER_CONNECTOR_IDL_
 #define WRITER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Writer_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
index ead5a9cf982..26fa3dc7d22 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef KEYED_TEST_CONNECTOR_IDL_
 #define KEYED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Keyed_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
index 46a2a3adaba..b5ed2dfe1c8 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef WRITER_CONNECTOR_IDL_
 #define WRITER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Writer_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
index 5cdc86f380f..cd00ac4a3de 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
 #define LISTEN_MANY_BY_MANY_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/LMBM_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
index af638d9599d..e346a730766 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
 #define LISTEN_NOT_ENABLED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/LNE_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/LNE_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
index 7ae5f874606..e1f67124bdd 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
 #define LISTEN_ONE_BY_ONE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/LOBO_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
index b9a782189fe..1d01e9edd9d 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
@@ -4,8 +4,9 @@
 #define NOMODULE_CONNECTOR_IDL
 
 #include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "NoModule.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "NoModule_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
index a88c5ee3663..34d1bc352a8 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef NONCHANGABLE_CONNECTOR_IDL_
 #define NONCHANGABLE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/NonChangeable_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/NonChangeable_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
index 6ccd2f5c7c7..dee6de05d2c 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
 #define ON_INCONSISTENT_TOPIC_TEST_RECEIVER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/OIT_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "ReceiverConnector/OIT_Receiver_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
index 8d94fa4fd2a..d69fbd3896d 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl
@@ -1,3 +1,4 @@
+
 // $Id$
 
 /**
@@ -8,9 +9,9 @@
 #ifndef ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
 #define ON_INCONSISTENT_TOPIC_TEST_SENDER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
 #include "Base/OIT_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "SenderConnector/OIT_Sender_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
index 709b9e2c465..c215d775c69 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
@@ -4,7 +4,8 @@
 #define OFM_CONNECTOR_IDL
 
 #if defined __TAO_IDL
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
+
+#include <ccm_dds.idl>
 #endif
 
 #pragma ndds typesupport "OFM_ConnectorSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
index 357e9746d89..ae5f63f3c39 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
@@ -9,7 +9,8 @@
 #define ONEFILE_CONNECTOR_IDL_
 
 #if defined __TAO_IDL
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
+
+#include <ccm_dds.idl>
 #endif
 
 #pragma ndds typesupport "OneFile_ConnectorSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
index 13f6f7e0b4a..aefa5f9b42a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl
@@ -6,7 +6,7 @@
 #pragma dds4ccm impl "DDS_PSAT_Connector_T.h"
 
 #if defined (__TAO_IDL)
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
+#include <ccm_dds.idl>
 #endif
 
 /**
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
index dc265e11e46..e960bcb890a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef PSL_DeadlineTest_CONNECTOR_IDL_
 #define PSL_DeadlineTest_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/PSL_DeadlineTest_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
index f26d672fc2f..930098bee48 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef PSL_SampleLost_CONNECTOR_IDL_
 #define PSL_SampleLost_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/PSL_SampleLost_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
index 34da13b1cce..0c622c0a259 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
 #define PORTUSAGE_EVENT_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/PortUsage_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "EventConnector/PortUsageEvent_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
index 19da7b7b040..7a26567b179 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef PORTUSAGE_STATE_CONNECTOR_IDL_
 #define PORTUSAGE_STATE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/PortUsage_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "StateConnector/PortUsageState_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
index 7514b8cd719..0c543bb4371 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_
 #define QOS_PROFILE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/QosProfile_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
index 9aba86d598e..6b634bce73e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
 #define QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/QCLE_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/QCLE_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
index 370ba27eaaa..3dc9bbad390 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_
 #define QUERY_CONDITION_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/ReadGet_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
index 31e84a39978..7506601efc8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
 #define QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/QCLS_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/QCLS_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
index 4f1e8228bc3..e5b7dd5227a 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef READER_TEST_CONNECTOR_IDL_
 #define READER_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Reader_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Reader_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
index 281bda78bd2..584d71b1a04 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef SL_DISABLED_CONNECTOR_IDL_
 #define SL_DISABLED_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/SL_Disabled_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
index 3598c79e354..70ccc38da42 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
@@ -8,9 +8,9 @@
 #ifndef SL_MANYBYMANY_CONNECTOR_IDL_
 #define SL_MANYBYMANY_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
 #include "Base/SL_ManyByMany_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
index 309ee8478f2..9f3528b66d3 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef SL_ONEBYONE_CONNECTOR_IDL_
 #define SL_ONEBYONE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/SL_OneByOne_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
index bbfe23ccdc7..87337b75c9e 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
 #define SETCONNECTORATTRIBUTE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/SetConnectorAttribute_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
index f1f2c60548e..edbb93d61f1 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
@@ -8,9 +8,10 @@
 #ifndef SHARED_DP_CONNECTOR1_IDL_
 #define SHARED_DP_CONNECTOR1_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector1/Connector1E.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
index a7e45ebdf75..51a1fbcb3b0 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
@@ -8,9 +8,10 @@
 #ifndef SHARED_DP_CONNECTOR2_IDL_
 #define SHARED_DP_CONNECTOR2_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector2/Connector2E.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
index 75494f4ddc2..13e64e91aed 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
@@ -8,9 +8,10 @@
 #ifndef SHARED_DP_CONNECTOR3_IDL_
 #define SHARED_DP_CONNECTOR3_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector3/Connector3E.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
index f16a853aa20..f76c054764d 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
@@ -8,9 +8,10 @@
 #ifndef SHARED_DP_CONNECTOR_IDL_
 #define SHARED_DP_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
index b95def0041c..07cccf4d94a 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef KEYED_TEST_CONNECTOR_IDL_
 #define KEYED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/State_Connection_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
index d382e20e91e..35c1953e81f 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef TWOTOPICS_CONNECTOR_IDL_
 #define TWOTOPICS_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/TwoTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
 #pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
index c18f3535053..c541074eacf 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
@@ -8,11 +8,11 @@
 #ifndef CONNECTOR_IDL_
 #define CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
 #include "Hello/HelloGoodbye.idl"
 #include "Goodbye/HelloGoodbye.idl"
 
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/ConnectorE.idl"
 #pragma ndds typesupport "Hello/HelloGoodbyeSupport.h"
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
index 411ee4f9976..696b716af72 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef UNKEYED_TEST_CONNECTOR_IDL_
 #define UNKEYED_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Unkeyed_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
index 19f4ef12391..787133fdff6 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef WRITER_CONNECTOR_IDL_
 #define WRITER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Writer_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
index 25e73c0d784..fbb04099a0d 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef UPDATER_CONNECTOR_IDL_
 #define UPDATER_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/Updater_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/Updater_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
index 4a3e44a68b0..ac1c8d522f5 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
 #define USERDATA_COPY_COUNT_TEST_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/UCC_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/UCC_Test_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
index 36118b660c7..5cfdc24d596 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_ARRAY_CONNECTOR_IDL_
 #define VT_ARRAY_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Array/VT_Array_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
index 33b890e8911..906d875e259 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_SEQ_CONNECTOR_IDL_
 #define VT_SEQ_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Seq/VT_Seq_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
index dd2a013a93d..0da43f614f3 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_STRING_CONNECTOR_IDL_
 #define VT_STRING_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_String/VT_String_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
index ed1b6168ebf..a62fdf59741 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_UNION_CONNECTOR_IDL_
 #define VT_UNION_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Union/VT_Union_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
index bc216de0722..a3bf05497a9 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_VALUETYPE_CONNECTOR_IDL_
 #define VT_VALUETYPE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Valuetype/VT_Valuetype_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
index 41b013feb53..60213191f73 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTOPIC_CONNECTOR_IDL_
 #define VTOPIC_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopic_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/VTopic_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
index 5132fb6e7aa..343b3529102 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTS_ARRAY_CONNECTOR_IDL_
 #define VTS_ARRAY_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Array/VTS_Array_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
index c2904917eae..03ed0654edd 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTS_SEQ_CONNECTOR_IDL_
 #define VTS_SEQ_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
index 293e6fef3d2..9f40e9b2bed 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTS_STRING_CONNECTOR_IDL_
 #define VTS_STRING_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_String/VTS_String_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
index 572c747967e..3f1f98e773b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VT_UNION_CONNECTOR_IDL_
 #define VT_UNION_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Union/VTS_Union_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
index 081f0a301e6..b87b1aacce7 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTS_VALUE_TYPE_CONNECTOR_IDL_
 #define VTS_VALUE_TYPE_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Conn_Valuetype/VTS_Valuetype_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
index c0b7cd37f7c..acbff70c104 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
@@ -8,9 +8,10 @@
 #ifndef VTOPICS_CONNECTOR_IDL_
 #define VTOPICS_CONNECTOR_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Base/VTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/VTopics_ConnectorE.idl"
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
index 3e87d01efed..23e893b0400 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl
@@ -3,9 +3,10 @@
 #ifndef SHAPES_SHAPETYPE_CONN_IDL_
 #define SHAPES_SHAPETYPE_CONN_IDL_
 
-#include  <Components.idl>
+#include <Components.idl>
+#include <ccm_dds.idl>
+
 #include "Shapes_msg.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Shapes_ShapeType_connE.idl"