diff --git a/include/libtorrent/error_code.hpp b/include/libtorrent/error_code.hpp
index bad3237b0..5c0627c87 100644
--- a/include/libtorrent/error_code.hpp
+++ b/include/libtorrent/error_code.hpp
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/system/error_code.hpp>
 #endif
 
-#include "libtorrent/config.hpp"
+#include <string.h>
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/lazy_entry.hpp b/include/libtorrent/lazy_entry.hpp
index 4569ac62a..c693e762c 100644
--- a/include/libtorrent/lazy_entry.hpp
+++ b/include/libtorrent/lazy_entry.hpp
@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <utility>
 #include <vector>
 #include <string>
+#include <cstring>
 #include "libtorrent/config.hpp"
 #include "libtorrent/assert.hpp"
 #include "libtorrent/size_type.hpp"
@@ -60,7 +61,7 @@ namespace libtorrent
 		char const* ptr;
 		bool operator<(pascal_string const& rhs) const
 		{
-			return memcmp(ptr, rhs.ptr, (std::min)(len, rhs.len)) < 0
+			return std::memcmp(ptr, rhs.ptr, (std::min)(len, rhs.len)) < 0
 				|| len < rhs.len;
 		}
 	};
diff --git a/src/time.cpp b/src/time.cpp
index 3a4718c31..1d1c7901a 100644
--- a/src/time.cpp
+++ b/src/time.cpp
@@ -32,6 +32,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <ctime>
 #include <string>
+#include <cstdio>
+#include <limits>
 #include <boost/version.hpp>
 #include "libtorrent/config.hpp"
 #include "libtorrent/time.hpp"