diff --git a/src/globalreplacedialog.cpp b/src/globalreplacedialog.cpp
index 3febc83..341ab29 100755
--- a/src/globalreplacedialog.cpp
+++ b/src/globalreplacedialog.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <memory>
 #include "globalreplacedialog.h"
 #include "wrapregex.h"
 
diff --git a/src/housestyle.cpp b/src/housestyle.cpp
index 8731632..7879899 100755
--- a/src/housestyle.cpp
+++ b/src/housestyle.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <cstring>
 #include "housestyle.h"
 #include "readfile.h"
 
diff --git a/src/housestylereader.h b/src/housestylereader.h
index d981c58..879bfe0 100755
--- a/src/housestylereader.h
+++ b/src/housestylereader.h
@@ -24,6 +24,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff --git a/src/housestylewriter.h b/src/housestylewriter.h
index bac17c4..3c1fe4f 100755
--- a/src/housestylewriter.h
+++ b/src/housestylewriter.h
@@ -22,6 +22,7 @@
 
 #include <set>
 #include <string>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 #include "wrapregex.h"
diff --git a/src/stringset.h b/src/stringset.h
index a9c8103..9aff0f9 100755
--- a/src/stringset.h
+++ b/src/stringset.h
@@ -24,6 +24,7 @@
 #include <stdexcept>
 #include <cmath>
 #include <climits>
+#include <cstring>
 #ifdef __WXMSW__
 #include <mem.h>
 #endif
diff --git a/src/wrapregex.cpp b/src/wrapregex.cpp
index 11da5c4..f77abf0 100755
--- a/src/wrapregex.cpp
+++ b/src/wrapregex.cpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <ctype.h>
 #include <stdexcept>
+#include <cstring>
 #include "wrapregex.h"
 #include "contexthandler.h"
 
diff --git a/src/xmlassociatedtd.h b/src/xmlassociatedtd.h
index 1f9c44a..428a618 100755
--- a/src/xmlassociatedtd.h
+++ b/src/xmlassociatedtd.h
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct DtdData : public ParserData
diff --git a/src/xmlassociatexsd.cpp b/src/xmlassociatexsd.cpp
index e5cc926..5d25320 100755
--- a/src/xmlassociatexsd.cpp
+++ b/src/xmlassociatexsd.cpp
@@ -21,6 +21,7 @@
 #include <vector>
 #include <stdexcept>
 #include <expat.h>
+#include <cstring>
 #include "xmlassociatexsd.h"
 #include "xmlparseschemans.h"
 #include "readfile.h"
diff --git a/src/xmlassociatexsd.h b/src/xmlassociatexsd.h
index ad2ccbf..6acb751 100755
--- a/src/xmlassociatexsd.h
+++ b/src/xmlassociatexsd.h
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <string>
 #include <map>
+#include <memory>
 #include "wrapexpat.h"
 
 struct AssociateXsdData : public ParserData
diff --git a/src/xmlassociatexsl.cpp b/src/xmlassociatexsl.cpp
index 6031afa..483522b 100755
--- a/src/xmlassociatexsl.cpp
+++ b/src/xmlassociatexsl.cpp
@@ -21,6 +21,7 @@
 #include <vector>
 #include <stdexcept>
 #include <expat.h>
+#include <cstring>
 #include "xmlassociatexsl.h"
 
 XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) :
diff --git a/src/xmlassociatexsl.h b/src/xmlassociatexsl.h
index 794edd8..8a41757 100755
--- a/src/xmlassociatexsl.h
+++ b/src/xmlassociatexsl.h
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct XslData : public ParserData
diff --git a/src/xmlcopyeditorcopy.h b/src/xmlcopyeditorcopy.h
index b40d667..ab2e531 100755
--- a/src/xmlcopyeditorcopy.h
+++ b/src/xmlcopyeditorcopy.h
@@ -25,7 +25,7 @@
 
 #endif
 #define ABOUT_COPYRIGHT _("Copyright © 2005-2008 Gerald Schmidt <gnschmidt@users.sourceforge.net>")
