diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
--- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2009-06-02 17:25:05.000000000 +0200
+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2009-06-02 17:56:03.000000000 +0200
@@ -22,6 +22,9 @@
 #include <log4cxx/logmanager.h>
 #include <iostream>
 #include <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
--- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2009-06-02 17:26:33.000000000 +0200
@@ -20,6 +20,7 @@
 #include <log4cxx/helpers/exception.h>
 #include <log4cxx/helpers/pool.h>
 #include <log4cxx/helpers/bytebuffer.h>
+#include <string.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
--- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2009-06-02 17:33:46.000000000 +0200
@@ -19,6 +19,7 @@
 #include <log4cxx/helpers/socketoutputstream.h>
 #include <log4cxx/helpers/socket.h>
 #include <log4cxx/helpers/bytebuffer.h>
+#include <string.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/stringhelper.cpp apache-log4cxx-0.10.0/src/main/cpp/stringhelper.cpp
--- apache-log4cxx-0.10.0.orig/src/main/cpp/stringhelper.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/main/cpp/stringhelper.cpp	2009-06-02 17:36:16.000000000 +0200
@@ -29,6 +29,7 @@
 #include <log4cxx/private/log4cxx_private.h>
 #include <cctype>
 #include <apr.h>
+#include <stdlib.h>
 
 
 using namespace log4cxx;
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/systemerrwriter.cpp apache-log4cxx-0.10.0/src/main/cpp/systemerrwriter.cpp
--- apache-log4cxx-0.10.0.orig/src/main/cpp/systemerrwriter.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/main/cpp/systemerrwriter.cpp	2009-06-02 17:52:09.000000000 +0200
@@ -19,6 +19,7 @@
 #include <log4cxx/helpers/systemerrwriter.h>
 #include <log4cxx/helpers/transcoder.h>
 #include <stdio.h>
+#include <wchar.h>
 #if !defined(LOG4CXX)
 #define LOG4CXX 1
 #endif
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/systemoutwriter.cpp apache-log4cxx-0.10.0/src/main/cpp/systemoutwriter.cpp
--- apache-log4cxx-0.10.0.orig/src/main/cpp/systemoutwriter.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/main/cpp/systemoutwriter.cpp	2009-06-02 17:51:49.000000000 +0200
@@ -19,6 +19,7 @@
 #include <log4cxx/helpers/systemoutwriter.h>
 #include <log4cxx/helpers/transcoder.h>
 #include <stdio.h>
+#include <wchar.h>
 #if !defined(LOG4CXX)
 #define LOG4CXX 1
 #endif
diff -Naur apache-log4cxx-0.10.0.orig/src/test/cpp/helpers/messagebuffertest.cpp apache-log4cxx-0.10.0/src/test/cpp/helpers/messagebuffertest.cpp
--- apache-log4cxx-0.10.0.orig/src/test/cpp/helpers/messagebuffertest.cpp	2009-06-02 17:25:04.000000000 +0200
+++ apache-log4cxx-0.10.0/src/test/cpp/helpers/messagebuffertest.cpp	2009-06-02 17:57:58.000000000 +0200
@@ -20,6 +20,7 @@
 #include "../insertwide.h"
 #include "../logunit.h"
 #include <log4cxx/logstring.h>
+#include <wchar.h>
 
 #if LOG4CXX_CFSTRING_API
 #include <CoreFoundation/CFString.h>