219 files changed, 619 insertions, 286 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d23a6484c80..329097e441b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,336 @@
+Thu Jun 24 11:42:19 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/idl/ccm_dds.idl:
+        * connectors/dds4ccm/impl/Coherent_Changes_Guard.h:
+        * connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp:
+        * connectors/dds4ccm/impl/ContentFilterSetting.h:
+        * connectors/dds4ccm/impl/ContentFilterSetting.cpp:
+        * connectors/dds4ccm/impl/ContentFilteredTopic_T.h:
+        * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp:
+        * connectors/dds4ccm/impl/DDSCallbackStatusHandler.h:
+        * connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp:
+        * connectors/dds4ccm/impl/DDSDataReaderListener_T.h:
+        * connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/DDSDataWriterListener_T.h:
+        * connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp:
+        * connectors/dds4ccm/impl/DDSPublisherListener_T.h:
+        * connectors/dds4ccm/impl/DDSPublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/DDSSubscriberListener_T.h:
+        * connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/DDSTopicListener_T.h:
+        * connectors/dds4ccm/impl/DDSTopicListener_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Get_T.h:
+        * connectors/dds4ccm/impl/DDS_Get_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Listen_T.h:
+        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Read_T.h:
+        * connectors/dds4ccm/impl/DDS_Read_T.cpp:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.h:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.h:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+        * connectors/dds4ccm/impl/DataListenerControl_T.h:
+        * connectors/dds4ccm/impl/DataListenerControl_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.h:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderListener_T.h:
+        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/DataReader_T.h:
+        * connectors/dds4ccm/impl/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/DataWriterListener_T.h:
+        * connectors/dds4ccm/impl/DataWriterListener_T.cpp:
+        * connectors/dds4ccm/impl/DataWriter_T.h:
+        * connectors/dds4ccm/impl/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/DomainParticipantFactory_T.h:
+        * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp:
+        * connectors/dds4ccm/impl/DomainParticipantListener.h:
+        * connectors/dds4ccm/impl/DomainParticipantListener.cpp:
+        * connectors/dds4ccm/impl/DomainParticipantListener_T.h:
+        * connectors/dds4ccm/impl/DomainParticipantListener_T.cpp:
+        * connectors/dds4ccm/impl/DomainParticipant_T.h:
+        * connectors/dds4ccm/impl/DomainParticipant_T.cpp:
+        * connectors/dds4ccm/impl/Getter_T.h:
+        * connectors/dds4ccm/impl/Getter_T.cpp:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
+        * connectors/dds4ccm/impl/Log_Macros.h:
+        * connectors/dds4ccm/impl/Log_Macros.cpp:
+        * connectors/dds4ccm/impl/PortStatusListener_T.h:
+        * connectors/dds4ccm/impl/PortStatusListener_T.cpp:
+        * connectors/dds4ccm/impl/PublisherListener_T.h:
+        * connectors/dds4ccm/impl/PublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/Publisher_T.h:
+        * connectors/dds4ccm/impl/Publisher_T.cpp:
+        * connectors/dds4ccm/impl/QueryCondition_T.h:
+        * connectors/dds4ccm/impl/QueryCondition_T.cpp:
+        * connectors/dds4ccm/impl/ReadCondition_T.h:
+        * connectors/dds4ccm/impl/ReadCondition_T.cpp:
+        * connectors/dds4ccm/impl/Reader_T.h:
+        * connectors/dds4ccm/impl/Reader_T.cpp:
+        * connectors/dds4ccm/impl/StateListenerControl_T.h:
+        * connectors/dds4ccm/impl/StateListenerControl_T.cpp:
+        * connectors/dds4ccm/impl/StatusCondition.h:
+        * connectors/dds4ccm/impl/StatusCondition.cpp:
+        * connectors/dds4ccm/impl/SubscriberListener_T.h:
+        * connectors/dds4ccm/impl/SubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/Subscriber_T.h:
+        * connectors/dds4ccm/impl/Subscriber_T.cpp:
+        * connectors/dds4ccm/impl/TimeUtilities.h:
+        * connectors/dds4ccm/impl/TopicDescription_T.h:
+        * connectors/dds4ccm/impl/TopicDescription_T.cpp:
+        * connectors/dds4ccm/impl/TopicListener_T.h:
+        * connectors/dds4ccm/impl/TopicListener_T.cpp:
+        * connectors/dds4ccm/impl/Topic_T.h:
+        * connectors/dds4ccm/impl/Topic_T.cpp:
+        * connectors/dds4ccm/impl/Updater_T.h:
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+        * connectors/dds4ccm/impl/Utils.h:
+        * connectors/dds4ccm/impl/Utils.cpp:
+        * connectors/dds4ccm/impl/Writer_T.h:
+        * connectors/dds4ccm/impl/Writer_T.cpp:
+        * connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h:
+        * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
+        * connectors/dds4ccm/impl/ndds:
+        * connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h:
+        * connectors/dds4ccm/impl/opendds:
+        * connectors/dds4ccm/impl/splice:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h:
+        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp:
+        * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h:
+        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Policies/deadline_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dest_order_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dp_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dr_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dur_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/dur_service_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/duration.h:
+        * connectors/dds4ccm/tests/Policies/dw_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/group_data_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/hist_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/lifespan_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/liveliness_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/octet_seq.h:
+        * connectors/dds4ccm/tests/Policies/ownership_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/partition_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/presentation_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/pub_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/reliability_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/sub_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/tbf_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/tp_data_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/tp_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/user_data_qos_test.h:
+        * connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h:
+        * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp:
+        * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp:
+        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
+        * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp:
+        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp:
+        * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h:
+        * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp:
+        * connectors/dds4ccm/impl/dds/ContentFilterSetting.h:
+        * connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp:
+        * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.h:
+        * connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h:
+        * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp:
+        * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h:
+        * connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h:
+        * connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.h:
+        * connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.h:
+        * connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDSTopicListener_T.h:
+        * connectors/dds4ccm/impl/dds/DDSTopicListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Get_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Listen_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Read_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Update_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_Write_T.h:
+        * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataListenerControl_T.h:
+        * connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReaderHandler_T.h:
+        * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReaderListener_T.h:
+        * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h:
+        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataReader_T.h:
+        * connectors/dds4ccm/impl/dds/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataWriterListener_T.h:
+        * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DataWriter_T.h:
+        * connectors/dds4ccm/impl/dds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.h:
+        * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp:
+        * connectors/dds4ccm/impl/dds/DomainParticipantListener.h:
+        * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp:
+        * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h:
+        * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/DomainParticipant_T.h:
+        * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp:
+        * connectors/dds4ccm/impl/dds/Getter_T.h:
+        * connectors/dds4ccm/impl/dds/Getter_T.cpp:
+        * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h:
+        * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp:
+        * connectors/dds4ccm/impl/dds/Log_Macros.h:
+        * connectors/dds4ccm/impl/dds/Log_Macros.cpp:
+        * connectors/dds4ccm/impl/dds/PortStatusListener_T.h:
+        * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/PublisherListener_T.h:
+        * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/Publisher_T.h:
+        * connectors/dds4ccm/impl/dds/Publisher_T.cpp:
+        * connectors/dds4ccm/impl/dds/QueryCondition_T.h:
+        * connectors/dds4ccm/impl/dds/QueryCondition_T.cpp:
+        * connectors/dds4ccm/impl/dds/ReadCondition_T.h:
+        * connectors/dds4ccm/impl/dds/ReadCondition_T.cpp:
+        * connectors/dds4ccm/impl/dds/Reader_T.h:
+        * connectors/dds4ccm/impl/dds/Reader_T.cpp:
+        * connectors/dds4ccm/impl/dds/StateListenerControl_T.h:
+        * connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp:
+        * connectors/dds4ccm/impl/dds/StatusCondition.h:
+        * connectors/dds4ccm/impl/dds/StatusCondition.cpp:
+        * connectors/dds4ccm/impl/dds/SubscriberListener_T.h:
+        * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/Subscriber_T.h:
+        * connectors/dds4ccm/impl/dds/Subscriber_T.cpp:
+        * connectors/dds4ccm/impl/dds/TimeUtilities.h:
+        * connectors/dds4ccm/impl/dds/TopicDescription_T.h:
+        * connectors/dds4ccm/impl/dds/TopicDescription_T.cpp:
+        * connectors/dds4ccm/impl/dds/TopicListener_T.h:
+        * connectors/dds4ccm/impl/dds/TopicListener_T.cpp:
+        * connectors/dds4ccm/impl/dds/Topic_T.h:
+        * connectors/dds4ccm/impl/dds/Topic_T.cpp:
+        * connectors/dds4ccm/impl/dds/Updater_T.h:
+        * connectors/dds4ccm/impl/dds/Updater_T.cpp:
+        * connectors/dds4ccm/impl/dds/Utils.h:
+        * connectors/dds4ccm/impl/dds/Utils.cpp:
+        * connectors/dds4ccm/impl/dds/Writer_T.h:
+        * connectors/dds4ccm/impl/dds/Writer_T.cpp:
+        * connectors/dds4ccm/impl/dds/dds4ccm_dds_impl_export.h:
+        * connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc:
+        * connectors/dds4ccm/impl/dds/ndds:
+
+        * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h:
+        * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/Duration_t.h:
+        * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h:
+        * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h:
+        * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h:
+        * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/ParticipantBuiltinTopicData.h:
+        * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h:
+        * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h:
+        * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/ReliableReaderActivityChangedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/ReliableWriterCacheChangedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h:
+        * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/StringSeq.h:
+        * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h:
+        * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h:
+        * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/Time_t.h:
+        * connectors/dds4ccm/impl/dds/ndds/TopicBuiltinTopicData.h:
+        * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/TopicQos.h:
+        * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h:
+        * connectors/dds4ccm/impl/dds/opendds:
+        * connectors/dds4ccm/impl/dds/splice:
+          Moved all core files up one level.
+
 Thu Jun 24 09:41:09 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
