1 files changed, 13 insertions, 18 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
index 8a02245aed1..e16f249f401 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
@@ -11,31 +11,26 @@
 #define _CIAO_COHERENT_CHANGES_GUARD
 
 #include "ace/Copy_Disabled.h"
+#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DdsDcpsC.h"
-typedef ::DDS::Publisher DDSPublisher;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard :
-      private ACE_Copy_Disabled
+    namespace RTI
     {
-      public:
-        Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write);
-        ~Coherent_Changes_Guard ();
-      private:
-        ::DDSPublisher* p_;
-        bool const coherent_write_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard :
+        private ACE_Copy_Disabled
+      {
+        public:
+          Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write);
+          ~Coherent_Changes_Guard ();
+        private:
+          ::DDSPublisher* p_;
+          bool const coherent_write_;
+      };
+    }
   }
 }