diff --git a/include/io/convert_adaptor.hpp b/include/io/convert_adaptor.hpp
index 2dcf85f3..59b8ea82 100644
--- a/include/io/convert_adaptor.hpp
+++ b/include/io/convert_adaptor.hpp
@@ -18,6 +18,7 @@
 #include <ostream>
 #include <vector>
 #include <algorithm>
+#include <cstring>
 
 #include <SAX/ArabicaConfig.hpp>
 #ifdef ARABICA_VS6_WORKAROUND
diff --git a/include/io/socket_stream.hpp b/include/io/socket_stream.hpp
index 2b6a2204..de5f714e 100644
--- a/include/io/socket_stream.hpp
+++ b/include/io/socket_stream.hpp
@@ -27,6 +27,7 @@
 #include <algorithm>
 #include <vector>
 #include <cstdlib>
+#include <cstring>
 
 #ifndef INADDR_NONE
 #  define INADDR_NONE             ((in_addr_t) -1)
diff --git a/tests/CppUnit/framework/TestCaller.h b/tests/CppUnit/framework/TestCaller.h
index da9effbe..68813c25 100644
--- a/tests/CppUnit/framework/TestCaller.h
+++ b/tests/CppUnit/framework/TestCaller.h
@@ -9,6 +9,7 @@
 #ifndef CPPUNIT_TESTCASE_H
 #include "TestCase.h"
 #endif
+#include <memory>
 
 /* 
  * A test caller provides access to a test case method 
diff --git a/tests/Utils/test_base64.hpp b/tests/Utils/test_base64.hpp
index ff313925..65434458 100644
--- a/tests/Utils/test_base64.hpp
+++ b/tests/Utils/test_base64.hpp
@@ -7,6 +7,7 @@
 #pragma warning(disable: 4244)
 #endif
 
+#include <cstring>
 
 class Base64Test : public TestCase
 {