index 92c8e562dcc..23374609ffc 100644
--- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
+++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
@@ -10,8 +10,8 @@
 #include "connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl"
 #include "connectors/dds4ccm/idl/dds4ccm_Connector.idl"
 
-#pragma dds4ccm impl "connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h" 
-#pragma dds4ccm impl "connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h" 
+#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" 
+#pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h" 
 
 module CCM_DDS
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
index fc5a8f7516c..8626e351417 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/Coherent_Changes_Guard.h"
 
 CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (
   DDSPublisher* p,
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h
index d98cde63d1b..eb350ffe3b8 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h
+++ b/CIAO/connectors/dds4ccm/impl/Coherent_Changes_Guard.h
@@ -11,7 +11,7 @@
 #define _CIAO_COHERENT_CHANGES_GUARD
 
 #include "ace/Copy_Disabled.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
 # include "ndds/ndds_cpp.h"
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
index f9278f5ed2e..d767118cc40 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilterSetting.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #include "ContentFilterSetting.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/Utils.h"
 #include "ace/Auto_Ptr.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilterSetting.h b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h
index 03efb91f127..2a0f88297e9 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilterSetting.h
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.h
@@ -9,11 +9,11 @@
 #ifndef CCM_DDS_CONTENTFILTERSETTING_H
 #define CCM_DDS_CONTENTFILTERSETTING_H
 
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 #include "dds4ccm/idl/dds4ccm_BaseEC.h"
-#include "dds4ccm/impl/dds/ContentFilteredTopic_T.h"
+#include "dds4ccm/impl/ContentFilteredTopic_T.h"
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp
index fecc5ffe7dc..0bf31adedee 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp
@@ -5,7 +5,7 @@
 
 #include "ndds/StringSeq.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.h b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.h
index ecf4052d481..f6b83450715 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.h
@@ -12,7 +12,7 @@
 #include "DomainParticipant_T.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "tao/LocalObject.h"
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
@@ -71,6 +71,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/ContentFilteredTopic_T.cpp"
+#include "dds4ccm/impl/ContentFilteredTopic_T.cpp"
 
 #endif /* CIAO_NDDS_CONTENFILTEREDTOPIC_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
index e70feab2dd9..6402411d0af 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 //============================================================
 // On_Unexpected_Status_Handler
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
index 32d9701e738..32d9701e738 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSCallbackStatusHandler.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp
index 06dbb4395c2..e357a7fa2ad 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.cpp
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.h
index e19e3f3b59e..c7230ae815e 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSDataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSDataReaderListener_T.h
@@ -76,6 +76,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DDSDataReaderListener_T.cpp"
+#include "dds4ccm/impl/DDSDataReaderListener_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp
index 5fbaced5089..65f105174fc 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.cpp
@@ -8,7 +8,7 @@
 #include "ndds/OfferedDeadlineMissedStatus.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h
index ec7a5a8d5b6..09d7fd42494 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSDataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -73,6 +73,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DDSDataWriterListener_T.cpp"
+#include "dds4ccm/impl/DDSDataWriterListener_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSPublisherListener_T.cpp
index cedd2537031..17ae8384bc8 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSPublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSPublisherListener_T.cpp
@@ -13,7 +13,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSPublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSPublisherListener_T.h
index 3c9cd2d9402..5ed0014db09 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSPublisherListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSPublisherListener_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -95,6 +95,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DDSPublisherListener_T.cpp"
+#include "dds4ccm/impl/DDSPublisherListener_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp
index 85a8566d5b1..13db52c3659 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSSubscriberListener_T.cpp
@@ -10,7 +10,7 @@
 #include "ndds/LivelinessChangedStatus.h"
 #include "ndds/RequestedIncompatibleQosStatus.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSSubscriberListener_T.h
index a71fb52ee52..ca8c3eb940c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSSubscriberListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSSubscriberListener_T.h
@@ -13,7 +13,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -100,7 +100,7 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DDSSubscriberListener_T.cpp"
+#include "dds4ccm/impl/DDSSubscriberListener_T.cpp"
 
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSTopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DDSTopicListener_T.cpp
index c36dcccf401..d4b95f4f7ee 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSTopicListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDSTopicListener_T.cpp
@@ -7,7 +7,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSTopicListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSTopicListener_T.h
index 8a9466deb27..6976540c652 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDSTopicListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSTopicListener_T.h
@@ -52,6 +52,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DDSTopicListener_T.cpp"
+#include "dds4ccm/impl/DDSTopicListener_T.cpp"
 
 #endif /* DDS4CCM_TOPICLISTENER_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
index 94803efc15c..2cac29b1e83 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DomainParticipant_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DomainParticipant_T.h"
 #include "ace/Tokenizer_T.h"
 #include "ace/Env_Value_T.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
index cf1f123535c..d3f82c49c28 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h
@@ -9,8 +9,8 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 #include "tao/LocalObject.h"
-#include "dds4ccm/impl/dds/DomainParticipantListener_T.h"
-#include "dds4ccm/impl/dds/DomainParticipantFactory_T.h"
+#include "dds4ccm/impl/DomainParticipantListener_T.h"
+#include "dds4ccm/impl/DomainParticipantFactory_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Base_Connector_T
@@ -67,6 +67,6 @@ protected:
   DomainParticipantFactory dp_factory_;
 };
 
