1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
index 292333ad7e0..81bfdf71f08 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
@@ -5,16 +5,14 @@
 #define UTF8_LATIN1_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "tao/Codeset/codeset_export.h"
+#include "codeset_export.h"
 #include "ace/Service_Config.h"
-#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "Codeset_Translator_Factory.h"
 
-#include "tao/Codeset/UTF8_Latin1_Translator.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "UTF8_Latin1_Translator.h"
 
 class TAO_Codeset_Export TAO_UTF8_Latin1_Factory
-  : public TAO_Codeset_Translator_Factory
+  : public  TAO_Codeset_Translator_Factory
 {
 public:
   TAO_UTF8_Latin1_Factory ();
@@ -44,8 +42,6 @@ private:
   TAO_UTF8_Latin1_Translator *translator_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory)
 ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory)