diff --git a/src/angle.gyp b/src/angle.gyp
index f7951fc7e..68ec1f05e 100644
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -49,6 +49,7 @@
                 'angle_enable_gl%': 1,
             }],
         ],
+        'openssl_fips' : '',
     },
 
 
diff --git a/src/common/angleutils.h b/src/common/angleutils.h
index a0178fd41..ced9548bd 100644
--- a/src/common/angleutils.h
+++ b/src/common/angleutils.h
@@ -14,6 +14,7 @@
 #include <climits>
 #include <cstdarg>
 #include <cstddef>
+#include <cstdint>
 #include <string>
 #include <set>
 #include <sstream>
diff --git a/src/libANGLE/HandleAllocator.cpp b/src/libANGLE/HandleAllocator.cpp
index 4815855d5..18afa6e36 100644
--- a/src/libANGLE/HandleAllocator.cpp
+++ b/src/libANGLE/HandleAllocator.cpp
@@ -10,6 +10,7 @@
 #include "libANGLE/HandleAllocator.h"
 
 #include <algorithm>
+#include <limits>
 
 #include "common/debug.h"