diff --git a/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp
index 1404da2c5..0f2b85b25 100644
--- a/include/mbgl/util/chrono.hpp
+++ b/include/mbgl/util/chrono.hpp
@@ -5,6 +5,7 @@
 #include <chrono>
 #include <limits>
 #include <string>
+#include <type_traits>
 
 namespace mbgl {
 
diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp
index 176f270b0..96554d65b 100644
--- a/include/mbgl/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -4,8 +4,7 @@
 #include <mbgl/util/unitbezier.hpp>
 
 #include <cmath>
-#include <string>
-#include <vector>
+#include <cstddef>
 
 namespace mbgl {
 
diff --git a/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp
index aab8b8f04..e5458f2ed 100644
--- a/include/mbgl/util/convert.hpp
+++ b/include/mbgl/util/convert.hpp
@@ -1,8 +1,8 @@
 #include <mbgl/util/util.hpp>
 
 #include <array>
+#include <cstddef>
 #include <type_traits>
-#include <utility>
 
 namespace mbgl {
 namespace util {
diff --git a/include/mbgl/util/default_style.hpp b/include/mbgl/util/default_style.hpp
index b97d86ba9..1fb5f696d 100644
--- a/include/mbgl/util/default_style.hpp
+++ b/include/mbgl/util/default_style.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <array>
 #include <string>
-#include <vector>
 
 namespace mbgl {
 namespace util {
diff --git a/include/mbgl/util/monotonic_timer.hpp b/include/mbgl/util/monotonic_timer.hpp
index bdb167214..4a5061cfa 100644
--- a/include/mbgl/util/monotonic_timer.hpp
+++ b/include/mbgl/util/monotonic_timer.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
 #include <chrono>
-#include <functional>
-#include <mbgl/util/noncopyable.hpp>
-#include <memory>
+#include <utility>
 
 namespace mbgl {
 namespace util {
diff --git a/include/mbgl/util/size.hpp b/include/mbgl/util/size.hpp
index 12c0ad056..e20be06bb 100644
--- a/include/mbgl/util/size.hpp
+++ b/include/mbgl/util/size.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cstdint>
-#include <array>
 
 namespace mbgl {
 
diff --git a/include/mbgl/util/tile_server_options.hpp b/include/mbgl/util/tile_server_options.hpp
index 0879e026b..41c5ba7d1 100644
--- a/include/mbgl/util/tile_server_options.hpp
+++ b/include/mbgl/util/tile_server_options.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <string>
-#include <memory>
 #include <mbgl/util/default_style.hpp>
 
+#include <memory>
 #include <optional>
+#include <string>
+#include <vector>
 
 namespace mbgl {
 
diff --git a/src/mbgl/style/sources/image_source_impl.cpp b/src/mbgl/style/sources/image_source_impl.cpp
index 4c21a01db..176bbd70a 100644
--- a/src/mbgl/style/sources/image_source_impl.cpp
+++ b/src/mbgl/style/sources/image_source_impl.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/style/sources/image_source_impl.hpp>
-#include <mbgl/util/geo.hpp>
 
 namespace mbgl {
 namespace style {
@@ -15,6 +14,7 @@ ImageSource::Impl::Impl(const Impl& rhs, PremultipliedImage&& image_)
     coords(rhs.coords),
     image(std::make_shared<PremultipliedImage>(std::move(image_))) {
 }
+
 ImageSource::Impl::~Impl() = default;
 
 std::shared_ptr<PremultipliedImage> ImageSource::Impl::getImage() const {
diff --git a/src/mbgl/style/sources/image_source_impl.hpp b/src/mbgl/style/sources/image_source_impl.hpp
index 494e6deeb..4bf1472ca 100644
--- a/src/mbgl/style/sources/image_source_impl.hpp
+++ b/src/mbgl/style/sources/image_source_impl.hpp
@@ -5,6 +5,8 @@
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/geo.hpp>
 
+#include <array>
+
 namespace mbgl {
 
 namespace style {