Wed Feb 24 15:01:17 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h:
        * connectors/dds4ccm/impl/ndds/DataReader.h:
        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h:
        * connectors/dds4ccm/impl/ndds/DataReaderListener.h:
        * connectors/dds4ccm/impl/ndds/DataReaderQos.h:
        * connectors/dds4ccm/impl/ndds/DataWriter.h:
        * connectors/dds4ccm/impl/ndds/DataWriterListener.h:
        * connectors/dds4ccm/impl/ndds/DataWriterQos.h:
        * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h:
        * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/Duration_t.h:
        * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h:
        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h:
        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h:
        * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h:
        * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h:
        * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h:
        * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h:
        * connectors/dds4ccm/impl/ndds/Publisher.h:
        * connectors/dds4ccm/impl/ndds/PublisherListener.h:
        * connectors/dds4ccm/impl/ndds/PublisherQos.h:
        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h:
        * connectors/dds4ccm/impl/ndds/QueryCondition.h:
        * connectors/dds4ccm/impl/ndds/ReadCondition.h:
        * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/SampleLostStatus.h:
        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h:
        * connectors/dds4ccm/impl/ndds/StatusCondition.h:
        * connectors/dds4ccm/impl/ndds/StringSeq.h:
        * connectors/dds4ccm/impl/ndds/Subscriber.h:
        * connectors/dds4ccm/impl/ndds/SubscriberListener.h:
        * connectors/dds4ccm/impl/ndds/SubscriberQos.h:
        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h:
        * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/Time_t.h:
        * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/TopicListener.h:
        * connectors/dds4ccm/impl/ndds/TopicQos.h:
        * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h:
          Implemented Qos operators and renamed header defines.

63 files changed, 430 insertions, 195 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 50dca549ee0..d50de02c7e2 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,69 @@
+Wed Feb 24 15:01:17 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h:
+        * connectors/dds4ccm/impl/ndds/DataReader.h:
+        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h:
+        * connectors/dds4ccm/impl/ndds/DataReaderListener.h:
+        * connectors/dds4ccm/impl/ndds/DataReaderQos.h:
+        * connectors/dds4ccm/impl/ndds/DataWriter.h:
+        * connectors/dds4ccm/impl/ndds/DataWriterListener.h:
+        * connectors/dds4ccm/impl/ndds/DataWriterQos.h:
+        * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h:
+        * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/Duration_t.h:
+        * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h:
+        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h:
+        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h:
+        * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h:
+        * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h:
+        * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h:
+        * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h:
+        * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h:
+        * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h:
+        * connectors/dds4ccm/impl/ndds/Publisher.h:
+        * connectors/dds4ccm/impl/ndds/PublisherListener.h:
+        * connectors/dds4ccm/impl/ndds/PublisherQos.h:
+        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h:
+        * connectors/dds4ccm/impl/ndds/QueryCondition.h:
+        * connectors/dds4ccm/impl/ndds/ReadCondition.h:
+        * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h:
+        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h:
+        * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/SampleLostStatus.h:
+        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h:
+        * connectors/dds4ccm/impl/ndds/StatusCondition.h:
+        * connectors/dds4ccm/impl/ndds/StringSeq.h:
+        * connectors/dds4ccm/impl/ndds/Subscriber.h:
+        * connectors/dds4ccm/impl/ndds/SubscriberListener.h:
+        * connectors/dds4ccm/impl/ndds/SubscriberQos.h:
+        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h:
+        * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/Time_t.h:
+        * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/TopicListener.h:
+        * connectors/dds4ccm/impl/ndds/TopicQos.h:
+        * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h:
+          Implemented Qos operators and renamed header defines.
+
 Wed Feb 24 14:36:37 UTC 2010  William R. Otte <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tools/Split_Plan/Split_Plan_impl.h:
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
new file mode 100644
index 00000000000..3c12b7008f9
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
@@ -0,0 +1,38 @@
+                                      /**
+ * @author Marcel Smit <msmit@dre.vanderbilt.edu>
+ *
+ * $Id$
+ *
+ */
+
+#ifndef BUILTINTOPICKEY_T_H
+#define BUILTINTOPICKEY_T_H
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+inline void
+operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey)
+{
+  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
+}
+
+inline void
+operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey)
+{
+  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
+}
+
+inline void
+operator>>= (const ::DDS_BuiltinTopicKey_t &builtintopickey, ::DDS::BuiltinTopicKey_t & ddsbuiltintopickey)
+{
+  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
+}
+
+inline void
+operator>>= (const ::DDS::BuiltinTopicKey_t &builtintopickey, ::DDS_BuiltinTopicKey_t & ddsbuiltintopickey)
+{
+  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
+}
+
+#endif
+
+#endif /* BUILTINTOPICKEY_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index d7e1a43722f..ace577ce6e3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAREADER_H
-#define CIAO_RTI_DATAREADER_H
+#ifndef DDS4CCM_DATAREADER_H
+#define DDS4CCM_DATAREADER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
index 6c4d0ed9724..929f9cea0df 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
@@ -8,8 +8,8 @@
  * received data from DDS.
  */
 