-#define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero and Siarhei Kuchuk.")
+#define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero, Siarhei Kuchuk\nand Ian Abbott.")
 #define ABOUT_LICENSE _T(\
 "This program is free software; you can redistribute it\n"\
 "and/or modify it under the terms of the GNU General Public\n"\
diff --git a/src/xmlencodinghandler.cpp b/src/xmlencodinghandler.cpp
index 4ebc0f6..70a932a 100755
--- a/src/xmlencodinghandler.cpp
+++ b/src/xmlencodinghandler.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <cstring>
 #include "xmlencodinghandler.h"
 
 bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )
diff --git a/src/xmlencodingspy.h b/src/xmlencodingspy.h
index cbc8198..65dd56b 100755
--- a/src/xmlencodingspy.h
+++ b/src/xmlencodingspy.h
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct EncodingData : public ParserData
diff --git a/src/xmlfilterreader.cpp b/src/xmlfilterreader.cpp
index 85e8759..7b6dacc 100755
--- a/src/xmlfilterreader.cpp
+++ b/src/xmlfilterreader.cpp
@@ -23,6 +23,7 @@
 #include <expat.h>
 #include <map>
 #include <set>
+#include <cstring>
 #include "xmlfilterreader.h"
 
 using namespace std;
diff --git a/src/xmlfilterreader.h b/src/xmlfilterreader.h
index 255de5c..245443f 100755
--- a/src/xmlfilterreader.h
+++ b/src/xmlfilterreader.h
@@ -24,6 +24,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff --git a/src/xmlparseschemans.h b/src/xmlparseschemans.h
index c6a37e1..73b9b54 100755
--- a/src/xmlparseschemans.h
+++ b/src/xmlparseschemans.h
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct ParseSchemaNsData : public ParserData
diff --git a/src/xmlpromptgenerator.h b/src/xmlpromptgenerator.h
index 3a77f24..771455a 100755
--- a/src/xmlpromptgenerator.h
+++ b/src/xmlpromptgenerator.h
@@ -23,6 +23,7 @@
 #include <expat.h>
 #include <map>
 #include <set>
+#include <memory>
 #include "wrapexpat.h"
 #include "parserdata.h"
 
diff --git a/src/xmlschemalocator.cpp b/src/xmlschemalocator.cpp
index c24e0e2..6047589 100755
--- a/src/xmlschemalocator.cpp
+++ b/src/xmlschemalocator.cpp
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 #include <stdexcept>
+#include <cstring>
 #include <expat.h>
 #include "xmlschemalocator.h"
 
diff --git a/src/xmlschemalocator.h b/src/xmlschemalocator.h
index c0869ce..9346da5 100755
--- a/src/xmlschemalocator.h
+++ b/src/xmlschemalocator.h
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct SchemaLocatorData
diff --git a/src/xmlshallowvalidator.h b/src/xmlshallowvalidator.h
index a3eab15..123b3d0 100755
--- a/src/xmlshallowvalidator.h
+++ b/src/xmlshallowvalidator.h
@@ -25,6 +25,7 @@
 #include <set>
 #include <vector>
 #include <utility>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff --git a/src/xmlutf8reader.h b/src/xmlutf8reader.h
index 91f26c4..48e1bc6 100755
--- a/src/xmlutf8reader.h
+++ b/src/xmlutf8reader.h
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct UtfData : public ParserData
diff --git a/src/xmlwordcount.h b/src/xmlwordcount.h
index 54e7479..bfbadcb 100755
--- a/src/xmlwordcount.h
+++ b/src/xmlwordcount.h
@@ -21,6 +21,7 @@
 #define XML_WORD_COUNT_H
 
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct WordCountData : public ParserData
diff --git a/src/xsllocator.cpp b/src/xsllocator.cpp
index 0685827..ddaa910 100755
--- a/src/xsllocator.cpp
+++ b/src/xsllocator.cpp
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 #include <stdexcept>
+#include <cstring>
 #include <expat.h>
 #include "xsllocator.h"
 
diff --git a/src/xsllocator.h b/src/xsllocator.h
index a65978e..feb619f 100755
--- a/src/xsllocator.h
+++ b/src/xsllocator.h
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct XslLocatorData : public ParserData