diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index 0f83b85..469bb82 100644
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sstream>
+#include <cctype>
 
 #include "platform.h"
 #include "t_oop_generator.h"
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index bdc41b1..00e9850 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -38,6 +38,7 @@
 
 #include <string>
 #include <errno.h>
+#include <stdlib.h>
 
 #include "main.h"
 #include "globals.h"
diff --git a/compiler/cpp/src/windows/config.h b/compiler/cpp/src/windows/config.h
index a69b546..9d75e80 100644
--- a/compiler/cpp/src/windows/config.h
+++ b/compiler/cpp/src/windows/config.h
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <direct.h>
 
-#define strtoll(begin_ptr, end_ptr, length) strtol(begin_ptr, end_ptr, length)
+#define strtoll(begin_ptr, end_ptr, length) _strtoi64(begin_ptr, end_ptr, length)
 
 #define PRIu64 "I64d"
 #define PRIi64 "I64d"