-#ifndef CIAO_RTI_DATAREADERHANDLER_T_H
-#define CIAO_RTI_DATAREADERHANDLER_T_H
+#ifndef DDS4CCM_DATAREADERHANDLER_T_H
+#define DDS4CCM_DATAREADERHANDLER_T_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Event_Handler.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
index b236c576f1a..a65d2e37931 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAREADERLISTENER_H
-#define CIAO_RTI_DATAREADERLISTENER_H
+#ifndef DDS4CCM_DATAREADERLISTENER_H
+#define DDS4CCM_DATAREADERLISTENER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
index 948dc8399d3..23df656a4f8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAREADERQOS_H
-#define CIAO_RTI_DATAREADERQOS_H
+#ifndef DDS4CCM_DATAREADERQOS_H
+#define DDS4CCM_DATAREADERQOS_H
 
 #include "DurabilityQosPolicy.h"
 #include "DeadlineQosPolicy.h"
@@ -96,4 +96,4 @@ operator>>= (const ::DDS::DataReaderQos &qos, ::DDS_DataReaderQos & ddsqos)
 }
 #endif
 
-#endif /* CIAO_RTI_DATAREADERQOS_H */
+#endif /* DDS4CCM_DATAREADERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index 996477acc4a..30ee9a94b12 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAWRITER_H
-#define CIAO_RTI_DATAWRITER_H
+#ifndef DDS4CCM_DATAWRITER_H
+#define DDS4CCM_DATAWRITER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
index fd22b9a76fa..fc0751bc1f2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAWRITERLISTENER_H
-#define CIAO_RTI_DATAWRITERLISTENER_H
+#ifndef DDS4CCM_DATAWRITERLISTENER_H
+#define DDS4CCM_DATAWRITERLISTENER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
index 3cc9547a02f..a12804a4789 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DATAWRITERQOS_H
-#define CIAO_RTI_DATAWRITERQOS_H
+#ifndef DDS4CCM_DATAWRITERQOS_H
+#define DDS4CCM_DATAWRITERQOS_H
 
 #include "DurabilityQosPolicy.h"
 #include "DurabilityServiceQosPolicy.h"
@@ -111,4 +111,4 @@ operator>>= (const ::DDS::DataWriterQos &qos, ::DDS_DataWriterQos & ddsqos)
 }
 #endif
 
-#endif /* CIAO_RTI_DATAWRITERQOS_H */
+#endif /* DDS4CCM_DATAWRITERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
index 28d9de8cfc5..83e5298f9fd 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DEADLINEQOSPOLICY_H
-#define CIAO_RTI_DEADLINEQOSPOLICY_H
+#ifndef DDS4CCM_DEADLINEQOSPOLICY_H
+#define DDS4CCM_DEADLINEQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::DeadlineQosPolicy &qos, ::DDS_DeadlineQosPolicy & ddsq
 }
 #endif
 
-#endif /* CIAO_RTI_DEADLINEQOSPOLICY_H */
+#endif /* DDS4CCM_DEADLINEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
index bd0c080b85b..31dbeb1b32d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
-#define CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
+#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H
+#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::DestinationOrderQosPolicy &qos, ::DDS_DestinationOrder
 }
 #endif
 
-#endif /* CIAO_RTI_DESTINATIONORDERQOSPOLICY_H */
+#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
index ccdcd70779c..19ebdea5b16 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
-#define CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
+#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
+#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
 
 #include "EntityFactoryQosPolicy.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::DomainParticipantFactoryQos &qos, ::DDS_DomainParticip
 }
 #endif
 
-#endif /* CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
+#endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index 45661c47ba7..ef0b7f6aee9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DOMAINPARTICIPANTLISTENER_H
-#define CIAO_RTI_DOMAINPARTICIPANTLISTENER_H
+#ifndef DDS4CCM_DOMAINPARTICIPANTLISTENER_H
+#define DDS4CCM_DOMAINPARTICIPANTLISTENER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
index 8b76cc3d605..bc023e1c5e5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H
-#define CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H
+#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
+#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
 
 #include "UserDataQosPolicy.h"
 #include "EntityFactoryQosPolicy.h"
@@ -45,4 +45,4 @@ operator>>= (const ::DDS::DomainParticipantQos &qos, ::DDS_DomainParticipantQos
 }
 #endif
 
-#endif /* CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H */
+#endif /* DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
index cd3252356b0..6b56460f3db 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DURABILITYQOSPOLICY_H
-#define CIAO_RTI_DURABILITYQOSPOLICY_H
+#ifndef DDS4CCM_DURABILITYQOSPOLICY_H
+#define DDS4CCM_DURABILITYQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::DurabilityQosPolicy DDS_DurabilityQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::DurabilityQosPolicy &qos, ::DDS_DurabilityQosPolicy &
 }
 #endif
 
-#endif /* CIAO_RTI_DURABILITYQOSPOLICY_H */
+#endif /* DDS4CCM_DURABILITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
index 5fbb0dd73b8..f1bbc26325a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H
-#define CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H
+#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
+#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -61,4 +61,4 @@ operator>>= (const ::DDS::DurabilityServiceQosPolicy &qos, ::DDS_DurabilityServi
 }
 #endif
 