-#include "dds4ccm/impl/dds/DDS_Base_Connector_T.cpp"
+#include "dds4ccm/impl/DDS_Base_Connector_T.cpp"
 
 #endif /* CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
index a71b478d97d..a21f0bc36f2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp
@@ -1,15 +1,15 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataReaderListener_T.h"
-#include "dds4ccm/impl/dds/DataWriterListener_T.h"
-#include "dds4ccm/impl/dds/Writer_T.h"
-#include "dds4ccm/impl/dds/Getter_T.h"
-#include "dds4ccm/impl/dds/Reader_T.h"
-#include "dds4ccm/impl/dds/DataListenerControl_T.h"
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
-
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderListener_T.h"
+#include "dds4ccm/impl/DataWriterListener_T.h"
+#include "dds4ccm/impl/Writer_T.h"
+#include "dds4ccm/impl/Getter_T.h"
+#include "dds4ccm/impl/Reader_T.h"
+#include "dds4ccm/impl/DataListenerControl_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
+
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h
index ae0ea4f5ca4..51107d60e3a 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h
@@ -8,10 +8,10 @@
 #ifndef DDS_EVENT_CONNECTOR_T_H_
 #define DDS_EVENT_CONNECTOR_T_H_
 
-#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/dds/DDS_Get_T.h"
-#include "dds4ccm/impl/dds/DDS_Write_T.h"
-#include "dds4ccm/impl/dds/DDS_Listen_T.h"
+#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
+#include "dds4ccm/impl/DDS_Get_T.h"
+#include "dds4ccm/impl/DDS_Write_T.h"
+#include "dds4ccm/impl/DDS_Listen_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_Event_Connector_T
@@ -106,6 +106,6 @@ private:
  typedef DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE> TopicBaseConnector;
 };
 
-#include "dds4ccm/impl/dds/DDS_Event_Connector_T.cpp"
+#include "dds4ccm/impl/DDS_Event_Connector_T.cpp"
 
 #endif /* DDS_EVENT_CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
index 184d69f8ac4..90a2d194735 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Get_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
index 880221246fc..9a634c36c5a 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
@@ -8,8 +8,8 @@
 #ifndef DDS_GET_T_H_
 #define DDS_GET_T_H_
 
-#include "dds4ccm/impl/dds/DDS_Subscriber_Base_T.h"
-#include "dds4ccm/impl/dds/Getter_T.h"
+#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
+#include "dds4ccm/impl/Getter_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_Get_T
@@ -48,6 +48,6 @@ private:
   typedef DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED> DDSSubscriberBase;
 };
 
-#include "dds4ccm/impl/dds/DDS_Get_T.cpp"
+#include "dds4ccm/impl/DDS_Get_T.cpp"
 
 #endif /* DDS_GET_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index 55915c19fed..e61deac1922 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataListenerControl_T.h"
-#include "dds4ccm/impl/dds/DataReaderListener_T.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataListenerControl_T.h"
+#include "dds4ccm/impl/DataReaderListener_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Listen_T (void) :
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
index 4f3ba379e4d..f47abe59459 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
@@ -8,7 +8,7 @@
 #ifndef DDS_LISTEN_T_H_
 #define DDS_LISTEN_T_H_
 
-#include "dds4ccm/impl/dds/DDS_Subscriber_Base_T.h"
+#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
@@ -47,6 +47,6 @@ private:
   typedef ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE> DataReaderListener;
 };
 
-#include "dds4ccm/impl/dds/DDS_Listen_T.cpp"
+#include "dds4ccm/impl/DDS_Listen_T.cpp"
 
 #endif /* DDS_LISTEN_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
index 9c378adc898..da85c353df2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 DDS_Read_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Read_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h
index f809390a598..a94aa3d3117 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Read_T.h
@@ -8,7 +8,7 @@
 #ifndef DDS_READ_T_H_
 #define DDS_READ_T_H_
 
-#include "dds4ccm/impl/dds/DDS_Subscriber_Base_T.h"
+#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_Read_T
@@ -19,6 +19,6 @@ public:
   ~DDS_Read_T (void);
 };
 
-#include "dds4ccm/impl/dds/DDS_Read_T.cpp"
+#include "dds4ccm/impl/DDS_Read_T.cpp"
 
 #endif /* DDS_READ_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
index bc18843db84..14478628577 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/dds/DataWriterListener_T.h"
-#include "dds4ccm/impl/dds/StateListenerControl_T.h"
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
+#include "dds4ccm/impl/DataReaderStateListener_T.h"
+#include "dds4ccm/impl/DataWriterListener_T.h"
+#include "dds4ccm/impl/StateListenerControl_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_StateListen_T (void) :
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
index e23bd40925d..35b4f995aa9 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
@@ -8,7 +8,7 @@
 #ifndef DDS_STATELISTEN_T_H_
 #define DDS_STATELISTEN_T_H_
 
-#include "dds4ccm/impl/dds/DDS_Subscriber_Base_T.h"
+#include "dds4ccm/impl/DDS_Subscriber_Base_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_StateListen_T
@@ -41,6 +41,6 @@ private:
   typedef ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE> DataReaderStateListener;
 };
 
-#include "dds4ccm/impl/dds/DDS_StateListen_T.cpp"
+#include "dds4ccm/impl/DDS_StateListen_T.cpp"
 
 #endif /* DDS_STATELISTEN_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
index f2e3ceedbb1..80dcfa59cfc 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp
@@ -1,17 +1,17 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/dds/DataWriterListener_T.h"
-#include "dds4ccm/impl/dds/Updater_T.h"
-#include "dds4ccm/impl/dds/Reader_T.h"
-#include "dds4ccm/impl/dds/PublisherListener_T.h"
-#include "dds4ccm/impl/dds/SubscriberListener_T.h"
-#include "dds4ccm/impl/dds/DataListenerControl_T.h"
-#include "dds4ccm/impl/dds/StateListenerControl_T.h"
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
-
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderStateListener_T.h"
+#include "dds4ccm/impl/DataWriterListener_T.h"
+#include "dds4ccm/impl/Updater_T.h"
+#include "dds4ccm/impl/Reader_T.h"
+#include "dds4ccm/impl/PublisherListener_T.h"
+#include "dds4ccm/impl/SubscriberListener_T.h"
+#include "dds4ccm/impl/DataListenerControl_T.h"
+#include "dds4ccm/impl/StateListenerControl_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
+
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h
index dfaaa7bddb6..c87044ae7d2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h
@@ -8,12 +8,12 @@
 #ifndef DDS_STATE_CONNECTOR_T_H_
 #define DDS_STATE_CONNECTOR_T_H_
 
