diff --git a/examples/echo/echo-server.cpp b/examples/echo/echo-server.cpp
index 251e1a2..0ec43df 100644
--- a/examples/echo/echo-server.cpp
+++ b/examples/echo/echo-server.cpp
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
+#include <limits.h>
 
 static const char* ECHO_SERVER_NAME = "org.freedesktop.DBus.Examples.Echo";
 static const char* ECHO_SERVER_PATH = "/org/freedesktop/DBus/Examples/Echo";
diff --git a/src/message.cpp b/src/message.cpp
index 6f6d7af..cb96694 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -25,6 +25,7 @@
 #include <dbus-c++/message.h>
 
 #include <dbus/dbus.h>
+#include <cstdlib>
 
 #include "internalerror.h"
 #include "message_p.h"
diff --git a/src/object.cpp b/src/object.cpp
index 1b79a89..0fc06a1 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -26,6 +26,7 @@
 #include <dbus-c++/object.h>
 #include "internalerror.h"
 
+#include <cstring>
 #include <map>
 #include <dbus/dbus.h>
 
diff --git a/src/types.cpp b/src/types.cpp
index fc85fa5..de91655 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -25,6 +25,7 @@
 #include <dbus-c++/types.h>
 #include <dbus-c++/object.h>
 #include <dbus/dbus.h>
+#include <cstdlib>
 #include <stdarg.h>
 
 #include "message_p.h"
diff --git a/tools/introspect.cpp b/tools/introspect.cpp
index dcbf1f3..d25d8c6 100644
--- a/tools/introspect.cpp
+++ b/tools/introspect.cpp
@@ -21,6 +21,7 @@
  *
  */
 
+#include <cstring>
 #include <signal.h>
 #include <unistd.h>
 #include <iostream>
diff --git a/tools/xml2cpp.cpp b/tools/xml2cpp.cpp
index 05f55ac..6af8f3b 100644
--- a/tools/xml2cpp.cpp
+++ b/tools/xml2cpp.cpp
@@ -26,6 +26,8 @@
 
 #include <dbus/dbus.h>
 
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <map>
 #include <iostream>