diff -NrU5 gloox-0.9.8.original/src/connectionsocks5proxy.cpp gloox-0.9.8/src/connectionsocks5proxy.cpp
--- gloox-0.9.8.original/src/connectionsocks5proxy.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/connectionsocks5proxy.cpp	2009-06-18 16:43:02.000000000 -0600
@@ -19,10 +19,11 @@
 #include "logsink.h"
 #include "prep.h"
 #include "base64.h"
 
 #include <string>
+#include <cstdlib>
 
 #include <string.h>
 
 #if !defined( _WIN32 ) && !defined( _WIN32_WCE )
 # include <netinet/in.h>
diff -NrU5 gloox-0.9.8.original/src/md5.cpp gloox-0.9.8/src/md5.cpp
--- gloox-0.9.8.original/src/md5.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/md5.cpp	2009-06-18 16:08:42.000000000 -0600
@@ -70,10 +70,11 @@
  */
 
 #include "md5.h"
 
 #include <string.h>
+#include <cstdio> 
 
 namespace gloox
 {
 // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
 // #ifdef ARCH_IS_BIG_ENDIAN
diff -NrU5 gloox-0.9.8.original/src/sha.cpp gloox-0.9.8/src/sha.cpp
--- gloox-0.9.8.original/src/sha.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/sha.cpp	2009-06-18 16:12:23.000000000 -0600
@@ -10,10 +10,12 @@
   This software is distributed without any warranty.
 */
 
 #include "sha.h"
 
+#include <cstdio>
+
 namespace gloox
 {
 
   SHA::SHA()
   {
diff -NrU5 gloox-0.9.8.original/src/tag.cpp gloox-0.9.8/src/tag.cpp
--- gloox-0.9.8.original/src/tag.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/tag.cpp	2009-06-18 16:00:06.000000000 -0600
@@ -12,10 +12,11 @@
 
 
 #include "tag.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef _WIN32_WCE
 # include <cmath>
 #else
 # include <sstream>
diff -NrU5 gloox-0.9.8.original/src/tests/tag/tag_perf.cpp gloox-0.9.8/src/tests/tag/tag_perf.cpp
--- gloox-0.9.8.original/src/tests/tag/tag_perf.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/tests/tag/tag_perf.cpp	2009-06-18 16:50:15.000000000 -0600
@@ -4,10 +4,11 @@
 using namespace gloox;
 
 #include <stdio.h>
 #include <locale.h>
 #include <string>
+#include <cstdlib>
 
 #include <sys/time.h>
 
 static double divider = 1000000;
 static int num = 2500;
diff -NrU5 gloox-0.9.8.original/src/tests/zlib/zlib_perf.cpp gloox-0.9.8/src/tests/zlib/zlib_perf.cpp
--- gloox-0.9.8.original/src/tests/zlib/zlib_perf.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/tests/zlib/zlib_perf.cpp	2009-06-18 16:57:39.000000000 -0600
@@ -8,10 +8,11 @@
 
 #include <stdio.h>
 #include <locale.h>
 #include <string>
 #include <sys/time.h>
+#include <cstdlib>
 
 #ifdef HAVE_ZLIB
 
 class ZlibTest : public CompressionDataHandler
 {
diff -NrU5 gloox-0.9.8.original/src/tlsgnutlsbase.cpp gloox-0.9.8/src/tlsgnutlsbase.cpp
--- gloox-0.9.8.original/src/tlsgnutlsbase.cpp	2009-06-18 15:57:01.000000000 -0600
+++ gloox-0.9.8/src/tlsgnutlsbase.cpp	2009-06-18 16:35:12.000000000 -0600
@@ -16,10 +16,13 @@
 
 #ifdef HAVE_GNUTLS
 
 #include <errno.h>
 
+#include <cstdlib>
+#include <cstring>
+
 namespace gloox
 {
 
   GnuTLSBase::GnuTLSBase( TLSHandler *th, const std::string& server )
     : TLSBase( th, server ), m_session( new gnutls_session_t ), m_buf( 0 ), m_bufsize( 17000 )