-#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/dds/DDS_Get_T.h"
-#include "dds4ccm/impl/dds/DDS_Listen_T.h"
-#include "dds4ccm/impl/dds/DDS_StateListen_T.h"
-#include "dds4ccm/impl/dds/DDS_Update_T.h"
-#include "dds4ccm/impl/dds/DDS_Read_T.h"
+#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
+#include "dds4ccm/impl/DDS_Get_T.h"
+#include "dds4ccm/impl/DDS_Listen_T.h"
+#include "dds4ccm/impl/DDS_StateListen_T.h"
+#include "dds4ccm/impl/DDS_Update_T.h"
+#include "dds4ccm/impl/DDS_Read_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_State_Connector_T
@@ -166,6 +166,6 @@ private:
 typedef DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE> TopicBaseConnector;
 };
 
-#include "dds4ccm/impl/dds/DDS_State_Connector_T.cpp"
+#include "dds4ccm/impl/DDS_State_Connector_T.cpp"
 
 #endif /* DDS_STATE_CONNECTOR_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
index 54b0035b4bb..46859c2f4cd 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Subscriber_Base_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
index bc15daefaff..97c292ef694 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Subscriber_Base_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
@@ -10,11 +10,11 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/impl/dds/Reader_T.h"
-#include "dds4ccm/impl/dds/DataReader_T.h"
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
-#include "dds4ccm/impl/dds/ContentFilterSetting.h"
-#include "dds4ccm/impl/dds/ContentFilteredTopic_T.h"
+#include "dds4ccm/impl/Reader_T.h"
+#include "dds4ccm/impl/DataReader_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
+#include "dds4ccm/impl/ContentFilterSetting.h"
+#include "dds4ccm/impl/ContentFilteredTopic_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_Subscriber_Base_T
@@ -69,6 +69,6 @@ private:
   typedef ::CIAO::DDS4CCM::PortStatusListener_T <DDS_TYPE, CCM_TYPE> PortStatusListener;
 };
 
-#include "dds4ccm/impl/dds/DDS_Subscriber_Base_T.cpp"
+#include "dds4ccm/impl/DDS_Subscriber_Base_T.cpp"
 
 #endif /* DDS_READ_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
index a973be29cef..039ad0941e3 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_TopicBase_Connector_T (void) :
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h
index 6b2280d9f6a..614e59cac49 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h
@@ -9,11 +9,11 @@
 #define DDS_TOPIC_BASE_CONNECTOR_H
 
 #include "ace/Copy_Disabled.h"
-#include "dds4ccm/impl/dds/DDS_Base_Connector_T.h"
-#include "dds4ccm/impl/dds/DomainParticipant_T.h"
-#include "dds4ccm/impl/dds/DDSTopicListener_T.h"
-#include "dds4ccm/impl/dds/PublisherListener_T.h"
-#include "dds4ccm/impl/dds/SubscriberListener_T.h"
+#include "dds4ccm/impl/DDS_Base_Connector_T.h"
+#include "dds4ccm/impl/DomainParticipant_T.h"
+#include "dds4ccm/impl/DDSTopicListener_T.h"
+#include "dds4ccm/impl/PublisherListener_T.h"
+#include "dds4ccm/impl/SubscriberListener_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_TopicBase_Connector_T
@@ -70,6 +70,6 @@ protected:
   typedef DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE> BaseConnector;
 };
 
-#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp"
+#include "dds4ccm/impl/DDS_TopicBase_Connector_T.cpp"
 
 #endif /* DDS_TOPIC_BASE_CONNECTOR_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index c0aca512602..ca81f87c64b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataReaderStateListener_T.h"
-#include "dds4ccm/impl/dds/DataWriterListener_T.h"
-#include "dds4ccm/impl/dds/Updater_T.h"
-#include "dds4ccm/impl/dds/DataWriter_T.h"
+#include "dds4ccm/impl/DataReaderStateListener_T.h"
+#include "dds4ccm/impl/DataWriterListener_T.h"
+#include "dds4ccm/impl/Updater_T.h"
+#include "dds4ccm/impl/DataWriter_T.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_Update_T<DDS_TYPE, CCM_TYPE>::DDS_Update_T (void) :
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
index 97b8caa1d1d..207ee671007 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
@@ -8,7 +8,7 @@
 #ifndef DDS_UPDATE_T_H
 #define DDS_UPDATE_T_H
 
-#include "dds4ccm/impl/dds/Updater_T.h"
+#include "dds4ccm/impl/Updater_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Update_T
@@ -46,6 +46,6 @@ private:
   typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener;
 };
 
-#include "dds4ccm/impl/dds/DDS_Update_T.cpp"
+#include "dds4ccm/impl/DDS_Update_T.cpp"
 
 #endif /* DDS_UPDATE_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
index 29209a094f8..3b9678a6f95 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/dds/DataReaderListener_T.h"
-#include "dds4ccm/impl/dds/DataListenerControl_T.h"
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
+#include "dds4ccm/impl/DataReaderListener_T.h"
+#include "dds4ccm/impl/DataListenerControl_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::DDS_Write_T (void) :
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
index 75be2a53044..0f42014acba 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
@@ -8,9 +8,9 @@
 #ifndef DDS_WRITE_T_H_
 #define DDS_WRITE_T_H_
 
-#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h"
-#include "dds4ccm/impl/dds/DataWriterListener_T.h"
-#include "dds4ccm/impl/dds/Writer_T.h"
+#include "dds4ccm/impl/DDS_TopicBase_Connector_T.h"
+#include "dds4ccm/impl/DataWriterListener_T.h"
+#include "dds4ccm/impl/Writer_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Write_T
@@ -55,6 +55,6 @@ private:
   typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener;
 };
 
-#include "dds4ccm/impl/dds/DDS_Write_T.cpp"
+#include "dds4ccm/impl/DDS_Write_T.cpp"
 
 #endif /* DDS_WRITE_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
index 627cec340b4..627cec340b4 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
index 50630e7221a..52c5ec6ceb7 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataListenerControl_T.h
@@ -42,7 +42,7 @@ protected:
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CCM_DDS::DataNumber_t> max_delivered_data_;
 };
 
-#include "dds4ccm/impl/dds/DataListenerControl_T.cpp"
+#include "dds4ccm/impl/DataListenerControl_T.cpp"
 
 #endif /* DDS4CCM_DATALISTENERCONTROLI_H_  */
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
index d8a52b0b7ee..c37ec5d6598 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T (
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
index 44d96bc24c2..8db1fd368a0 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.h
@@ -58,6 +58,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataReaderHandler_T.cpp"
+#include "dds4ccm/impl/DataReaderHandler_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
index b0d7df62a2a..eca6b1d2a80 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 #include "ace/Reactor.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
index bc5c4f77b3e..bd05a5845f6 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
-#include "dds4ccm/impl/dds/PortStatusListener_T.h"
+#include "dds4ccm/impl/PortStatusListener_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
@@ -54,6 +54,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataReaderListener_T.cpp"
+#include "dds4ccm/impl/DataReaderListener_T.cpp"
 
 #endif /* DDS4CCM_DATAREADERLISTENER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index c61e4324bf1..5f13443f307 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DataReaderHandler_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
 #include <vector>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
index 18e1cf4bb3d..2249c867423 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
@@ -48,6 +48,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataReaderStateListener_T.cpp"
+#include "dds4ccm/impl/DataReaderStateListener_T.cpp"
 
 #endif /* DDS4CCM_DATAREADERSTATELISTENER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp
index 94d689fffc0..d6f38566597 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp
@@ -22,7 +22,7 @@
 #include "ndds/DataReaderQos.h"
 #include "ndds/StringSeq.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/DataReader_T.h
index d8570004c79..5520a7f03fe 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataReader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.h
@@ -12,9 +12,9 @@
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t;
@@ -227,6 +227,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataReader_T.cpp"
+#include "dds4ccm/impl/DataReader_T.cpp"
 
 #endif /* DDS_DATAREADER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataWriterListener_T.cpp
index 8c5db69056d..502c7309df9 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataWriterListener_T.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataWriter_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::DataWriterListener_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/DataWriterListener_T.h
index d6ec727260a..94878608212 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataWriterListener_T.h
@@ -67,6 +67,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataWriterListener_T.cpp"
+#include "dds4ccm/impl/DataWriterListener_T.cpp"
 
 #endif /* DDS_DATAWRITERLISTENER_T */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp
index 8b64feb7e61..50fca56fb84 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp
@@ -16,7 +16,7 @@
 #include "ndds/DataWriterQos.h"
 #include "ndds/SubscriptionBuiltinTopicData.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/DataWriter_T.h
index 65dd92fef36..61fb75e97f6 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataWriter_T.h
@@ -14,8 +14,8 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 #include "tao/LocalObject.h"
 
@@ -114,6 +114,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DataWriter_T.cpp"
+#include "dds4ccm/impl/DataWriter_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp
index a1426827b92..0889e7db6d1 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp
@@ -9,7 +9,7 @@
 
 #include "Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.h
index 8e24a5a2621..b1c75a772af 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.h
@@ -14,7 +14,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/LocalObject.h"
@@ -107,6 +107,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DomainParticipantFactory_T.cpp"
+#include "dds4ccm/impl/DomainParticipantFactory_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener.cpp
index 7dacd6c8f02..ecb21b31e3f 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener.cpp
@@ -12,7 +12,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener.h
index 0355ab70a88..0355ab70a88 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener_T.cpp
index 058bed9a386..e5be9e17a77 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener_T.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DataReaderHandler_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderHandler_T.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/ORB_Core.h"
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener_T.h
index 4bb1e8c0ae8..959e1a46430 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantListener_T.h
@@ -114,4 +114,4 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DomainParticipantListener_T.cpp"
+#include "dds4ccm/impl/DomainParticipantListener_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp
index c975278b1df..753a1b8fc41 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp
@@ -25,7 +25,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 #include "ace/CORBA_macros.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant_T.h b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.h
index 264a6077926..aa1a7b58237 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.h
@@ -16,8 +16,8 @@
 #include "tao/LocalObject.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include <map>
@@ -254,6 +254,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/DomainParticipant_T.cpp"
+#include "dds4ccm/impl/DomainParticipant_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
index 17c9e45ad7c..b7378196fff 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp
@@ -1,10 +1,10 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/ndds/Duration_t.h"
-#include "dds4ccm/impl/dds/ndds/SampleInfo.h"
+#include "dds4ccm/impl/ndds/Duration_t.h"
+#include "dds4ccm/impl/ndds/SampleInfo.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::Getter_Base_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h
index df093f2b6c0..17bd80a033b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Getter_T.h
@@ -147,6 +147,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Getter_T.cpp"
+#include "dds4ccm/impl/Getter_T.cpp"
 
 #endif /* GETTER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
index cd482c1d1a4..f33c8d7bd66 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataWriter_T.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
 CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::InstanceHandleManager_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
index 401c9bb25a6..c325b2b3b7c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h
+++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h
@@ -46,6 +46,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/InstanceHandleManager_T.cpp"
+#include "dds4ccm/impl/InstanceHandleManager_T.cpp"
 
 #endif /* INSTANCE_HANDLEMANGER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Log_Macros.cpp b/CIAO/connectors/dds4ccm/impl/Log_Macros.cpp
index 676cb7273d0..676cb7273d0 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Log_Macros.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Log_Macros.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/Log_Macros.h
index 7e35b37c7ee..ec7cae71c8b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Log_Macros.h
+++ b/CIAO/connectors/dds4ccm/impl/Log_Macros.h
@@ -12,7 +12,7 @@
 // default information printed with CIAO logging messages.
 
 #include "ciao/Logger/Log_Macros.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 
 #if !defined (CLINFO)
 #  define CLINFO "(%P|%t) [%M] - %T - "
diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
index 4998e63ad31..702faa2b693 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DataReaderHandler_T.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.h
index 14cbecb1e5a..eed0662dfb4 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.h
@@ -79,6 +79,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/PortStatusListener_T.cpp"
+#include "dds4ccm/impl/PortStatusListener_T.cpp"
 
 #endif /* DDS4CCM_PORTSTATUSLISTENER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
index 4abf4a6651c..21cde9204cb 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
@@ -1,9 +1,9 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DataReaderHandler_T.h"
-#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DataReaderHandler_T.h"
+#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 #include "tao/ORB_Core.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.h
index e352c86084c..f00675ef51f 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.h
@@ -77,7 +77,7 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/PublisherListener_T.cpp"
+#include "dds4ccm/impl/PublisherListener_T.cpp"
 
 #endif /* DDS_PUBLISHERLISTENER_T_H_ */
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher_T.cpp b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp
index 46e69acf3b0..4749993727c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Publisher_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp
@@ -16,7 +16,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher_T.h b/CIAO/connectors/dds4ccm/impl/Publisher_T.h
index 1b83d89ae15..e8edf84996b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Publisher_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Publisher_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -150,6 +150,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Publisher_T.cpp"
+#include "dds4ccm/impl/Publisher_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition_T.cpp b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp
index 61cc1e92fc6..b64e4a0ce2c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp
@@ -7,7 +7,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition_T.h b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.h
index d6631973f3c..13d3b4ab41b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition_T.h
+++ b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -79,6 +79,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/QueryCondition_T.cpp"
+#include "dds4ccm/impl/QueryCondition_T.cpp"
 
 #endif /* DDS4CCM_QUERYCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition_T.cpp b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp
index 19216292045..19216292045 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition_T.h b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.h
index 3505d72af6e..e75a8160689 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -71,6 +71,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/ReadCondition_T.cpp"
+#include "dds4ccm/impl/ReadCondition_T.cpp"
 
 #endif /* DDS4CCM_READCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
index d7b2a802daf..e4f6475fd5c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/DataReader_T.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/DataReader_T.h"
 
-#include "dds4ccm/impl/dds/ndds/SampleInfo.h"
-#include "dds4ccm/impl/dds/ndds/StringSeq.h"
+#include "dds4ccm/impl/ndds/SampleInfo.h"
+#include "dds4ccm/impl/ndds/StringSeq.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED>::Reader_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.h b/CIAO/connectors/dds4ccm/impl/Reader_T.h
index 0b1c6d4e6ed..97e5fa42385 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Reader_T.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
-#include "dds4ccm/impl/dds/DataReader_T.h"
+#include "dds4ccm/impl/DataReader_T.h"
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t;
@@ -84,7 +84,7 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Reader_T.cpp"
+#include "dds4ccm/impl/Reader_T.cpp"
 
 #endif /* DDS_READER_T */
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
index ec778903502..ec778903502 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
index bbee0e73a71..722675f6ded 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h
+++ b/CIAO/connectors/dds4ccm/impl/StateListenerControl_T.h
@@ -4,7 +4,7 @@
 #ifndef DDS4CCM_STATELISTENERCONTROLI_H_
 #define DDS4CCM_STATELISTENERCONTROLI_H_
 
-#include "dds4ccm/impl/dds/DataListenerControl_T.h"
+#include "dds4ccm/impl/DataListenerControl_T.h"
 #include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -32,7 +32,7 @@ private:
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CORBA::Boolean> is_filter_interpreted_;
 };
 
