diff --git a/json_util.c b/json_util.c
index 00cdc30..c7c2325 100644
--- a/json_util.c
+++ b/json_util.c
@@ -39,6 +39,7 @@
 #endif /* HAVE_UNISTD_H */
 
 #ifdef WIN32
+# define strtoll _strtoi64
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # include <io.h>
diff --git a/strerror_override.h b/strerror_override.h
index 15d8320..5c087f3 100644
--- a/strerror_override.h
+++ b/strerror_override.h
@@ -10,12 +10,12 @@
 extern "C" {
 #endif
 
+#include <string.h>
+
 JSON_EXPORT char *_json_c_strerror(int errno_in);
 
 #ifndef STRERROR_OVERRIDE_IMPL
 #define strerror	_json_c_strerror
-#else
-#include <string.h>
 #endif
 
 #ifdef __cplusplus