diff --git a/src/mbgl/gfx/context.hpp b/src/mbgl/gfx/context.hpp
index 451b1e403..de63d61cc 100644
--- a/src/mbgl/gfx/context.hpp
+++ b/src/mbgl/gfx/context.hpp
@@ -9,6 +9,9 @@
 #include <mbgl/gfx/texture.hpp>
 #include <mbgl/gfx/types.hpp>
 
+#include <memory>
+#include <string>
+
 namespace mbgl {
 
 class PaintParameters;
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 05b4f7cfe..833abc670 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -16,10 +16,8 @@
 #include <mbgl/util/noncopyable.hpp>
 
 #include <functional>
-#include <memory>
 #include <vector>
 #include <array>
-#include <string>
 
 namespace mbgl {
 namespace gl {