diff -ur xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp xmlcopyeditor-1.1.0.6-gcc43/src/globalreplacedialog.cpp
--- xmlcopyeditor-1.1.0.6/src/globalreplacedialog.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/globalreplacedialog.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -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 -ur xmlcopyeditor-1.1.0.6/src/housestyle.cpp xmlcopyeditor-1.1.0.6-gcc43/src/housestyle.cpp
--- xmlcopyeditor-1.1.0.6/src/housestyle.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/housestyle.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -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 -ur xmlcopyeditor-1.1.0.6/src/housestylereader.h xmlcopyeditor-1.1.0.6-gcc43/src/housestylereader.h
--- xmlcopyeditor-1.1.0.6/src/housestylereader.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/housestylereader.h	2008-07-04 15:03:47.000000000 +0100
@@ -24,6 +24,7 @@
 #include <map>
 #include <set>
 #include <vector>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/housestylewriter.h xmlcopyeditor-1.1.0.6-gcc43/src/housestylewriter.h
--- xmlcopyeditor-1.1.0.6/src/housestylewriter.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/housestylewriter.h	2008-07-04 15:03:47.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <set>
 #include <string>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 #include "wrapregex.h"
diff -ur xmlcopyeditor-1.1.0.6/src/stringset.h xmlcopyeditor-1.1.0.6-gcc43/src/stringset.h
--- xmlcopyeditor-1.1.0.6/src/stringset.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/stringset.h	2008-07-04 15:03:47.000000000 +0100
@@ -24,6 +24,7 @@
 #include <stdexcept>
 #include <cmath>
 #include <climits>
+#include <cstring>
 #ifdef __WXMSW__
 #include <mem.h>
 #endif
diff -ur xmlcopyeditor-1.1.0.6/src/wrapregex.cpp xmlcopyeditor-1.1.0.6-gcc43/src/wrapregex.cpp
--- xmlcopyeditor-1.1.0.6/src/wrapregex.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/wrapregex.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -21,6 +21,7 @@
 #include <string>
 #include <ctype.h>
 #include <stdexcept>
+#include <cstring>
 #include "wrapregex.h"
 #include "contexthandler.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatedtd.h
--- xmlcopyeditor-1.1.0.6/src/xmlassociatedtd.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatedtd.h	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct DtdData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsd.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsd.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -21,6 +21,7 @@
 #include <vector>
 #include <stdexcept>
 #include <expat.h>
+#include <cstring>
 #include "xmlassociatexsd.h"
 #include "xmlparseschemans.h"
 #include "readfile.h"
diff -ur xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsd.h
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsd.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsd.h	2008-07-04 15:03:47.000000000 +0100
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <string>
 #include <map>
+#include <memory>
 #include "wrapexpat.h"
 
 struct AssociateXsdData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsl.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsl.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -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 -ur xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsl.h
--- xmlcopyeditor-1.1.0.6/src/xmlassociatexsl.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlassociatexsl.h	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct XslData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xmlencodinghandler.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlencodinghandler.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlencodinghandler.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -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 -ur xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlencodingspy.h
--- xmlcopyeditor-1.1.0.6/src/xmlencodingspy.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlencodingspy.h	2008-07-04 15:03:47.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct EncodingData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xmlfilterreader.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlfilterreader.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <expat.h>
 #include <map>
 #include <set>
+#include <cstring>
 #include "xmlfilterreader.h"
 
 using namespace std;
diff -ur xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlfilterreader.h
--- xmlcopyeditor-1.1.0.6/src/xmlfilterreader.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlfilterreader.h	2008-07-04 15:03:47.000000000 +0100
@@ -24,6 +24,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlparseschemans.h
--- xmlcopyeditor-1.1.0.6/src/xmlparseschemans.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlparseschemans.h	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct ParseSchemaNsData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlpromptgenerator.h
--- xmlcopyeditor-1.1.0.6/src/xmlpromptgenerator.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlpromptgenerator.h	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <expat.h>
 #include <map>
 #include <set>
+#include <memory>
 #include "wrapexpat.h"
 #include "parserdata.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xmlschemalocator.cpp
--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlschemalocator.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 #include <stdexcept>
+#include <cstring>
 #include <expat.h>
 #include "xmlschemalocator.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlschemalocator.h
--- xmlcopyeditor-1.1.0.6/src/xmlschemalocator.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlschemalocator.h	2008-07-04 15:03:47.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct SchemaLocatorData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlshallowvalidator.h
--- xmlcopyeditor-1.1.0.6/src/xmlshallowvalidator.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlshallowvalidator.h	2008-07-04 15:03:47.000000000 +0100
@@ -25,6 +25,7 @@
 #include <set>
 #include <vector>
 #include <utility>
+#include <memory>
 #include <expat.h>
 #include "wrapexpat.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlutf8reader.h
--- xmlcopyeditor-1.1.0.6/src/xmlutf8reader.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlutf8reader.h	2008-07-04 15:03:47.000000000 +0100
@@ -23,6 +23,7 @@
 #include <vector>
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct UtfData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xmlwordcount.h xmlcopyeditor-1.1.0.6-gcc43/src/xmlwordcount.h
--- xmlcopyeditor-1.1.0.6/src/xmlwordcount.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xmlwordcount.h	2008-07-04 15:03:47.000000000 +0100
@@ -21,6 +21,7 @@
 #define XML_WORD_COUNT_H
 
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct WordCountData : public ParserData
diff -ur xmlcopyeditor-1.1.0.6/src/xsllocator.cpp xmlcopyeditor-1.1.0.6-gcc43/src/xsllocator.cpp
--- xmlcopyeditor-1.1.0.6/src/xsllocator.cpp	2008-01-20 20:14:24.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xsllocator.cpp	2008-07-04 15:03:47.000000000 +0100
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 #include <stdexcept>
+#include <cstring>
 #include <expat.h>
 #include "xsllocator.h"
 
diff -ur xmlcopyeditor-1.1.0.6/src/xsllocator.h xmlcopyeditor-1.1.0.6-gcc43/src/xsllocator.h
--- xmlcopyeditor-1.1.0.6/src/xsllocator.h	2008-01-20 20:14:30.000000000 +0000
+++ xmlcopyeditor-1.1.0.6-gcc43/src/xsllocator.h	2008-07-04 15:03:47.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <expat.h>
 #include <string>
+#include <memory>
 #include "wrapexpat.h"
 
 struct XslLocatorData : public ParserData