-#include "dds4ccm/impl/dds/StateListenerControl_T.cpp"
+#include "dds4ccm/impl/StateListenerControl_T.cpp"
 
 #endif /* DDS4CCM_STATELISTENERCONTROLI_H_  */
 
diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp
index 600a6621f81..61dc222ddc1 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/StatusCondition.h
index f3caf0d4c97..07284e04b52 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/StatusCondition.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
index a50d7bb73f6..7d8ea2935e5 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
-#include "dds4ccm/impl/dds/Log_Macros.h"
-#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Log_Macros.h"
+#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
+#include "dds4ccm/impl/Utils.h"
 #include "tao/ORB_Core.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.h
index bbb72ae0f17..7ac7c2e798b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.h
@@ -83,6 +83,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/SubscriberListener_T.cpp"
+#include "dds4ccm/impl/SubscriberListener_T.cpp"
 
 #endif /* DDS_SUBSCRIBERLISTENER_T_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber_T.cpp b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp
index 10f7122ec15..99afb3fdb31 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp
@@ -16,7 +16,7 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber_T.h b/CIAO/connectors/dds4ccm/impl/Subscriber_T.h
index 2d6f3fb2bf7..c22d205afe0 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Subscriber_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #include "tao/LocalObject.h"
@@ -201,6 +201,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Subscriber_T.cpp"
+#include "dds4ccm/impl/Subscriber_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
index e6f1050e518..e6f1050e518 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h
+++ b/CIAO/connectors/dds4ccm/impl/TimeUtilities.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription_T.cpp b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp
index c4bee918e67..b337ccbbeca 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp
@@ -4,7 +4,7 @@
 #include "DomainParticipant_T.h"
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 namespace CIAO
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription_T.h b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.h
index 5b6abcfc6af..b6506223d47 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription_T.h
+++ b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_NDDS==1)
@@ -67,6 +67,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/TopicDescription_T.cpp"
+#include "dds4ccm/impl/TopicDescription_T.cpp"
 
 #endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
index 78b8753ae05..624c2c46c92 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
@@ -1,9 +1,9 @@
 // $Id$
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
-#include "dds4ccm/impl/dds/Topic_T.h"
-#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Topic_T.h"
+#include "dds4ccm/impl/DDSCallbackStatusHandler.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::TopicListener_T (
diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h b/CIAO/connectors/dds4ccm/impl/TopicListener_T.h
index ec48ba9fb58..754a8e6f605 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/TopicListener_T.h
@@ -44,4 +44,4 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/TopicListener_T.cpp"
+#include "dds4ccm/impl/TopicListener_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic_T.cpp b/CIAO/connectors/dds4ccm/impl/Topic_T.cpp
index 13ee7585bce..3f9657f374c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Topic_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Topic_T.cpp
@@ -9,7 +9,7 @@
 #include "ndds/InconsistentTopicStatus.h"
 #include "ndds/TopicQos.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic_T.h b/CIAO/connectors/dds4ccm/impl/Topic_T.h
index e6b728c092d..993da1dffbf 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Topic_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Topic_T.h
@@ -12,7 +12,7 @@
 
 #include "DomainParticipant_T.h"
 
-#include "dds4ccm/impl/dds/dds4ccm_dds_impl_export.h"
+#include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "tao/LocalObject.h"
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
@@ -80,6 +80,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Topic_T.cpp"
+#include "dds4ccm/impl/Topic_T.cpp"
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
index 21243c5d379..559720f4828 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h"
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/DataWriter_T.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::Updater_T (void)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/Updater_T.h
index 3b60e71ede8..172f9e58c75 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Updater_T.h
@@ -86,6 +86,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Updater_T.cpp"
+#include "dds4ccm/impl/Updater_T.cpp"
 
 #endif /* DDS4CCM_UPDATER_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/Utils.cpp
index 0f270083afb..0f270083afb 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Utils.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.h b/CIAO/connectors/dds4ccm/impl/Utils.h
index a4d2c1a5f1a..a4d2c1a5f1a 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Utils.h
+++ b/CIAO/connectors/dds4ccm/impl/Utils.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
index 9727a401c73..784938637ef 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h"
+#include "dds4ccm/impl/DataWriter_T.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/Coherent_Changes_Guard.h"
 
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 
-#include "dds4ccm/impl/dds/Log_Macros.h"
+#include "dds4ccm/impl/Log_Macros.h"
 template <typename DDS_TYPE, typename CCM_TYPE >
 CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::Writer_T (void)
   : InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type> (),
diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/Writer_T.h
index 5164a8a2bdc..23c4d9c45aa 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h
+++ b/CIAO/connectors/dds4ccm/impl/Writer_T.h
@@ -59,6 +59,6 @@ namespace CIAO
   }
 }
 
-#include "dds4ccm/impl/dds/Writer_T.cpp"
+#include "dds4ccm/impl/Writer_T.cpp"
 
 #endif /* WRITER_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_dds_impl_export.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
