diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index e23f0f5f..b87acf4d 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -37,6 +37,7 @@
 #include <cassert>
 #include <cstdlib>
 #include <ctime>
+#include <linux/limits.h>
 
 #include "client/linux/handler/exception_handler.h"
 #include "common/linux/guid_creator.h"
diff --git a/src/client/linux/handler/linux_thread.cc b/src/client/linux/handler/linux_thread.cc
index 2fe103e4..c8ac4926 100644
--- a/src/client/linux/handler/linux_thread.cc
+++ b/src/client/linux/handler/linux_thread.cc
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <string.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/client/linux/handler/minidump_generator.cc b/src/client/linux/handler/minidump_generator.cc
index 8d4d1315..bc4d213a 100644
--- a/src/client/linux/handler/minidump_generator.cc
+++ b/src/client/linux/handler/minidump_generator.cc
@@ -40,6 +40,7 @@
 
 #include <cstdlib>
 #include <ctime>
+#include <string.h>
 
 #include "common/linux/file_id.h"
 #include "client/linux/handler/linux_thread.h"
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc
index 1af940d6..b523c5d8 100644
--- a/src/common/linux/dump_symbols.cc
+++ b/src/common/linux/dump_symbols.cc
@@ -40,9 +40,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <algorithm>
 
 #include <functional>
 #include <vector>
+#include <string.h>
 
 #include "common/linux/dump_symbols.h"
 #include "common/linux/file_id.h"
diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc
index 3e4d8e88..50054ebc 100644
--- a/src/common/string_conversion.cc
+++ b/src/common/string_conversion.cc
@@ -30,6 +30,7 @@
 #include "common/convert_UTF.h"
 #include "processor/scoped_ptr.h"
 #include "common/string_conversion.h"
+#include <string.h>
 
 namespace google_breakpad {