diff --git a/test/t/area/test_area_id.cpp b/test/t/area/test_area_id.cpp
index 6918d690..4349c380 100644
--- a/test/t/area/test_area_id.cpp
+++ b/test/t/area/test_area_id.cpp
@@ -1,6 +1,7 @@
 #include "catch.hpp"
 
 #include <osmium/osm/area.hpp>
+#include <osmium/osm/item_type.hpp>
 
 TEST_CASE("object_id to area_id conversion") {
     REQUIRE( 46 == osmium::object_id_to_area_id( 23, osmium::item_type::way));
diff --git a/test/t/area/test_assembler.cpp b/test/t/area/test_assembler.cpp
index b4970105..7d45ff84 100644
--- a/test/t/area/test_assembler.cpp
+++ b/test/t/area/test_assembler.cpp
@@ -1,9 +1,11 @@
 #include "catch.hpp"
 
 #include <osmium/area/assembler.hpp>
+#include <osmium/area/assembler_config.hpp>
 #include <osmium/builder/attr.hpp>
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm/area.hpp>
+#include <osmium/osm/way.hpp>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
 
diff --git a/test/t/builder/test_attr.cpp b/test/t/builder/test_attr.cpp
index c6f92001..d1404a74 100644
--- a/test/t/builder/test_attr.cpp
+++ b/test/t/builder/test_attr.cpp
@@ -5,11 +5,10 @@
 #include <osmium/osm.hpp>
 #include <osmium/osm/types.hpp>
 
-#include <cstdint>
+#include <cstddef>
 #include <initializer_list>
 #include <iterator>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/test/t/builder/test_object_builder.cpp b/test/t/builder/test_object_builder.cpp
index 3a84bb53..f647994a 100644
--- a/test/t/builder/test_object_builder.cpp
+++ b/test/t/builder/test_object_builder.cpp
@@ -4,6 +4,7 @@
 #include <osmium/memory/buffer.hpp>
 #include <osmium/osm.hpp>
 
+#include <cstddef>
 #include <string>
 
 constexpr const std::size_t test_buffer_size = 1024UL * 10UL;
diff --git a/test/t/geom/test_coordinates.cpp b/test/t/geom/test_coordinates.cpp
index 84704096..2143eb40 100644
--- a/test/t/geom/test_coordinates.cpp
+++ b/test/t/geom/test_coordinates.cpp
@@ -1,6 +1,7 @@
 #include "catch.hpp"
 
 #include <osmium/geom/coordinates.hpp>
+#include <osmium/osm/location.hpp>
 
 #include <string>
 
diff --git a/test/t/geom/test_crs.cpp b/test/t/geom/test_crs.cpp
index 5bd7d4f7..c8a37654 100644
--- a/test/t/geom/test_crs.cpp
+++ b/test/t/geom/test_crs.cpp
@@ -1,6 +1,8 @@
 #include "catch.hpp"
 
+#include <osmium/geom/coordinates.hpp>
 #include <osmium/geom/projection.hpp>
+#include <osmium/geom/util.hpp>
 
 TEST_CASE("CRS") {
     const osmium::geom::CRS wgs84{4326};
diff --git a/test/t/geom/test_factory_with_projection.cpp b/test/t/geom/test_factory_with_projection.cpp
index 690f044e..3e98c9ab 100644
--- a/test/t/geom/test_factory_with_projection.cpp
+++ b/test/t/geom/test_factory_with_projection.cpp
@@ -2,7 +2,6 @@
 
 #include <osmium/geom/mercator_projection.hpp>
 #include <osmium/geom/projection.hpp>
-#include <osmium/geom/wkb.hpp>
 #include <osmium/geom/wkt.hpp>
 
 #include <string>
diff --git a/test/t/osm/test_area.cpp b/test/t/osm/test_area.cpp
index 51b5d51c..487e2a60 100644
--- a/test/t/osm/test_area.cpp
+++ b/test/t/osm/test_area.cpp
@@ -6,6 +6,8 @@
 #include <osmium/osm/area.hpp>
 #include <osmium/osm/crc.hpp>
 
+#include <cstdint>
+#include <ctime>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/osm/test_location.cpp b/test/t/osm/test_location.cpp
index dbf49f69..e43b995b 100644
--- a/test/t/osm/test_location.cpp
+++ b/test/t/osm/test_location.cpp
@@ -2,6 +2,7 @@
 
 #include <osmium/osm/location.hpp>
 
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <iterator>
diff --git a/test/t/osm/test_relation.cpp b/test/t/osm/test_relation.cpp
index f054fc56..bd1ddaa1 100644
--- a/test/t/osm/test_relation.cpp
+++ b/test/t/osm/test_relation.cpp
@@ -6,6 +6,7 @@
 #include <osmium/osm/crc.hpp>
 #include <osmium/osm/relation.hpp>
 
+#include <cstdint>
 #include <string>
 
 using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
diff --git a/test/t/util/test_file.cpp b/test/t/util/test_file.cpp
index 1926d97a..739484e8 100644
--- a/test/t/util/test_file.cpp
+++ b/test/t/util/test_file.cpp
@@ -5,8 +5,8 @@
 #include <osmium/io/detail/read_write.hpp>
 #include <osmium/util/file.hpp>
 
-#include <stdexcept>
 #include <string>
+#include <system_error>
 
 TEST_CASE("file_size(int) and file_offset() of known file") {
     const std::string file_name{with_data_dir("t/util/known_file_size")};
diff --git a/test/t/util/test_memory_mapping.cpp b/test/t/util/test_memory_mapping.cpp
index 794f3f53..f64e8618 100644
--- a/test/t/util/test_memory_mapping.cpp
+++ b/test/t/util/test_memory_mapping.cpp
@@ -3,6 +3,7 @@
 #include <osmium/util/file.hpp>
 #include <osmium/util/memory_mapping.hpp>
 
+#include <cstdint>
 #include <cstdlib>
 #include <limits>
 #include <utility>
diff --git a/test/t/util/test_misc.cpp b/test/t/util/test_misc.cpp
index e3ea7b57..50968fe6 100644
--- a/test/t/util/test_misc.cpp
+++ b/test/t/util/test_misc.cpp
@@ -2,6 +2,8 @@
 
 #include <osmium/util/misc.hpp>
 
+#include <cstdint>
+
 namespace {
 
 template <typename T>