diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc	2008-09-29 20:52:46.000000000 -0600
@@ -32,6 +32,7 @@
 #include "talk/base/byteorder.h"
 #include "talk/base/common.h"
 #include "talk/base/logging.h"
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc	2008-09-29 20:52:46.000000000 -0600
@@ -30,6 +30,7 @@
 #include "talk/base/byteorder.h"
 #include <algorithm>
 #include <cassert>
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc	2008-09-29 20:52:46.000000000 -0600
@@ -29,7 +29,8 @@
 #include "talk/base/logging.h"
 #include "talk/base/network.h"
 #include "talk/base/socket.h"
-#include <string>
+#include <cstring>
+#include <cstdlib>
 #include <iostream>
 #include <cassert>
 #include <errno.h>
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h	2008-09-29 20:52:46.000000000 -0600
@@ -32,6 +32,7 @@
 #include "talk/base/criticalsection.h"
 #include "talk/base/socketserver.h"
 #include "talk/base/jtime.h"
+#include <cstring>
 #include <vector>
 #include <queue>
 #include <algorithm>
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc	2008-09-29 20:52:46.000000000 -0600
@@ -30,11 +30,13 @@
 #endif
 
 #include <cassert>
+#include <algorithm>
 
 #ifdef POSIX
 extern "C" {
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
 }
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc	2008-09-29 20:52:46.000000000 -0600
@@ -42,6 +42,7 @@
 #endif
 
 #include <cassert>
+#include <cstring>
 
 #include "talk/base/base64.h"
 #include "talk/base/basicdefs.h"
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc	2006-10-01 11:26:44.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc	2008-09-29 20:52:46.000000000 -0600
@@ -29,6 +29,7 @@
 #include "talk/p2p/base/stun.h"
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc	2006-10-01 11:26:44.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc	2008-09-29 20:52:46.000000000 -0600
@@ -28,6 +28,7 @@
 #include "talk/base/bytebuffer.h"
 #include "talk/p2p/base/stunserver.h"
 #include <iostream>
+#include <cstring>
 
 #ifdef POSIX
 extern "C" {
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h	2006-10-01 11:26:45.000000000 -0600
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h	2008-09-29 20:52:46.000000000 -0600
@@ -31,6 +31,8 @@
 #include "talk/base/linked_ptr.h"
 #include "talk/base/scoped_ptr.h"
 
+#include <cstring>
+
 namespace buzz {
 
 class XmppPasswordImpl {