-#endif /* CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H */
+#endif /* DDS4CCM_DURABILITYSERVICEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
index 0488dd875e5..74d6815b2a7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_DURATION_T_H
-#define CIAO_RTI_DURATION_T_H
+#ifndef DDS4CCM_DURATION_T_H
+#define DDS4CCM_DURATION_T_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Duration_t DDS_Duration_t;
@@ -37,5 +37,5 @@ operator>>= (const ::DDS_Duration_t &duration, ::DDS::Duration_t & ddsduration)
 }
 #endif
 
-#endif /* CIAO_RTI_DURATION_T_H */
+#endif /* DDS4CCM_DURATION_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
index 5074e14909b..ec0a24a23f2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
-#define CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
+#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H
+#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::EntityFactoryQosPolicy DDS_EntityFactoryQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::EntityFactoryQosPolicy &qos, ::DDS_EntityFactoryQosPol
 }
 #endif
 
-#endif /* CIAO_RTI_ENTITYFACTORYQOSPOLICY_H */
+#endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
index 86a531443af..096016416e7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_GROUPDATAQOSPOLICY_H
-#define CIAO_RTI_GROUPDATAQOSPOLICY_H
+#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H
+#define DDS4CCM_GROUPDATAQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::GroupDataQosPolicy DDS_GroupDataQosPolicy;
@@ -20,7 +20,7 @@ operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy &
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -28,7 +28,7 @@ operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy &
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -36,7 +36,7 @@ operator>>= (const ::DDS_GroupDataQosPolicy &qos, ::DDS::GroupDataQosPolicy & dd
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -44,8 +44,8 @@ operator>>= (const ::DDS::GroupDataQosPolicy &qos, ::DDS_GroupDataQosPolicy & dd
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value));
 }
 #endif
 
-#endif /* CIAO_RTI_GROUPDATAQOSPOLICY_H */
+#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
index 43daab4ffbf..0a4ce342254 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_HISTORYQOSPOLICY_H
-#define CIAO_RTI_HISTORYQOSPOLICY_H
+#ifndef DDS4CCM_HISTORYQOSPOLICY_H
+#define DDS4CCM_HISTORYQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::HistoryQosPolicy DDS_HistoryQosPolicy;
@@ -43,4 +43,4 @@ operator>>= (const ::DDS::HistoryQosPolicy &qos, ::DDS_HistoryQosPolicy & ddsqos
 }
 #endif
 
-#endif /* CIAO_RTI_HISTORYQOSPOLICY_H */
+#endif /* DDS4CCM_HISTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
index 412879aabd9..841b28e1660 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_INCONSISTENTTOPICSTATUS_H
-#define CIAO_RTI_INCONSISTENTTOPICSTATUS_H
+#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H
+#define DDS4CCM_INCONSISTENTTOPICSTATUS_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus;
@@ -44,4 +44,4 @@ operator>>= (const ::DDS::InconsistentTopicStatus &status, ::DDS_InconsistentTop
 }
 #endif
 
-#endif /* CIAO_RTI_INCONSISTENTTOPICSTATUS_H */
+#endif /* DDS4CCM_INCONSISTENTTOPICSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
index a17871bc6eb..e5c49ba137c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_INSTANCEHANDLESEQ_H
-#define CIAO_RTI_INSTANCEHANDLESEQ_H
+#ifndef DDS4CCM_INSTANCEHANDLESEQ_H
+#define DDS4CCM_INSTANCEHANDLESEQ_H
 
 #include "InstanceHandle_t.h"
 
@@ -63,4 +63,4 @@ operator>>= (const ::DDS::InstanceHandleSeq &instancehandle, ::DDS_InstanceHandl
 }
 #endif
 
-#endif /* CIAO_RTI_INSTANCEHANDLESEQ_H */
+#endif /* DDS4CCM_INSTANCEHANDLESEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index 57f16af2658..ea731ea7f28 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_INSTANCEHANDLE_T_H
-#define CIAO_RTI_INSTANCEHANDLE_T_H
+#ifndef DDS4CCM_INSTANCEHANDLE_T_H
+#define DDS4CCM_INSTANCEHANDLE_T_H
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
@@ -103,4 +103,4 @@ operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_Instan
 }
 #endif
 
-#endif /* CIAO_RTI_INSTANCEHANDLE_T_H */
+#endif /* DDS4CCM_INSTANCEHANDLE_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
index 2f374a057e7..0aaee70207c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_LATENCYBUDGETQOSPOLICY_H
-#define CIAO_RTI_LATENCYBUDGETQOSPOLICY_H
+#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H
+#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::LatencyBudgetQosPolicy &qos, ::DDS_LatencyBudgetQosPol
 }
 #endif
 
-#endif /* CIAO_RTI_LATENCYBUDGETQOSPOLICY_H */
+#endif /* DDS4CCM_LATENCYBUDGETQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
index 5093f4b96df..a40e0cae31f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_LIFESPANQOSPOLICY_H
-#define CIAO_RTI_LIFESPANQOSPOLICY_H
+#ifndef DDS4CCM_LIFESPANQOSPOLICY_H
+#define DDS4CCM_LIFESPANQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::LifespanQosPolicy &qos, ::DDS_LifespanQosPolicy & ddsq
 }
 #endif
 
