diff --git a/src/os.cpp b/src/os.cpp
index 505063f827..16d6847d4e 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -37,7 +37,9 @@
 #include <fcntl.h>
 #include <ntsecapi.h>
 
+#if defined(_MSC_VER)
 typedef SSIZE_T ssize_t;
+#endif
 #else
 #define ZIG_OS_POSIX
 
diff --git a/src/zig_clang.h b/src/zig_clang.h
index f938d8b56e..272064a0ef 100644
--- a/src/zig_clang.h
+++ b/src/zig_clang.h
@@ -50,7 +50,9 @@ enum ZigClangAPValueKind {
 struct ZigClangAPValue {
     enum ZigClangAPValueKind Kind;
     // experimentally-derived size of clang::APValue::DataType
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(__i386__)
+    char Data[68];
+#elif defined(_WIN32) && defined(_MSC_VER)
     char Data[52];
 #elif defined(__i386__)
     char Data[48];