diff -Nru source/common/XML_Node.cpp source-gil/common/XML_Node.cpp
--- source/common/XML_Node.cpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/common/XML_Node.cpp	2010-05-16 08:23:09.000000000 +0200
@@ -8,6 +8,9 @@
 
 #include "XMP_Environment.h"	// ! Must be the first #include!
 #include "XMLParserAdapter.hpp"
+#include <string.h>
+#include <cstring>
+#include <stdio.h>
 
 #include <map>
 
diff -Nru source/common/XMP_LibUtils.cpp source-gil/common/XMP_LibUtils.cpp
--- source/common/XMP_LibUtils.cpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/common/XMP_LibUtils.cpp	2010-05-16 08:23:58.000000000 +0200
@@ -7,6 +7,7 @@
 // =================================================================================================
 
 #include "XMP_Environment.h"
+#include <stdio.h>
 
 #include "XMP_LibUtils.hpp"
 
diff -Nru source/common/XMP_LibUtils.hpp source-gil/common/XMP_LibUtils.hpp
--- source/common/XMP_LibUtils.hpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/common/XMP_LibUtils.hpp	2010-05-16 08:23:44.000000000 +0200
@@ -13,7 +13,11 @@
 #include "XMP_Const.h"
 
 #include <map>
+#include <string.h>
+#include <cstring>
+#include <cstdlib>
 #include <string>
+#include <stdio.h>
 
 #if XMP_DebugBuild
 	#include <cassert>
diff -Nru source/XMPCore/XMPCore_Impl.hpp source-gil/XMPCore/XMPCore_Impl.hpp
--- source/XMPCore/XMPCore_Impl.hpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPCore/XMPCore_Impl.hpp	2010-05-16 08:09:13.000000000 +0200
@@ -17,6 +17,8 @@
 #include "client-glue/WXMP_Common.hpp"
 
 #include <vector>
+#include <string.h>
+#include <cstring>
 #include <string>
 #include <map>
 
diff -Nru source/XMPCore/XMPMeta.cpp source-gil/XMPCore/XMPMeta.cpp
--- source/XMPCore/XMPMeta.cpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPCore/XMPMeta.cpp	2010-05-16 08:07:53.000000000 +0200
@@ -12,7 +12,9 @@
 #include "XMP_Environment.h"	// ! This must be the first include!
 #include "XMPCore_Impl.hpp"
 
+#include <string.h>
 #include <stdio.h>
+#include <cstring>
 
 #include "XMPMeta.hpp"
 #include "XMPIterator.hpp"
@@ -24,7 +26,9 @@
 #include <algorithm>	// For sort and stable_sort.
 #include <stdio.h>		// For snprintf.
 
+
 #if XMP_DebugBuild
+    #include <string>
 	#include <iostream>
 #endif
 
diff -Nru source/XMPFiles/FileHandlers/AVCHD_Handler.cpp source-gil/XMPFiles/FileHandlers/AVCHD_Handler.cpp
--- source/XMPFiles/FileHandlers/AVCHD_Handler.cpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPFiles/FileHandlers/AVCHD_Handler.cpp	2010-05-16 08:15:31.000000000 +0200
@@ -8,6 +8,10 @@
 // =================================================================================================
 
 #include "AVCHD_Handler.hpp"
+#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 
 #include "MD5.h"
 #include "UnicodeConversions.hpp"
diff -Nru source/XMPFiles/FileHandlers/AVCHD_Handler.hpp source-gil/XMPFiles/FileHandlers/AVCHD_Handler.hpp
--- source/XMPFiles/FileHandlers/AVCHD_Handler.hpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPFiles/FileHandlers/AVCHD_Handler.hpp	2010-05-16 08:12:10.000000000 +0200
@@ -11,6 +11,8 @@
 // =================================================================================================
 
 #include "XMP_Environment.h"	// ! This must be the first include.
+#include <string.h>
+#include <cstring>
 
 #include "XMPFiles_Impl.hpp"
 
diff -Nru source/XMPFiles/FormatSupport/XMPScanner.cpp source-gil/XMPFiles/FormatSupport/XMPScanner.cpp
--- source/XMPFiles/FormatSupport/XMPScanner.cpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPFiles/FormatSupport/XMPScanner.cpp	2010-05-16 08:17:11.000000000 +0200
@@ -20,6 +20,8 @@
 #include "XMPScanner.hpp"
 
 #include <cassert>
+#include <string.h>
+#include <cstring>
 #include <string>
 #include <cstdlib>
 
diff -Nru source/XMPFiles/FormatSupport/XMPScanner.hpp source-gil/XMPFiles/FormatSupport/XMPScanner.hpp
--- source/XMPFiles/FormatSupport/XMPScanner.hpp	2010-05-05 15:01:58.000000000 +0200
+++ source-gil/XMPFiles/FormatSupport/XMPScanner.hpp	2010-05-16 08:17:24.000000000 +0200
@@ -16,6 +16,9 @@
 
 #include <list>
 #include <vector>
+#include <string.h>
+#include <cstring>
+#include <cstdlib>
 #include <string>
 #include <memory>
 #include <stdexcept>