index c22f3ecbe8f..c22f3ecbe8f 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_dds_impl_export.h
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_dds_impl_export.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
index f3fdc892466..f3fdc892466 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
index b9499075d09..b9499075d09 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
index 8df844a7386..8df844a7386 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
index 28eef81e587..28eef81e587 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
index 59baeba5405..59baeba5405 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
index b28d8bedf75..b28d8bedf75 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
index 5a392830c03..5a392830c03 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
index e6f8429ca35..e6f8429ca35 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
index 08ad411e188..08ad411e188 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
index 9686b01e59d..9686b01e59d 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
index 597339c10ab..597339c10ab 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
index 356de511292..356de511292 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
index c8c63445f29..c8c63445f29 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
index d2140f4ca63..d2140f4ca63 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
index 6946874f57c..6946874f57c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
index 6a95c92a610..6a95c92a610 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index 8b2517eaa35..8b2517eaa35 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
index 27900434e79..27900434e79 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
index 53220c3b745..53220c3b745 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
index a588bb4cf31..a588bb4cf31 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
index dff10ab7ab3..dff10ab7ab3 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
index 18b56dae8cf..18b56dae8cf 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/OctetSeq.h
index ed0cc97a018..ed0cc97a018 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OctetSeq.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
index 164d6a571c4..164d6a571c4 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
index 9b6391a747b..9b6391a747b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
index eec42c30ed1..eec42c30ed1 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
index 77401f1d9e2..77401f1d9e2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ParticipantBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/ParticipantBuiltinTopicData.h
index 67600ad3858..67600ad3858 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ParticipantBuiltinTopicData.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ParticipantBuiltinTopicData.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
index 0059665c277..0059665c277 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
index 7d5ab4fc283..7d5ab4fc283 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
index ce578f36e82..ce578f36e82 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
index 2374f58d2c2..2374f58d2c2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
index 6a129795137..6a129795137 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index 5a6224d84a7..5a6224d84a7 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
index 8d0ab08b72a..8d0ab08b72a 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
index d4253585857..d4253585857 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliableReaderActivityChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h
index 113a27393a7..d5611558b9c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliableReaderActivityChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliableReaderActivityChangedStatus.h
@@ -9,7 +9,7 @@
 #ifndef DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H
 #define DDS4CCM_RELIABLEREADERACTIVITYCHANGEDSTATUS_H
 
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
 #if (CIAO_DDS4CCM_OPENDDS==1)
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliableWriterCacheChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliableWriterCacheChangedStatus.h
index 31e8653b8be..31e8653b8be 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliableWriterCacheChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliableWriterCacheChangedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
index 9d26f544d4b..9d26f544d4b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
index d36b9d7da1c..d36b9d7da1c 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
index f7d2f2dd1f0..f7d2f2dd1f0 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
index 5b1122e1db8..5b1122e1db8 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
index 6191c745c17..6191c745c17 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
index 2467b100e13..2467b100e13 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
index 6fcc769b4f2..6fcc769b4f2 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
index 9741f0b9682..9741f0b9682 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionBuiltinTopicData.h
index 06f39b23e4b..06f39b23e4b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionBuiltinTopicData.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
index a8d02d7a24d..a8d02d7a24d 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
index dfb3f711249..dfb3f711249 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
index c9c62c27372..c9c62c27372 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicBuiltinTopicData.h
index ca664800802..ca664800802 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicBuiltinTopicData.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicBuiltinTopicData.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
index 394b201ff77..394b201ff77 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
index 1cbc53d2b4b..1cbc53d2b4b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
index 3116b5f5bb5..3116b5f5bb5 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
index 9e4dc792d5d..9e4dc792d5d 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
index 6cecbb95c45..6cecbb95c45 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index a55f27ed648..cb18af378cc 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -9,8 +9,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
index 4e5d4a825a4..48098c463e2 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
@@ -10,7 +10,7 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index eb60c0b7c9f..256cec568cd 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
@@ -8,7 +8,7 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index 1c1d6ca38ff..61d65d8a0a4 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
@@ -8,7 +8,7 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
index 0b5d71c2410..5220b3a3a77 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
@@ -8,7 +8,7 @@
 
 #include "Base/Writer_BaseSupport.h"
 #include "Connector/Writer_Connector_conn.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_Writer_Sender_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
index cc779646b7f..5d840808919 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h
@@ -15,7 +15,7 @@
 
 #include "tao/LocalObject.h"
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
+#include "dds4ccm/impl/DataWriter_T.h"
 
 #include <map>
 
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
index 9eac6d1caf5..6096761030e 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h
@@ -3,8 +3,8 @@
 #if !defined DERIVED_CONNECTOR_T
 #define DERIVED_CONNECTOR_T
 
-#include "connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h"
-#include "connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h"
+#include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h"
+#include "connectors/dds4ccm/impl/DDS_State_Connector_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class MyEvent_Connector_T
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index 731d35d5f34..f6cd005c630 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -7,10 +7,10 @@
 
 #include "Base/Writer_BaseSupport.h"
 #include "Connector/Writer_Connector_conn.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
+#include "dds4ccm/impl/DataWriter_T.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index 4eac207c278..6d319f76199 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -6,7 +6,7 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 namespace CIAO_Keyed_Test_Receiver_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
index 9a2b105b0bc..903e38294d8 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp
@@ -5,7 +5,7 @@
 #include "NonChangeable_Component_exec.h"
 #include "Base/NonChangeable_BaseSupport.h"
 
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 #define DOMAIN_ID_IN_DP 56
 #define TOPIC_NAME_IN_DP "NonChangeable"
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
index 71ef9fe2195..b1e8cf54898 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h
@@ -3,7 +3,7 @@
 #ifndef DDS_PSAT_CONNECTOR_T
 #define DDS_PSAT_CONNECTOR_T
 
-#include "connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h"
+#include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
 class DDS_PSAT_Event_Connector_T
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index 60369c1271b..3ef7bca68d1 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
@@ -10,8 +10,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
index 2f6aa70e130..3cb1f53a21f 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
@@ -8,8 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
index 3713165c665..edc87480a5b 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h"
+#include "dds4ccm/impl/ndds/DeadlineQosPolicy.h"
 
 class DeadlinePolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
index 58887bc0311..dce04d58526 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h"
+#include "dds4ccm/impl/ndds/DestinationOrderQosPolicy.h"
 
 class DestinationOrderPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
index 84a3582c7fa..a79e834342a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h"
+#include "dds4ccm/impl/ndds/DomainParticipantFactoryQos.h"
 
 class DomainParticipantFactoryPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
index 9694f56b2b7..a4e24e29331 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DomainParticipantQos.h"
+#include "dds4ccm/impl/ndds/DomainParticipantQos.h"
 
 class DomainParticipantPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
index ab276d80429..054e8517805 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DataReaderQos.h"
+#include "dds4ccm/impl/ndds/DataReaderQos.h"
 
 class DatareaderPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
index e2ec969df10..058d9ea4695 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h"
+#include "dds4ccm/impl/ndds/DurabilityQosPolicy.h"
 
 class DurabilityPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
index 4b212a2745a..991a0a89d42 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h"
+#include "dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h"
 
 class DurabilityServicePolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
index dae8057bfb4..73052e3fa2f 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/Duration_t.h"
+#include "dds4ccm/impl/ndds/Duration_t.h"
 
 class Duration
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
index 23bf760321b..ba90494f1b9 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/DataWriterQos.h"
+#include "dds4ccm/impl/ndds/DataWriterQos.h"
 
 class DatawriterPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