-#endif /* CIAO_RTI_LIFESPANQOSPOLICY_H */
+#endif /* DDS4CCM_LIFESPANQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
index b25544b2e48..6828b018a51 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_LIVELINESSCHANGEDSTATUS_H
-#define CIAO_RTI_LIVELINESSCHANGEDSTATUS_H
+#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H
+#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -58,4 +58,4 @@ operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChang
 }
 #endif
 
-#endif /* CIAO_RTI_LIVELINESSCHANGEDSTATUS_H */
+#endif /* DDS4CCM_LIVELINESSCHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
index 8a7605c7f1d..6561f6fe2c4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_LIVELINESSLOSTSTATUS_H
-#define CIAO_RTI_LIVELINESSLOSTSTATUS_H
+#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H
+#define DDS4CCM_LIVELINESSLOSTSTATUS_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
@@ -44,4 +44,4 @@ operator>>= (const ::DDS::LivelinessLostStatus &status, ::DDS_LivelinessLostStat
 }
 #endif
 
-#endif /* CIAO_RTI_LIVELINESSLOSTSTATUS_H */
+#endif /* DDS4CCM_LIVELINESSLOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
index 895e4d09b44..ec3121e9efb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_LIVELINESSQOSPOLICY_H
-#define CIAO_RTI_LIVELINESSQOSPOLICY_H
+#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H
+#define DDS4CCM_LIVELINESSQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -45,4 +45,4 @@ operator>>= (const ::DDS::LivelinessQosPolicy &qos, ::DDS_LivelinessQosPolicy &
 }
 #endif
 
-#endif /* CIAO_RTI_LIVELINESSQOSPOLICY_H */
+#endif /* DDS4CCM_LIVELINESSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
index 7a301519e91..8c242eec417 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H
-#define CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H
+#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
+#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -50,4 +50,4 @@ operator>>= (const ::DDS::OfferedDeadlineMissedStatus &status, ::DDS_OfferedDead
 }
 #endif
 
-#endif /* CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H */
+#endif /* DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
index 12a1d37db47..4ac14dc690b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H
-#define CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H
+#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
+#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
 
 #include "QosPolicyCountSeq.h"
 
@@ -54,4 +54,4 @@ operator>>= (const ::DDS::OfferedIncompatibleQosStatus &status, ::DDS_OfferedInc
 }
 #endif
 
-#endif /* CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H */
+#endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
index eb3764c9efe..1553d5d4ddb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_OWNERSHIPQOSPOLICY_H
-#define CIAO_RTI_OWNERSHIPQOSPOLICY_H
+#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H
+#define DDS4CCM_OWNERSHIPQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::OwnershipQosPolicy DDS_OwnershipQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::OwnershipQosPolicy &qos, ::DDS_OwnershipQosPolicy & dd
 }
 #endif
 
-#endif /* CIAO_RTI_OWNERSHIPQOSPOLICY_H */
+#endif /* DDS4CCM_OWNERSHIPQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
index 3345c0c99c0..64e905a4faa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
-#define CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
+#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
+#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::OwnershipStrengthQosPolicy DDS_OwnershipStrengthQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::OwnershipStrengthQosPolicy &qos, ::DDS_OwnershipStreng
 }
 #endif
 
-#endif /* CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H */
+#endif /* DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
index 2f7e71be1f8..49a84ebc20c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
@@ -6,8 +6,10 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PARTITIONQOSPOLICY_H
-#define CIAO_RTI_PARTITIONQOSPOLICY_H
+#ifndef DDS4CCM_PARTITIONQOSPOLICY_H
+#define DDS4CCM_PARTITIONQOSPOLICY_H
+
+#include "dds4ccm/impl/ndds/StringSeq.h"
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy;
@@ -17,34 +19,26 @@ typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy;
 inline void
 operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos)
 {
-  ACE_UNUSED_ARG (ddsqos);
-  ACE_UNUSED_ARG (qos);
-//  ddsqos.name <<= qos.name;
+  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos)
 {
-  ACE_UNUSED_ARG (ddsqos);
-  ACE_UNUSED_ARG (qos);
-//  ddsqos.name <<= qos.name;
+  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator>>= (const ::DDS_PartitionQosPolicy &qos, ::DDS::PartitionQosPolicy & ddsqos)
 {
-  ACE_UNUSED_ARG (ddsqos);
-  ACE_UNUSED_ARG (qos);
-//  ddsqos.name <<= qos.name;
+  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator>>= (const ::DDS::PartitionQosPolicy &qos, ::DDS_PartitionQosPolicy & ddsqos)
 {
-  ACE_UNUSED_ARG (ddsqos);
-  ACE_UNUSED_ARG (qos);
-//  ddsqos.name <<= qos.name;
+  ddsqos.name <<= qos.name;
 }
 #endif
 
-#endif /* CIAO_RTI_PARTITIONQOSPOLICY_H */
+#endif /* DDS4CCM_PARTITIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
index 992f08bb832..b2018f2ec82 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PRESENTATIONQOSPOLICY_H
-#define CIAO_RTI_PRESENTATIONQOSPOLICY_H
+#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H
+#define DDS4CCM_PRESENTATIONQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy;
@@ -17,6 +17,7 @@ typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy;
 inline void
 operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos)
 {
+  ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -24,6 +25,7 @@ operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPo
 inline void
 operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos)
 {
+  ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -31,6 +33,7 @@ operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPo
 inline void
 operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolicy & ddsqos)
 {
+  ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -38,9 +41,10 @@ operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolic
 inline void
 operator>>= (const ::DDS::PresentationQosPolicy &qos, ::DDS_PresentationQosPolicy & ddsqos)
 {
+  ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
 #endif
 
-#endif /* CIAO_RTI_PRESENTATIONQOSPOLICY_H */
+#endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
new file mode 100644
index 00000000000..ddae0d255e0
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
@@ -0,0 +1,110 @@
+/**
+ * @author Marcel Smit <msmit@remedy.nl>
+ *
+ * $Id$
+ *
+ */
+
+#ifndef PUBLICATIONBUILTINTOPICDATA_H_
+#define PUBLICATIONBUILTINTOPICDATA_H_
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+inline void
+operator<<= (::DDS::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & topicdata)
+{
+  ddstopicdata.key <<= topicdata.key;
+  ddstopicdata.participant_key <<= topicdata.participant_key;
+  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
+  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
+  ddstopicdata.durability <<= topicdata.durability;
+  ddstopicdata.durability_service <<= topicdata.durability_service;
+  ddstopicdata.deadline <<= topicdata.deadline;
+  ddstopicdata.latency_budget <<= topicdata.latency_budget;
+  ddstopicdata.liveliness <<= topicdata.liveliness;
+  ddstopicdata.reliability <<= topicdata.reliability;
+  ddstopicdata.lifespan <<= topicdata.lifespan;
+  ddstopicdata.user_data <<= topicdata.user_data;
+  ddstopicdata.ownership <<= topicdata.ownership;
+  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
+  ddstopicdata.destination_order <<= topicdata.destination_order;
+  ddstopicdata.presentation <<= topicdata.presentation;
+  ddstopicdata.partition <<= topicdata.partition;
+  ddstopicdata.topic_data <<= topicdata.topic_data;
+  ddstopicdata.group_data <<= topicdata.group_data;
+}
+
+inline void
+operator<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & topicdata)
+{
+  topicdata.key <<= ddstopicdata.key;
+  topicdata.participant_key <<= ddstopicdata.participant_key;
+  topicdata.topic_name = CORBA::string_dup (ddstopicdata.topic_name);
+  topicdata.type_name = CORBA::string_dup (ddstopicdata.type_name);
+  topicdata.durability <<= ddstopicdata.durability;
+  topicdata.durability_service <<= ddstopicdata.durability_service;
+  topicdata.deadline <<= ddstopicdata.deadline;
+  topicdata.latency_budget <<= ddstopicdata.latency_budget;
+  topicdata.liveliness <<= ddstopicdata.liveliness;
+  topicdata.reliability <<= ddstopicdata.reliability;
+  topicdata.lifespan <<= ddstopicdata.lifespan;
+  topicdata.user_data <<= ddstopicdata.user_data;
+  topicdata.ownership <<= ddstopicdata.ownership;
+  topicdata.ownership_strength <<= ddstopicdata.ownership_strength;
+  topicdata.destination_order <<= ddstopicdata.destination_order;
+  topicdata.presentation <<= ddstopicdata.presentation;
+  topicdata.partition <<= ddstopicdata.partition;
+  topicdata.topic_data <<= ddstopicdata.topic_data;
+  topicdata.group_data <<= ddstopicdata.group_data;
+}
+
+inline void
+operator>>= (const ::DDS_PublicationBuiltinTopicData & topicdata, ::DDS::PublicationBuiltinTopicData & ddstopicdata)
+{
+  ddstopicdata.key <<= topicdata.key;
+  ddstopicdata.participant_key <<= topicdata.participant_key;
+  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
+  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
+  ddstopicdata.durability <<= topicdata.durability;
+  ddstopicdata.durability_service <<= topicdata.durability_service;
+  ddstopicdata.deadline <<= topicdata.deadline;
+  ddstopicdata.latency_budget <<= topicdata.latency_budget;
+  ddstopicdata.liveliness <<= topicdata.liveliness;
+  ddstopicdata.reliability <<= topicdata.reliability;
+  ddstopicdata.lifespan <<= topicdata.lifespan;
+  ddstopicdata.user_data <<= topicdata.user_data;
+  ddstopicdata.ownership <<= topicdata.ownership;
+  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
+  ddstopicdata.destination_order <<= topicdata.destination_order;
+  ddstopicdata.presentation <<= topicdata.presentation;
+  ddstopicdata.partition <<= topicdata.partition;
+  ddstopicdata.topic_data <<= topicdata.topic_data;
+  ddstopicdata.group_data <<= topicdata.group_data;
+}
+
+inline void
+operator>>= (const ::DDS::PublicationBuiltinTopicData & topicdata, ::DDS_PublicationBuiltinTopicData & ddstopicdata)
+{
+  ddstopicdata.key <<= topicdata.key;
+  ddstopicdata.participant_key <<= topicdata.participant_key;
+  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
+  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
+  ddstopicdata.durability <<= topicdata.durability;
+  ddstopicdata.durability_service <<= topicdata.durability_service;
+  ddstopicdata.deadline <<= topicdata.deadline;
+  ddstopicdata.latency_budget <<= topicdata.latency_budget;
+  ddstopicdata.liveliness <<= topicdata.liveliness;
+  ddstopicdata.reliability <<= topicdata.reliability;
+  ddstopicdata.lifespan <<= topicdata.lifespan;
+  ddstopicdata.user_data <<= topicdata.user_data;
+  ddstopicdata.ownership <<= topicdata.ownership;
+  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
+  ddstopicdata.destination_order <<= topicdata.destination_order;
+  ddstopicdata.presentation <<= topicdata.presentation;
+  ddstopicdata.partition <<= topicdata.partition;
+  ddstopicdata.topic_data <<= topicdata.topic_data;
+  ddstopicdata.group_data <<= topicdata.group_data;
+}
+
+#endif
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
index 972cabc140b..819a2d447aa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H
-#define CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H
+#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
+#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -58,4 +58,4 @@ operator>>= (const ::DDS::PublicationMatchedStatus &status, ::DDS_PublicationMat
 }
 #endif
 
-#endif /* CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H */
+#endif /* DDS4CCM_PUBLICATIONMATCHEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
index 24d218429a3..f090330c618 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PUBLISHER_H
-#define CIAO_RTI_PUBLISHER_H
+#ifndef DDS4CCM_PUBLISHER_H
+#define DDS4CCM_PUBLISHER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
index 84eee618d5a..4feaaeb4e31 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PUBLISHERLISTENER_H
-#define CIAO_RTI_PUBLISHERLISTENER_H
+#ifndef DDS4CCM_PUBLISHERLISTENER_H
+#define DDS4CCM_PUBLISHERLISTENER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
index d79631645f1..f948216ebe7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_PUBLISHERQOS_H
-#define CIAO_RTI_PUBLISHERQOS_H
+#ifndef DDS4CCM_PUBLISHERQOS_H
+#define DDS4CCM_PUBLISHERQOS_H
 
 #include "PresentationQosPolicy.h"
 #include "PartitionQosPolicy.h"
@@ -56,4 +56,4 @@ operator>>= (const ::DDS::PublisherQos &qos, ::DDS_PublisherQos & ddsqos)
 }
 #endif
 
-#endif /* CIAO_RTI_PUBLISHERQOS_H */
+#endif /* DDS4CCM_PUBLISHERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index 7e19f1b8fc1..01b6abd175c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_QOSPOLICYCOUNTSEQ_H
-#define CIAO_RTI_QOSPOLICYCOUNTSEQ_H
+#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H
+#define DDS4CCM_QOSPOLICYCOUNTSEQ_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq;
@@ -16,25 +16,48 @@ typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq;
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
-operator<<= (::DDS::QosPolicyCountSeq &/*ddsstatus*/, const ::DDS_QosPolicyCountSeq & /*status*/)
+operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount)
 {
-  // todo
+  ddspolicycount.length (policycount.length ());
+  for (::DDS_Long i = 0 ; i < policycount.length (); ++i)
+    {
+      ddspolicycount[i].policy_id = policycount[i].policy_id;
+      ddspolicycount[i].count = policycount[i].count;
+    }
 }
 
 inline void
-operator<<= (::DDS_QosPolicyCountSeq &/*ddsstatus*/, const ::DDS::QosPolicyCountSeq & /*status*/)
+operator<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount)
 {
+  ddspolicycount.length (policycount.length ());
+  for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i)
+    {
+      ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id);
+      ddspolicycount[i].count = policycount[i].count;
+    }
 }
 
 inline void
-operator>>= (const ::DDS_QosPolicyCountSeq &/*status*/, ::DDS::QosPolicyCountSeq & /*ddsstatus*/)
+operator>>= (const ::DDS_QosPolicyCountSeq & policycount, ::DDS::QosPolicyCountSeq & ddspolicycount)
 {
+  ddspolicycount.length (policycount.length ());
+  for (::DDS_Long i = 0 ; i < policycount.length (); ++i)
+    {
+      ddspolicycount[i].policy_id = policycount[i].policy_id;
+      ddspolicycount[i].count = policycount[i].count;
+    }
 }
 
 inline void
-operator>>= (const ::DDS::QosPolicyCountSeq &/*status*/, ::DDS_QosPolicyCountSeq & /*ddsstatus*/)
+operator>>= (const ::DDS::QosPolicyCountSeq & policycount, ::DDS_QosPolicyCountSeq & ddspolicycount)
 {
+  ddspolicycount.length (policycount.length ());
+  for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i)
+    {
+      ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id);
+      ddspolicycount[i].count = policycount[i].count;
+    }
 }
 #endif
 
-#endif /* CIAO_RTI_QOSPOLICYCOUNTSEQ_H */
+#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
index 7937023b30d..e7f7bd0dc17 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_QUERYCONDITION_H
-#define CIAO_RTI_QUERYCONDITION_H
+#ifndef DDS4CCM_QUERYCONDITION_H
+#define DDS4CCM_QUERYCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -80,4 +80,4 @@ namespace CIAO
   }
 }
 
-#endif /* CIAO_RTI_QUERYCONDITION_H */
+#endif /* DDS4CCM_QUERYCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
index d83633f2ed3..7bf2c6325b2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_READCONDITION_H
-#define CIAO_RTI_READCONDITION_H
+#ifndef DDS4CCM_READCONDITION_H
+#define DDS4CCM_READCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -69,4 +69,4 @@ namespace CIAO
   }
 }
 
-#endif /* CIAO_RTI_READCONDITION_H */
+#endif /* DDS4CCM_READCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
index d5f32c0b62d..b383e26b23c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
-#define CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
+#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
+#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::ReaderDataLifecycleQosPolicy DDS_ReaderDataLifecycleQosPolicy;
@@ -43,4 +43,4 @@ operator>>= (const ::DDS::ReaderDataLifecycleQosPolicy &qos, ::DDS_ReaderDataLif
 }
 #endif
 
-#endif /* CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H */
+#endif /* DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
index 9d3bf4d52d3..031474a4484 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_RELIABILITYSQOSPOLICY_H
-#define CIAO_RTI_RELIABILITYSQOSPOLICY_H
+#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H
+#define DDS4CCM_RELIABILITYSQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -45,4 +45,4 @@ operator>>= (const ::DDS::ReliabilityQosPolicy &qos, ::DDS_ReliabilityQosPolicy
 }
 #endif
 
-#endif /* CIAO_RTI_RELIABILITYSQOSPOLICY_H */
+#endif /* DDS4CCM_RELIABILITYSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
index 5445008aff6..fe0fa067115 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H
-#define CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H
+#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
+#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -50,4 +50,4 @@ operator>>= (const ::DDS::RequestedDeadlineMissedStatus &status, ::DDS_Requested
 }
 #endif
 
-#endif /* CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H */
+#endif /* DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
index 30281c0abbe..2300236f884 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H
-#define CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H
+#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
+#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
 
 #include "QosPolicyCountSeq.h"
 
@@ -54,4 +54,4 @@ operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_Requeste
 }
 #endif
 
-#endif /* CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
+#endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
index b0405998b0f..439c4c0047b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
-#define CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
+#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H
+#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::ResourceLimitsQosPolicy DDS_ResourceLimitsQosPolicy;
@@ -47,4 +47,4 @@ operator>>= (const ::DDS::ResourceLimitsQosPolicy &qos, ::DDS_ResourceLimitsQosP
 }
 #endif
 
-#endif /* CIAO_RTI_RESOURCELIMITSQOSPOLICY_H */
+#endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
index 096d92e1d0a..920f4051bd4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SAMPLELOSTSTATUS_H
-#define CIAO_RTI_SAMPLELOSTSTATUS_H
+#ifndef DDS4CCM_SAMPLELOSTSTATUS_H
+#define DDS4CCM_SAMPLELOSTSTATUS_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
@@ -30,5 +30,5 @@ operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & dds
 }
 #endif
 
-#endif /* CIAO_RTI_SAMPLELOSTSTATUS_H */
+#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
index 2f2d419e990..032aca41a8c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SAMPLEREJECTEDSTATUS_H
-#define CIAO_RTI_SAMPLEREJECTEDSTATUS_H
+#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H
+#define DDS4CCM_SAMPLEREJECTEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -54,4 +54,4 @@ operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStat
 }
 #endif
 
-#endif /* CIAO_RTI_SAMPLEREJECTEDSTATUS_H */
+#endif /* DDS4CCM_SAMPLEREJECTEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
index b10b437f864..1101549109a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_STATUSCONDITION_H
-#define CIAO_RTI_STATUSCONDITION_H
+#ifndef DDS4CCM_STATUSCONDITION_H
+#define DDS4CCM_STATUSCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -61,4 +61,4 @@ namespace CIAO
   }
 }
 
-#endif /* CIAO_RTI_STATUSCONDITION_H */
+#endif /* DDS4CCM_STATUSCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
index 613137c4433..6f75683fd3f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef CIAO_RTI_STRINGSEQ_T_H
-#define CIAO_RTI_STRINGSEQ_T_H
+#ifndef DDS4CCM_STRINGSEQ_T_H
+#define DDS4CCM_STRINGSEQ_T_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::StringSeq DDS_StringSeq;
@@ -40,4 +40,4 @@ operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_s
 }
 #endif
 
-#endif /* CIAO_RTI_STRINGSEQ_T_H */
+#endif /* DDS4CCM_STRINGSEQ_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
index 12e59f178ed..3465ecc0cef 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SUBSCRIBER_H
-#define CIAO_RTI_SUBSCRIBER_H
+#ifndef DDS4CCM_SUBSCRIBER_H
+#define DDS4CCM_SUBSCRIBER_H
 
 #include "tao/LocalObject.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
