diff --git a/src/wrapxerces.cpp b/src/wrapxerces.cpp
index 4696df0..0f6e1da 100755
--- a/src/wrapxerces.cpp
+++ b/src/wrapxerces.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "wrapxerces.h"
-#define XERCES_TMPLSINC
 
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
diff --git a/src/wrapxerces.h b/src/wrapxerces.h
index e6eb8d1..e1f2bce 100755
--- a/src/wrapxerces.h
+++ b/src/wrapxerces.h
@@ -19,7 +19,10 @@
 
 #ifndef WRAP_XERCES
 #define WRAP_XERCES
+
+#if __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 7 )
 #define XERCES_TMPLSINC
+#endif
 
 #include <wx/wx.h>
 #include <string>
diff --git a/src/xmlpromptgenerator.cpp b/src/xmlpromptgenerator.cpp
index a2cb94f..e49b9be 100755
--- a/src/xmlpromptgenerator.cpp
+++ b/src/xmlpromptgenerator.cpp
@@ -30,9 +30,7 @@
 #include "catalogresolver.h"
 
 // Xerces-C req'd for Schema parsing
-#ifdef __WXMSW__
-#define XERCES_TMPLSINC
-#endif
+#include "wrapxerces.h" // Declaration of toString() and XERCES_TMPLSINC definition
 
 #include <xercesc/util/NameIdPool.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
@@ -42,7 +40,6 @@
 #include <xercesc/validators/schema/SchemaValidator.hpp>
 #include <xercesc/validators/common/ContentSpecNode.hpp>
 #include <xercesc/validators/schema/SchemaSymbols.hpp>
-#include "wrapxerces.h" // Delearation of toString()
 
 using namespace xercesc;