index ef53fb43aea..0d96f895c69 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h"
+#include "dds4ccm/impl/ndds/EntityFactoryQosPolicy.h"
 
 class EntityFactoryPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
index ba5347e505e..bc7c6df7aeb 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h"
+#include "dds4ccm/impl/ndds/GroupDataQosPolicy.h"
 
 class GroupDataPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
index 0290a8bd519..8330c6b7586 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/HistoryQosPolicy.h"
+#include "dds4ccm/impl/ndds/HistoryQosPolicy.h"
 
 class HistoryPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
index be70a034310..5d785b6b958 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h"
+#include "dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h"
 
 class LatencyBudgetPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
index 482a2927450..11947108ee5 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/LifespanQosPolicy.h"
+#include "dds4ccm/impl/ndds/LifespanQosPolicy.h"
 
 class LifespanPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
index a1d9208879c..44bad6846a1 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h"
+#include "dds4ccm/impl/ndds/LivelinessQosPolicy.h"
 
 class LivelinessPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
index 62401a7630d..32193296cdb 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/OctetSeq.h"
+#include "dds4ccm/impl/ndds/OctetSeq.h"
 
 class OctetSequence
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
index 1307c7f6037..a08fb121043 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h"
+#include "dds4ccm/impl/ndds/OwnershipQosPolicy.h"
 
 class OwnershipPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
index 36e3169b594..db36da6795f 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h"
+#include "dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h"
 
 class OwnershipStrengthPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
index 6fef89f535d..5fc8a3fc652 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/PartitionQosPolicy.h"
+#include "dds4ccm/impl/ndds/PartitionQosPolicy.h"
 
 class PartitionPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
index 4359e25632c..720c6468fda 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/PresentationQosPolicy.h"
+#include "dds4ccm/impl/ndds/PresentationQosPolicy.h"
 
 class PresentationPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
index c2d022aff88..cfbbc5860a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/PublisherQos.h"
+#include "dds4ccm/impl/ndds/PublisherQos.h"
 
 class PublisherPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
index 314704e1e96..b25c6698ae7 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h"
+#include "dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h"
 
 class ReaderDataLifecyclePolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
index d325f489c90..afa1451a3df 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h"
+#include "dds4ccm/impl/ndds/ReliabilityQosPolicy.h"
 
 class ReliabilityPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
index a430ee30034..6ce279bb2fd 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h"
+#include "dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h"
 
 class ResourceLimitsPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
index dc85ffdd582..b32b49b5954 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h
@@ -6,7 +6,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/SubscriberQos.h"
+#include "dds4ccm/impl/ndds/SubscriberQos.h"
 
 class SubscriberPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
index f42d8aaf7e0..e8a615ce173 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h"
+#include "dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h"
 
 class TimeBasedFilterPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
index 2ccb36be118..9fb34e72ae8 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h"
+#include "dds4ccm/impl/ndds/TopicDataQosPolicy.h"
 
 class TopicDataPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
index 0508102b8e3..50cbcc9b991 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/TopicQos.h"
+#include "dds4ccm/impl/ndds/TopicQos.h"
 
 class TopicPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
index 358dd62388f..b8d9b700cc3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h"
+#include "dds4ccm/impl/ndds/TransportPriorityQosPolicy.h"
 
 class TransportPriorityPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
index c56c94f48f9..4b65510553e 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/UserDataQosPolicy.h"
+#include "dds4ccm/impl/ndds/UserDataQosPolicy.h"
 
 class UserDataPolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
index ac8674525f0..a8ae2d8fcd3 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
@@ -5,7 +5,7 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ndds/ndds_cpp.h"
-#include "dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h"
+#include "dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h"
 
 class WriterDataLifecyclePolicyTest
 {
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
index 3857f5f422b..3565cbc0c70 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.cpp
@@ -6,7 +6,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
index 6bcfdc94b69..a7aaecc132f 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
@@ -5,7 +5,7 @@
 
 #include "ace/OS_NS_unistd.h"
 #include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
 {
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 581b177762d..522bfbb65c2 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
@@ -8,8 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 namespace CIAO_SL_Disabled_Receiver_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
index d0d8e720e88..494596b9b97 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
@@ -8,8 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 namespace CIAO_SL_ManyByMany_Receiver_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index bdffb208313..2021ed3f03d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -8,8 +8,8 @@
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
index d243b915ef9..52154191907 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp
@@ -6,7 +6,7 @@
 #include "Base/SetConnectorAttribute_BaseSupport.h"
 #include "Connector/SetConnectorAttribute_Connector_conn.h"
 
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 #define DOMAIN_ID_IN_DP 56
 #define TOPIC_NAME_IN_DP "SetConnectorAttribute"
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
index 1b287795aa5..6ec2052b6eb 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.h
@@ -14,7 +14,7 @@
 
 #include "tao/LocalObject.h"
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
+#include "dds4ccm/impl/DataWriter_T.h"
 
 namespace CIAO_SetConnectorAttribute_SetConnectorAttributeComponent_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
index 5d3db24d3bf..506829dcd81 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
@@ -6,7 +6,7 @@
 
 #include "Base/BaseSupport.h"
 
-#include "dds4ccm/impl/dds/DataWriter.h"
+#include "dds4ccm/impl/DataWriter.h"
 
 namespace CIAO_SharedDP_SharedDPComponent_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
index 5d4106176f5..1094d748f79 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
@@ -10,7 +10,7 @@
 
 #include "Base/BaseSupport.h"
 
-#include "dds4ccm/impl/dds/DataWriter_T.h"
+#include "dds4ccm/impl/DataWriter_T.h"
 
 const char * tp_name_conn_1_ = "SharedDP";
 const char * tp_name_conn_2_ = "SharedDP";
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
index 338ad6e0d52..8eaf1e069ad 100644
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 #include "ace/OS_NS_sys_time.h"
 
 int
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index fb3f9792ae6..adf194d81ac 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -7,8 +7,8 @@
 #include "ace/Log_Msg.h"
 
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/Utils.h"
+#include "dds4ccm/impl/TimeUtilities.h"
 
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
index d50ca32ae67..582b79fb758 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
@@ -6,7 +6,7 @@
 
 #include "VTopic_Receiver_exec.h"
 #include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_VTopic_Receiver_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
index b41127ab77a..1417d35b487 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
@@ -5,7 +5,7 @@
 //Test different topic types, with DDS_EVENT connectors,  look for 'PUBLICATION_MATCHED_STATUS
 #include "VTopic_Sender_exec.h"
 #include "ace/Log_Msg.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_VTopic_Sender_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
index 81f4d6f1fd5..933d13c2e5c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
@@ -5,7 +5,7 @@
 //Test for different topic types , with DDS_STATE connector, look for 'SUBSCRIPTION_MATCHED_STATUS
 
 #include "VTopics_Receiver_exec.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 
 namespace CIAO_VTopics_Receiver_Impl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
index 059372ba636..77ccb8eac3d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
@@ -4,7 +4,7 @@
 
 //Test different topic types, with DDS_STATE connector, look for 'PUBLICATION_MATCHED_STATUS
 #include "VTopics_Sender_exec.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/Utils.h"
 
 namespace CIAO_VTopics_Sender_Impl
 {