1 files changed, 11 insertions, 9 deletions
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index 01a932546b7..a541a954488 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -1,5 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,20 +16,21 @@
 #ifndef TAO_DIOP_ENDPOINT_H
 #define TAO_DIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
-#include "tao/Endpoint.h"
-
-
-#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
-
 
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
+
+#include "tao/Strategies/strategies_export.h"
+#include "tao/Endpoint.h"
 #include "tao/CORBA_String.h"
 #include "ace/INET_Addr.h"
-#include "strategies_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_DIOP_Connection_Handler;
 
@@ -138,8 +138,10 @@ private:
   TAO_DIOP_Endpoint *next_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
+# include "tao/Strategies/DIOP_Endpoint.i"
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */