diff --git a/utils/TableGen/Record.h b/utils/TableGen/Record.h
index 928fd5cf266..87a49ee2f84 100644
--- a/utils/TableGen/Record.h
+++ b/utils/TableGen/Record.h
@@ -15,6 +15,7 @@
 #ifndef RECORD_H
 #define RECORD_H
 
+#include "llvm/Support/DataTypes.h"
 #include <string>
 #include <vector>
 #include <map>
diff --git a/utils/TableGen/TGLexer.h b/utils/TableGen/TGLexer.h
index 2c5a852fcd4..0e67f680557 100644
--- a/utils/TableGen/TGLexer.h
+++ b/utils/TableGen/TGLexer.h
@@ -14,6 +14,7 @@
 #ifndef TGLEXER_H
 #define TGLEXER_H
 
+#include "llvm/Support/DataTypes.h"
 #include <vector>
 #include <string>
 #include <iosfwd>
diff --git a/win32/config.h b/win32/config.h
index 1e57d1df5c4..90958169f24 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -2,7 +2,7 @@
  * config.h */
 
 #define PACKAGE_NAME "LLVM (win32 vc8.0)" 
-#define PACKAGE_VERSION 2.2
+#define PACKAGE_VERSION 2.4
 #define LLVM_HOSTTRIPLE "i686-pc-win32"
 #define HAVE_WINDOWS_H 1 
 #define HAVE_LIMITS_H 1 
@@ -22,7 +22,8 @@
 #define LTDL_SYSSEARCHPATH "" 
 #define LLVM_ON_WIN32 1 
 
-#define strtoll strtol
+#define strtoll _strtoi64
+#define strtoull _strtoui64
 #define stricmp _stricmp
 #define strdup _strdup