index aecff4d659d..6ccfa187656 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SUBSCRIBERLISTENER_H
-#define CIAO_RTI_SUBSCRIBERLISTENER_H
+#ifndef DDS4CCM_SUBSCRIBERLISTENER_H
+#define DDS4CCM_SUBSCRIBERLISTENER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
index c16c7b61542..4121a2569e4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SUBSCRIBERQOS_H
-#define CIAO_RTI_SUBSCRIBERQOS_H
+#ifndef DDS4CCM_SUBSCRIBERQOS_H
+#define DDS4CCM_SUBSCRIBERQOS_H
 
 #include "EntityFactoryQosPolicy.h"
 
@@ -53,4 +53,4 @@ operator>>= (const ::DDS::SubscriberQos &qos, ::DDS_SubscriberQos & ddsqos)
 }
 #endif
 
-#endif /* CIAO_RTI_SUBSCRIBERQOS_H */
+#endif /* DDS4CCM_SUBSCRIBERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
index b5c870524f3..01a6f04c5e7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H
-#define CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H
+#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
+#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
@@ -58,5 +58,5 @@ operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionM
 }
 #endif
 
-#endif /* CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H */
+#endif /* DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
index 542cbc72caa..19aaaf31251 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H
-#define CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H
+#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
+#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
 
 #include "Duration_t.h"
 
@@ -41,4 +41,4 @@ operator>>= (const ::DDS::TimeBasedFilterQosPolicy &qos, ::DDS_TimeBasedFilterQo
 }
 #endif
 
-#endif /* CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H */
+#endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
index da7d447206b..a78b01a4058 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TIME_T_H
-#define CIAO_RTI_TIME_T_H
+#ifndef DDS4CCM_TIME_T_H
+#define DDS4CCM_TIME_T_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Time_t DDS_Time_t;
@@ -37,5 +37,5 @@ operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime)
 }
 #endif
 
-#endif /* CIAO_RTI_TIME_T_H */
+#endif /* DDS4CCM_TIME_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
index 5c1059199cb..0769149068f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TOPICDATAQOSPOLICY_H
-#define CIAO_RTI_TOPICDATAQOSPOLICY_H
+#ifndef DDS4CCM_TOPICDATAQOSPOLICY_H
+#define DDS4CCM_TOPICDATAQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy;
@@ -48,4 +48,4 @@ operator>>= (const ::DDS::TopicDataQosPolicy &qos, ::DDS_TopicDataQosPolicy & dd
 }
 #endif
 
-#endif /* CIAO_RTI_TOPICDATAQOSPOLICY_H */
+#endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
index 19098d1d066..e991ac8257e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TOPICLISTENER_H
-#define CIAO_RTI_TOPICLISTENER_H
+#ifndef DDS4CCM_TOPICLISTENER_H
+#define DDS4CCM_TOPICLISTENER_H
 
 #include "tao/LocalObject.h"
 
@@ -49,4 +49,4 @@ namespace CIAO
   }
 }
 
-#endif /* CIAO_RTI_TOPICLISTENER_H */
+#endif /* DDS4CCM_TOPICLISTENER_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
index a5746642b33..f26f376dd6c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TOPICQOS_H
-#define CIAO_RTI_TOPICQOS_H
+#ifndef DDS4CCM_TOPICQOS_H
+#define DDS4CCM_TOPICQOS_H
 
 #include "TopicDataQosPolicy.h"
 #include "DurabilityQosPolicy.h"
@@ -101,4 +101,4 @@ operator>>= (const ::DDS::TopicQos &qos, ::DDS_TopicQos & ddsqos)
 }
 #endif
 
-#endif /* CIAO_RTI_TOPICQOS_H */
+#endif /* DDS4CCM_TOPICQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
index f491e2a9e8f..7778cdce0d5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
-#define CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
+#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
+#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::TransportPriorityQosPolicy &qos, ::DDS_TransportPriori
 }
 #endif
 
-#endif /* CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H */
+#endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
index 054588f839a..aaa0950e1bf 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_USERDATAQOSPOLICY_H
-#define CIAO_RTI_USERDATAQOSPOLICY_H
+#ifndef DDS4CCM_USERDATAQOSPOLICY_H
+#define DDS4CCM_USERDATAQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::UserDataQosPolicy DDS_UserDataQosPolicy;
@@ -19,7 +19,7 @@ operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & q
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -27,7 +27,7 @@ operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & q
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -35,7 +35,7 @@ operator>>= (const ::DDS_UserDataQosPolicy &qos, ::DDS::UserDataQosPolicy & ddsq
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
 }
 
 inline void
@@ -43,8 +43,8 @@ operator>>= (const ::DDS::UserDataQosPolicy &qos, ::DDS_UserDataQosPolicy & ddsq
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//  ddsqos.value <<= qos.value;
+//   ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value));
 }
 #endif
 
-#endif /* CIAO_RTI_USERDATAQOSPOLICY_H */
+#endif /* DDS4CCM_USERDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
index b125003e396..09b32871a32 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
-#define CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
+#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
+#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::WriterDataLifecycleQosPolicy DDS_WriterDataLifecycleQosPolicy;
@@ -39,4 +39,4 @@ operator>>= (const ::DDS::WriterDataLifecycleQosPolicy &qos, ::DDS_WriterDataLif
 }
 #endif
 
-#endif /* CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H */
+#endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */