1 files changed, 10 insertions, 12 deletions
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 4c4647e5432..ba4077c94cb 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -14,20 +14,10 @@
 
 #ifndef TAO_MESSAGING_H
 #define TAO_MESSAGING_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
-
-#define TAO_MESSAGING_SAFE_INCLUDE
-#include "tao/Messaging/MessagingC.h"
-#undef TAO_MESSAGING_SAFE_INCLUDE
-
-#include "tao/Messaging/MessagingA.h"
-#include "tao/Messaging/TAO_ExtC.h"
-#include "tao/TAOC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "messaging_export.h"
 
 class TAO_Messaging_Export TAO_Messaging_Initializer
 {
@@ -39,6 +29,15 @@ public:
 static int
 TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
 
+#define TAO_MESSAGING_SAFE_INCLUDE
+#include "MessagingC.h"
+#undef TAO_MESSAGING_SAFE_INCLUDE
+
+#include "MessagingA.h"
+#include "TAO_ExtC.h"
+#include "tao/TAOC.h"
+
+
 // Typedef for the Reply Handler Skeleton.
 // This is handcrafted not generated by the IDL compiler.
 
@@ -92,7 +91,6 @@ namespace TAO_Messaging_Helper
            ACE_ENV_ARG_DECL);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif /* TAO_MESSAGING_H */