diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in
index a19ce290373..69255c45668 100644
--- a/include/llvm/Support/DataTypes.h.in
+++ b/include/llvm/Support/DataTypes.h.in
@@ -69,9 +69,13 @@ typedef u_int64_t uint64_t;
 #include <stddef.h>
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-typedef signed   int int32_t;
+typedef signed int int32_t;
 typedef unsigned int uint32_t;
-typedef signed   int ssize_t;
+typedef short int16_t;
+typedef unsigned short uint16_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed int ssize_t;
 #define INT8_MAX 127
 #define INT8_MIN -128
 #define UINT8_MAX 255