1 files changed, 2 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index 19b81c44354..ffdef9e1738 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -12,8 +12,7 @@
 #define UUID_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
-#include "tao/Versioned_Namespace.h"
+#include "ftrtevent_export.h"
 #include "ace/OS.h"
 #include "ace/SString.h"
 
@@ -29,8 +28,6 @@
 #define TAO_EXPORT_NESTED_MACRO FtRtEvent_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * This is an implementation of Global Unique Identifier
  * which follows the document draft-leach-uuids-guids-01.txt. The
@@ -113,10 +110,8 @@ class TAO_FtRtEvent_Export  UUID
     } rep_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/UUID.inl"
+#include "UUID.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"