Tue May 15 13:35:32 UTC 2012 Marcel Smit <msmit@remedy.nl>

        * MPC/config/dds4ccm.mpb:
        * MPC/config/dds4ccm_base.mpb:
        * MPC/config/dds4ccm_impl.mpb:
        * MPC/config/dds4ccm_ts_default.mpb:
        * MPC/config/ndds_idltocpp.mpb:
        * MPC/config/ndds_idltocpp_ts_defaults.mpb:

        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:

        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl:
        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc:

        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc:

        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc:

        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc:

        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc:

        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl:

        * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl:
        * 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/Base/Quoter_Base.idl:

        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl:
        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc:

        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:

        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc:

        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp:

        * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl:

        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:

        * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:

        * connectors/dds4ccm/impl/ConditionManager.cpp:
        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
        * connectors/dds4ccm/impl/Updater_T.cpp:

        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:

        * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl:
        * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc:

        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc:
        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp:

        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc:

        * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl:
        * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc:

        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc:

        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc:

        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:

        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl:
        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc:

        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:

        * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl:
        * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc:

        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:

        * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl:
        * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc:

        * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl:
        * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc:

        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl:

        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc:

        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:

        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc:

        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:

        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc:

        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:

        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl:
        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc:

        * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl:

        * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl:
        * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc:

        * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl:

        * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl:
        * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc:

        * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl:

        * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl:
        * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc:

        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl:
        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc:

        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:

        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc:

        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:

        * connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc:

        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:

        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:

        * connectors/dds4ccm/tests/Derived/Derived.idl:
        * connectors/dds4ccm/tests/Derived/Derived_Connector.idl:
        * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc:

        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:

        * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl:
        * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc:

        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:

        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl:
        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc:

        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:

        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl:
        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc:

        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:

        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl:
        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc:

        * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl:

        * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl:
        * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc:

        * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl:

        * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl:
        * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc:

        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:

        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl:
        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc:

        * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl:

        * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl:
        * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc:

        * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl:

        * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl:
        * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:

        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:

        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc:

        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc:

        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl:

        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl:
        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc:

        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl:

        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc:

        * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl:

        * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc:

        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl:

        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl:
        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc:

        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl:

        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl:

        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:

        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc:

        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:

        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl:
        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc:

        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl:

        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl:
        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc:

        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:

        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl:
        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:

        * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl:

        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl:
        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc:

        * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl:

        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
        * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl:
        * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc:

        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:

        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl:
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc:

        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:

        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp:

        * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc:

        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc:

        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc:

        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl:
        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc:

        * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl:
        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
        * connectors/dds4ccm/tests/PSAT/psat_type.idl:

        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:

        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl:
        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc:

        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:

        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl:
        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc:

        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:

        * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl:
        * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc:

        * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl:
        * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc:

        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:

        * connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl:
        * connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:

        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl:
        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc:

        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:

        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl:
        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc:

        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:

        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl:
        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc:

        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:

        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl:
        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc:

        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:

        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl:
        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc:

        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:

        * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl:
        * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc:

        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:

        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl:
        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc:

        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:

        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl:
        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc:

        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:

        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl:
        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc:

        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:

        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:

        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl:
        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc:

        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:

        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc:
        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl:

        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:

        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc:

        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl:
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc:

        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc:

        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:

        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl:
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc:

        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:

        * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl:
        * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc:

        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:

        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl:
        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc:

        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc:

        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:

        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:

        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl:

        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc:

        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl:

        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc:

        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl:

        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl:
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc:

        * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl:

        * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl:
        * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:

        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc:

        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
        * 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.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc:

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc:

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc:

        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc:
        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:

        * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl:

        * connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl:

        * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc:
        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h:
        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp:
        * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp:

        * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc:
        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h:
        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
          Added support for openDDS.

339 files changed, 1944 insertions, 683 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 22e40af94f3..9fc463b3636 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,559 @@
+Tue May 15 13:35:32 UTC 2012  Marcel Smit  <msmit@remedy.nl>
+
+        * MPC/config/dds4ccm.mpb:
+        * MPC/config/dds4ccm_base.mpb:
+        * MPC/config/dds4ccm_impl.mpb:
+        * MPC/config/dds4ccm_ts_default.mpb:
+        * MPC/config/ndds_idltocpp.mpb:
+        * MPC/config/ndds_idltocpp_ts_defaults.mpb:
+
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
+
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl:
+        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc:
+
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc:
+
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc:
+
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc:
+
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc:
+
+        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl:
+
+        * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl:
+        * 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/Base/Quoter_Base.idl:
+
+        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl:
+        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc:
+
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
+
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
+        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc:
+
+        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp:
+
+        * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl:
+
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
+
+        * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
+
+        * connectors/dds4ccm/impl/ConditionManager.cpp:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+
+        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:
+
+        * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl:
+        * connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc:
+
+        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc:
+        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp:
+
+        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc:
+
+        * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl:
+        * connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc:
+
+        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc:
+
+        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc:
+
+        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
+
+        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl:
+        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc:
+
+        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
+
+        * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.idl:
+        * connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc:
+
+        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
+
+        * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl:
+        * connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc:
+
+        * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.idl:
+        * connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl:
+
+        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl:
+        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
+
+        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl:
+        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
+
+        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl:
+        * connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl:
+        * connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl:
+
+        * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl:
+        * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
+        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl:
+        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
+
+        * connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl:
+        * connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc:
+
+        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
+
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:
+
+        * connectors/dds4ccm/tests/Derived/Derived.idl:
+        * connectors/dds4ccm/tests/Derived/Derived_Connector.idl:
+        * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc:
+
+        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
+
+        * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl:
+        * connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc:
+
+        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
+
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc:
+
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
+
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc:
+
+        * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.idl:
+        * connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.idl:
+        * connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl:
+        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl:
+
+        * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl:
+        * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc:
+
+        * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl:
+        * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
+
+        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl:
+        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc:
+
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc:
+
+        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl:
+        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl:
+
+        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl:
+        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc:
+
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl:
+
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc:
+
+        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl:
+
+        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl:
+        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl:
+        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl:
+
+        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
+        * connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl:
+        * connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc:
+
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
+
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc:
+
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp:
+
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.idl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc:
+
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.idl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc:
+
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl:
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc:
+
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl:
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc:
+
+        * connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl:
+        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
+        * connectors/dds4ccm/tests/PSAT/psat_type.idl:
+
+        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
+
+        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl:
+        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc:
+
+        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
+
+        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl:
+        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc:
+
+        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl:
+        * connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc:
+
+        * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl:
+        * connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc:
+
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl:
+        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl:
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl:
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl:
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
+
+        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl:
+        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc:
+
+        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
+
+        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
+
+        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl:
+        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc:
+
+        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
+
+        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc:
+        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl:
+
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
+
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc:
+
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc:
+
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc:
+
+        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl:
+        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl:
+        * connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
+
+        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl:
+        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc:
+
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc:
+
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:
+
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:
+
+        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl:
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc:
+
+        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl:
+
+        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl:
+        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc:
+
+        * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl:
+
+        * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl:
+        * connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
+
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc:
+
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
+        * 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.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc:
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc:
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc:
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
+
+        * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl:
+
+        * connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl:
+
+        * tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp:
+        * tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp:
+
+        * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc:
+        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h:
+        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
+          Added support for openDDS.
+
 Mon May 14 05:42:00 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/Protocols/Sender/Sender_exec.cpp:
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
index 57661c7de93..5978961e24b 100644
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -6,17 +6,6 @@ feature(dds4ccm_opendds) : taoidldefaults, dcps {
   macros += CIAO_DDS4CCM_OPENDDS=1
   idlflags += -DCIAO_DDS4CCM_OPENDDS=1 \
               -Wb,dds_impl=opendds \
-              -Wb,opendds_sequence_suffix=DDSSeq \
-              -I $(CIAO_ROOT)/connectors \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
-  includes += $(CIAO_ROOT)/connectors/dds4ccm/idl \
-              $(CIAO_ROOT)/connectors
-}
-
-feature(dds4ccm_splice) : taoidldefaults {
-  macros += CIAO_DDS4CCM_SPLICE=1
-  idlflags += -DCIAO_DDS4CCM_SPLICE=1 \
-              -Wb,dds_impl=opensplice \
               -I $(CIAO_ROOT)/connectors \
               -I $(CIAO_ROOT)/connectors/dds4ccm/idl
   includes += $(CIAO_ROOT)/connectors/dds4ccm/idl \
@@ -36,6 +25,6 @@ feature(dds4ccm_coredx) : taoidldefaults, taolib {
 feature(dds4ccm_ndds) : ndds_idltocpp_stub {
 }
 
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) {
+feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) {
   requires += dummy_label
 }
diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb
index de7602f3cf8..47fbb383f4c 100644
--- a/CIAO/MPC/config/dds4ccm_base.mpb
+++ b/CIAO/MPC/config/dds4ccm_base.mpb
@@ -1,11 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm_stub, ciao_connector_base, dcps {
-  after += DDS4CCM_lem_gen
-}
-
-feature(dds4ccm_splice) : dds4ccm_stub, ciao_connector_base {
+feature(dds4ccm_opendds) : dds4ccm_stub, ciao_connector_base, dcps_rtps, dcps_lem_stub {
   after += DDS4CCM_lem_gen
 }
 
@@ -17,6 +13,6 @@ feature(dds4ccm_coredx) : dds4ccm_stub, ciao_connector_base {
   after += DDS4CCM_lem_gen
 }
 
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) {
+feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) {
   requires += dummy_label
 }
diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb
index e57e0472aaf..16c0906c0e3 100644
--- a/CIAO/MPC/config/dds4ccm_impl.mpb
+++ b/CIAO/MPC/config/dds4ccm_impl.mpb
@@ -1,14 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_lem_stub, dcps_lem_stub, dcps {
-  after += CIAO_DDS4CCM_DDS_Impl
-  libs += CIAO_DDS4CCM_DDS_Impl
-  includes += $(CIAO_ROOT)/connectors \
-              $(CIAO_ROOT)/connectors/dds4ccm/idl
-}
-
-feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub {
+feature(dds4ccm_opendds) : dds4ccm_skel, dds4ccm_lem_stub, dcps_lem_stub, dcps_rtps, dds4ccm_logger {
   after += CIAO_DDS4CCM_DDS_Impl
   libs += CIAO_DDS4CCM_DDS_Impl
   includes += $(CIAO_ROOT)/connectors \
@@ -29,6 +22,6 @@ feature(dds4ccm_coredx) : dds4ccm_skel, dds4ccm_lem_stub {
               $(CIAO_ROOT)/connectors/dds4ccm/idl
 }
 
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) {
+feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) {
   requires += dummy_label
 }
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
index 9f6c03d7aef..3e6c02baf46 100644
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb
@@ -1,20 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps {
+feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps_rtps {
   Define_Custom(DDSGenerator) : TypeSupport {
-    commandflags += -Wb,opendds_sequence_suffix=DDSSeq -DCIAO_DDS4CCM_OPENDDS=1
+    commandflags += -DCIAO_DDS4CCM_OPENDDS=1 -UDDS4CCM_NEEDS_SEQUENCES_DEFINED
     keyword opendds_ts_flags = commandflags
     keyword dds_ts_flags = commandflags
   }
 }
 
-feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults {
-  Define_Custom(DDSGenerator) : SpliceTypeSupport {
-    keyword dds_ts_flags = commandflags
-  }
-}
-
 feature(dds4ccm_coredx) : dds4ccm, coredx_ts_defaults, coredxlib {
   Define_Custom(DDSGenerator) : CoreDXTypeSupport {
     keyword dds_ts_flags = commandflags
@@ -40,14 +34,6 @@ feature(!dds4ccm_ndds) {
   }
 }
 
-feature(!dds4ccm_splice) {
-  // this allows the user's project to reference splice_ts_flags,
-  // which will simply be ignored
-  Define_Custom(SpliceDummyTypeSupport) {
-    keyword splice_ts_flags
-  }
-}
-
 feature(!dds4ccm_coredx) {
   // this allows the user's project to reference coredx_ts_flags,
   // which will simply be ignored
@@ -56,7 +42,7 @@ feature(!dds4ccm_coredx) {
   }
 }
 
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice, !dds4ccm_coredx) : typecode {
+feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_coredx) : typecode {
   Define_Custom(DDSGenerator) {
     keyword dds_ts_flags
   }
diff --git a/CIAO/MPC/config/ndds_idltocpp.mpb b/CIAO/MPC/config/ndds_idltocpp.mpb
index c5b0176487b..02f4580d277 100644
--- a/CIAO/MPC/config/ndds_idltocpp.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp.mpb
@@ -5,6 +5,7 @@ project : nddslib, nddsmonitor, taoidldefaults, taolib {
   requires += ndds
   macros += CIAO_DDS4CCM_NDDS=1
   idlflags += -DCIAO_DDS4CCM_NDDS=1 \
+              -DDDS4CCM_NEEDS_SEQUENCES_DEFINED \
               -Wb,dds_impl=ndds \
               -I $(CIAO_ROOT)/connectors \
               -I $(CIAO_ROOT)/connectors/dds4ccm/idl \
diff --git a/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb b/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb
index f5fbb00aae0..765345223d4 100644
--- a/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb
+++ b/CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb
@@ -3,7 +3,9 @@
 
 project : ndds_cck_ts_defaults, nddslib, taolib {
   Define_Custom(DDSGenerator) : NDDSTypeSupport {
-    commandflags += -typeSequenceSuffix RTISeq -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT)
+    commandflags += -typeSequenceSuffix RTISeq -verbosity 1
+    commandflags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl
+    commandflags += -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT)
     keyword dds_ts_flags = commandflags
   }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index a007b78098e..4821f961be8 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -10,7 +10,6 @@
 
 #pragma ndds typesupport "Base/Hello_BaseSupport.h"
 #pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h"
-#pragma splice typesupport "Base/Hello_BaseDcpsC.h"
 
 #pragma DCPS_DATA_TYPE "DDSHello"
 
@@ -19,6 +18,8 @@ struct DDSHello {
   short iterator;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<DDSHello> DDSHelloSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
index d52ed3883c7..1d919fdd8fb 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Hello_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Hello_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::DDSHello, ::DDSHelloSeq> Hello;
 
 #endif /* HELLO_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index 61e1ed33c06..d537d32a7e0 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen
+  after  += DDS4CCM_idl_gen DDS_Hello_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Hello_Connector_stub_export.h \
@@ -34,9 +34,9 @@ project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after  += DDS_Hello_Connector_lem_gen \
             DDS_Hello_Connector_stub \
-            DDS_Hello_Base_stub 
+            DDS_Hello_Base_stub
   libs   += DDS_Hello_Base_stub \
-            DDS_Hello_Connector_stub 
+            DDS_Hello_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -93,7 +93,7 @@ project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
   sharedname = DDS_Hello_Connector_exec
   libs += DDS_Hello_Connector_stub \
           DDS_Hello_Connector_lem_stub \
-          DDS_Hello_Base_stub 
+          DDS_Hello_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -119,12 +119,12 @@ project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
 project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_Hello_Connector_lem_stub \
                 DDS_Hello_Connector_exec \
-                DDS_Hello_Connector_stub 
+                DDS_Hello_Connector_stub
   sharedname  = DDS_Hello_Connector_svnt
   libs       += DDS_Hello_Connector_stub \
                 DDS_Hello_Connector_lem_stub  \
                 DDS_Hello_Base_stub \
-                DDS_Hello_Connector_exec 
+                DDS_Hello_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
index 6ce341653bd..bb683b6071f 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc
@@ -34,6 +34,8 @@ project(I2C_ShapeType_lem_stub) : ndds_idltocpp_lem_stub {
   sharedname = I2C_ShapeType_lem_stub
   dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL
 
+  requires += dds4ccm_ndds
+
   IDL_Files {
   }
 
@@ -60,6 +62,8 @@ project(I2C_ShapeType_stub) : ndds_idltocpp_stub {
   sharedname = I2C_ShapeType_stub
   dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL
 
+  requires += dds4ccm_ndds
+
   IDL_Files {
   }
 
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
index 9fb8605a90b..ea7df37ab7f 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc
@@ -10,6 +10,8 @@ project(I2C_Shapes_Common) : dds4ccm_logger, ndds_idltocpp_impl {
   libout = ../lib
   libpaths += ../lib
 
+  requires += dds4ccm_ndds
+
   includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
 
   Header_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
index 67d449af618..e7fe6687276 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc
@@ -6,6 +6,8 @@ project(*i2c_shapes_rec) : dds4ccm_logger, ndds_idltocpp_impl {
 
   includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors
 
+  requires += dds4ccm_ndds
+
   libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub
   libpaths += ../lib
 
diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
index d39c36677a3..b0725c2fe14 100755
--- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc
@@ -10,6 +10,8 @@ project(*i2c_shapes_sender) : dds4ccm_logger, ndds_idltocpp_impl, ndds_cck_ts_de
   libs += I2C_Shapes_Common I2C_Shapes_Base_stub I2C_ShapeType_stub
   libpaths += ../lib
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     I2C_Shapes_Sender.cpp
   }
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
index 3551ecf5326..97c8b5541ac 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl
@@ -12,6 +12,9 @@
 struct LargeType {
   string value; //@key
 };
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<LargeType> LargeTypeSeq;
+#endif
 
 #endif
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 7d10d0ab5a3..e3e8c394f95 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.idl
@@ -10,6 +10,10 @@
 
 #pragma ciao lem "Connector/Large_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Common/CommonTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::LargeType, ::LargeTypeSeq> LargeTypeConn;
 
 #endif
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 d7f0717f044..4531b732125 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -b dds4ccm_base -u Large Large_Connector"
 
 project(Large_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen Large_Deployment_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LARGE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Large_Connector_stub_export.h \
@@ -33,7 +33,7 @@ project(Large_Connector_lem_gen) : ciaoidldefaults, dds4ccm_base {
 
 project(Large_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += Large_Connector_lem_gen Large_Connector_stub Large_Deployment_stub
-  libs  +=  Large_Connector_stub Large_Deployment_stub 
+  libs  +=  Large_Connector_stub Large_Deployment_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 7c530c9d2eb..733e9055068 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
@@ -3,6 +3,7 @@
 
 project(Large_DDS_Pub_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
+  after += Large_Deployment_stub
   idlflags += -Wb,stub_export_macro=DDS_PUB_STUB_Export \
               -Wb,stub_export_include=DDS_Pub_stub_export.h \
               -Wb,skel_export_macro=DDS_PUB_SVNT_Export \
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 9de6f2338ac..035241561ca 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
@@ -3,6 +3,7 @@
 
 project(Large_DDS_Sub_idl_gen) : componentidldefaults, dds4ccm {
   custom_only = 1
+  after += Large_Deployment_stub
   idlflags += -Wb,stub_export_macro=DDS_SUB_STUB_Export \
               -Wb,stub_export_include=DDS_Sub_stub_export.h \
               -Wb,skel_export_macro=DDS_SUB_SVNT_Export \
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
index f10374c18f6..9a34761db87 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
@@ -24,7 +24,9 @@ module Quoter
     unsigned long current;
     string symbol; //@key
   };
+  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
   typedef sequence<Stock_Info> Stock_InfoSeq;
+  #endif
 };
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
index 90c3831e0fd..2d244a20c52 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Quoter_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Quoter_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::Quoter::Stock_Info, ::Quoter::Stock_InfoSeq> Quoter;
 
 #endif /* QUOTER_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index a658421a258..4c69d8ea320 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector"
 
 project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Quoter_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Quoter_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub 
-  libs  += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub 
+  after += DDS_Quoter_Connector_lem_gen DDS_Quoter_Connector_stub DDS_Quoter_Base_stub
+  libs  += DDS_Quoter_Base_stub DDS_Quoter_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub 
+  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub
   sharedname = DDS_Quoter_Connector_exec
-  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub 
+  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub 
+  after      += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_exec DDS_Quoter_Connector_stub
   sharedname  = DDS_Quoter_Connector_svnt
   libs       += DDS_Quoter_Connector_stub \
                 DDS_Quoter_Connector_lem_stub  \
                 DDS_Quoter_Base_stub \
-                DDS_Quoter_Connector_exec 
+                DDS_Quoter_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index 89c617969bf..74dec206da2 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -10,7 +10,6 @@
 
 #pragma ndds typesupport "Base/Shapes_BaseSupport.h"
 #pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h"
-#pragma splice typesupport "Base/Shapes_BaseDscpC.h"
 
 #pragma DCPS_DATA_TYPE "ShapeType"
 #pragma DCPS_DATA_KEY "ShapeType color"
@@ -21,6 +20,11 @@ struct ShapeType {
   long y;
   long shapesize;
 };
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence<ShapeType> ShapeTypeSeq;
+#endif
+
 #pragma keylist ShapeType color
 
 #pragma DCPS_DATA_TYPE "Attributes"
@@ -32,7 +36,9 @@ struct Attributes {
   string color; //@key
   float speed;
 };
-typedef sequence<ShapeType> ShapeTypeSeq;
+
+// #pragma DCPS_DATA_SEQUENCE_TYPE "AttributesSeq"
+// typedef sequence<Attributes> AttributesSeq;
 
 #pragma keylist Attributes shape color
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index fc2a9693413..b23e543c67a 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Shapes_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Shapes_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> Shapes;
 
 #endif /* SHAPES_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index 473a05bfe3e..fbdc0f64686 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector"
 
 project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Shapes_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Shapes_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub 
-  libs  += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub 
+  after += DDS_Shapes_Connector_lem_gen DDS_Shapes_Connector_stub DDS_Shapes_Base_stub
+  libs  += DDS_Shapes_Base_stub DDS_Shapes_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub 
+  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub
   sharedname = DDS_Shapes_Connector_exec
-  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub 
+  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub 
+  after      += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_exec DDS_Shapes_Connector_stub
   sharedname  = DDS_Shapes_Connector_svnt
   libs       += DDS_Shapes_Connector_stub \
                 DDS_Shapes_Connector_lem_stub  \
                 DDS_Shapes_Base_stub \
-                DDS_Shapes_Connector_exec 
+                DDS_Shapes_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
index 20e21f0a836..13db4011ff7 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
@@ -331,7 +331,7 @@ namespace CIAO_Shapes_Sender_Impl
   {
     this->start ();
 
-    //Register shape with dds.
+    // Register shape with dds.
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"),
                   this->square_->color.in (),
                   this->square_->x,
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
index fbd09ec6f63..d64c6d512e6 100755
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
@@ -11,6 +11,7 @@ use PerlACE::TestTarget;
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
 $DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+$DDS_ROOT = "$ENV{'DDS_ROOT'}";
 
 $daemons_running = 0;
 $em_running = 0;
@@ -23,7 +24,6 @@ $nr_daemon = 2;
 @nodenames = ( "SenderNode", "ReceiverNode" );
 
 # ior files other than daemon
-# ior files other than daemon
 $ior_nsbase = "ns.ior";
 $ior_nsfile = 0;
 $ior_embase = "EM.ior";
@@ -159,6 +159,7 @@ if ($tg_naming->WaitForFileTimed ($ior_nsbase,
 }
 
 $ns_running = 1;
+
 # Set up NamingService environment
 $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
 
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index 5059695f65e..98463bb4dbb 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -11,8 +11,4 @@
 # include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl"
 #endif
 
-#if (CIAO_DDS4CCM_SPLICE==1)
-# include "dds_dcps.idl"
-#endif
-
 #endif
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
index 38982e8dea9..93bef38510d 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
@@ -62,7 +62,7 @@ project (CIAO_NDDS_stub) : install, ndds_idltocpp, ccm_stub, ciaolib_with_idl, c
 
 project (CIAO_NDDS_idl_install_only) {
 
-  avoids += dds4ccm_opendds dds4ccm_ndds dds4ccm_splice
+  avoids += dds4ccm_opendds dds4ccm_ndds
 
   custom_only = 1
 
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
index ac668fbdc69..68278d208eb 100644
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
@@ -63,9 +63,9 @@ namespace CIAO
                                                             error,
                                                             non_existent);
 #else
-      ACE_UNUSED_ARG (instance_handle);
-      ACE_UNUSED_ARG (lookup_handle);
-      ::DDS::InstanceHandle_t ret = ::DDS::RETCODE_OK;
+      ::DDS::InstanceHandle_t ret = lookup_handle;
+      error = instance_handle != ::DDS::HANDLE_NIL && instance_handle != lookup_handle;
+      non_existent = lookup_handle == ::DDS::HANDLE_NIL;
 #endif
       if (error)
         throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
@@ -111,6 +111,7 @@ namespace CIAO
                                   ::DDS::NOT_READ_SAMPLE_STATE,
                                   ::DDS::NEW_VIEW_STATE | ::DDS::NOT_NEW_VIEW_STATE,
                                   ::DDS::ALIVE_INSTANCE_STATE | ::DDS::NOT_ALIVE_INSTANCE_STATE);
+
           if ( ::CORBA::is_nil (this->rd_condition_.in ()))
             {
               DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
@@ -421,21 +422,24 @@ namespace CIAO
               ::DDS::QueryCondition_var q_condition = this->get_querycondition_getter ();
               if (::CORBA::is_nil (q_condition.in ()))
                 {
-                  // Read condition should be attached to the waitset.
-                  retcode = this->ws_.detach_condition (this->rd_condition_.in ());
-                  if (retcode != ::DDS::RETCODE_OK)
-                    {
-                      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
-                                    ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                    ACE_TEXT ("Unable to detach read condition ")
-                                    ACE_TEXT ("from waitset. Error <%C>\n"),
-                                    translate_retcode (retcode)));
-                    }
-                  else
+                  if (!::CORBA::is_nil (this->rd_condition_.in ()))
                     {
-                      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
-                                    ACE_TEXT ("ConditionManager::remove_conditions - ")
-                                    ACE_TEXT ("Read condition successfully detached from waitset.\n")));
+                      // Read condition should be attached to the waitset.
+                      retcode = this->ws_.detach_condition (this->rd_condition_.in ());
+                      if (retcode != ::DDS::RETCODE_OK)
+                        {
+                          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
+                                        ACE_TEXT ("ConditionManager::remove_conditions - ")
+                                        ACE_TEXT ("Unable to detach read condition ")
+                                        ACE_TEXT ("from waitset. Error <%C>\n"),
+                                        translate_retcode (retcode)));
+                        }
+                      else
+                        {
+                          DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO
+                                        ACE_TEXT ("ConditionManager::remove_conditions - ")
+                                        ACE_TEXT ("Read condition successfully detached from waitset.\n")));
+                        }
                     }
                 }
             }
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
index 936c24a4e82..abc1bf780b2 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
@@ -16,7 +16,15 @@
 #endif
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
-#include "dds/DCPS/Marked_Default_Qos.h"
+# include "dds/DCPS/Marked_Default_Qos.h"
+# include "dds/DCPS/RcHandle_T.h"
+# include "dds/DCPS/RTPS/RtpsDiscovery.h"
+# include "dds/DCPS/transport/framework/TransportType_rch.h"
+# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst_rch.h"
+# include "dds/DCPS/transport/rtps_udp/RtpsUdpInst.h"
+# include "dds/DCPS/transport/framework/TransportRegistry.h"
+// # include "dds/DCPS/transport/framework/TransportConfig.h"
+# include "dds/DCPS/transport/framework/TransportConfig_rch.h"
 #endif
 
 template <typename CCM_TYPE>
@@ -35,10 +43,7 @@ DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T (void)
       this->dlf_->init ();
     }
 #if (CIAO_DDS4CCM_OPENDDS==1)
-  int argc = 0 ;
-  ACE_TCHAR** argv = 0;
-  this->participant_factory_ = TheParticipantFactoryWithArgs (argc, argv);
-//  OpenDDS::DCPS::set_DCPS_debug_level  (10);
+  this->create_opendds_participant_factory ();
 #endif
 }
 
@@ -58,6 +63,47 @@ DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T (void)
 #endif
 }
 
+
+#if (CIAO_DDS4CCM_OPENDDS==1)
+template <typename CCM_TYPE>
+void
+DDS_Base_Connector_T<CCM_TYPE>::create_opendds_participant_factory (void)
+{
+  DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::create_opendds_participant_factory");
+  try
+    {
+      this->participant_factory_ = TheParticipantFactory;
+      OpenDDS::DCPS::TransportConfig_rch config =
+        OpenDDS::DCPS::TransportRegistry::instance()->create_config("dds4ccm_rtps");
+
+      OpenDDS::DCPS::TransportInst_rch inst =
+        OpenDDS::DCPS::TransportRegistry::instance()->create_inst("the_rtps_transport",
+                                                  "rtps_udp");
+      OpenDDS::DCPS::RtpsUdpInst_rch rui =
+        OpenDDS::DCPS::static_rchandle_cast<OpenDDS::DCPS::RtpsUdpInst>(inst);
+      rui->handshake_timeout_ = 1;
+
+      config->instances_.push_back(inst);
+
+      OpenDDS::DCPS::TransportRegistry::instance()->global_config(config);
+
+      OpenDDS::RTPS::RtpsDiscovery_rch disc =
+        new OpenDDS::RTPS::RtpsDiscovery(OpenDDS::DCPS::Discovery::DEFAULT_RTPS);
+
+      TheServiceParticipant->add_discovery(OpenDDS::DCPS::static_rchandle_cast<OpenDDS::DCPS::Discovery>(disc));
+      TheServiceParticipant->set_repo_domain(this->domain_id (), disc->key());
+    }
+  catch (const CORBA::Exception& e)
+    {
+      DDS4CCM_PRINT_CORBA_EXCEPTION (DDS4CCM_LOG_LEVEL_ERROR, e,
+          "DDS_Base_Connector_T::create_opendds_participant_factory - "
+          "Exception caught whilst setting up openDDS:");
+      throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+    }
+}
+#endif
+
+
 template <typename CCM_TYPE>
 ::DDS::DomainId_t
 DDS_Base_Connector_T<CCM_TYPE>::domain_id (void)
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
index 95af4c95f3b..1926ab599c5 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
@@ -64,6 +64,14 @@ public:
   virtual void ccm_passivate (void);
   //@}
 
+private:
+  /**
+   * Initialization of opendds.
+   */
+#if (CIAO_DDS4CCM_OPENDDS==1)
+  void create_opendds_participant_factory (void);
+#endif
+
 protected:
 
   /**
diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
index 81aacbb8ce2..c6badf41ecb 100644
--- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
@@ -148,8 +148,15 @@ namespace CIAO
       ::CCM_DDS::DataNumber_t index)
     {
       DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i");
+
+      ::DDS::InstanceHandle_t hnd = instance_handle;
+      if (instance_handle == ::DDS::HANDLE_NIL)
+        {
+          hnd = this->dds_writer ()->lookup_instance (an_instance);
+        }
+
       ::DDS::ReturnCode_t result =
-          this->dds_writer ()->dispose (an_instance, instance_handle);
+          this->dds_writer ()->dispose (an_instance, hnd);
       if (result != ::DDS::RETCODE_OK)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
@@ -158,7 +165,7 @@ namespace CIAO
           translate_retcode (result)));
           throw ::CCM_DDS::InternalError (result, index);
         }
-      result = this->dds_writer ()->unregister_instance (an_instance, instance_handle);
+      result = this->dds_writer ()->unregister_instance (an_instance, hnd);
       if (result != ::DDS::RETCODE_OK)
         {
           DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
@@ -197,7 +204,7 @@ namespace CIAO
         {
           throw CCM_DDS::NonExistent (0);
         }
-      this->delete_i (an_instance, instance_handle, 0);
+      this->delete_i (an_instance, hnd, 0);
     }
 
     template <typename UPDATER_TYPE, typename TYPED_DDS_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
index 4ea82b5956f..463ddcaefad 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp
@@ -103,6 +103,11 @@ namespace CIAO
               return this->rti_entity ()->detach_condition (rc_proxy->get_rti_entity ());
             }
         }
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO
+                    "DDS_WaitSet_i::detach_condition - "
+                    "Unable to narrow the given condition to a ReadCondition "
+                    "nor a QueryCondition\n"));
+
       return ::DDS::RETCODE_BAD_PARAMETER;
     }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
index 2fda9a3d1f8..75ad6ac8522 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.idl
@@ -3,17 +3,12 @@
 #ifndef LATENCY_BASE_IDL
 #define LATENCY_BASE_IDL
 
-//#pragma ndds typesupport "Base/Latency_BaseSupport.h"
-
 const short MAX_DATA_SEQUENCE_LENGTH = 8192;
 typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> octet_sequence;
-//#pragma DCPS_DATA_TYPE "Latency"
 
 struct LatencyTest {
   long seq_num;
   octet_sequence data;
  };
 
-//typedef sequence<LatencyTest> LatencyTest_Seq;
-
 #endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
index 663cfe3f090..2a211a8f7e5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc
@@ -5,6 +5,8 @@ project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default {
   dynamicflags += LATENCY_BASE_STUB_BUILD_DLL
   libout = ../lib
 
+  requires += dds4ccm_ndds
+
   idlflags += -SS -Sci \
               -Wb,stub_export_macro=LATENCY_BASE_STUB_Export \
               -Wb,stub_export_include=LATENCY_Base_plain_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
index 10440358782..11ed41b1d61 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(*latency_receiver_plain) : nddslib, acelib, taolib, typecode {
+project(*latency_receiver_plain) : ndds_idltocpp, acelib, taolib, typecode {
   after += DDS_Latency_Base_plain_stub
   exename = DDS_receiver
   libpaths += ../lib
@@ -8,6 +8,8 @@ project(*latency_receiver_plain) : nddslib, acelib, taolib, typecode {
   libs  += DDS_Latency_Base_plain_stub
   includes += ../Base
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     Latency_Receiver.cpp
   }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
index 7cc51a87fe1..1a867414c05 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp
@@ -5,9 +5,14 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Env_Value_T.h"
 #include "ace/Tokenizer_T.h"
-#include "Latency_Base.h"
-#include "Latency_BaseSupport.h"
-#include "Latency_BasePlugin.h"
+#if (CIAO_DDS4CCM_NDDS==1)
+# include "Latency_Base.h"
+# include "Latency_BaseSupport.h"
+# include "Latency_BasePlugin.h"
+#else
+# include "Latency_BaseC.h"
+# include "Latency_BaseTypeSupportC.h"
+#endif
 
 #include <ndds/ndds_namespace_cpp.h>
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
index 6467dae02b5..f9fd7b2e227 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc
@@ -9,6 +9,8 @@ project(*latency_sender_plain) : nddslib, acelib, taolib, typecode {
   includes += ../Base
   libs  += DDS_Latency_Base_plain_stub
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     Latency_Sender.cpp
   }
@@ -23,6 +25,8 @@ project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, typecode {
   includes += ../Base
   libs  += DDS_Latency_Base_plain_stub
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     NDDS_Latency_Sender.cpp
   }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
index 3aa853dded9..e75939fbd7f 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.idl
@@ -8,8 +8,6 @@
 #ifndef THROUGHPUT_BASE_IDL
 #define THROUGHPUT_BASE_IDL
 
-//#pragma ndds typesupport "Base/Throughput_BaseSupport.h"
-
 const short MAX_DATA_SEQUENCE_LENGTH = 8192;
 
 typedef enum ThroughputCommandKind
@@ -27,8 +25,6 @@ struct ThroughputTest {
  OctetSeq data;
  };
 
-//typedef sequence<ThroughputTest> ThroughputTest_Seq;
-
 struct ThroughputCommand
 {
     CommandKind  command;
@@ -37,6 +33,4 @@ struct ThroughputCommand
     unsigned long long final_publisher_effort;
 };
 
-//typedef sequence<ThroughputCommand> ThroughputCommand_Seq;
-
 #endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
index 216124ffbac..5f636810cca 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc
@@ -5,6 +5,8 @@ project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default {
   dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL
   libout = ../lib
 
+  requires += dds4ccm_ndds
+
   idlflags += -SS -Sci \
               -Wb,stub_export_macro=THROUGHPUT_BASE_STUB_Export \
               -Wb,stub_export_include=THROUGHPUT_Base_stub_export.h
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
index 59ab14bca79..54b5f880053 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc
@@ -8,6 +8,8 @@ project(*receiver_plain) : nddslib, acelib, taolib, typecode {
   includes += ../Base
   libs  += DDS_Throughput_Base_stub
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     Throughput_Receiver.cpp
   }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
index 8f826ecd792..478971923b6 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc
@@ -9,6 +9,8 @@ project(*sender_plain) : nddslib, acelib, taolib, typecode {
   includes += ../Base
   libs  += DDS_Throughput_Base_stub
 
+  requires += dds4ccm_ndds
+
   Source_Files {
     Throughput_Sender.cpp
   }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
index aedd21bcea7..33cac8d3885 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
@@ -31,6 +31,9 @@ struct PerfKeyedTest {
   unsigned long long nanotime;
 };
 
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<PerfKeyedTest> PerfKeyedTestSeq;
+#endif
 
 #endif
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 864f5503c8f..6890c1c5871 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
@@ -17,6 +17,10 @@
 
 #pragma ciao lem "Connector/Perf_Keyed_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Perf_Keyed_Test_BaseTypeSupport.idl"
+#endif
+
 module CCM_DDS
 {
   module ::CCM_DDS::Typed < ::PerfKeyedTest, ::PerfKeyedTestSeq> PerfKeyedTest;
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 e4131be2dfd..0dd5297ede6 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
 
 project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Perf_Keyed_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Perf_Keyed_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub 
-  libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub 
+  after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub
+  libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub 
+  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub
   sharedname = DDS_Perf_Keyed_Test_Connector_exec
-  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub 
+  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub 
+  after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub
   sharedname  = DDS_Perf_Keyed_Test_Connector_svnt
   libs       += DDS_Perf_Keyed_Test_Connector_stub \
                 DDS_PK_Test_Connector_lem_stub  \
                 DDS_Perf_Keyed_Test_Base_stub \
-                DDS_Perf_Keyed_Test_Connector_exec 
+                DDS_Perf_Keyed_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
index e2e636812e5..35aebdcedf8 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl
@@ -22,6 +22,8 @@ struct LatencyTTTest {
   BD_oct_seq data;
  };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<LatencyTTTest> LatencyTTTestSeq;
+#endif
 
 #endif
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 1fd8c4a131b..d205dcd7546 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
@@ -17,6 +17,10 @@
 
 #pragma ciao lem "Connector/LatencyTT_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/LatencyTT_Test_BaseTypeSupport.idl"
+#endif
+
 module LatencyTT_Test
 {
   module ::CCM_DDS::Typed < ::LatencyTTTest, ::LatencyTTTestSeq> LatencyTTTestConn;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
index ea89e031a47..cb6b9ef764e 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_LatencyTT_Test_Base -l .. -o ../lib -u DDS LatencyTT_Test_Connector"
 
 project(DDS_LatencyTT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_LatencyTT_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LATENCYTT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LatencyTT_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_LatencyTT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_LTT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub 
-  libs  += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub 
+  after += DDS_LatencyTT_Test_Connector_lem_gen DDS_LatencyTT_Test_Connector_stub DDS_LatencyTT_Test_Base_stub
+  libs  += DDS_LatencyTT_Test_Base_stub DDS_LatencyTT_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_LatencyTT_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub 
+  after   += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_stub
   sharedname = DDS_LatencyTT_Test_Connector_exec
-  libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub 
+  libs += DDS_LatencyTT_Test_Connector_stub DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_LatencyTT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub 
+  after      += DDS_LTT_Test_Connector_lem_stub DDS_LatencyTT_Test_Connector_exec DDS_LatencyTT_Test_Connector_stub
   sharedname  = DDS_LatencyTT_Test_Connector_svnt
   libs       += DDS_LatencyTT_Test_Connector_stub \
                 DDS_LTT_Test_Connector_lem_stub  \
                 DDS_LatencyTT_Test_Base_stub \
-                DDS_LatencyTT_Test_Connector_exec 
+                DDS_LatencyTT_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
index 62acf782e59..119cabbb4a4 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl
@@ -30,7 +30,9 @@ struct ThroughputTest {
  OctetSeq data;
  };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ThroughputTest> ThroughputTestSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "ThroughputCommand"
 
@@ -42,6 +44,8 @@ struct ThroughputCommand
     unsigned long long final_publisher_effort;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ThroughputCommand> ThroughputCommandSeq;
+#endif
 
 #endif
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 5d6b3672f8c..42b7db1e705 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.idl
@@ -17,6 +17,10 @@
 
 #pragma ciao lem "Connector/Throughput_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Throughput_BaseTypeSupport.idl"
+#endif
+
 module Throughput
 {
   module ::CCM_DDS::Typed < ::ThroughputTest, ::ThroughputTestSeq> ThroughputTestConn;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
index b178877facf..1645ed889a7 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Connector"
 
 project(DDS_Throughput_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Throughput_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=THROUGHPUT_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Throughput_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Throughput_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_TP_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub 
-  libs  += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub 
+  after += DDS_Throughput_Connector_lem_gen DDS_Throughput_Connector_stub DDS_Throughput_Base_stub
+  libs  += DDS_Throughput_Base_stub DDS_Throughput_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_Throughput_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub 
+  after   += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_stub
   sharedname = DDS_Throughput_Connector_exec
-  libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub 
+  libs += DDS_Throughput_Connector_stub DDS_TP_Test_Connector_lem_stub DDS_Throughput_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Throughput_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub 
+  after      += DDS_TP_Test_Connector_lem_stub DDS_Throughput_Connector_exec DDS_Throughput_Connector_stub
   sharedname  = DDS_Throughput_Connector_svnt
   libs       += DDS_Throughput_Connector_stub \
                 DDS_TP_Test_Connector_lem_stub  \
                 DDS_Throughput_Base_stub \
-                DDS_Throughput_Connector_exec 
+                DDS_Throughput_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 c7001ad6978..e37a14c946a 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
@@ -17,6 +17,10 @@
 
 #pragma ciao lem "SecConnector/Throughput_Sec_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Throughput_BaseTypeSupport.idl"
+#endif
+
 module Throughput
 {
   module ::CCM_DDS::Typed < ::ThroughputCommand, ::ThroughputCommandSeq> ThroughputCommandConn;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
index e7935f78d38..431bd3846d5 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Throughput_Base -l .. -o ../lib -u DDS Throughput_Sec_Connector"
 
 project(DDS_TP_Sec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Throughput_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=THROUGHPUT_SEC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Throughput_Sec_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_TP_Sec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_TP_Sec_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub 
-  libs  += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub 
+  after += DDS_TP_Sec_Connector_lem_gen DDS_Throughput_Sec_Connector_stub DDS_Throughput_Base_stub
+  libs  += DDS_Throughput_Base_stub DDS_Throughput_Sec_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_Throughput_Sec_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub 
+  after   += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_stub
   sharedname = DDS_Throughput_Sec_Connector_exec
-  libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub 
+  libs += DDS_Throughput_Sec_Connector_stub DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_Throughput_Sec_Connector_exec) : ciao_executor, dds4ccm_impl {
 }
 
 project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem_stub {
-  after      += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub 
+  after      += DDS_TP_Sec_Connector_lem_stub DDS_Throughput_Sec_Connector_exec DDS_Throughput_Sec_Connector_stub
   sharedname  = DDS_Throughput_Sec_Connector_svnt
   libs       += DDS_Throughput_Sec_Connector_stub \
                 DDS_TP_Sec_Connector_lem_stub  \
                 DDS_Throughput_Base_stub \
-                DDS_Throughput_Sec_Connector_exec 
+                DDS_Throughput_Sec_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
index 3afbf57609f..4566e7cd7e5 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
-
 #endif
+
+#endif /* CSL_DEADLINETEST_BASE_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 00f32d69e66..b66fb9eda8f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CSL_DeadlineTest_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLDeadlineConnector;
 
 #endif /* CSL_DeadlineTest_CONNECTOR_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 50ee0b44588..a740d5eb48e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
 
 project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CSL_DeadlineTest_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CSL_DeadlineTest_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub 
-  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub 
+  after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
+  libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub 
+  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub
   sharedname = DDS_CSL_DeadlineTest_Connector_exec
-  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub 
+  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub 
+  after      += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub
   sharedname  = DDS_CSL_DeadlineTest_Connector_svnt
   libs       += DDS_CSL_DeadlineTest_Connector_stub \
                 DDS_CSL_DT_Connector_lem_stub  \
                 DDS_CSL_DeadlineTest_Base_stub \
-                DDS_CSL_DeadlineTest_Connector_exec 
+                DDS_CSL_DeadlineTest_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
index fe0fe4452f1..99e862a2248 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
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 31a1efc335c..a26ceb37184 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CSL_QoSTest_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSLQoSConnector;
 
 #endif /* CSL_QoSTest_CONNECTOR_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 79dcb9cc5d8..02279c6ded0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
 
 project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CSL_QoSTest_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CSL_QoSTest_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CSL_QoSTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub 
-  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub 
+  after += DDS_CSL_QoSTest_Connector_lem_gen DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Base_stub
+  libs  += DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub 
+  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub
   sharedname = DDS_CSL_QoSTest_Connector_exec
-  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub 
+  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub 
+  after      += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_exec DDS_CSL_QoSTest_Connector_stub
   sharedname  = DDS_CSL_QoSTest_Connector_svnt
   libs       += DDS_CSL_QoSTest_Connector_stub \
                 DDS_CSL_QoSTest_Connector_lem_stub  \
                 DDS_CSL_QoSTest_Base_stub \
-                DDS_CSL_QoSTest_Connector_exec 
+                DDS_CSL_QoSTest_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
index 854121364d7..a1ad1f615f0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
@@ -18,6 +18,8 @@ struct TestTopic {
   string key; //@key
   long x;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
-
 #endif
+
+#endif /* CSL_SRTEST_BASE_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 3e93b98eb2e..64bd31b5f8c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CSL_SRTest_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_SR_Connector;
 
 #endif /* CSL_SRTEST_CONNECTOR_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 ace737213f7..2f0ca5e560c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
 
 project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CSL_SRTest_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CSL_SRTest_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CSL_SRTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub 
-  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub 
+  after += DDS_CSL_SRTest_Connector_lem_gen DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Base_stub
+  libs  += DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub 
+  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub
   sharedname = DDS_CSL_SRTest_Connector_exec
-  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub 
+  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub 
+  after      += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_exec DDS_CSL_SRTest_Connector_stub
   sharedname  = DDS_CSL_SRTest_Connector_svnt
   libs       += DDS_CSL_SRTest_Connector_stub \
                 DDS_CSL_SRTest_Connector_lem_stub  \
                 DDS_CSL_SRTest_Base_stub \
-                DDS_CSL_SRTest_Connector_exec 
+                DDS_CSL_SRTest_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
index 8bc2f1bb8ad..c628b16045b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
@@ -18,6 +18,8 @@ struct TestTopic {
   string key; //@key
   long x;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
-
 #endif
+
+#endif /* CSL_USTEST_BASE_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 dc50dd006eb..3f3d1c4d29a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CSL_USTest_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector;
 
 #endif /* CSL_USTest_CONNECTOR_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 0681b875095..da92a6b340c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
 
 project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CSL_USTest_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CSL_USTest_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub 
-  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub 
+  after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub
+  libs  += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub 
+  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub
   sharedname = DDS_CSL_USTest_Connector_exec
-  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub 
+  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub 
+  after      += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub
   sharedname  = DDS_CSL_USTest_Connector_svnt
   libs       += DDS_CSL_USTest_Connector_stub \
                 DDS_CSL_USTest_Connector_lem_stub  \
                 DDS_CSL_USTest_Base_stub \
-                DDS_CSL_USTest_Connector_exec 
+                DDS_CSL_USTest_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
index 955edf1dada..2a445aeb903 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl
@@ -19,6 +19,8 @@ struct CoherentUpdateTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<CoherentUpdateTest> CoherentUpdateTestSeq;
-
 #endif
+
+#endif /* COHERENT_UPDATE_TEST_BASE_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 1f91a96ba2d..b7c376debb9 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CoherentUpdate_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CoherentUpdate_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::CoherentUpdateTest, ::CoherentUpdateTestSeq> CoherentUpdate_Test;
 
-#endif /* CoherentUpdate_TestCONNECTOR_IDL_ */
+#endif /* COHERENT_UPDATE_TEST_CONNECTOR_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 11417e91eea..fbd9038545d 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p CoherentUpdate_TestBase -l .. -o ../lib -u DDS CoherentUpdate_Test_Connector"
 
 project(CoherentUpdate_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen CoherentUpdate_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COHERENT_UPDATE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CoherentUpdate_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
index 921c64d06f9..4d162663d76 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl
@@ -19,6 +19,8 @@ struct CoherentWriteTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<CoherentWriteTest> CoherentWriteTestSeq;
+#endif
 
 #endif
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 92aed6d4f48..d2085f40b6d 100644
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CoherentWrite_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTestSeq> CoherentWriteTestConnector;
 
 #endif /* CoherentWrite_Test_CONNECTOR_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 e9be14db0bd..8e4c9e09c88 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector"
 
 project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen CoherentWrite_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CoherentWrite_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub 
-  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub 
+  after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub
+  libs  += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub 
+  after      += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub
   sharedname  = CoherentWrite_Test_Connector_svnt
   libs       += CoherentWrite_Test_Connector_stub \
                 CoherentWrite_Test_Connector_lem_stub  \
                 CoherentWrite_Test_Base_stub \
-                CoherentWrite_Test_Connector_exec 
+                CoherentWrite_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
index 7cf07c81a11..f459bedb753 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl
@@ -13,7 +13,9 @@ module CoPubSub {
     string hello;
     long msgId;
   };
-  typedef sequence <Test_msg> Test_msgSeq;
+  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence <Test_msg> Test_msgSeq;
+#endif
 };
 
 
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
index e5083387d94..e7de0623ff4 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
@@ -10,6 +10,10 @@
 
 #pragma ciao lem "Connector/Collocated_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Collocated_BaseTypeSupport.idl"
+#endif
+
 module CoPubSub {
   module CCM_DDS::Typed <Test_msg, Test_msgSeq> Test_conn;
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
index 9b5aecce470..fa515cbb86a 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(Collocated_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen Collocated_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COLLACATED_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Collocated_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
index e1755aaaabc..846f64df98e 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl
@@ -13,6 +13,8 @@ struct DiffDirType {
   string value; //@key
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<DiffDirType> DiffDirTypeSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
index fe7c04dd3b3..4131e8eb8cd 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.idl
@@ -10,6 +10,10 @@
 
 #pragma ciao lem "DiffDir_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Connector/DiffDirTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::DiffDirType, ::DiffDirTypeSeq> DiffDirConnector;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
index 03bb352085d..104354e6b6e 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -b dds4ccm_base DiffDir_Connector"
 
 project(DiffDir_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+  after += DiffDir_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DIFFDIR_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=DiffDir_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
index bd4c14c3832..f670ee71f85 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl
@@ -20,7 +20,9 @@ struct CFTTwoDimensionalTest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<CFTTwoDimensionalTest> CFTTwoDimensionalTestSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "CFTThreeDimensionalTest"
 #pragma DCPS_DATA_KEY "CFTThreeDimensionalTest symbol"
@@ -32,6 +34,8 @@ struct CFTThreeDimensionalTest {
   long z;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<CFTThreeDimensionalTest> CFTThreeDimensionalTestSeq;
+#endif
 
 #endif /* CONTENTFILTEREDTOPIC_TEST_BASE_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 c47d72c5a82..fbd82498cfc 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CFT_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CFT_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::CFTTwoDimensionalTest, ::CFTTwoDimensionalTestSeq> CFTTwoDimensionalTestConn;
 module ::CCM_DDS::Typed < ::CFTThreeDimensionalTest, ::CFTThreeDimensionalTestSeq> CFTThreeDimensionalTestConn;
 #endif /* CONTENTFILTEREDTOPIC_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
index aafeaef696a..54946c6b406 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p CFT_Test_Base -l .. -o ../lib -u DDS CFT_Test_Connector"
 
 project(CFT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen CFT_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CFT_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(CFT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(CFT_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub 
-  libs  += CFT_Test_Base_stub CFT_Test_Connector_stub 
+  after += CFT_Test_Connector_lem_gen CFT_Test_Connector_stub CFT_Test_Base_stub
+  libs  += CFT_Test_Base_stub CFT_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(CFT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub 
+  after      += CFT_Test_Connector_lem_stub CFT_Test_Connector_exec CFT_Test_Connector_stub
   sharedname  = CFT_Test_Connector_svnt
   libs       += CFT_Test_Connector_stub \
                 CFT_Test_Connector_lem_stub  \
                 CFT_Test_Base_stub \
-                CFT_Test_Connector_exec 
+                CFT_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
index 88eb6ec60d5..d10944664dd 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl
@@ -19,6 +19,8 @@ struct ContentFilteredTopicListenEventTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ContentFilteredTopicListenEventTest> ContentFilteredTopicListenEventTestSeq;
+#endif
 
 #endif
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 90d1a087880..f3803448708 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/CFTLE_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CFTLE_Test_BaseTypeSupport.idl"
+#endif
+
 module CFTLE_Test
 {
   module ::CCM_DDS::Typed < ::ContentFilteredTopicListenEventTest, ::ContentFilteredTopicListenEventTestSeq> ContentFilteredTopicListenEventTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
index d47af56e58f..031d42d2b25 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CFTLE_Test_Base -l .. -o ../lib -u DDS CFTLE_Test_Connector"
 
 project(DDS_CFTLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CFTLE_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CFTLE_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CFTLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CFTLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub 
-  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub 
+  after += DDS_CFTLE_Test_Connector_lem_gen DDS_CFTLE_Test_Connector_stub DDS_CFTLE_Test_Base_stub
+  libs  += DDS_CFTLE_Test_Base_stub DDS_CFTLE_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CFTLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub 
+  after      += DDS_CFTLE_Test_Connector_lem_stub DDS_CFTLE_Test_Connector_exec DDS_CFTLE_Test_Connector_stub
   sharedname  = DDS_CFTLE_Test_Connector_svnt
   libs       += DDS_CFTLE_Test_Connector_stub \
                 DDS_CFTLE_Test_Connector_lem_stub  \
                 DDS_CFTLE_Test_Base_stub \
-                DDS_CFTLE_Test_Connector_exec 
+                DDS_CFTLE_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
index 6313e7e8294..04acfd18444 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl
@@ -20,6 +20,8 @@ struct CFTExceptionTest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<CFTExceptionTest> CFTExceptionTestSeq;
+#endif
 
 #endif /* CFT_EXCEPTION_TEST_BASE_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 bad6c8b9916..19f8fa9dffa 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
@@ -15,5 +15,9 @@
 
 #pragma ciao lem "Connector/Exception_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Exception_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::CFTExceptionTest, ::CFTExceptionTestSeq> CFTExceptionTestConn;
 #endif /* CFT_EXCEPTION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
index c5354d85dc3..270ff9ad3b3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p CFT_Exception_Test_Base -l .. -o ../lib -u DDS CFT_Exception_Test_Connector"
 
 project(CFT_Exception_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen CFT_Exception_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CFT_EXCEPTION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CFT_Exception_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(CFT_Exception_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(CFT_Exception_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub 
-  libs  += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub 
+  after += CFT_Exception_Test_Connector_lem_gen CFT_Exception_Test_Connector_stub CFT_Exception_Test_Base_stub
+  libs  += CFT_Exception_Test_Base_stub CFT_Exception_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(CFT_Exception_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub 
+  after      += CFT_Exception_Test_Connector_lem_stub CFT_Exception_Test_Connector_exec CFT_Exception_Test_Connector_stub
   sharedname  = CFT_Exception_Test_Connector_svnt
   libs       += CFT_Exception_Test_Connector_stub \
                 CFT_Exception_Test_Connector_lem_stub  \
                 CFT_Exception_Test_Base_stub \
-                CFT_Exception_Test_Connector_exec 
+                CFT_Exception_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
index f9dab9efc35..9205eafa3bc 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTest> QueryConditionTestSeq;
+#endif
 
 #endif
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 3dc9bbad390..07fb630b014 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/ReadGet_Test_BaseTypeSupport.idl"
+#endif
+
 module ReadGet_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
index 34923267436..383938b156f 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
 
 project(CFT_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen CFT_ReadGet_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(CFT_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(CFT_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += CFT_ReadGet_Test_Connector_lem_gen CFT_ReadGet_Test_Connector_stub \
-           CFT_ReadGet_Test_Base_stub 
-  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub 
+           CFT_ReadGet_Test_Base_stub
+  libs  += CFT_ReadGet_Test_Base_stub CFT_ReadGet_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(CFT_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += CFT_ReadGet_Test_Connector_lem_stub CFT_ReadGet_Test_Connector_exec \
-                CFT_ReadGet_Test_Connector_stub 
+                CFT_ReadGet_Test_Connector_stub
   sharedname  = CFT_ReadGet_Test_Connector_svnt
   libs       += CFT_ReadGet_Test_Connector_stub \
                 CFT_ReadGet_Test_Connector_lem_stub  \
                 CFT_ReadGet_Test_Base_stub \
-                CFT_ReadGet_Test_Connector_exec 
+                CFT_ReadGet_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
index 27e19211522..700810b49f6 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl
@@ -19,6 +19,8 @@ struct ContentFilteredTopicListenStateTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ContentFilteredTopicListenStateTest> ContentFilteredTopicListenStateTestSeq;
+#endif
 
 #endif
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 d9f78b5593b..fbb3b81c748 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
@@ -15,9 +15,13 @@
 
 #pragma ciao lem "Connector/CFTLS_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/CFTLS_Test_BaseTypeSupport.idl"
+#endif
+
 module CFTLS_Test
 {
   module ::CCM_DDS::Typed < ::ContentFilteredTopicListenStateTest, ::ContentFilteredTopicListenStateTestSeq> ContentFilteredTopicListenStateTestConnector;
 };
 
-#endif /* CFTLS_Test_CONNECTOR_IDL_ */
+#endif /* CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
index 793ee81f5de..867c2feec9c 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CFTLS_Test_Base -l .. -o ../lib -u DDS CFTLS_Test_Connector"
 
 project(DDS_CFTLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CFTLS_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=CFTLS_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_CFTLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_CFTLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub 
-  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub 
+  after += DDS_CFTLS_Test_Connector_lem_gen DDS_CFTLS_Test_Connector_stub DDS_CFTLS_Test_Base_stub
+  libs  += DDS_CFTLS_Test_Base_stub DDS_CFTLS_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_CFTLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub 
+  after      += DDS_CFTLS_Test_Connector_lem_stub DDS_CFTLS_Test_Connector_exec DDS_CFTLS_Test_Connector_stub
   sharedname  = DDS_CFTLS_Test_Connector_svnt
   libs       += DDS_CFTLS_Test_Connector_stub \
                 DDS_CFTLS_Test_Connector_lem_stub  \
                 DDS_CFTLS_Test_Base_stub \
-                DDS_CFTLS_Test_Connector_exec 
+                DDS_CFTLS_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
index dc758d20b36..9c72ed80d07 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl
@@ -19,6 +19,8 @@ struct WriterTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WriterTest> WriterTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
index b5ed2dfe1c8..52da51a41e1 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Writer_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
 
 #endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
index bdb237f55b1..82f95008537 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
 
 project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_DDSWriterEntityBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_DDSWriterEntityConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub 
-  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub 
+  after += DDS_DDSWriterEntityConnector_lem_gen DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityBase_stub
+  libs  += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub 
+  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub
   sharedname = DDS_DDSWriterEntityConnector_exec
-  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub 
+  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub 
+  after      += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_exec DDS_DDSWriterEntityConnector_stub
   sharedname  = DDS_DDSWriterEntityConnector_svnt
   libs       += DDS_DDSWriterEntityConnector_stub \
                 DDS_DDSWriterEntityConnector_lem_stub  \
                 DDS_DDSWriterEntityBase_stub \
-                DDS_DDSWriterEntityConnector_exec 
+                DDS_DDSWriterEntityConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
index 02fb99b96de..1749483f932 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
@@ -90,7 +90,7 @@ project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_impl {
   libout = ../lib
   includes += ..
   dynamicflags += RECEIVER_EXEC_BUILD_DLL
-  requires += ndds
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
@@ -117,7 +117,7 @@ project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   libout = ../lib
   includes += ..
   dynamicflags += RECEIVER_SVNT_BUILD_DLL
-  requires += ndds
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
index 3adfbc254fb..e83430bb723 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
@@ -97,7 +97,8 @@ project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += SENDER_EXEC_BUILD_DLL
-  requires += ndds
+
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
index 66d77afd91e..0fee7b58604 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl
@@ -13,6 +13,8 @@ struct DerivedType {
   string value; //@key
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<DerivedType> DerivedTypeSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
index 1e498636a08..287d61e070e 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl
@@ -12,6 +12,10 @@
 
 #pragma dds4ccm impl "DDS_Derived_Connector_T.h"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "DerivedTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::DerivedType, ::DerivedTypeSeq> DerivedTypeConnector;
 
 interface fooA
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
index d6713045e5c..ca72d74e1b6 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
@@ -2,6 +2,7 @@
 
 project(Derived_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   custom_only = 1
+  after += Derived_stub
   idlflags += -Wb,stub_export_macro=DERIVED_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Derived_Connector_stub_export.h \
               -Wb,skel_export_macro=DERIVED_CONNECTOR_SVNT_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
index 251e6396eef..6bd1abc666c 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl
@@ -24,7 +24,9 @@ module X
         string key; //@key
         long iter;
       };
-      typedef sequence<DNM_Test_Struct> DNM_Test_StructSeq;
+      #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence<DNM_Test_Struct> DNM_Test_StructSeq;
+#endif
     };
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
index 583a5e977fd..f7f11684c6a 100644
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/DNM_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/DNM_BaseTypeSupport.idl"
+#endif
+
 module DNM_Test_Connector
 {
   module Nested_Connector
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
index 2a6f741adbb..144fde53eff 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_DNM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_DNM_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DOUBLE_NESTED_MODULE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=DNM_Connector_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_DNM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_DNM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub 
-  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub 
+  after += DDS_DNM_Connector_lem_gen DDS_DNM_Connector_stub DDS_DNM_Base_stub
+  libs  += DDS_DNM_Base_stub DDS_DNM_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -84,9 +84,9 @@ project(DDS_DNM_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub 
+  after   += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_stub
   sharedname = DDS_DNM_Connector_exec
-  libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub 
+  libs += DDS_DNM_Connector_stub DDS_DNM_Connector_lem_stub DDS_DNM_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_DNM_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub 
+  after      += DDS_DNM_Connector_lem_stub DDS_DNM_Connector_exec DDS_DNM_Connector_stub
   sharedname  = DDS_DNM_Connector_svnt
   libs       += DDS_DNM_Connector_stub \
                 DDS_DNM_Connector_lem_stub  \
                 DDS_DNM_Base_stub \
-                DDS_DNM_Connector_exec 
+                DDS_DNM_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
index 685128c5007..e7bce731755 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
@@ -19,6 +19,8 @@ struct Event_ConnectionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Event_ConnectionTest> Event_ConnectionTestSeq;
+#endif
 
 #endif
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 2e62dab9c3b..fbcfc782f50 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Event_Connection_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Event_Connection_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::Event_ConnectionTest, ::Event_ConnectionTestSeq> Event_ConnectionConnector;
 
 #endif /* Event_Connection_Test_CONNECTOR_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 81c2f135049..65ce1a135f6 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
 
 project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_ECT_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Event_Connection_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_ECT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub 
-  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub 
+  after += DDS_ECT_Connector_lem_gen DDS_ECT_Connector_stub DDS_ECT_Base_stub
+  libs  += DDS_ECT_Base_stub DDS_ECT_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub 
+  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub
   sharedname = DDS_ECT_Connector_exec
-  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub 
+  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub 
+  after      += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_exec DDS_ECT_Connector_stub
   sharedname  = DDS_ECT_Connector_svnt
   libs       += DDS_ECT_Connector_stub \
                 DDS_ECT_Connector_lem_stub  \
                 DDS_ECT_Base_stub \
-                DDS_ECT_Connector_exec 
+                DDS_ECT_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
index 6ec51c89495..0d8ba6898eb 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
@@ -18,6 +18,8 @@ struct FixedStructSizeTest {
   long two;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
+#endif
 
 #endif
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 c86b9c33ca9..15df8d385de 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/FSS_Event_BaseTypeSupport.idl"
+#endif
+
 module FSS_Event
 {
   module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
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 889c96c4b52..2ad1c8ee68f 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
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_FSS_Event_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=FSS_Event_Connector_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub 
-  libs  += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub 
+  after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub
+  libs  += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -84,9 +84,9 @@ project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub 
+  after   += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub
   sharedname = DDS_FSS_Event_Connector_exec
-  libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub 
+  libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub 
+  after      += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub
   sharedname  = DDS_FSS_Event_Connector_svnt
   libs       += DDS_FSS_Event_Connector_stub \
                 DDS_FSS_Event_Connector_lem_stub  \
                 DDS_FSS_Event_Base_stub \
-                DDS_FSS_Event_Connector_exec 
+                DDS_FSS_Event_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
index 5a2a379a89d..6acc2d0312a 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
@@ -18,6 +18,8 @@ struct FixedStructSizeTest {
   long two;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<FixedStructSizeTest> FixedStructSizeTestSeq;
+#endif
 
 #endif
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 c3d5e0b85d6..22c6bca8e5c 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/FSS_State_BaseTypeSupport.idl"
+#endif
+
 module FSS_State
 {
   module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTestSeq> FixedStructSizeTestConnector;
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 bb7759517b9..f7ba974f5cd 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
 
 project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_FSS_State_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=FSS_State_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub 
-  libs  += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub 
+  after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub
+  libs  += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub 
+  after      += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub
   sharedname  = DDS_FSS_State_Connector_svnt
   libs       += DDS_FSS_State_Connector_stub \
                 DDS_FSS_State_Connector_lem_stub  \
                 DDS_FSS_State_Base_stub \
-                DDS_FSS_State_Connector_exec 
+                DDS_FSS_State_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
index 69fccc3435c..8f4eae12a0f 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl
@@ -20,6 +20,8 @@ struct GCETest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<GCETest> GCETestSeq;
+#endif
 
 #endif /* GET_COMPONENT_EVENT_TEST_BASE_IDL */
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 0e3bc7abdc7..ef2af9c5f98 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
@@ -15,5 +15,10 @@
 
 #pragma ciao lem "Connector/GCE_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/GCE_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::GCETest, ::GCETestSeq> GCETestConnector;
+
 #endif /* GET_COMPONENT_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
index a898244a545..4acf6b46127 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p GCE_Test_Base -l .. -o ../lib -u DDS GCE_Test_Connector"
 
 project(GCE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen GCE_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GET_COMPONENT_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=GCE_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(GCE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(GCE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub 
-  libs  += GCE_Test_Base_stub GCE_Test_Connector_stub 
+  after += GCE_Test_Connector_lem_gen GCE_Test_Connector_stub GCE_Test_Base_stub
+  libs  += GCE_Test_Base_stub GCE_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(GCE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub 
+  after      += GCE_Test_Connector_lem_stub GCE_Test_Connector_exec GCE_Test_Connector_stub
   sharedname  = GCE_Test_Connector_svnt
   libs       += GCE_Test_Connector_stub \
                 GCE_Test_Connector_lem_stub  \
                 GCE_Test_Base_stub \
-                GCE_Test_Connector_exec 
+                GCE_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
index 8046f1d6d6a..329b96ab7bd 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl
@@ -20,6 +20,8 @@ struct GCSTest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<GCSTest> GCSTestSeq;
+#endif
 
 #endif /* GET_COMPONENT_STATE_TEST_BASE_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 191e741c110..c69d12fecbe 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
@@ -15,5 +15,10 @@
 
 #pragma ciao lem "Connector/GCS_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/GCS_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::GCSTest, ::GCSTestSeq> GCSTestConnector;
+
 #endif /* GET_COMPONENT_STATE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
index eb2b649ab81..7f57d44fba7 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p GCS_Test_Base -l .. -o ../lib -u DDS GCS_Test_Connector"
 
 project(GCS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen GCS_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GET_COMPONENT_STATE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=GCS_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(GCS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(GCS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub 
-  libs  += GCS_Test_Base_stub GCS_Test_Connector_stub 
+  after += GCS_Test_Connector_lem_gen GCS_Test_Connector_stub GCS_Test_Base_stub
+  libs  += GCS_Test_Base_stub GCS_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(GCS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub 
+  after      += GCS_Test_Connector_lem_stub GCS_Test_Connector_exec GCS_Test_Connector_stub
   sharedname  = GCS_Test_Connector_svnt
   libs       += GCS_Test_Connector_stub \
                 GCS_Test_Connector_lem_stub  \
                 GCS_Test_Base_stub \
-                GCS_Test_Connector_exec 
+                GCS_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
index 6eaf0158843..152f122c5d6 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
@@ -17,7 +17,10 @@ struct GetterTest {
   string key;
   long iteration;
 };
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<GetterTest> GetterTestSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "GetterFixed"
 
@@ -25,6 +28,9 @@ struct GetterFixed {
   long key;
   long iteration;
 };
-typedef sequence<GetterFixed> GetterFixedSeq;
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence<GetterFixed> GetterFixedSeq;
 #endif
+
+#endif /* GETTER_TEST_BASE_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 fc18ed06eaf..f5b31e30270 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
@@ -9,12 +9,16 @@
 #define GETTER_TEST_CONNECTOR_IDL_
 
 #include <Components.idl>
-#include "Base/Getter_Test_Base.idl"
-
 #include <ccm_dds.idl>
 
+#include "Base/Getter_Test_Base.idl"
+
 #pragma ciao lem "Connector/Getter_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Getter_Test_BaseTypeSupport.idl"
+#endif
+
 module Getter_Test
 {
   module ::CCM_DDS::Typed < ::GetterTest, ::GetterTestSeq> GetterTestConnector;
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 01d5f9e3a4b..5486e99bf8c 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
 
 project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Getter_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Getter_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Getter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub 
-  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub 
+  after += DDS_Getter_Test_Connector_lem_gen DDS_Getter_Test_Connector_stub DDS_Getter_Test_Base_stub
+  libs  += DDS_Getter_Test_Base_stub DDS_Getter_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub 
+  after      += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_exec DDS_Getter_Test_Connector_stub
   sharedname  = DDS_Getter_Test_Connector_svnt
   libs       += DDS_Getter_Test_Connector_stub \
                 DDS_Getter_Test_Connector_lem_stub  \
                 DDS_Getter_Test_Base_stub \
-                DDS_Getter_Test_Connector_exec 
+                DDS_Getter_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
index 5ef2e3a12d6..f3394567a7e 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl
@@ -10,7 +10,6 @@
 
 #pragma ndds typesupport "Base/HomeT_BaseSupport.h"
 #pragma opendds typesupport "Base/HomeT_BaseTypeSupportImpl.h"
-#pragma splice typesupport "Base/HomeT_BaseDcpsC.h"
 
 #pragma DCPS_DATA_TYPE "HomeTest"
 
@@ -19,6 +18,8 @@ struct HomeTest {
   short iterator;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<HomeTest> HomeTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
index ad0284e78b1..eadb01c151e 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/HomeT_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/HomeT_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::HomeTest, ::HomeTestSeq> ConnComp;
 
 #endif /* HOMET_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
index 01bbc8af0ed..7e06925c3d4 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after  += DDS4CCM_idl_gen
+  after  += DDS4CCM_idl_gen HomeT_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=HomeT_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
index ee11c24c27c..a9ea3f1686d 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl
@@ -19,6 +19,8 @@ struct IDL_Test {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<IDL_Test> IDL_TestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
index 6e16c944627..c9e20eaefd4 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/IDL_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/IDL_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::IDL_Test, ::IDL_TestSeq> IDL_Connector;
 
 #endif /* IDL_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
index c8e9ebc9706..81c86b2f614 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p IDL_Test_Base -l .. -o ../lib -u DDS IDL_Test_Connector"
 
 project(IDL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen IDL_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=IDL_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(IDL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(IDL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub 
-  libs  += IDL_Test_Base_stub IDL_Test_Connector_stub 
+  after += IDL_Test_Connector_lem_gen IDL_Test_Connector_stub IDL_Test_Base_stub
+  libs  += IDL_Test_Base_stub IDL_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(IDL_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub 
+  after   += IDL_Test_Connector_lem_stub IDL_Test_Connector_stub
   sharedname = IDL_Test_Connector_exec
-  libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub 
+  libs += IDL_Test_Connector_stub IDL_Test_Connector_lem_stub IDL_Test_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(IDL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub 
+  after      += IDL_Test_Connector_lem_stub IDL_Test_Connector_exec IDL_Test_Connector_stub
   sharedname  = IDL_Test_Connector_svnt
   libs       += IDL_Test_Connector_stub \
                 IDL_Test_Connector_lem_stub  \
                 IDL_Test_Base_stub \
-                IDL_Test_Connector_exec 
+                IDL_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
index 8761be1672c..6ff0bd86e90 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
@@ -18,6 +18,8 @@ struct WriterTest {
   string key; //@key
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WriterTest> WriterTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
index b5ed2dfe1c8..52da51a41e1 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Writer_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
 
 #endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index a032e7e739b..a054f38f52e 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
 
 project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_DDSInstanceHandleBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_InstanceHandleConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub 
-  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub 
+  after += DDS_InstanceHandleConnector_lem_gen DDS_InstanceHandleConnector_stub DDS_DDSInstanceHandleBase_stub
+  libs  += DDS_DDSInstanceHandleBase_stub DDS_InstanceHandleConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub 
+  after      += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_exec DDS_InstanceHandleConnector_stub
   sharedname  = DDS_InstanceHandleConnector_svnt
   libs       += DDS_InstanceHandleConnector_stub \
                 DDS_InstanceHandleConnector_lem_stub  \
                 DDS_DDSInstanceHandleBase_stub \
-                DDS_InstanceHandleConnector_exec 
+                DDS_InstanceHandleConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index b9d68e2e51a..70cf9cebeff 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -95,7 +95,7 @@ project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += SENDER_EXEC_BUILD_DLL
-  requires += ndds
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
index 97b6020e892..9eb427dbd61 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
@@ -19,6 +19,8 @@ struct KeyedTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<KeyedTest> KeyedTestSeq;
+#endif
 
 #endif
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 26fa3dc7d22..1924f1ee4f9 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Keyed_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Keyed_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::KeyedTest, ::KeyedTestSeq> KeyedTestConnector;
 
-#endif /* Keyed_Test_CONNECTOR_IDL_ */
+#endif /* KEYED_TEST_CONNECTOR_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 3731dcdd994..33ba628f7f7 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
 
 project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Keyed_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Keyed_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Keyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub 
-  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub 
+  after += DDS_Keyed_Test_Connector_lem_gen DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Base_stub
+  libs  += DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub 
+  after      += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_exec DDS_Keyed_Test_Connector_stub
   sharedname  = DDS_Keyed_Test_Connector_svnt
   libs       += DDS_Keyed_Test_Connector_stub \
                 DDS_Keyed_Test_Connector_lem_stub  \
                 DDS_Keyed_Test_Base_stub \
-                DDS_Keyed_Test_Connector_exec 
+                DDS_Keyed_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
index dc758d20b36..9c72ed80d07 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
@@ -19,6 +19,8 @@ struct WriterTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WriterTest> WriterTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
index b5ed2dfe1c8..52da51a41e1 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Writer_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
 
 #endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index b5314ddd07a..01dc4bd21dc 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
 project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_KeyedWriterBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_KeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub 
-  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub 
+  after += DDS_KeyedWriterConnector_lem_gen DDS_KeyedWriterConnector_stub DDS_KeyedWriterBase_stub
+  libs  += DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub 
+  after      += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_exec DDS_KeyedWriterConnector_stub
   sharedname  = DDS_KeyedWriterConnector_svnt
   libs       += DDS_KeyedWriterConnector_stub \
                 DDS_KeyedWriterConnector_lem_stub  \
                 DDS_KeyedWriterBase_stub \
-                DDS_KeyedWriterConnector_exec 
+                DDS_KeyedWriterConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
index c11e85ae55f..199ee6c0a86 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl
@@ -19,6 +19,8 @@ struct RG_LateBindingTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<RG_LateBindingTest> RG_LateBindingTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
index 5d7f20d9300..f6e1080005b 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/RG_LateBinding_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/RG_LateBinding_BaseTypeSupport.idl"
+#endif
+
 module RG_LateBinding
 {
   module ::CCM_DDS::Typed < ::RG_LateBindingTest, ::RG_LateBindingTestSeq> RG_LateBindingTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
index 03c7ea275fe..20bb1d2460f 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p RG_LateBindingBase -l .. -o ../lib -u DDS RG_LateBinding_Connector"
 
 project (RG_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen RG_LateBindingBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RG_LATEBINDING_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
index 71795cf639a..9e07835428f 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl
@@ -19,6 +19,8 @@ struct WU_LateBindingTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WU_LateBindingTest> WU_LateBindingTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
index 28f7ec1c36d..152751ba587 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/WU_LateBinding_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/WU_LateBinding_BaseTypeSupport.idl"
+#endif
+
 module WU_LateBinding
 {
   module ::CCM_DDS::Typed < ::WU_LateBindingTest, ::WU_LateBindingTestSeq> WU_LateBindingTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
index 26e3fd89b59..842302c01d8 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p WU_LateBindingBase -l .. -o ../lib -u DDS WU_LateBinding_Connector"
 
 project (WU_LateBindingConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen WU_LateBindingBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WU_LATEBINDING_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
index bb1bcdf020c..050aee731a1 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
@@ -19,6 +19,8 @@ struct ListenManyByManyTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ListenManyByManyTest> ListenManyByManyTestSeq;
+#endif
 
 #endif
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 cd00ac4a3de..04d5e934a48 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/LMBM_Test_BaseTypeSupport.idl"
+#endif
+
 module LMBM_Test
 {
   module ::CCM_DDS::Typed
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 d03528e7b78..9ac206eba11 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
 
 project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_LMBM_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LMBM_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_LMBM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub 
-  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub 
+  after += DDS_LMBM_Test_Connector_lem_gen DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Base_stub
+  libs  += DDS_LMBM_Test_Base_stub DDS_LMBM_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub 
+  after      += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_exec DDS_LMBM_Test_Connector_stub
   sharedname  = DDS_LMBM_Test_Connector_svnt
   libs       += DDS_LMBM_Test_Connector_stub \
                 DDS_LMBM_Test_Connector_lem_stub  \
                 DDS_LMBM_Test_Base_stub \
-                DDS_LMBM_Test_Connector_exec 
+                DDS_LMBM_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
index d8e75f32203..fa50e162f10 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
@@ -19,6 +19,8 @@ struct ListenNotEnabledTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ListenNotEnabledTest> ListenNotEnabledTestSeq;
+#endif
 
 #endif
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 e346a730766..fdf631ade12 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/LNE_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/LNE_Test_BaseTypeSupport.idl"
+#endif
+
 module LNE_Test
 {
   module ::CCM_DDS::Typed < ::ListenNotEnabledTest, ::ListenNotEnabledTestSeq> ListenNotEnabledTestConnector;
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 bda90db2aa8..5148be80884 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
 
 project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_LNE_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LNE_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_LNE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub 
-  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub 
+  after += DDS_LNE_Test_Connector_lem_gen DDS_LNE_Test_Connector_stub DDS_LNE_Test_Base_stub
+  libs  += DDS_LNE_Test_Base_stub DDS_LNE_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub 
+  after      += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_exec DDS_LNE_Test_Connector_stub
   sharedname  = DDS_LNE_Test_Connector_svnt
   libs       += DDS_LNE_Test_Connector_stub \
                 DDS_LNE_Test_Connector_lem_stub  \
                 DDS_LNE_Test_Base_stub \
-                DDS_LNE_Test_Connector_exec 
+                DDS_LNE_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
index a6f22d724b4..cead5e3c051 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
@@ -19,6 +19,8 @@ struct ListenOneByOneTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ListenOneByOneTest> ListenOneByOneTestSeq;
+#endif
 
 #endif
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 e1f67124bdd..09a6f1b1440 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/LOBO_Test_BaseTypeSupport.idl"
+#endif
+
 module LOBO_Test
 {
   module ::CCM_DDS::Typed
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 bc582a1e439..22a7db10b0c 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
 
 project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_LOBO_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LOBO_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_LOBO_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub 
-  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub 
+  after += DDS_LOBO_Test_Connector_lem_gen DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Base_stub
+  libs  += DDS_LOBO_Test_Base_stub DDS_LOBO_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub 
+  after      += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_exec DDS_LOBO_Test_Connector_stub
   sharedname  = DDS_LOBO_Test_Connector_svnt
   libs       += DDS_LOBO_Test_Connector_stub \
                 DDS_LOBO_Test_Connector_lem_stub  \
                 DDS_LOBO_Test_Base_stub \
-                DDS_LOBO_Test_Connector_exec 
+                DDS_LOBO_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
index 6a5c0db8c9b..45e8928d9b7 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl
@@ -19,6 +19,8 @@ struct Event_MemLeakDetectionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Event_MemLeakDetectionTest> Event_MemLeakDetectionTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
index 384fbc64062..7be512e3f05 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Event_MemLeakDetection_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Event_MemLeakDetection_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::Event_MemLeakDetectionTest, ::Event_MemLeakDetectionTestSeq> Event_MemLeakDetectionConnector;
 
 #endif /* Event_MemLeakDetection_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
index 63489f0af2d..ee554d1ac21 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_EMLDT_Base -l .. -o ../lib -u DDS Event_MemLeakDetection_Test_Connector"
 
 project(DDS_EMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_EMLDT_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EVENT_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Event_MemLeakDetection_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_EMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_EMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_EMLDT_Connector_lem_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub 
-  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub 
+  after += DDS_EMLDT_Connector_lem_gen DDS_EMLDT_Connector_stub DDS_EMLDT_Base_stub
+  libs  += DDS_EMLDT_Base_stub DDS_EMLDT_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -85,9 +85,9 @@ project(DDS_EMLDT_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_EMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub 
+  after   += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_stub
   sharedname = DDS_EMLDT_Connector_exec
-  libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Base_stub 
+  libs += DDS_EMLDT_Connector_stub DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_EMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_exec DDS_EMLDT_Connector_stub 
+  after      += DDS_EMLDT_Connector_lem_stub DDS_EMLDT_Connector_exec DDS_EMLDT_Connector_stub
   sharedname  = DDS_EMLDT_Connector_svnt
   libs       += DDS_EMLDT_Connector_stub \
                 DDS_EMLDT_Connector_lem_stub  \
                 DDS_EMLDT_Base_stub \
-                DDS_EMLDT_Connector_exec 
+                DDS_EMLDT_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
index c7ad6003cad..55d39800fe5 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl
@@ -19,6 +19,8 @@ struct State_MemLeakDetectionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<State_MemLeakDetectionTest> State_MemLeakDetectionTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
index 2929795616a..e1e48db1c7b 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/State_MemLeakDetection_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/State_MemLeakDetection_Test_BaseTypeSupport.idl"
+#endif
+
 module State_MemLeakDetection_Test
 {
   module ::CCM_DDS::Typed < ::State_MemLeakDetectionTest, ::State_MemLeakDetectionTestSeq> State_MemLeakDetectionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
index 936aaa02532..4880fc80375 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SMLDT_Base -l .. -o ../lib -u DDS State_MemLeakDetection_Test_Connector"
 
 project(DDS_SMLDT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SMLDT_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STATE_MEMLEAKDETECTION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=State_MemLeakDetection_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SMLDT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SMLDT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SMLDT_Connector_lem_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub 
-  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub 
+  after += DDS_SMLDT_Connector_lem_gen DDS_SMLDT_Connector_stub DDS_SMLDT_Base_stub
+  libs  += DDS_SMLDT_Base_stub DDS_SMLDT_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SMLDT_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_exec DDS_SMLDT_Connector_stub 
+  after      += DDS_SMLDT_Connector_lem_stub DDS_SMLDT_Connector_exec DDS_SMLDT_Connector_stub
   sharedname  = DDS_SMLDT_Connector_svnt
   libs       += DDS_SMLDT_Connector_stub \
                 DDS_SMLDT_Connector_lem_stub  \
                 DDS_SMLDT_Base_stub \
-                DDS_SMLDT_Connector_exec 
+                DDS_SMLDT_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
index fadd68c8746..743842d32f5 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl
@@ -18,6 +18,8 @@ struct MLDTypeRegistrationTest {
   unsigned long key;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<MLDTypeRegistrationTest> MLDTypeRegistrationTestSeq;
+#endif
 
 #endif /* MLD_TYPE_REGISTRATION_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
index 66ec43c68bb..dd55fb31477 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl
@@ -15,5 +15,10 @@
 
 #pragma ciao lem "Connector/TypeRegistration_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/TypeRegistration_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::MLDTypeRegistrationTest, ::MLDTypeRegistrationTestSeq> MLDTypeRegistrationTestConn;
+
 #endif /* MLD_TYPE_REGISTRATION_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
index 224a9a31a43..36051e01f55 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p TypeRegistration_Base -l .. -o ../lib -u DDS TypeRegistration_Connector"
 
 project(TypeRegistration_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen TypeRegistration_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=MLD_TYPE_REGISTRATION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=TypeRegistration_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
index 782e4d6b6f4..3d7d202bd87 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl
@@ -10,7 +10,6 @@
 
 #pragma ndds typesupport "Base/MultiTopic_BaseSupport.h"
 #pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportImpl.h"
-#pragma splice typesupport "Base/MultiTopic_BaseDscpC.h"
 
 #pragma DCPS_DATA_TYPE "ShapeType"
 #pragma DCPS_DATA_KEY "ShapeType color"
@@ -32,8 +31,12 @@ struct Attributes {
   string color; //@key
   float speed;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ShapeType> ShapeTypeSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Attributes> AttributesSeq;
+#endif
 
 #pragma keylist Attributes shape color
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
index db89b699185..e342ebb5307 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/MultiTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/MultiTopic_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS_MT::Typed_MT < ::ShapeType, ::ShapeTypeSeq> Shapes;
 
 #endif /* MULTITOPIC_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
index d84372bc7a3..69e8fe17a38 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
@@ -2,6 +2,7 @@
 
 project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm {
   custom_only = 1
+  after += DDS_MultiTopic_Base_stub
   idlflags += -Wb,stub_export_macro=CCM_DDS_MT_STUB_Export \
               -Wb,stub_export_include=ccm_dds_mt_stub_export.h \
               -Wb,skel_export_macro=CCM_DDS_MT_SKEL_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
index 05cc65413ce..52c37f06c6c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl
@@ -28,7 +28,11 @@ struct TestTopicTwo {
   long z;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopicOne> TestTopicOneSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopicTwo> TestTopicTwoSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
index 71d8b68e693..2a13c61a03a 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl
@@ -13,6 +13,8 @@ struct NoModuleType {
   string value; //@key
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<NoModuleType> NoModuleTypeSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
index 1d01e9edd9d..1f96e9b8a73 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.idl
@@ -10,6 +10,10 @@
 
 #pragma ciao lem "NoModule_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "NoModuleTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::NoModuleType, ::NoModuleTypeSeq> NoModuleTypeConnector;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
index 7d75e5a3452..58aa35083bc 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
@@ -3,6 +3,7 @@
 
 project(NoModule_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   custom_only = 1
+  after += NoModule_stub
   idlflags += -Wb,stub_export_macro=NOMODULE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=NoModule_Connector_stub_export.h \
               -Wb,skel_export_macro=NOMODULE_CONNECTOR_SVNT_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
index 5b08435f422..27e33eddbd7 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
@@ -18,6 +18,8 @@ struct NonChangeableTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<NonChangeableTest> NonChangeableTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
index 34d1bc352a8..d553eaafb88 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/NonChangeable_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/NonChangeable_BaseTypeSupport.idl"
+#endif
+
 module NonChangeable
 {
   module ::CCM_DDS::Typed
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index 5c58a00cc29..a4b547196a8 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
 
 project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_NonChangeableBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NONCHANGABLE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=NonChangeable_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_NonChangeableConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub 
-  libs  += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub 
+  after += DDS_NonChangeableConnector_lem_gen DDS_NonChangeableConnector_stub DDS_NonChangeableBase_stub
+  libs  += DDS_NonChangeableBase_stub DDS_NonChangeableConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub 
+  after      += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_exec DDS_NonChangeableConnector_stub
   sharedname  = DDS_NonChangeableConnector_svnt
   libs       += DDS_NonChangeableConnector_stub \
                 DDS_NonChangeableConnector_lem_stub  \
                 DDS_NonChangeableBase_stub \
-                DDS_NonChangeableConnector_exec 
+                DDS_NonChangeableConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
index cc87b3d87dc..0d6cc5b1673 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl
@@ -20,7 +20,9 @@ struct OIT_Receiver_Topic {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<OIT_Receiver_Topic> OIT_Receiver_TopicSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "OIT_Sender_Topic"
 #pragma DCPS_DATA_KEY "OIT_Sender_Topic symbol"
@@ -32,6 +34,8 @@ struct OIT_Sender_Topic {
   long z;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<OIT_Sender_Topic> OIT_Sender_TopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
index 3cd719843a6..7c400f41dda 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
@@ -29,7 +29,6 @@ namespace CIAO_OIT_Test_Receiver_Impl
     ACE_Thread_ID t_id;
     this->thread_id_ = t_id;
     this->inconsistent_ = true;
-    this->inconsistent_ = true;
   }
 
   void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
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 dee6de05d2c..83ea6163774 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "ReceiverConnector/OIT_Receiver_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/OIT_Test_BaseTypeSupport.idl"
+#endif
+
 module OIT_Test
 {
   module ::CCM_DDS::Typed < ::OIT_Receiver_Topic, ::OIT_Receiver_TopicSeq>
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
index 1300bee26e9..53b10bfed03 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Receiver_Connector"
 
 project(OIT_Receiver_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen OIT_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=OIT_Receiver_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(OIT_Receiver_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(OIT_Receiver_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub 
-  libs  += OIT_Test_Base_stub OIT_Receiver_Connector_stub 
+  after += OIT_Receiver_Connector_lem_gen OIT_Receiver_Connector_stub OIT_Test_Base_stub
+  libs  += OIT_Test_Base_stub OIT_Receiver_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(OIT_Receiver_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub 
+  after      += OIT_Receiver_Connector_lem_stub OIT_Receiver_Connector_exec OIT_Receiver_Connector_stub
   sharedname  = OIT_Receiver_Connector_svnt
   libs       += OIT_Receiver_Connector_stub \
                 OIT_Receiver_Connector_lem_stub  \
                 OIT_Test_Base_stub \
-                OIT_Receiver_Connector_exec 
+                OIT_Receiver_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 d69fbd3896d..70098b3c538 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "SenderConnector/OIT_Sender_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/OIT_Test_BaseTypeSupport.idl"
+#endif
+
 module OIT_Test
 {
   module ::CCM_DDS::Typed < ::OIT_Sender_Topic, ::OIT_Sender_TopicSeq>
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
index f651b020293..95b306fa58c 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p OIT_Test_Base -l .. -o ../lib -u DDS OIT_Sender_Connector"
 
 project(OIT_Sender_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen OIT_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ON_INCONSISTENT_TOPIC_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=OIT_Sender_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(OIT_Sender_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(OIT_Sender_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub 
-  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub 
+  after += OIT_Sender_Connector_lem_gen OIT_Sender_Connector_stub OIT_Test_Base_stub
+  libs  += OIT_Test_Base_stub OIT_Sender_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(OIT_Sender_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub 
+  after      += OIT_Sender_Connector_lem_stub OIT_Sender_Connector_exec OIT_Sender_Connector_stub
   sharedname  = OIT_Sender_Connector_svnt
   libs       += OIT_Sender_Connector_stub \
                 OIT_Sender_Connector_lem_stub  \
                 OIT_Test_Base_stub \
-                OIT_Sender_Connector_exec 
+                OIT_Sender_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
index 8783dc418f4..28b3df7a970 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl
@@ -13,7 +13,9 @@ struct Topic1 {
   string key_value_topic1; //@key
   long long_value;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Topic1> Topic1Seq;
+#endif
 
 #pragma DCPS_DATA_TYPE "Topic2"
 #pragma DCPS_DATA_KEY "Topic2 key_value_topic2"
@@ -22,7 +24,9 @@ struct Topic2 {
   string key_value_topic2; //@key
   float float_value;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Topic2> Topic2Seq;
+#endif
 
 #pragma DCPS_DATA_TYPE "Topic3"
 #pragma DCPS_DATA_KEY "Topic3 key_value_topic3"
@@ -31,6 +35,8 @@ struct Topic3 {
   string key_value_topic3; //@key
   short short_value;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<Topic3> Topic3Seq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
index c981fb46d0f..cb892cf51de 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl
@@ -10,6 +10,10 @@
 
 #pragma ciao lem "OFM_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "OFM_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::Topic1, ::Topic1Seq> Topic1Connector;
 module ::CCM_DDS::Typed < ::Topic2, ::Topic2Seq> Topic2Connector;
 module ::CCM_DDS::Typed < ::Topic3, ::Topic3Seq> Topic3Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
index b437583be1d..b05f0e9c15b 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
@@ -26,6 +26,7 @@ project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default {
 
 project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   custom_only = 1
+  after += OFM_Base_stub
   idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=OFM_Connector_stub_export.h \
               -Wb,skel_export_macro=OFM_CONNECTOR_SKEL_Export \
@@ -41,7 +42,7 @@ project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
 }
 
 project(OFM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  after    += OFM_Connector_idl_gen
+  after += OFM_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=OFM_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=OFM_Connector_lem_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
index addb25a283e..94ab95016e5 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl
@@ -18,6 +18,8 @@ struct OneFileTopic {
   string hello; //@key
   long iteration;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<OneFileTopic> OneFileTopicSeq;
+#endif
 
 #endif /* ONEFILE_BASE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
index d659e0b1f3c..8a08e82bad4 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "OneFile_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "OneFile_BaseTypeSupport.idl"
+#endif
+
 module OneFile_Connector
 {
   module ::CCM_DDS::Typed < OneFileTopic, OneFileTopicSeq> OneFileConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
index 305c7292428..32cf1ae3a20 100755
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
@@ -25,6 +25,7 @@ project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default {
 
 project(OneFile_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   custom_only = 1
+  after += OneFile_Base_stub
   idlflags += -Wb,stub_export_macro=ONEFILE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=OneFile_Connector_stub_export.h \
               -Wb,skel_export_macro=ONEFILE_CONNECTOR_SKEL_Export \
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
index fe78db3e454..417178bb667 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/PSAT_Connector.idl
@@ -9,11 +9,15 @@
 
 #include  <Components.idl>
 
-#include "psat_type.idl"
 #include "ccm_dds_psat.idl"
+#include "psat_type.idl"
 
 #pragma ciao lem "PSAT_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "psat_typeTypeSupport.idl"
+#endif
+
 module ::CCM_DDS_PSAT::Typed_PSAT < ::TestTopic, ::TestTopicSeq> TestTopicMod;
 
 #endif /* PSAT_CONNECTOR_USER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
index 5a9e9955e65..5c15db9f585 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
@@ -54,7 +54,7 @@ project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de
 
 
 project(PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_CCM_Example_PSAT_type_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSAT_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=PSAT_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
index 196aca80eab..f708eb1d96a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl
@@ -18,6 +18,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
index 242266e3a2c..5e4bedfc434 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #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 e960bcb890a..f515c800b9b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/PSL_DeadlineTest_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/PSL_DeadlineTest_BaseTypeSupport.idl"
+#endif
+
 module PSL_DeadlineTest
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSLDeadlineConnector;
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 79dac5a4ea5..3058eaf1d15 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
 
 project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_PSL_DeadlineTest_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=PSL_DeadlineTest_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_PSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub 
-  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub 
+  after += DDS_PSL_DT_Connector_lem_gen DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Base_stub
+  libs  += DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub 
+  after      += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_exec DDS_PSL_DeadlineTest_Connector_stub
   sharedname  = DDS_PSL_DeadlineTest_Connector_svnt
   libs       += DDS_PSL_DeadlineTest_Connector_stub \
                 DDS_PSL_DT_Connector_lem_stub  \
                 DDS_PSL_DeadlineTest_Base_stub \
-                DDS_PSL_DeadlineTest_Connector_exec 
+                DDS_PSL_DeadlineTest_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
index a4be0a63bee..347fafd5076 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
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 930098bee48..88c6d2407b5 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/PSL_SampleLost_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/PSL_SampleLost_BaseTypeSupport.idl"
+#endif
+
 module PSL_SampleLost
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> PSL_SampleLostConnector;
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 690445c10c3..7509f5ca7e4 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
 
 project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_PSL_SampleLost_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=PSL_SampleLost_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_PSL_SL_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub 
-  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub 
+  after += DDS_PSL_SL_Connector_lem_gen DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Base_stub
+  libs  += DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub 
+  after      += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_exec DDS_PSL_SampleLost_Connector_stub
   sharedname  = DDS_PSL_SampleLost_Connector_svnt
   libs       += DDS_PSL_SampleLost_Connector_stub \
                 DDS_PSL_SL_Connector_lem_stub  \
                 DDS_PSL_SampleLost_Base_stub \
-                DDS_PSL_SampleLost_Connector_exec 
+                DDS_PSL_SampleLost_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
index b268ffed77e..79653c6fa20 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl
@@ -19,7 +19,9 @@ struct PortUsageTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<PortUsageTest> PortUsageTestSeq;
+#endif
 
 enum PORT_USAGE_ASSIGNMENT {
   //event ports
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
index 0c622c0a259..a07c8315e1b 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "EventConnector/PortUsageEvent_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/PortUsage_Test_BaseTypeSupport.idl"
+#endif
+
 module PortUsageEvent_Test
 {
   module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
index 72a1976e10f..6c6491d07ee 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageEvent_Connector"
 
 project(PortUsageEvent_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=PortUsageEvent_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(PortUsageEvent_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(PortUsageEvent_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub 
-  libs  += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub 
+  after += PortUsageEvent_Connector_lem_gen PortUsageEvent_Connector_stub PortUsage_Test_Base_stub
+  libs  += PortUsage_Test_Base_stub PortUsageEvent_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(PortUsageEvent_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub 
+  after      += PortUsageEvent_Connector_lem_stub PortUsageEvent_Connector_exec PortUsageEvent_Connector_stub
   sharedname  = PortUsageEvent_Connector_svnt
   libs       += PortUsageEvent_Connector_stub \
                 PortUsageEvent_Connector_lem_stub  \
                 PortUsage_Test_Base_stub \
-                PortUsageEvent_Connector_exec 
+                PortUsageEvent_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
index 7a26567b179..524426a50c6 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "StateConnector/PortUsageState_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/PortUsage_Test_BaseTypeSupport.idl"
+#endif
+
 module PortUsageState_Test
 {
   module ::CCM_DDS::Typed < ::PortUsageTest, ::PortUsageTestSeq> PortUsageTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
index 161b1485f4e..4805c334cf2 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p PortUsage_Test_Base -l .. -o ../lib -u DDS PortUsageState_Connector"
 
 project(PortUsageState_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen PortUsage_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PORTUSAGE_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=PortUsageState_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(PortUsageState_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(PortUsageState_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub 
-  libs  += PortUsage_Test_Base_stub PortUsageState_Connector_stub 
+  after += PortUsageState_Connector_lem_gen PortUsageState_Connector_stub PortUsage_Test_Base_stub
+  libs  += PortUsage_Test_Base_stub PortUsageState_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(PortUsageState_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub 
+  after      += PortUsageState_Connector_lem_stub PortUsageState_Connector_exec PortUsageState_Connector_stub
   sharedname  = PortUsageState_Connector_svnt
   libs       += PortUsageState_Connector_stub \
                 PortUsageState_Connector_lem_stub  \
                 PortUsage_Test_Base_stub \
-                PortUsageState_Connector_exec 
+                PortUsageState_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
index e20c0e26f40..9c07b650022 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl
@@ -19,6 +19,8 @@ struct ProxyReadWriteTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ProxyReadWriteTest> ProxyReadWriteTestSeq;
+#endif
 
 #endif /* PROXY_RW_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
index ac631ee59fa..a8361298e44 100644
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Proxy_RW_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Proxy_RW_Test_BaseTypeSupport.idl"
+#endif
+
 module Proxy_RW_Test
 {
   module ::CCM_DDS::Typed < ::ProxyReadWriteTest, ::ProxyReadWriteTestSeq> ProxyReadWriteTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
index eaee93bae4c..cc683971bc9 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Proxy_RW_Test_Base -l .. -o ../lib -u DDS Proxy_RW_Test_Connector"
 
 project(Proxy_RW_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen Proxy_RW_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PROXY_RW_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Proxy_RW_Test_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
index 7831a20dee5..e25f8238242 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl
@@ -19,6 +19,8 @@ struct QosProfileTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QosProfileTest> QosProfileTestSeq;
+#endif
 
 #endif
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 0c543bb4371..5d589595aac 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QosProfile_Test_BaseTypeSupport.idl"
+#endif
+
 module QosProfile_Test
 {
   module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
index a4b41c1e134..8c8901d1b38 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p QosProfile_Test_Base -l .. -o ../lib -u DDS QosProfile_Test_Connector"
 
 project(QosProfile_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen QosProfile_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QosProfile_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(QosProfile_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(QosProfile_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub 
-  libs  += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub 
+  after += QosProfile_Test_Connector_lem_gen QosProfile_Test_Connector_stub QosProfile_Test_Base_stub
+  libs  += QosProfile_Test_Base_stub QosProfile_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(QosProfile_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub 
+  after      += QosProfile_Test_Connector_lem_stub QosProfile_Test_Connector_exec QosProfile_Test_Connector_stub
   sharedname  = QosProfile_Test_Connector_svnt
   libs       += QosProfile_Test_Connector_stub \
                 QosProfile_Test_Connector_lem_stub  \
                 QosProfile_Test_Base_stub \
-                QosProfile_Test_Connector_exec 
+                QosProfile_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
index 53792f964f0..fc06d47642a 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTest> QueryConditionTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
index 0fe930b1701..848f4815dd2 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Different_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Different_Test_BaseTypeSupport.idl"
+#endif
+
 module Different_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
index 941c743621a..d07b8fc70f6 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Different_Test_Base -l .. -o ../lib -u DDS Different_Test_Connector"
 
 project(QC_Different_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen QC_Different_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Different_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(QC_Different_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(QC_Different_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += QC_Different_Test_Connector_lem_gen QC_Different_Test_Connector_stub \
-           QC_Different_Test_Base_stub 
-  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub 
+           QC_Different_Test_Base_stub
+  libs  += QC_Different_Test_Base_stub QC_Different_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(QC_Different_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += QC_Different_Test_Connector_lem_stub QC_Different_Test_Connector_exec \
-                QC_Different_Test_Connector_stub 
+                QC_Different_Test_Connector_stub
   sharedname  = QC_Different_Test_Connector_svnt
   libs       += QC_Different_Test_Connector_stub \
                 QC_Different_Test_Connector_lem_stub  \
                 QC_Different_Test_Base_stub \
-                QC_Different_Test_Connector_exec 
+                QC_Different_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
index e9f0b258f0d..0776e8afb26 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionListenEventTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionListenEventTest> QueryConditionListenEventTestSeq;
+#endif
 
 #endif
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 6b634bce73e..0c3e4cf9168 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QCLE_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QCLE_Test_BaseTypeSupport.idl"
+#endif
+
 module QCLE_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionListenEventTest, ::QueryConditionListenEventTestSeq> QueryConditionListenEventTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
index 8b932282b08..1ad731daf88 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLE_Test_Base -l .. -o ../lib -u DDS QCLE_Test_Connector"
 
 project(DDS_QCLE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_QCLE_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QCLE_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_QCLE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_QCLE_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub 
-  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub 
+  after += DDS_QCLE_Test_Connector_lem_gen DDS_QCLE_Test_Connector_stub DDS_QCLE_Test_Base_stub
+  libs  += DDS_QCLE_Test_Base_stub DDS_QCLE_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_QCLE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub 
+  after      += DDS_QCLE_Test_Connector_lem_stub DDS_QCLE_Test_Connector_exec DDS_QCLE_Test_Connector_stub
   sharedname  = DDS_QCLE_Test_Connector_svnt
   libs       += DDS_QCLE_Test_Connector_stub \
                 DDS_QCLE_Test_Connector_lem_stub  \
                 DDS_QCLE_Test_Base_stub \
-                DDS_QCLE_Test_Connector_exec 
+                DDS_QCLE_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
index f9dab9efc35..9205eafa3bc 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTest> QueryConditionTestSeq;
+#endif
 
 #endif
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 3dc9bbad390..07fb630b014 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/ReadGet_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/ReadGet_Test_BaseTypeSupport.idl"
+#endif
+
 module ReadGet_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
index 72d2bf53811..9e15bab2cc4 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p ReadGet_Test_Base -l .. -o ../lib -u DDS ReadGet_Test_Connector"
 
 project(QC_ReadGet_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen QC_ReadGet_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ReadGet_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(QC_ReadGet_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(QC_ReadGet_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += QC_ReadGet_Test_Connector_lem_gen QC_ReadGet_Test_Connector_stub \
-           QC_ReadGet_Test_Base_stub 
-  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub 
+           QC_ReadGet_Test_Base_stub
+  libs  += QC_ReadGet_Test_Base_stub QC_ReadGet_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(QC_ReadGet_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += QC_ReadGet_Test_Connector_lem_stub QC_ReadGet_Test_Connector_exec \
-                QC_ReadGet_Test_Connector_stub 
+                QC_ReadGet_Test_Connector_stub
   sharedname  = QC_ReadGet_Test_Connector_svnt
   libs       += QC_ReadGet_Test_Connector_stub \
                 QC_ReadGet_Test_Connector_lem_stub  \
                 QC_ReadGet_Test_Base_stub \
-                QC_ReadGet_Test_Connector_exec 
+                QC_ReadGet_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
index 9a267a45868..a3806ce2419 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionListenStateTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionListenStateTest> QueryConditionListenStateTestSeq;
+#endif
 
 #endif
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 7506601efc8..8f57199a5ff 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QCLS_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QCLS_Test_BaseTypeSupport.idl"
+#endif
+
 module QCLS_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionListenStateTest, ::QueryConditionListenStateTestSeq> QueryConditionListenStateTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
index fec70bf2120..9fbd812bac4 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_QCLS_Test_Base -l .. -o ../lib -u DDS QCLS_Test_Connector"
 
 project(DDS_QCLS_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_QCLS_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_LISTEN_STATE_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QCLS_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_QCLS_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_QCLS_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub 
-  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub 
+  after += DDS_QCLS_Test_Connector_lem_gen DDS_QCLS_Test_Connector_stub DDS_QCLS_Test_Base_stub
+  libs  += DDS_QCLS_Test_Base_stub DDS_QCLS_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_QCLS_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub 
+  after      += DDS_QCLS_Test_Connector_lem_stub DDS_QCLS_Test_Connector_exec DDS_QCLS_Test_Connector_stub
   sharedname  = DDS_QCLS_Test_Connector_svnt
   libs       += DDS_QCLS_Test_Connector_stub \
                 DDS_QCLS_Test_Connector_lem_stub  \
                 DDS_QCLS_Test_Base_stub \
-                DDS_QCLS_Test_Connector_exec 
+                DDS_QCLS_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
index cf12fe03497..c89c994dafa 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTwoListenersTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTwoListenersTest> QueryConditionTwoListenersTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
index 83e2fed89ed..a8d36c76abf 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QCTL_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QCTL_Test_BaseTypeSupport.idl"
+#endif
+
 module QCTL_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTwoListenersTest, ::QueryConditionTwoListenersTestSeq> QueryConditionTwoListenersTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
index 97d4bbb5aa9..4e9865eaa5e 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_QCTL_Test_Base -l .. -o ../lib -u DDS QCTL_Test_Connector"
 
 project(DDS_QCTL_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_QCTL_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TWO_LISTENERS_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QCTL_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_QCTL_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_QCTL_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub 
-  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub 
+  after += DDS_QCTL_Test_Connector_lem_gen DDS_QCTL_Test_Connector_stub DDS_QCTL_Test_Base_stub
+  libs  += DDS_QCTL_Test_Base_stub DDS_QCTL_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_QCTL_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub 
+  after      += DDS_QCTL_Test_Connector_lem_stub DDS_QCTL_Test_Connector_exec DDS_QCTL_Test_Connector_stub
   sharedname  = DDS_QCTL_Test_Connector_svnt
   libs       += DDS_QCTL_Test_Connector_stub \
                 DDS_QCTL_Test_Connector_lem_stub  \
                 DDS_QCTL_Test_Base_stub \
-                DDS_QCTL_Test_Connector_exec 
+                DDS_QCTL_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
index c745f592588..dac9dda9bf4 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTest> QueryConditionTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
index 014adc99e24..d325d1b1e0e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QCTQ_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QCTQ_Test_BaseTypeSupport.idl"
+#endif
+
 module QCTQ_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
index 2bbf9d1ffeb..96c96578e2c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p QCTQ_Test_Base -l .. -o ../lib -u DDS QCTQ_Test_Connector"
 
 project(QC_QCTQ_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen QC_QCTQ_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QCTQ_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(QC_QCTQ_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(QC_QCTQ_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += QC_QCTQ_Test_Connector_lem_gen QC_QCTQ_Test_Connector_stub \
-           QC_QCTQ_Test_Base_stub 
-  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub 
+           QC_QCTQ_Test_Base_stub
+  libs  += QC_QCTQ_Test_Base_stub QC_QCTQ_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(QC_QCTQ_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += QC_QCTQ_Test_Connector_lem_stub QC_QCTQ_Test_Connector_exec \
-                QC_QCTQ_Test_Connector_stub 
+                QC_QCTQ_Test_Connector_stub
   sharedname  = QC_QCTQ_Test_Connector_svnt
   libs       += QC_QCTQ_Test_Connector_stub \
                 QC_QCTQ_Test_Connector_lem_stub  \
                 QC_QCTQ_Test_Base_stub \
-                QC_QCTQ_Test_Connector_exec 
+                QC_QCTQ_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
index 48d65a962c6..1265ffa3cc9 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl
@@ -19,6 +19,8 @@ struct QueryConditionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<QueryConditionTest> QueryConditionTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
index 9848488a4df..06e52858e9b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/QCTQM_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/QCTQM_Test_BaseTypeSupport.idl"
+#endif
+
 module QCTQM_Test
 {
   module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
index 9a05b0c9b18..367081673e0 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p QCTQM_Test_Base -l .. -o ../lib -u DDS QCTQM_Test_Connector"
 
 project(QC_QCTQM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen QC_QCTQM_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=QCTQM_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(QC_QCTQM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(QC_QCTQM_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += QC_QCTQM_Test_Connector_lem_gen QC_QCTQM_Test_Connector_stub \
-           QC_QCTQM_Test_Base_stub 
-  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub 
+           QC_QCTQM_Test_Base_stub
+  libs  += QC_QCTQM_Test_Base_stub QC_QCTQM_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(QC_QCTQM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += QC_QCTQM_Test_Connector_lem_stub QC_QCTQM_Test_Connector_exec \
-                QC_QCTQM_Test_Connector_stub 
+                QC_QCTQM_Test_Connector_stub
   sharedname  = QC_QCTQM_Test_Connector_svnt
   libs       += QC_QCTQM_Test_Connector_stub \
                 QC_QCTQM_Test_Connector_lem_stub  \
                 QC_QCTQM_Test_Base_stub \
-                QC_QCTQM_Test_Connector_exec 
+                QC_QCTQM_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
index 25ba19e0a37..c13b7c71f7d 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
@@ -19,6 +19,8 @@ struct ReaderTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ReaderTest> ReaderTestSeq;
+#endif
 
 #endif
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 e5b7dd5227a..1fe1e59936d 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Reader_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Reader_Test_BaseTypeSupport.idl"
+#endif
+
 module Reader_Test
 {
   module ::CCM_DDS::Typed < ::ReaderTest, ::ReaderTestSeq> ReaderTestConnector;
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 7d2b87f936e..e55b4e35c2a 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
 
 project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Reader_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Reader_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_Reader_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub 
-  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub 
+  after += DDS_Reader_Test_Connector_lem_gen DDS_Reader_Test_Connector_stub DDS_Reader_Test_Base_stub
+  libs  += DDS_Reader_Test_Base_stub DDS_Reader_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub 
+  after      += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_exec DDS_Reader_Test_Connector_stub
   sharedname  = DDS_Reader_Test_Connector_svnt
   libs       += DDS_Reader_Test_Connector_stub \
                 DDS_Reader_Test_Connector_lem_stub  \
                 DDS_Reader_Test_Base_stub \
-                DDS_Reader_Test_Connector_exec 
+                DDS_Reader_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
index c4023e4d495..105d0123e7e 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
@@ -19,6 +19,8 @@ struct RG_ResetTopicSample {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<RG_ResetTopicSample> RG_ResetTopicSampleSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
index 1da3f3494d0..c9f6ca1c2ea 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/RG_ResetTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/RG_ResetTopic_BaseTypeSupport.idl"
+#endif
+
 module RG_ResetTopic
 {
   module ::CCM_DDS::Typed < ::RG_ResetTopicSample, ::RG_ResetTopicSampleSeq> RG_ResetTopicSampleConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
index c37580e6821..47324d8c3c0 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p RG_ResetTopicBase -l .. -o ../lib -u DDS RG_ResetTopic_Connector"
 
 project (RG_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen RG_ResetTopicBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RG_RESETTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=LateBinding_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
index 755bf2051d5..303f901ec7c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl
@@ -19,6 +19,8 @@ struct TE_ResetTopicTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TE_ResetTopicTest> TE_ResetTopicTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
index 7fa6bd3d791..22d04cff378 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/TE_ResetTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/TE_ResetTopic_BaseTypeSupport.idl"
+#endif
+
 module TE_ResetTopic
 {
   module ::CCM_DDS::Typed < ::TE_ResetTopicTest, ::TE_ResetTopicTestSeq> TE_ResetTopicTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
index d7328088ab9..e4624f4217a 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p TE_ResetTopicBase -l .. -o ../lib -u DDS TE_ResetTopic_Connector"
 
 project (TE_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen TE_ResetTopicBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TE_RESETTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
index 761ab9e4ee3..6088cccbbda 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl
@@ -19,6 +19,8 @@ struct TL_ResetTopicTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TL_ResetTopicTest> TL_ResetTopicTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
index 2da5ce49b47..f3edfe458f6 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/TL_ResetTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/TL_ResetTopic_BaseTypeSupport.idl"
+#endif
+
 module TL_ResetTopic
 {
   module ::CCM_DDS::Typed < ::TL_ResetTopicTest, ::TL_ResetTopicTestSeq> TL_ResetTopicTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
index c9c8e62acac..6dfe620ef80 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p TL_ResetTopicBase -l .. -o ../lib -u DDS TL_ResetTopic_Connector"
 
 project (TL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen TL_ResetTopicBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TL_RESETTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
index b5c336cb238..34d01d38303 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl
@@ -19,6 +19,8 @@ struct UL_ResetTopicTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<UL_ResetTopicTest> UL_ResetTopicTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
index 356d663a39a..37f6f273c31 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/UL_ResetTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/UL_ResetTopic_BaseTypeSupport.idl"
+#endif
+
 module UL_ResetTopic
 {
   module ::CCM_DDS::Typed < ::UL_ResetTopicTest, ::UL_ResetTopicTestSeq> UL_ResetTopicTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
index c2e3c2a8b20..4f046695be8 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p UL_ResetTopicBase -l .. -o ../lib -u DDS UL_ResetTopic_Connector"
 
 project (UL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen UL_ResetTopicBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UL_RESETTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
index 852665465f9..256c03da1af 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl
@@ -19,6 +19,8 @@ struct WL_ResetTopicTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WL_ResetTopicTest> WL_ResetTopicTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
index 458104748f6..04e934b4a6a 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/WL_ResetTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/WL_ResetTopic_BaseTypeSupport.idl"
+#endif
+
 module WL_ResetTopic
 {
   module ::CCM_DDS::Typed < ::WL_ResetTopicTest, ::WL_ResetTopicTestSeq> WL_ResetTopicTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
index d69a574e44d..d7ac8716da5 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p WL_ResetTopicBase -l .. -o ../lib -u DDS WL_ResetTopic_Connector"
 
 project (WL_ResetTopicConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen WL_ResetTopicBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WL_RESETTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=ResetTopic_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
index f11e1c2d289..543dd666359 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
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 584d71b1a04..7aec48b8da6 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/SL_Disabled_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/SL_Disabled_BaseTypeSupport.idl"
+#endif
+
 module SL_Disabled
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_DisabledConnector;
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 1ef29e1e3fc..c2062e987ed 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
 
 project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SL_Disabled_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=SL_Disabled_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SL_OC_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub 
-  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub 
+  after += DDS_SL_OC_Connector_lem_gen DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Base_stub
+  libs  += DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub 
+  after      += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_exec DDS_SL_Disabled_Connector_stub
   sharedname  = DDS_SL_Disabled_Connector_svnt
   libs       += DDS_SL_Disabled_Connector_stub \
                 DDS_SL_OC_Connector_lem_stub  \
                 DDS_SL_Disabled_Base_stub \
-                DDS_SL_Disabled_Connector_exec 
+                DDS_SL_Disabled_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
index 90852393b73..3a07099c88d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
@@ -229,7 +229,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl
       {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("OK : Haven't received an  unexpected ")
-                    ACE_TEXT (" oparation from StateListener in Receiver\n")
+                    ACE_TEXT (" operation from StateListener in Receiver\n")
                    ));
       }
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
index 532960e42b2..1a7998e1bef 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
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 70ccc38da42..6c713a28400 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl
@@ -14,6 +14,10 @@
 
 #pragma ciao lem "Connector/SL_ManyByMany_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/SL_ManyByMany_BaseTypeSupport.idl"
+#endif
+
 module SL_ManyByMany
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SLManyByManyConnector;
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 abc9df04a91..266960e4fd0 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
 
 project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SL_ManyByMany_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=SL_ManyByMany_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SL_MBM_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub 
-  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub 
+  after += DDS_SL_MBM_Connector_lem_gen DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Base_stub
+  libs  += DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub 
+  after      += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_exec DDS_SL_ManyByMany_Connector_stub
   sharedname  = DDS_SL_ManyByMany_Connector_svnt
   libs       += DDS_SL_ManyByMany_Connector_stub \
                 DDS_SL_MBM_Connector_lem_stub  \
                 DDS_SL_ManyByMany_Base_stub \
-                DDS_SL_ManyByMany_Connector_exec 
+                DDS_SL_ManyByMany_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
index 054113c5b65..8ded5794351 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index 94af0031a82..499d1fcd276 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
 
 project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SL_OneByOne_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=SL_OneByOne_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SL_OBO_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub 
-  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub 
+  after += DDS_SL_OBO_Connector_lem_gen DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Base_stub
+  libs  += DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub 
+  after      += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_exec DDS_SL_OneByOne_Connector_stub
   sharedname  = DDS_SL_OneByOne_Connector_svnt
   libs       += DDS_SL_OneByOne_Connector_stub \
                 DDS_SL_OBO_Connector_lem_stub  \
                 DDS_SL_OneByOne_Base_stub \
-                DDS_SL_OneByOne_Connector_exec 
+                DDS_SL_OneByOne_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 9f3528b66d3..5821bee165b 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/SL_OneByOne_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/SL_OneByOne_BaseTypeSupport.idl"
+#endif
+
 module SL_OneByOne
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> SL_OneByOneConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
index f86a2d0ccbf..4ec2a99fd2e 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
@@ -18,6 +18,8 @@ struct SetConnectorAttributeTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SetConnectorAttributeTest> SetConnectorAttributeTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
index 9a096cf64fb..04ac5d4c44b 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
@@ -95,7 +95,7 @@ project(SetAttribute_Component_exec) : ciao_executor, dds4ccm_impl {
   libout = ../lib
   includes += ..
   dynamicflags += COMPONENT_EXEC_BUILD_DLL
-  requires += ndds
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
@@ -126,7 +126,7 @@ project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   libout = ../lib
   includes += ..
   dynamicflags += COMPONENT_SVNT_BUILD_DLL
-  requires += ndds
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
index 87337b75c9e..30b992edce3 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/SetConnectorAttribute_BaseTypeSupport.idl"
+#endif
+
 module SetConnectorAttribute
 {
   module ::CCM_DDS::Typed
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index a3a7b059a63..a85e29956c2 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
 
 project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SCABase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=SetConnectorAttribute_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SCAConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub 
-  libs  += DDS_SCABase_stub DDS_SCAConnector_stub 
+  after += DDS_SCAConnector_lem_gen DDS_SCAConnector_stub DDS_SCABase_stub
+  libs  += DDS_SCABase_stub DDS_SCAConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub 
+  after      += DDS_SCAConnector_lem_stub DDS_SCAConnector_exec DDS_SCAConnector_stub
   sharedname  = DDS_SCAConnector_svnt
   libs       += DDS_SCAConnector_stub \
                 DDS_SCAConnector_lem_stub  \
                 DDS_SCABase_stub \
-                DDS_SCAConnector_exec 
+                DDS_SCAConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index b755cc4155e..60696f3b55f 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -24,18 +24,25 @@ struct SharedDPTest1 {
   string key1;
   long iteration1;
 };
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest1> SharedDPTest1Seq;
+#endif
 
 struct SharedDPTest2 {
   string key2;
   long iteration2;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest2> SharedDPTest2Seq;
+#endif
 
 struct SharedDPTest3 {
   string key3;
   long iteration3;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest3> SharedDPTest3Seq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index a1999b81ff5..9293423f2bf 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -100,7 +100,8 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += COMPONENT_EXEC_BUILD_DLL
-  requires += ndds
+
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
index edbb93d61f1..bbd5643d6ad 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector1/Connector1E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector1
 {
   module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index 47577d5f9d0..3d85c0181dc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
               -Wb,stub_export_include=Connector1_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector1_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub 
+  after += DDS_SharedDP_Connector1_lem_gen DDS_SharedDP_Connector1_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector1_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub 
+  after      += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_exec DDS_SharedDP_Connector1_stub
   sharedname  = DDS_Connector1_svnt
   libs       += DDS_Connector1_stub \
                 DDS_Connector1_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector1_exec 
+                DDS_Connector1_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
index 51a1fbcb3b0..c9a54be1cd2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector2/Connector2E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector2
 {
   module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index 25b513ce964..a2698aca377 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
               -Wb,stub_export_include=Connector2_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub 
+  after += DDS_SharedDP_Connector2_lem_gen DDS_SharedDP_Connector2_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector2_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub 
+  after      += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_exec DDS_SharedDP_Connector2_stub
   sharedname  = DDS_Connector2_svnt
   libs       += DDS_Connector2_stub \
                 DDS_Connector2_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector2_exec 
+                DDS_Connector2_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
index 13e64e91aed..21196720078 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector3/Connector3E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector3
 {
   module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index 8d687b20c36..8bc2b4f99f5 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDP_DDBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
               -Wb,stub_export_include=Connector3_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub 
-  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub 
+  after += DDS_SharedDP_Connector3_lem_gen DDS_SharedDP_Connector3_stub DDS_SharedDP_DDBase_stub
+  libs  += DDS_SharedDP_DDBase_stub DDS_Connector3_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub 
+  after      += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_exec DDS_SharedDP_Connector3_stub
   sharedname  = DDS_Connector3_svnt
   libs       += DDS_Connector3_stub \
                 DDS_Connector3_lem_stub  \
                 DDS_SharedDP_DDBase_stub \
-                DDS_Connector3_exec 
+                DDS_Connector3_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
index b755cc4155e..fa546e7c9c7 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Base/Base.idl
@@ -24,18 +24,24 @@ struct SharedDPTest1 {
   string key1;
   long iteration1;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest1> SharedDPTest1Seq;
+#endif
 
 struct SharedDPTest2 {
   string key2;
   long iteration2;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest2> SharedDPTest2Seq;
+#endif
 
 struct SharedDPTest3 {
   string key3;
   long iteration3;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest3> SharedDPTest3Seq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
index 1edb3a60ae4..e6e1f572bd0 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Component/Component.mpc
@@ -100,7 +100,8 @@ project(SharedDP_Diff_ID_Component_exec) : ciao_executor, dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += COMPONENT_EXEC_BUILD_DLL
-  requires += ndds
+
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
index edbb93d61f1..bbd5643d6ad 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector1/Connector1E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector1
 {
   module ::CCM_DDS::Typed < ::SharedDPTest1, ::SharedDPTest1Seq> SharedDPTest1Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
index 6f218318d68..3f2e2f11cc6 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector1/Connector1.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(SharedDP_Diff_ID_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
               -Wb,stub_export_include=Connector1_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
index 51a1fbcb3b0..c9a54be1cd2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector2/Connector2E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector2
 {
   module ::CCM_DDS::Typed < ::SharedDPTest2, ::SharedDPTest2Seq> SharedDPTest2Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
index ccdcea2424f..cf32790d93b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector2/Connector2.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(SharedDP_Diff_ID_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
               -Wb,stub_export_include=Connector2_stub_export.h \
@@ -32,8 +32,8 @@ project(SharedDP_Diff_ID_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(SharedDP_Diff_ID_Connector2_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub 
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector2_stub 
+  after += SharedDP_Diff_ID_Connector2_lem_gen SharedDP_Diff_ID_Connector2_stub SharedDP_Diff_ID_Base_stub
+  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector2_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(SharedDP_Diff_ID_Connector2_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(SharedDP_Diff_ID_Connector2_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_exec SharedDP_Diff_ID_Connector2_stub 
+  after      += SharedDP_Diff_ID_Connector2_lem_stub SharedDP_Diff_ID_Connector2_exec SharedDP_Diff_ID_Connector2_stub
   sharedname  = DDS_Connector2_svnt
   libs       += DDS_Connector2_stub \
                 DDS_Connector2_lem_stub  \
                 SharedDP_Diff_ID_Base_stub \
-                DDS_Connector2_exec 
+                DDS_Connector2_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
index 13e64e91aed..21196720078 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector3/Connector3E.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP_Connector3
 {
   module ::CCM_DDS::Typed < ::SharedDPTest3, ::SharedDPTest3Seq> SharedDPTest3Connector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
index 394c759f680..bdd99302c5f 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDomainID/Connector3/Connector3.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(SharedDP_Diff_ID_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen SharedDP_Diff_ID_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
               -Wb,stub_export_include=Connector3_stub_export.h \
@@ -32,8 +32,8 @@ project(SharedDP_Diff_ID_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(SharedDP_Diff_ID_Connector3_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += SharedDP_Diff_ID_Connector3_lem_gen SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub 
-  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector3_stub 
+  after += SharedDP_Diff_ID_Connector3_lem_gen SharedDP_Diff_ID_Connector3_stub SharedDP_Diff_ID_Base_stub
+  libs  += SharedDP_Diff_ID_Base_stub DDS_Connector3_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(SharedDP_Diff_ID_Connector3_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(SharedDP_Diff_ID_Connector3_svnt) : ciao_servant, dds4ccm_impl {
-  after      += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_exec SharedDP_Diff_ID_Connector3_stub 
+  after      += SharedDP_Diff_ID_Connector3_lem_stub SharedDP_Diff_ID_Connector3_exec SharedDP_Diff_ID_Connector3_stub
   sharedname  = DDS_Connector3_svnt
   libs       += DDS_Connector3_stub \
                 DDS_Connector3_lem_stub  \
                 SharedDP_Diff_ID_Base_stub \
-                DDS_Connector3_exec 
+                DDS_Connector3_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
index c0a4b3e10b5..37db69db053 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
@@ -18,6 +18,8 @@ struct SharedDPTest {
   string key;
   long iteration;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<SharedDPTest> SharedDPTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index 742ee5dcc50..4e59212255d 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -94,7 +94,8 @@ project(DDS_SharedDPComponent_exec) : ciao_executor,  dds4ccm_impl {
   includes += ..
   libout = ../lib
   dynamicflags += COMPONENT_EXEC_BUILD_DLL
-  requires += ndds
+
+  requires += dds4ccm_ndds
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
index f76c054764d..99513085a30 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/BaseTypeSupport.idl"
+#endif
+
 module SharedDP
 {
   module ::CCM_DDS::Typed < ::SharedDPTest, ::SharedDPTestSeq> SharedDPTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index 6bf6327e66e..937d3eefe83 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SharedDPBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Connector_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SharedDP_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub 
-  libs  += DDS_SharedDPBase_stub DDS_Connector_stub 
+  after += DDS_SharedDP_Connector_lem_gen DDS_SharedDP_Connector_stub DDS_SharedDPBase_stub
+  libs  += DDS_SharedDPBase_stub DDS_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,12 +110,12 @@ project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub 
+  after      += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_exec DDS_SharedDP_Connector_stub
   sharedname  = DDS_Connector_svnt
   libs       += DDS_Connector_stub \
                 DDS_Connector_lem_stub  \
                 DDS_SharedDPBase_stub \
-                DDS_Connector_exec 
+                DDS_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
index 36b8e3faed8..94d869e248b 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
@@ -19,6 +19,8 @@ struct State_ConnectionTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<State_ConnectionTest> State_ConnectionTestSeq;
+#endif
 
 #endif
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 07cccf4d94a..35942d13319 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/State_Connection_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/State_Connection_Test_BaseTypeSupport.idl"
+#endif
+
 module State_Connection_Test
 {
   module ::CCM_DDS::Typed < ::State_ConnectionTest, ::State_ConnectionTestSeq> State_ConnectionTestConnector;
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 8def4599916..fac077875ad 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
 
 project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_SCT_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=State_Connection_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub 
-  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub 
+  after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub
+  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub 
+  after      += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub
   sharedname  = DDS_SCT_Connector_svnt
   libs       += DDS_SCT_Connector_stub \
                 DDS_SCT_Connector_lem_stub  \
                 DDS_SCT_Base_stub \
-                DDS_SCT_Connector_exec 
+                DDS_SCT_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
index fdcf97f09ea..1d011fe0118 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl
@@ -20,6 +20,8 @@ struct TopicNameTest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicNameTest> TopicNameTestSeq;
+#endif
 
 #endif /* TOPICNAME_TEST_BASE_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
index 507b66dbbab..c6669638bfd 100644
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.idl
@@ -15,5 +15,10 @@
 
 #pragma ciao lem "Connector/TopicName_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/TopicName_Test_BaseTypeSupport.idl"
+#endif
+
 module ::CCM_DDS::Typed < ::TopicNameTest, ::TopicNameTestSeq> TopicNameTestConnector;
+
 #endif /* TOPICNAME_EVENT_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
index 35f0894f641..449fa22a777 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p TopicName_Test_Base -l .. -o ../lib -u DDS TopicName_Test_Connector"
 
 project(TopicName_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen TopicName_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TOPICNAME_EVENT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=TopicName_Test_Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
index b7cc6220766..cbca0f6dcc6 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
@@ -18,7 +18,9 @@ struct HelloTopic {
   string hello; //@key
   long iteration;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<HelloTopic> HelloTopicSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "GoodbyeTopic"
 #pragma DCPS_DATA_KEY "GoodbyeTopic goodbye"
@@ -27,6 +29,8 @@ struct GoodbyeTopic {
   string goodbye; //@key
   long iteration;
 };
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<GoodbyeTopic> GoodbyeTopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
index 8ea6f30d185..7f9a1930369 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/TwoTopics_BaseTypeSupport.idl"
+#endif
+
 module TT_Connector
 {
   module ::CCM_DDS::Typed < HelloTopic, HelloTopicSeq> HelloConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
index 1b3dd2ad778..15ab688ffa7 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
 
 project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_TwoTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub 
-  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub 
+  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub
+  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub 
+  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub
   sharedname  = DDS_TwoTopics_Connector_svnt
   libs       += DDS_TwoTopics_Connector_stub \
                 DDS_TwoTopics_Connector_lem_stub  \
                 DDS_TwoTopics_Base_stub \
-                DDS_TwoTopics_Connector_exec 
+                DDS_TwoTopics_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
index 55e92483ec2..bf121f84075 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
@@ -15,6 +15,11 @@
 
 #pragma ciao lem "Connector/ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Hello/HelloGoodbyeTypeSupport.idl"
+# include "Goodbye/HelloGoodbyeTypeSupport.idl"
+#endif
+
 module Hello
 {
   // Hello connector
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
index 088e25cab77..75328a809ea 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Hello_Namespace_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Connector_stub_export.h \
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
index b2a707e572f..21d86bfabbc 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
@@ -20,7 +20,9 @@ module Goodbye
     string goodbye;  //@key
     long iteration;
   };
-  typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
+  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
+#endif
 };
 
 #endif /* GOODBYE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
index 012ed9006d2..5c56d1c76e7 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
@@ -20,7 +20,9 @@ module Hello
     string hello;  //@key
     long iteration;
   };
-  typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
+  #if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
+typedef sequence<HelloGoodbye> HelloGoodbyeSeq;
+#endif
 };
 
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
index 621d44d20d2..491216ba0e2 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
@@ -19,6 +19,8 @@ struct UnkeyedTest {
   long iteration;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<UnkeyedTest> UnkeyedTestSeq;
+#endif
 
 #endif
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 696b716af72..97194267f11 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Unkeyed_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Unkeyed_Test_BaseTypeSupport.idl"
+#endif
+
 module Unkeyed_Test
 {
   module ::CCM_DDS::Typed < ::UnkeyedTest, ::UnkeyedTestSeq> UnkeyedTestConnector;
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 f3d8cdd33a2..b725e6e6a80 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
 
 project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Unkeyed_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Unkeyed_Test_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(DDS_Unkeyed_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += DDS_Unkeyed_Test_Connector_lem_gen DDS_Unkeyed_Test_Connector_stub \
-           DDS_Unkeyed_Test_Base_stub 
-  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub 
+           DDS_Unkeyed_Test_Base_stub
+  libs  += DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_exec \
-                DDS_Unkeyed_Test_Connector_stub 
+                DDS_Unkeyed_Test_Connector_stub
   sharedname  = DDS_Unkeyed_Test_Connector_svnt
   libs       += DDS_Unkeyed_Test_Connector_stub \
                 DDS_Unkeyed_Test_Connector_lem_stub  \
                 DDS_Unkeyed_Test_Base_stub \
-                DDS_Unkeyed_Test_Connector_exec 
+                DDS_Unkeyed_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
index 9841ef54e9e..d46c174faf9 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
@@ -22,6 +22,8 @@ struct WriterTest {
   OctetSeq data;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<WriterTest> WriterTestSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
index 787133fdff6..58890311082 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Writer_BaseTypeSupport.idl"
+#endif
+
 module Writer
 {
   module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index 3a8e05b1461..f4d5d32d8fd 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
 project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_UnkeyedWriterBase_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Writer_Connector_stub_export.h \
@@ -34,8 +34,8 @@ project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(DDS_UnkeyedWriterConnector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += DDS_UnkeyedWriterConnector_lem_gen DDS_UnkeyedWriterConnector_stub \
-           DDS_UnkeyedWriterBase_stub 
-  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub 
+           DDS_UnkeyedWriterBase_stub
+  libs  += DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -115,12 +115,12 @@ project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_exec \
-                DDS_UnkeyedWriterConnector_stub 
+                DDS_UnkeyedWriterConnector_stub
   sharedname  = DDS_UnkeyedWriterConnector_svnt
   libs       += DDS_UnkeyedWriterConnector_stub \
                 DDS_UnkeyedWriterConnector_lem_stub  \
                 DDS_UnkeyedWriterBase_stub \
-                DDS_UnkeyedWriterConnector_exec 
+                DDS_UnkeyedWriterConnector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
index 98a74035a21..7eb1b3818e1 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
@@ -19,6 +19,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
index fbb04099a0d..d67fcf9a08b 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/Updater_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/Updater_BaseTypeSupport.idl"
+#endif
+
 module Updater
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> UpdaterConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index f29b01b9ea6..3067e3618f2 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
 
 project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_Updater_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Updater_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_UPDATER_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub 
-  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub 
+  after += DDS_UPDATER_Connector_lem_gen DDS_Updater_Connector_stub DDS_Updater_Base_stub
+  libs  += DDS_Updater_Base_stub DDS_Updater_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub 
+  after      += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_exec DDS_Updater_Connector_stub
   sharedname  = DDS_Updater_Connector_svnt
   libs       += DDS_Updater_Connector_stub \
                 DDS_UPDATER_Connector_lem_stub  \
                 DDS_Updater_Base_stub \
-                DDS_Updater_Connector_exec 
+                DDS_Updater_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
index 060d03f78cb..d4ecc310c28 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl
@@ -20,7 +20,9 @@ struct UCCVariableSizedStructTest {
   long y;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<UCCVariableSizedStructTest> UCCVariableSizedStructTestSeq;
+#endif
 
 #pragma DCPS_DATA_TYPE "UCCFixedSizedStructTest"
 
@@ -30,6 +32,8 @@ struct UCCFixedSizedStructTest {
   long z;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<UCCFixedSizedStructTest> UCCFixedSizedStructTestSeq;
+#endif
 
 #endif /* USERDATA_COPY_COUNT_TEST_BASE_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 ac1c8d522f5..919a4a4aa05 100644
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/UCC_Test_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/UCC_Test_BaseTypeSupport.idl"
+#endif
+
 module UCCVariableSizedStruct_Test
 {
   module ::CCM_DDS::Typed < ::UCCVariableSizedStructTest, ::UCCVariableSizedStructTestSeq> UCCVariableSizedStructTestConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
index 094dbad880b..22d384504d1 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p UCC_Test_Base -l .. -o ../lib -u DDS UCC_Test_Connector"
 
 project(UCC_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen UCC_Test_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=USERDATA_COPY_COUNT_TEST_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=UCC_Test_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(UCC_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(UCC_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub 
-  libs  += UCC_Test_Base_stub UCC_Test_Connector_stub 
+  after += UCC_Test_Connector_lem_gen UCC_Test_Connector_stub UCC_Test_Base_stub
+  libs  += UCC_Test_Base_stub UCC_Test_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(UCC_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub 
+  after      += UCC_Test_Connector_lem_stub UCC_Test_Connector_exec UCC_Test_Connector_stub
   sharedname  = UCC_Test_Connector_svnt
   libs       += UCC_Test_Connector_stub \
                 UCC_Test_Connector_lem_stub  \
                 UCC_Test_Base_stub \
-                UCC_Test_Connector_exec 
+                UCC_Test_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index 5f2ba4a9182..5a030874caf 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -61,6 +61,7 @@ struct test {
   short x_test;
   string x_teststr;
 };
+
 typedef sequence<test> testSeq;
 
 #pragma DCPS_DATA_TYPE "TopicSeq"
@@ -89,15 +90,31 @@ struct TopicValuetype {
 #endif
 
 // Sequences
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicString> TopicStringSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicArray> TopicArraySeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicUnion> TopicUnionSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<X_Union> X_UnionSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicSeq> TopicSeqSeq;
+#endif
 #if !defined (CIAO_DDS4CCM_OPENDDS)
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicValuetype> TopicValuetypeSeq;
 #endif
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<X_Valuetype> X_ValuetypeSeq;
+#endif
 
 #endif
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 5cfdc24d596..e3f95046ac6 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Array/VT_Array_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopic_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
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 079f66eec7e..1eaddc726bf 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
 
 project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VT_Array_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VT_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub 
+  after += DDS_VT_ARRAY_Connector_lem_gen DDS_VT_Array_Connector_stub DDS_VTopic_Base_stub
+  libs  += DDS_VTopic_Base_stub DDS_VT_Array_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub 
+  after      += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_exec DDS_VT_Array_Connector_stub
   sharedname  = DDS_VT_Array_Connector_svnt
   libs       += DDS_VT_Array_Connector_stub \
                 DDS_VT_ARRAY_Connector_lem_stub  \
                 DDS_VTopic_Base_stub \
-                DDS_VT_Array_Connector_exec 
+                DDS_VT_Array_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 906d875e259..ea8265edca6 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Seq/VT_Seq_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopic_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
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 7a97e32486b..f06d96700c6 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
 
 project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VT_Seq_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VT_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub 
+  after += DDS_VT_SEQ_Connector_lem_gen DDS_VT_Seq_Connector_stub DDS_VTopic_Base_stub
+  libs  += DDS_VTopic_Base_stub DDS_VT_Seq_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub 
+  after      += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_exec DDS_VT_Seq_Connector_stub
   sharedname  = DDS_VT_Seq_Connector_svnt
   libs       += DDS_VT_Seq_Connector_stub \
                 DDS_VT_SEQ_Connector_lem_stub  \
                 DDS_VTopic_Base_stub \
-                DDS_VT_Seq_Connector_exec 
+                DDS_VT_Seq_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 0da43f614f3..55b19e87386 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_String/VT_String_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopic_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
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 308433fc923..4fa02ef5724 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
 
 project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VT_String_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VT_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub 
+  after += DDS_VT_STRING_Connector_lem_gen DDS_VT_String_Connector_stub DDS_VTopic_Base_stub
+  libs  += DDS_VTopic_Base_stub DDS_VT_String_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub 
+  after      += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_exec DDS_VT_String_Connector_stub
   sharedname  = DDS_VT_String_Connector_svnt
   libs       += DDS_VT_String_Connector_stub \
                 DDS_VT_STRING_Connector_lem_stub  \
                 DDS_VTopic_Base_stub \
-                DDS_VT_String_Connector_exec 
+                DDS_VT_String_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 48d4b6ac905..9f15496e66f 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Union/VT_Union_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopic_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
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 ef3664690da..85c9d4607e3 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
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_VT_UNION_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VT_Union_Connector_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_VT_UNION_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VT_UNION_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub 
+  after += DDS_VT_UNION_Connector_lem_gen DDS_VT_Union_Connector_stub DDS_VTopic_Base_stub
+  libs  += DDS_VTopic_Base_stub DDS_VT_Union_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VT_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_VT_UNION_Connector_lem_stub DDS_VT_Union_Connector_exec \
-                DDS_VT_Union_Connector_stub 
+                DDS_VT_Union_Connector_stub
   sharedname  = DDS_VT_Union_Connector_svnt
   libs       += DDS_VT_Union_Connector_stub \
                 DDS_VT_UNION_Connector_lem_stub  \
                 DDS_VTopic_Base_stub \
-                DDS_VT_Union_Connector_exec 
+                DDS_VT_Union_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
index 60213191f73..befcd027d07 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/VTopic_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopic_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index bb42936b606..e8f5d3f4d0e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
 
 project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopic_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTopic_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTopic_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub 
-  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub 
+  after += DDS_VTopic_Connector_lem_gen DDS_VTopic_Connector_stub DDS_VTopic_Base_stub
+  libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub 
+  after      += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_exec DDS_VTopic_Connector_stub
   sharedname  = DDS_VTopic_Connector_svnt
   libs       += DDS_VTopic_Connector_stub \
                 DDS_VTopic_Connector_lem_stub  \
                 DDS_VTopic_Base_stub \
-                DDS_VTopic_Connector_exec 
+                DDS_VTopic_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index a25f731ce52..e03201e30f8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -61,6 +61,7 @@ struct test {
   short x_test;
   string x_teststr;
 };
+
 typedef sequence<test> testSeq;
 
 #pragma DCPS_DATA_TYPE "TopicSeq"
@@ -89,15 +90,31 @@ struct TopicValuetype {
 #endif
 
 // Sequences
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicString> TopicStringSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicArray> TopicArraySeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicUnion> TopicUnionSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<X_Union> X_UnionSeq;
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicSeq> TopicSeqSeq;
+#endif
 #if !defined (CIAO_DDS4CCM_OPENDDS)
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TopicValuetype> TopicValuetypeSeq;
 #endif
+#endif
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<X_Valuetype> X_ValuetypeSeq;
+#endif
 
 #endif
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 343b3529102..c6bbac42716 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Array/VTS_Array_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopics_BaseTypeSupport.idl"
+#endif
+
 module VTopics
 {
   module ::CCM_DDS::Typed < ::TopicArray, ::TopicArraySeq> TopicArrayConnector;
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 9d456278398..a119c9f39ec 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
 
 project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTS_Array_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTS_ARRAY_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub 
+  after += DDS_VTS_ARRAY_Connector_lem_gen DDS_VTS_Array_Connector_stub DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTS_Array_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub 
+  after      += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_exec DDS_VTS_Array_Connector_stub
   sharedname  = DDS_VTS_Array_Connector_svnt
   libs       += DDS_VTS_Array_Connector_stub \
                 DDS_VTS_ARRAY_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTS_Array_Connector_exec 
+                DDS_VTS_Array_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 03ed0654edd..ef7db6158bf 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Seq/VTS_Seq_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopics_BaseTypeSupport.idl"
+#endif
+
 module VTopics
 {
   module ::CCM_DDS::Typed < ::TopicSeq, ::TopicSeqSeq> TopicSeqConnector;
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 7fe3ba92bdb..783413e0ca8 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
 
 project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTS_Seq_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTS_SEQ_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub 
+  after += DDS_VTS_SEQ_Connector_lem_gen DDS_VTS_Seq_Connector_stub DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTS_Seq_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub 
+  after      += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_exec DDS_VTS_Seq_Connector_stub
   sharedname  = DDS_VTS_Seq_Connector_svnt
   libs       += DDS_VTS_Seq_Connector_stub \
                 DDS_VTS_SEQ_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTS_Seq_Connector_exec 
+                DDS_VTS_Seq_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 9f40e9b2bed..a36e5808245 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_String/VTS_String_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopics_BaseTypeSupport.idl"
+#endif
+
 module VTopics
 {
   module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicStringConnector;
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 81d69998197..f1c9704394a 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
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
 
 project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTS_String_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTS_STRING_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub 
+  after += DDS_VTS_STRING_Connector_lem_gen DDS_VTS_String_Connector_stub DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTS_String_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub 
+  after      += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_exec DDS_VTS_String_Connector_stub
   sharedname  = DDS_VTS_String_Connector_svnt
   libs       += DDS_VTS_String_Connector_stub \
                 DDS_VTS_STRING_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTS_String_Connector_exec 
+                DDS_VTS_String_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 30b72136ea2..f56a7244386 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
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Conn_Union/VTS_Union_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopics_BaseTypeSupport.idl"
+#endif
+
 module VTopic
 {
   module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector;
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 dda7ffbaaea..b04e8e9ac2f 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
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_VTS_Union_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_UNION_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTS_Union_Connector_stub_export.h \
@@ -32,8 +32,8 @@ project(DDS_VTS_Union_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTS_Union_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub 
+  after += DDS_VTS_Union_Connector_lem_gen DDS_VTS_Union_Connector_stub DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTS_Union_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTS_Union_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_VTS_Union_Connector_lem_stub DDS_VTS_Union_Connector_exec \
-                DDS_VTS_Union_Connector_stub 
+                DDS_VTS_Union_Connector_stub
   sharedname  = DDS_VTS_Union_Connector_svnt
   libs       += DDS_VTS_Union_Connector_stub \
                 DDS_VTS_Union_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTS_Union_Connector_exec 
+                DDS_VTS_Union_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
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 aee02aaa288..b87ebbf4faf 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
@@ -1,7 +1,7 @@
 // $Id$
 
 project(DDS_VTS_Valuetype_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_VALUE_TYPE_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTS_Valuetype_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTS_Valuetype_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(DDS_VTS_VALUE_TYPE_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
   after += DDS_VTS_Valuetype_Connector_lem_gen DDS_VTS_Valuetype_Connector_stub \
-           DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub 
+           DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTS_Valuetype_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -114,12 +114,12 @@ project(DDS_VTS_Valuetype_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
   after      += DDS_VTS_VALUE_TYPE_Connector_lem_stub DDS_VTS_Valuetype_Connector_exec\
-                DDS_VTS_Valuetype_Connector_stub 
+                DDS_VTS_Valuetype_Connector_stub
   sharedname  = DDS_VTS_Valuetype_Connector_svnt
   libs       += DDS_VTS_Valuetype_Connector_stub \
                 DDS_VTS_VALUE_TYPE_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTS_Valuetype_Connector_exec 
+                DDS_VTS_Valuetype_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
index acbff70c104..8336c2f18bb 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/VTopics_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/VTopics_BaseTypeSupport.idl"
+#endif
+
 module VTopics
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> TestTopicConnector;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index 4006b783de5..e13ee96514f 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
 
 project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen DDS_VTopics_Base_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=VTopics_Connector_stub_export.h \
@@ -33,8 +33,8 @@ project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 }
 
 project(DDS_VTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub {
-  after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub 
-  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub 
+  after += DDS_VTopics_Connector_lem_gen DDS_VTopics_Connector_stub DDS_VTopics_Base_stub
+  libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,12 +111,12 @@ project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 
 project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub 
+  after      += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_exec DDS_VTopics_Connector_stub
   sharedname  = DDS_VTopics_Connector_svnt
   libs       += DDS_VTopics_Connector_stub \
                 DDS_VTopics_Connector_lem_stub  \
                 DDS_VTopics_Base_stub \
-                DDS_VTopics_Connector_exec 
+                DDS_VTopics_Connector_exec
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
index 122ef63ad99..ef528004460 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
@@ -54,7 +54,7 @@ project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../../ports/GeneratedCode
+  includes += ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Receiver_comp_lem_stub
   dynamicflags += SHAPES_RECEIVER_COMP_LEM_STUB_BUILD_DLL
@@ -84,7 +84,7 @@ project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../../ports/GeneratedCode
+  includes += ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Receiver_comp_stub
   dynamicflags += SHAPES_RECEIVER_COMP_STUB_BUILD_DLL
@@ -114,7 +114,7 @@ project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_lem_stub {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Receiver_comp_exec
   dynamicflags += SHAPES_RECEIVER_COMP_EXEC_BUILD_DLL
@@ -147,7 +147,7 @@ project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+  includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
 
   sharedname  = Shapes_Receiver_comp_svnt
   dynamicflags += SHAPES_RECEIVER_COMP_SVNT_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
index 86ce4151c7c..a342fc7781e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
@@ -54,7 +54,7 @@ project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../../ports/GeneratedCode
+  includes += ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Sender_comp_lem_stub
   dynamicflags += SHAPES_SENDER_COMP_LEM_STUB_BUILD_DLL
@@ -85,7 +85,7 @@ project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../../ports/GeneratedCode
+  includes += ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Sender_comp_stub
   dynamicflags += SHAPES_SENDER_COMP_STUB_BUILD_DLL
@@ -118,7 +118,7 @@ project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base {
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports/GeneratedCode
+  includes += ./GeneratedCode ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
 
   sharedname = Shapes_Sender_comp_exec
   dynamicflags += SHAPES_SENDER_COMP_EXEC_BUILD_DLL
@@ -156,7 +156,7 @@ project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   libpaths += ../../lib
   libout = ../../lib
 
-  includes += ../ports/GeneratedCode ../../ports/GeneratedCode
+  includes += ../ports/GeneratedCode ../../ports ../../ports/GeneratedCode
 
   sharedname  = Shapes_Sender_comp_svnt
   dynamicflags += SHAPES_SENDER_COMP_SVNT_BUILD_DLL
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 65a77c6b58e..02a5785fe5d 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
@@ -10,7 +10,13 @@
 
 #pragma ciao lem "Shapes_ShapeType_connE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+#include "GeneratedCode/Shapes_ShapeType_msgTypeSupport.idl"
+#endif
+
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<ShapeType> ShapeTypeSeq;
+#endif
 
 module Shapes
 {
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
index aabd7b238c6..a8cb84baadb 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project(Shapes_ShapeType_conn_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
+  after += DDS4CCM_idl_gen Shapes_ShapeType_msg_stub
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Shapes_ShapeType_conn_stub_export.h \
@@ -70,7 +70,7 @@ project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base {
   libpaths += ../lib
   libout = ../lib
 
-  includes += .
+  includes += . ..
 
   sharedname = Shapes_ShapeType_conn_stub
   dynamicflags += SHAPES_CONNECTOR_STUB_BUILD_DLL
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
index 989faf325db..087d88f2aa4 100755
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
@@ -5,7 +5,6 @@
 
 #pragma ndds typesupport "Shapes_ShapeType_msgSupport.h"
 #pragma opendds typesupport "Shapes_ShapeType_msgTypeSupportImpl.h"
-#pragma splice typesupport "Shapes_ShapeType_msgDscpC.h"
 
 #pragma DCPS_DATA_TYPE "ShapeType"
 #pragma DCPS_DATA_KEY "ShapeType color"
diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
index f37f419a1e5..96bf47123e2 100644
--- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
+++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl
@@ -20,6 +20,8 @@ struct TestTopic {
   long x;
 };
 
+#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
 typedef sequence<TestTopic> TestTopicSeq;
+#endif
 
 #endif
diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
index aaa866d7be4..1df993aa83a 100755
--- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
+++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.idl
@@ -15,6 +15,10 @@
 
 #pragma ciao lem "Connector/AmiDds_ConnectorE.idl"
 
+#if (CIAO_DDS4CCM_OPENDDS==1)
+# include "Base/AmiDds_DDSTypeSupport.idl"
+#endif
+
 module AmiDds
 {
   module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> AmiDdsConnector;
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
index 39f58087dbf..17753f15d8d 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/IDL2XMI_Test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL2XMI_Test) : taoexe, dance_xml_utils, xerces {
+project(*IDL2XMI_Test) : taoexe, xml_utils, xerces {
   exename = xmlvalidator
 
   Source_Files {
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
index 4b49a3cd871..2f125bd5a3e 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.cpp
@@ -10,94 +10,91 @@
 
 namespace Test
 {
-  namespace XML
+  Helper::Helper (XML::XML_Error_Handler &eh)
+    : impl_ (0)
+    , parser_ (0)
+    , e_handler_ (eh)
   {
-    Helper::Helper (DAnCE::XML::XML_Error_Handler &eh)
-      : impl_ (0)
-      , parser_ (0)
-      , e_handler_ (eh)
-    {
-      this->init_parser ();
-    }
-
-    Helper::~Helper (void)
-    {
-      this->terminate_parser ();
-    }
-
-    void
-    Helper::init_parser (void)
-    {
-      // Initialize the Xerces run-time
-      XERCES_CPP_NAMESPACE::XMLPlatformUtils::Initialize();
-
-      // Instantiate the DOM parser.
-      static const XMLCh gLS[] = { XERCES_CPP_NAMESPACE::chLatin_L,
-                                   XERCES_CPP_NAMESPACE::chLatin_S,
-                                   XERCES_CPP_NAMESPACE::chNull };
-
-      // Get an implementation of the Load-Store (LS) interface
-      // and cache it for later use
-      impl_ =
-        XERCES_CPP_NAMESPACE::DOMImplementationRegistry::getDOMImplementation(gLS);
-    }
-
-    int
-    Helper::validate_dom (const ACE_TCHAR *url)
-    {
-      if (url == 0)
-        return 0;
+    this->init_parser ();
+  }
+
+  Helper::~Helper (void)
+  {
+    this->terminate_parser ();
+  }
+
+  void
+  Helper::init_parser (void)
+  {
+    // Initialize the Xerces run-time
+    XERCES_CPP_NAMESPACE::XMLPlatformUtils::Initialize();
+
+    // Instantiate the DOM parser.
+    static const XMLCh gLS[] = { XERCES_CPP_NAMESPACE::chLatin_L,
+                                  XERCES_CPP_NAMESPACE::chLatin_S,
+                                  XERCES_CPP_NAMESPACE::chNull };
+
+    // Get an implementation of the Load-Store (LS) interface
+    // and cache it for later use
+    impl_ =
+      XERCES_CPP_NAMESPACE::DOMImplementationRegistry::getDOMImplementation(gLS);
+  }
 
-      try
-        {
-          if (this->parser_ == 0)
-            this->parser_ = new XERCES_CPP_NAMESPACE::XercesDOMParser ();
+  int
+  Helper::validate_dom (const ACE_TCHAR *url)
+  {
+    if (url == 0)
+      return 0;
 
-          // Discard comment nodes in the document
-          this->parser_->setCreateCommentNodes (false);
+    try
+      {
+        if (this->parser_ == 0)
+          this->parser_ = new XERCES_CPP_NAMESPACE::XercesDOMParser ();
 
-          // Do not create EntityReference nodes in the DOM tree. No
-          // EntityReference nodes will be created, only the nodes
-          // corresponding to their fully expanded sustitution text will be
-          // created.
-          this->parser_->setCreateEntityReferenceNodes (false);
+        // Discard comment nodes in the document
+        this->parser_->setCreateCommentNodes (false);
 
-          // Perform Validation
-          this->parser_->setValidationScheme (
-            XERCES_CPP_NAMESPACE::AbstractDOMParser::Val_Always);
+        // Do not create EntityReference nodes in the DOM tree. No
+        // EntityReference nodes will be created, only the nodes
+        // corresponding to their fully expanded sustitution text will be
+        // created.
+        this->parser_->setCreateEntityReferenceNodes (false);
 
-          // Do not include ignorable whitespace in the DOM tree.
-          this->parser_->setIncludeIgnorableWhitespace (false);
+        // Perform Validation
+        this->parser_->setValidationScheme (
+          XERCES_CPP_NAMESPACE::AbstractDOMParser::Val_Always);
 
-          // Enable full schema constraint checking, including checking which
-          // may be time-consuming or memory intensive. Currently, particle
-          // unique attribution constraint checking and particle derivation
-          // restriction checking are controlled by this option.
-          this->parser_->setValidationSchemaFullChecking (true);
+        // Do not include ignorable whitespace in the DOM tree.
+        this->parser_->setIncludeIgnorableWhitespace (false);
 
-          this->parser_->setErrorHandler (&e_handler_);
+        // Enable full schema constraint checking, including checking which
+        // may be time-consuming or memory intensive. Currently, particle
+        // unique attribution constraint checking and particle derivation
+        // restriction checking are controlled by this option.
+        this->parser_->setValidationSchemaFullChecking (true);
 
-          this->parser_->parse (ACE_TEXT_ALWAYS_CHAR (url));
+        this->parser_->setErrorHandler (&e_handler_);
 
-          if (e_handler_.getErrors ())
-            return 1;
+        this->parser_->parse (ACE_TEXT_ALWAYS_CHAR (url));
 
-          return 0;
-        }
-      catch (...)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Caught an unknown exception\n"));
-          throw;
-        }
+        if (e_handler_.getErrors ())
+          return 1;
 
-      return 0;
-    }
+        return 0;
+      }
+    catch (...)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Caught an unknown exception\n"));
+        throw;
+      }
+
+    return 0;
+  }
 
-    void
-    Helper::terminate_parser (void)
-    {
-      XERCES_CPP_NAMESPACE::XMLPlatformUtils::Terminate ();
-    }
+  void
+  Helper::terminate_parser (void)
+  {
+    XERCES_CPP_NAMESPACE::XMLPlatformUtils::Terminate ();
   }
 }
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
index 9142214a509..95ed9b74d03 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/XML_Helper.h
@@ -30,37 +30,34 @@ namespace XERCES_CPP_NAMESPACE
 
 namespace Test
 {
-  namespace XML
+  /**
+    * @class Helper
+    *
+    * @brief Helper class for some routine XML stuff.
+    */
+  class Helper
   {
-    /**
-     * @class Helper
-     *
-     * @brief Helper class for some routine XML stuff.
-     */
-    class Helper
-    {
-    public:
-      // Initialize the resolver we should use.
-      Helper (DAnCE::XML::XML_Error_Handler &eh);
+  public:
+    // Initialize the resolver we should use.
+    Helper (XML::XML_Error_Handler &eh);
 
-      ~Helper (void);
+    ~Helper (void);
 
-      int validate_dom (const ACE_TCHAR *uri);
+    int validate_dom (const ACE_TCHAR *uri);
 
-    protected:
-      /// Intialize the parser
-      void init_parser (void);
+  protected:
+    /// Intialize the parser
+    void init_parser (void);
 
-      /// Terminate the parser
-      void terminate_parser (void);
+    /// Terminate the parser
+    void terminate_parser (void);
 
-    private:
-      XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
-      XERCES_CPP_NAMESPACE::XercesDOMParser *parser_;
+  private:
+    XERCES_CPP_NAMESPACE::DOMImplementation *impl_;
+    XERCES_CPP_NAMESPACE::XercesDOMParser *parser_;
 
-      DAnCE::XML::XML_Error_Handler &e_handler_;
-    };
-  }
+    XML::XML_Error_Handler &e_handler_;
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
index 806815488a9..be73e801d0a 100644
--- a/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
+++ b/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/xmlvalidator.cpp
@@ -41,8 +41,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-  DAnCE::XML::XML_Error_Handler handler;
-  Test::XML::Helper helper (handler);
+  XML::XML_Error_Handler handler;
+  Test::Helper helper (handler);
 
   if (0 != helper.validate_dom (inp_file))
     {
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
index 7125cce4210..d887bc7e57e 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_TO_XMI.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, dance_xml_utils, xerces, tao_idl_fe {
+project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, xml_utils, xerces, tao_idl_fe {
   sharedname   = CIAO_IDL3_TO_XMI_BE
   dynamicflags += CIAO_IDL3_TO_XMI_BUILD_DLL
 
@@ -29,7 +29,7 @@ project(CIAO_IDL3_TO_XMI_BE) : acelib, install_lib, ciao_output, dance_xml_utils
   }
 }
 
-project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, dance_xml_utils, xerces, tao_idl_fe {
+project(CIAO_IDL3_TO_XMI_EXE) : aceexe, install, ciao_output, xml_utils, xerces, tao_idl_fe {
   after          += CIAO_IDL3_TO_XMI_BE
   exename         = tao_idl3_to_xmi
   libs           += CIAO_IDL3_TO_XMI_BE
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index 702860d150b..a3262bad219 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -67,7 +67,7 @@ using XERCES_CPP_NAMESPACE::DOMElement;
 using XERCES_CPP_NAMESPACE::DOMText;
 using XERCES_CPP_NAMESPACE::DOMDocumentType;
 using XERCES_CPP_NAMESPACE::XMLChar1_1;
-using DAnCE::XML::XStr;
+using XML::XStr;
 
 #if 0
 struct Foo {
@@ -2027,10 +2027,10 @@ namespace DAnCE
 
           target_name += fn;
 
-          DAnCE::XML::NoOp_Resolver res_func;
-          DAnCE::XML::XML_Schema_Resolver<> resolver (res_func);
-          DAnCE::XML::XML_Error_Handler handler;
-          DAnCE::XML::XML_Helper<> helper (&resolver, &handler);
+          XML::NoOp_Resolver res_func;
+          XML::XML_Schema_Resolver<> resolver (res_func);
+          XML::XML_Error_Handler handler;
+          XML::XML_Helper<> helper (&resolver, &handler);
 
           // Create XML document
           std::auto_ptr<DOMDocumentType> doctype (
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
index 70e0da82eab..5440f799465 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
@@ -230,7 +230,7 @@ namespace DAnCE
       ACE_TCHAR * union_label_value (AST_Expression *exp);
 
       typedef ACE_Hash_Map_Manager_Ex< ACE_TString,
-                                       DAnCE::XML::XStr,
+                                       XML::XStr,
                                        ACE_Hash <ACE_TString>,
                                        ACE_Equal_To <ACE_TString>,
                                        ACE_Null_Mutex > XMI_ID_MAP;
@@ -298,7 +298,7 @@ namespace DAnCE
 
       XERCES_CPP_NAMESPACE::DOMElement *associations_;
 
-      DAnCE::XML::XStr base_id_;
+      XML::XStr base_id_;
 
       /// true if for some reason the generated output is bad
       /// and shouldn't be written.