diff --git a/src/util/TransENameMap.hpp b/src/util/TransENameMap.hpp
index 2496182bd60e77b22bf893b70f536b2f122c9aed..270877f1d02eb268e98eca6ece7fdda06500b2dc 100644
--- a/src/util/TransENameMap.hpp
+++ b/src/util/TransENameMap.hpp
@@ -55,6 +55,11 @@
  */
 
 
+#if !defined(TRANSENAMEMAP_HPP)
+#define TRANSENAMEMAP_HPP
+
+#include <util/TransService.hpp>
+#include <util/XMLString.hpp>
 
 //
 //  This class is really private to the TransService class. However, some
@@ -187,3 +192,5 @@ private :
 #if !defined(XML4C_TMPLSINC)
 #include <util/TransENameMap.c>
 #endif
+
+#endif
diff --git a/src/util/TransService.cpp b/src/util/TransService.cpp
index e86e793a54ea7b1a677621a93da8429ac6d0047f..2081cc94dd6bebcf9cc666ddaac3adc4b554cbb8 100644
--- a/src/util/TransService.cpp
+++ b/src/util/TransService.cpp
@@ -59,8 +59,6 @@
 //  Includes
 // ---------------------------------------------------------------------------
 #include <util/RefHashTableOf.hpp>
-#include <util/TransService.hpp>
-#include <util/XMLString.hpp>
 #include <util/XML88591Transcoder.hpp>
 #include <util/XMLASCIITranscoder.hpp>
 #include <util/XMLEBCDICTranscoder.hpp>