diff --git a/expression-test/expression_test_logger.hpp b/expression-test/expression_test_logger.hpp
index 95b0697cb..ae03476fa 100644
--- a/expression-test/expression_test_logger.hpp
+++ b/expression-test/expression_test_logger.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 #define ANSI_COLOR_RED        "\x1b[31m"
diff --git a/include/mbgl/i18n/number_format.hpp b/include/mbgl/i18n/number_format.hpp
index cb1e94c7b..dceddfe96 100644
--- a/include/mbgl/i18n/number_format.hpp
+++ b/include/mbgl/i18n/number_format.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace mbgl {
diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
index c4fe52e87..5fc9c59e7 100644
--- a/include/mbgl/util/geometry.hpp
+++ b/include/mbgl/util/geometry.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 #include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/point_arithmetic.hpp>
 #include <mapbox/geometry/for_each_point.hpp>
diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
index df205b907..370b08afa 100644
--- a/include/mbgl/util/string.hpp
+++ b/include/mbgl/util/string.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 #include <cstdlib>
 #include <type_traits>
 #include <exception>
diff --git a/src/mbgl/programs/gl/shaders.hpp b/src/mbgl/programs/gl/shaders.hpp
index 46a87f4af..25a1e6cb5 100644
--- a/src/mbgl/programs/gl/shaders.hpp
+++ b/src/mbgl/programs/gl/shaders.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace mbgl {
diff --git a/vendor/eternal b/vendor/eternal
index 42801e2a7..dd2f5b9ff 160000
--- a/vendor/eternal
+++ b/vendor/eternal
@@ -1 +1 @@
-Subproject commit 42801e2a736f362ae851b7962b4aa1d4f4b2d424
+Subproject commit dd2f5b9ff38fcd36b59efd9d289127fa73efc6cb