diff --git a/include/hibf/build/update_parent_kmers.hpp b/include/hibf/build/update_parent_kmers.hpp
index 35c28e00..7b2da7e7 100644
--- a/include/hibf/build/update_parent_kmers.hpp
+++ b/include/hibf/build/update_parent_kmers.hpp
@@ -8,9 +8,10 @@
  */
 #pragma once
 
-#include <cinttypes> // for uint64_t
+#include <cinttypes>  // for uint64_t
+#include <functional> // for equal_to
 
-#include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set
+#include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set, hash
 #include <hibf/misc/timer.hpp>         // for serial_timer, concurrent_timer
 #include <hibf/platform.hpp>
 
diff --git a/include/hibf/hierarchical_interleaved_bloom_filter.hpp b/include/hibf/hierarchical_interleaved_bloom_filter.hpp
index ede835ba..986aa0c9 100644
--- a/include/hibf/hierarchical_interleaved_bloom_filter.hpp
+++ b/include/hibf/hierarchical_interleaved_bloom_filter.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include <algorithm>  // for __fn, fill, sort
-#include <cassert>    // for assert
-#include <cinttypes>  // for int64_t, uint16_t
-#include <concepts>   // for integral, unsigned_integral
-#include <cstddef>    // for size_t
-#include <functional> // for less, identity
-#include <memory>     // for addressof
-#include <ranges>     // for forward_range, range, range_value_t
-#include <vector>     // for vector, operator==
+#include <algorithm> // for __sort_fn, fill, sort
+#include <cassert>   // for assert
+#include <cinttypes> // for int64_t, uint16_t
+#include <concepts>  // for integral, unsigned_integral
+#include <cstddef>   // for size_t
+#include <ranges>    // for forward_range, range_value_t, range
+#include <utility>   // for addressof
+#include <vector>    // for vector, operator==
 
 #include <cereal/macros.hpp>       // for CEREAL_SERIALIZE_FUNCTION_NAME
 #include <cereal/types/vector.hpp> // IWYU pragma: keep
diff --git a/include/hibf/interleaved_bloom_filter.hpp b/include/hibf/interleaved_bloom_filter.hpp
index f5be675e..3eec7e60 100644
--- a/include/hibf/interleaved_bloom_filter.hpp
+++ b/include/hibf/interleaved_bloom_filter.hpp
@@ -15,9 +15,9 @@
 #include <cinttypes>   // for uint16_t, uint64_t
 #include <concepts>    // for integral, same_as, unsigned_integral
 #include <cstring>     // for size_t
-#include <memory>      // for addressof
-#include <ranges>      // for range, forward_range, input_range, range_reference_t, range_va...
+#include <ranges>      // for range, range_reference_t, range_value_t, forward_range, input_...
 #include <type_traits> // for remove_cvref_t
+#include <utility>     // for addressof
 #include <vector>      // for operator==, vector
 
 #include <cereal/macros.hpp>           // for CEREAL_SERIALIZE_FUNCTION_NAME
diff --git a/include/hibf/layout/hierarchical_binning.hpp b/include/hibf/layout/hierarchical_binning.hpp
index 652f7f27..38671bc6 100644
--- a/include/hibf/layout/hierarchical_binning.hpp
+++ b/include/hibf/layout/hierarchical_binning.hpp
@@ -6,8 +6,7 @@
 
 #include <cassert> // for assert
 #include <cstddef> // for size_t
-#include <memory>  // for addressof
-#include <utility> // for pair
+#include <utility> // for addressof, pair
 #include <vector>  // for vector
 
 #include <hibf/build/bin_size_in_bits.hpp> // for bin_size_in_bits
diff --git a/include/hibf/layout/simple_binning.hpp b/include/hibf/layout/simple_binning.hpp
index 23b8a8c5..bf7b2e9f 100644
--- a/include/hibf/layout/simple_binning.hpp
+++ b/include/hibf/layout/simple_binning.hpp
@@ -6,8 +6,8 @@
 
 #include <cassert>   // for assert
 #include <cstddef>   // for size_t
-#include <memory>    // for addressof
 #include <stdexcept> // for runtime_error
+#include <utility>   // for addressof
 #include <vector>    // for vector
 
 #include <hibf/layout/data_store.hpp>        // for data_store
diff --git a/include/hibf/misc/bit_vector.hpp b/include/hibf/misc/bit_vector.hpp
index a957ff8f..e02e96ad 100644
--- a/include/hibf/misc/bit_vector.hpp
+++ b/include/hibf/misc/bit_vector.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <algorithm>        // for max, __for_each_fn, for_each, __all_of_fn, __any_of_fn, __fill_fn
+#include <algorithm>        // for __for_each_fn, for_each, __all_of_fn, __any_of_fn, __fill_fn
 #include <bit>              // for countr_zero
 #include <cassert>          // for assert
 #include <cinttypes>        // for uint64_t
@@ -29,22 +29,21 @@
 #include <compare>          // for strong_ordering, operator==
 #include <concepts>         // for assignable_from
 #include <cstddef>          // for size_t, ptrdiff_t
-#include <functional>       // for identity
 #include <initializer_list> // for initializer_list
-#include <iterator>         // for back_inserter, iter_reference_t, random_access_iterator_tag
+#include <iterator>         // for iter_reference_t, back_inserter, iter_difference_t, iter_value_t
 #include <memory>           // for allocator, assume_aligned, allocator_traits
 #include <ranges>           // for __next_fn, distance, next, _Begin, _End, __distance_fn, begin
 #include <stdexcept>        // for out_of_range
-#include <string>           // for operator+, char_traits, to_string, operator""s
+#include <string>           // for char_traits, operator+, to_string, operator""s
 #include <type_traits>      // for conditional_t
 #include <utility>          // for swap
 #include <vector>           // for vector
 
-#include <cereal/cereal.hpp>     // for CEREAL_SERIALIZE_FUNCTION_NAME
-#include <cereal/macros.hpp>     // for CEREAL_SERIALIZE_FUNCTION_NAME
+#include <cereal/cereal.hpp>     // for binary_data
+#include <cereal/macros.hpp>     // for CEREAL_LOAD_FUNCTION_NAME, CEREAL_SAVE_FUNCTION_NAME
 #include <cereal/specialize.hpp> // for specialization, specialize
 
-#include <hibf/cereal/concepts.hpp>           // for cereal_archive
+#include <hibf/cereal/concepts.hpp>           // for cereal_archive, cereal_text_archive
 #include <hibf/contrib/aligned_allocator.hpp> // for aligned_allocator
 #include <hibf/platform.hpp>                  // for HIBF_CONSTEXPR_VECTOR
 
diff --git a/include/hibf/misc/counting_vector.hpp b/include/hibf/misc/counting_vector.hpp
index f82068b1..94732c22 100644
--- a/include/hibf/misc/counting_vector.hpp
+++ b/include/hibf/misc/counting_vector.hpp
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <algorithm>   // for transform
 #include <bit>         // for countr_zero
 #include <cassert>     // for assert
 #include <cinttypes>   // for uint64_t
@@ -17,7 +16,7 @@
 #include <concepts>    // for integral
 #include <cstring>     // for size_t
 #include <functional>  // for minus, plus
-#include <type_traits> // for conditional_t
+#include <type_traits> // for conditional, conditional_t
 #include <vector>      // for vector
 
 #include <hibf/contrib/aligned_allocator.hpp> // for aligned_allocator
diff --git a/include/hibf/misc/insert_iterator.hpp b/include/hibf/misc/insert_iterator.hpp
index ccebc3e1..b2d5d4f4 100644
--- a/include/hibf/misc/insert_iterator.hpp
+++ b/include/hibf/misc/insert_iterator.hpp
@@ -4,14 +4,15 @@
 
 #pragma once
 
-#include <cassert>   // for assert
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for ptrdiff_t
-#include <iterator>  // for output_iterator_tag
-#include <memory>    // for addressof
-#include <vector>    // for vector
+#include <cassert>    // for assert
+#include <cinttypes>  // for uint64_t
+#include <cstddef>    // for ptrdiff_t
+#include <functional> // for equal_to
+#include <iterator>   // for output_iterator_tag
+#include <utility>    // for addressof
+#include <vector>     // for vector
 
-#include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set
+#include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set, hash
 #include <hibf/platform.hpp>
 
 // IWYU pragma: private, include <hibf/config.hpp>
diff --git a/include/hibf/misc/timer.hpp b/include/hibf/misc/timer.hpp
index 05d9fba3..0db61e25 100644
--- a/include/hibf/misc/timer.hpp
+++ b/include/hibf/misc/timer.hpp
@@ -12,11 +12,12 @@
 #include <algorithm> // for max
 #include <atomic>    // for atomic, __atomic_base, memory_order_relaxed
 #include <cassert>   // for assert
-#include <chrono>    // for duration, time_point, operator-, steady_clock
 #include <cinttypes> // for uint64_t
 #include <concepts>  // for same_as
 #include <utility>   // for move
 
+#include <bits/chrono.h> // for duration, time_point, operator-, steady_clock
+
 #include <hibf/platform.hpp>
 
 namespace seqan::hibf
diff --git a/src/build/construct_ibf.cpp b/src/build/construct_ibf.cpp
index a6550f97..d44e7cca 100644
--- a/src/build/construct_ibf.cpp
+++ b/src/build/construct_ibf.cpp
@@ -2,11 +2,12 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <cassert>   // for assert
-#include <cinttypes> // for uint64_t
-#include <cmath>     // for ceil
-#include <cstddef>   // for size_t
-#include <vector>    // for vector
+#include <cassert>    // for assert
+#include <cinttypes>  // for uint64_t
+#include <cmath>      // for ceil
+#include <cstddef>    // for size_t
+#include <functional> // for equal_to
+#include <vector>     // for vector
 
 #include <hibf/build/bin_size_in_bits.hpp>    // for bin_size_in_bits
 #include <hibf/build/build_data.hpp>          // for build_data
@@ -14,7 +15,7 @@
 #include <hibf/build/insert_into_ibf.hpp>     // for insert_into_ibf
 #include <hibf/build/update_parent_kmers.hpp> // for update_parent_kmers
 #include <hibf/config.hpp>                    // for config
-#include <hibf/contrib/robin_hood.hpp>        // for unordered_flat_set
+#include <hibf/contrib/robin_hood.hpp>        // for unordered_flat_set, hash
 #include <hibf/interleaved_bloom_filter.hpp>  // for interleaved_bloom_filter, bin_count, bin_size, hash_function_c...
 #include <hibf/layout/graph.hpp>              // for graph
 #include <hibf/misc/divide_and_ceil.hpp>      // for divide_and_ceil
diff --git a/src/config.cpp b/src/config.cpp
index 1e27d498..bf6f6c43 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -3,12 +3,13 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include <cassert>     // for assert
-#include <cmath>       // for sqrt, ceil
+#include <cmath>       // for ceil, sqrt
 #include <functional>  // for function
-#include <iostream>    // for operator<<, basic_ostream, basic_istream, getline, stringstream
+#include <iostream>    // for basic_ostream, basic_istream, operator<<, stringstream, cerr
+#include <sstream>     // for basic_stringstream
 #include <stdexcept>   // for invalid_argument
-#include <string>      // for char_traits, string
-#include <string_view> // for operator==, basic_string_view
+#include <string>      // for char_traits, getline, operator<<, string
+#include <string_view> // for operator<<, operator==, basic_string_view
 
 #include <cereal/archives/json.hpp> // for JSONInputArchive, JSONOutputArchive
 #include <cereal/cereal.hpp>        // for make_nvp, InputArchive, OutputArchive
diff --git a/src/hierarchical_interleaved_bloom_filter.cpp b/src/hierarchical_interleaved_bloom_filter.cpp
index 9044df4f..8889425b 100644
--- a/src/hierarchical_interleaved_bloom_filter.cpp
+++ b/src/hierarchical_interleaved_bloom_filter.cpp
@@ -2,16 +2,17 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <algorithm> // for max, fill_n, shuffle
-#include <cassert>   // for assert
-#include <cinttypes> // for uint64_t, int64_t
-#include <cstddef>   // for size_t
-#include <mutex>     // for mutex, lock_guard
-#include <numeric>   // for iota
-#include <optional>  // for optional
-#include <random>    // for random_device, mt19937_64
-#include <utility>   // for move
-#include <vector>    // for vector, erase
+#include <algorithm>  // for shuffle
+#include <cassert>    // for assert
+#include <cinttypes>  // for uint64_t, int64_t
+#include <cstddef>    // for size_t
+#include <functional> // for equal_to
+#include <mutex>      // for mutex, lock_guard
+#include <numeric>    // for iota
+#include <optional>   // for optional
+#include <random>     // for random_device, mt19937_64
+#include <utility>    // for move
+#include <vector>     // for vector, erase
 
 #include <hibf/build/build_data.hpp>                      // for build_data
 #include <hibf/build/compute_kmers.hpp>                   // for compute_kmers
@@ -20,7 +21,7 @@
 #include <hibf/build/update_parent_kmers.hpp>             // for update_parent_kmers
 #include <hibf/build/update_user_bins.hpp>                // for update_user_bins
 #include <hibf/config.hpp>                                // for config
-#include <hibf/contrib/robin_hood.hpp>                    // for unordered_flat_set
+#include <hibf/contrib/robin_hood.hpp>                    // for unordered_flat_set, hash
 #include <hibf/hierarchical_interleaved_bloom_filter.hpp> // for hierarchical_interleaved_bloom_filter
 #include <hibf/interleaved_bloom_filter.hpp>              // for interleaved_bloom_filter
 #include <hibf/layout/compute_fpr_correction.hpp>         // for compute_fpr_correction
@@ -28,7 +29,7 @@
 #include <hibf/layout/graph.hpp>                          // for graph
 #include <hibf/layout/layout.hpp>                         // for layout
 #include <hibf/misc/divide_and_ceil.hpp>                  // for divide_and_ceil
-#include <hibf/misc/timer.hpp>                            // for timer
+#include <hibf/misc/timer.hpp>                            // for concurrent_timer
 #include <hibf/sketch/compute_sketches.hpp>               // for compute_sketches
 #include <hibf/sketch/hyperloglog.hpp>                    // for hyperloglog
 
diff --git a/src/layout/compute_layout.cpp b/src/layout/compute_layout.cpp
index d170c1f1..8f41c233 100644
--- a/src/layout/compute_layout.cpp
+++ b/src/layout/compute_layout.cpp
@@ -2,12 +2,11 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <algorithm>  // for __fn, sort
-#include <cstddef>    // for size_t
-#include <functional> // for identity
-#include <memory>     // for addressof
-#include <sstream>    // for stringstream
-#include <vector>     // for vector
+#include <algorithm> // for __sort_fn, sort
+#include <cstddef>   // for size_t
+#include <sstream>   // for basic_stringstream, stringstream
+#include <utility>   // for addressof
+#include <vector>    // for vector
 
 #include <hibf/config.hpp>                        // for config
 #include <hibf/layout/compute_fpr_correction.hpp> // for compute_fpr_correction
diff --git a/src/layout/graph.cpp b/src/layout/graph.cpp
index c1da014c..91291517 100644
--- a/src/layout/graph.cpp
+++ b/src/layout/graph.cpp
@@ -6,8 +6,8 @@
 #include <cassert>          // for assert
 #include <cstddef>          // for size_t
 #include <initializer_list> // for initializer_list
-#include <iterator>         // for __fn, prev
-#include <optional>         // for optional, nullopt
+#include <optional>         // for optional, nullopt, nullopt_t
+#include <ranges>           // for __prev_fn, prev
 #include <vector>           // for vector
 
 #include <hibf/layout/graph.hpp>  // for graph
diff --git a/src/misc/print.cpp b/src/misc/print.cpp
index 77834373..7849f1a4 100644
--- a/src/misc/print.cpp
+++ b/src/misc/print.cpp
@@ -2,11 +2,13 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <cinttypes> // for uint16_t, int16_t, int64_t, int8_t, uint8_t, int32_t, uint32_t, uin...
-#include <cstddef>   // for size_t
-#include <iostream>  // for basic_ostream::operator<<, ostream, operator<<, basic_ostream
-#include <ranges>    // for range_value_t, empty
-#include <vector>    // for vector
+#include <cinttypes>   // for uint16_t, int16_t, int64_t, int8_t, uint8_t, int32_t, uint32_t, uin...
+#include <cstddef>     // for size_t
+#include <iostream>    // for ostream, basic_ostream::operator<<, operator<<, basic_ostream
+#include <iterator>    // for __iter_traits_impl
+#include <ranges>      // for range_value_t, empty
+#include <type_traits> // for remove_cvref
+#include <vector>      // for vector
 
 #include <hibf/misc/bit_vector.hpp>      // for bit_vector
 #include <hibf/misc/counting_vector.hpp> // for counting_vector
diff --git a/src/sketch/hyperloglog.cpp b/src/sketch/hyperloglog.cpp
index 459b0d83..250ecd63 100644
--- a/src/sketch/hyperloglog.cpp
+++ b/src/sketch/hyperloglog.cpp
@@ -3,17 +3,16 @@
 // SPDX-FileCopyrightText: 2013 Hideaki Ohno <hide.o.j55{at}gmail.com>
 // SPDX-License-Identifier: BSD-3-Clause AND MIT
 
-#include <algorithm> // for max, __fn, fill
+#include <algorithm> // for max, __fill_fn, fill
 #include <array>     // for array
 #include <bit>       // for countl_zero
 #include <cassert>   // for assert
 #include <cinttypes> // for uint64_t, uint8_t, uint32_t
 #include <cmath>     // for log
 #include <cstddef>   // for size_t
-#include <iostream>  // for basic_ostream, basic_istream, istream, ostream
-#include <memory>    // for addressof
+#include <iostream>  // for basic_ostream, basic_istream, basic_istream::read, basic_ostre...
 #include <stdexcept> // for runtime_error, invalid_argument
-#include <utility>   // for swap
+#include <utility>   // for addressof, swap
 #include <vector>    // for vector
 
 #include <simde/x86/avx.h>  // for simde__m256i, simde_mm256_add_ps, simde_mm256_set1_ps, simde_m...
diff --git a/src/sketch/toolbox.cpp b/src/sketch/toolbox.cpp
index e13cea40..f97856c4 100644
--- a/src/sketch/toolbox.cpp
+++ b/src/sketch/toolbox.cpp
@@ -2,18 +2,19 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <algorithm> // for sort
-#include <cassert>   // for assert
-#include <cinttypes> // for uint64_t, int64_t
-#include <cmath>     // for sqrt, floor
-#include <cstddef>   // for size_t
-#include <limits>    // for numeric_limits
-#include <omp.h>     // for omp_get_thread_num
-#include <random>    // for uniform_int_distribution, mt19937_64
-#include <utility>   // for swap, move
-#include <vector>    // for vector
-
-#include <hibf/contrib/robin_hood.hpp> // for unordered_flat_map, pair
+#include <algorithm>  // for sort
+#include <cassert>    // for assert
+#include <cinttypes>  // for uint64_t, int64_t
+#include <cmath>      // for floor, sqrt
+#include <cstddef>    // for size_t
+#include <functional> // for equal_to, greater
+#include <limits>     // for numeric_limits
+#include <omp.h>      // for omp_get_thread_num
+#include <random>     // for uniform_int_distribution, mt19937_64
+#include <utility>    // for swap, move
+#include <vector>     // for vector
+
+#include <hibf/contrib/robin_hood.hpp> // for hash, unordered_flat_map
 #include <hibf/sketch/hyperloglog.hpp> // for hyperloglog
 #include <hibf/sketch/toolbox.hpp>     // for clustering_node, entry, neighbor, prio_queue, distance_matrix, cluste...
 
diff --git a/test/include/hibf/test/sandboxed_path.hpp b/test/include/hibf/test/sandboxed_path.hpp
index 6cbe760e..4d4eec79 100644
--- a/test/include/hibf/test/sandboxed_path.hpp
+++ b/test/include/hibf/test/sandboxed_path.hpp
@@ -11,7 +11,6 @@
 
 #include <filesystem>   // for path, filesystem_error, operator/
 #include <system_error> // for errc, make_error_code
-#include <type_traits>  // for __libcpp_remove_reference_t
 #include <utility>      // for move, forward
 
 #include <hibf/platform.hpp>
diff --git a/test/include/hibf/test/type_name_as_string.hpp b/test/include/hibf/test/type_name_as_string.hpp
index 4fdbdde0..d9f0ce0e 100644
--- a/test/include/hibf/test/type_name_as_string.hpp
+++ b/test/include/hibf/test/type_name_as_string.hpp
@@ -15,10 +15,11 @@
 
 #include <cstdlib>     // for free
 #include <functional>  // for function
-#include <memory>      // for allocator, addressof, unique_ptr
+#include <memory>      // for allocator, unique_ptr
 #include <string>      // for char_traits, operator+, string, to_string
 #include <type_traits> // for remove_reference_t
 #include <typeinfo>    // for type_info
+#include <utility>     // for addressof
 
 #include <hibf/platform.hpp>
 
diff --git a/test/performance/ibf/interleaved_bloom_filter_benchmark.cpp b/test/performance/ibf/interleaved_bloom_filter_benchmark.cpp
index 065dc41e..5bda0dda 100644
--- a/test/performance/ibf/interleaved_bloom_filter_benchmark.cpp
+++ b/test/performance/ibf/interleaved_bloom_filter_benchmark.cpp
@@ -4,18 +4,19 @@
 
 #include <benchmark/benchmark.h> // for State, Benchmark, AddCustomContext, Counter, BENCHMARK
 
-#include <algorithm> // for copy, fill_n, __generate_fn, generate
-#include <cmath>     // for log, ceil, exp
-#include <cstddef>   // for size_t
-#include <random>    // for uniform_int_distribution, mt19937_64
-#include <ranges>    // for all_t, transform_view, iterator_t, iota_view, _Partial
-#include <string>    // for allocator, to_string, basic_string
-#include <tuple>     // for tuple, make_tuple
-#include <utility>   // for move, pair
-#include <vector>    // for vector
-
-#include <hibf/contrib/robin_hood.hpp>              // for pair, unordered_map
-#include <hibf/contrib/std/chunk_view.hpp>          // for chunk_view, operator==, chunk, chunk_fn
+#include <algorithm>  // for __generate_fn, generate
+#include <cmath>      // for log, ceil, exp
+#include <cstddef>    // for size_t
+#include <functional> // for equal_to
+#include <random>     // for uniform_int_distribution, mt19937_64
+#include <ranges>     // for iota_view, transform_view, _Partial, _Transform, operator|
+#include <string>     // for to_string, basic_string
+#include <tuple>      // for tuple, make_tuple
+#include <utility>    // for move, pair
+#include <vector>     // for vector
+
+#include <hibf/contrib/robin_hood.hpp>              // for hash, unordered_map
+#include <hibf/contrib/std/chunk_view.hpp>          // for chunk, chunk_fn, chunk_view
 #include <hibf/contrib/std/detail/adaptor_base.hpp> // for operator|
 #include <hibf/contrib/std/to.hpp>                  // for to
 #include <hibf/interleaved_bloom_filter.hpp>        // for interleaved_bloom_filter, bin_index, bin_count, bin_size
diff --git a/test/unit/hibf/counting_vector_test.cpp b/test/unit/hibf/counting_vector_test.cpp
index 2eda550b..1b9713d0 100644
--- a/test/unit/hibf/counting_vector_test.cpp
+++ b/test/unit/hibf/counting_vector_test.cpp
@@ -6,14 +6,13 @@
 #    define HIBF_HAS_AVX512 0
 #endif
 
-#include <gtest/gtest.h> // for TYPED_TEST, Message, TestPartResult, ASSERT_EQ, EXPECT_EQ, TYPED_TE...
+#include <gtest/gtest.h> // for Message, TYPED_TEST, TestPartResult, ASSERT_EQ, EXPECT_EQ, Types
 
 #include <algorithm> // for fill, fill_n
 #include <cinttypes> // for int16_t, int32_t, int64_t, int8_t, uint16_t, uint32_t, uint64_t
 #include <concepts>  // for signed_integral
 #include <cstddef>   // for size_t
 #include <limits>    // for numeric_limits
-#include <vector>    // for __sanitizer_annotate_contiguous_container
 
 #include <hibf/misc/bit_vector.hpp>      // for bit_vector
 #include <hibf/misc/counting_vector.hpp> // for counting_vector
diff --git a/test/unit/hibf/layout/layout_test.cpp b/test/unit/hibf/layout/layout_test.cpp
index 8662cdeb..73b61357 100644
--- a/test/unit/hibf/layout/layout_test.cpp
+++ b/test/unit/hibf/layout/layout_test.cpp
@@ -2,12 +2,13 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, AssertionResult, Message, TestPartResult, EXPECT_EQ, TestInfo, TEST
+#include <gtest/gtest.h> // for Test, Message, AssertionResult, TestPartResult, EXPECT_EQ, TestInfo, TEST
 
-#include <cstddef> // for size_t
-#include <sstream> // for operator<<, basic_ostream, stringstream, basic_stringstream, basic_iostream
-#include <string>  // for char_traits, allocator, string
-#include <vector>  // for vector
+#include <cstddef>     // for size_t
+#include <sstream>     // for basic_stringstream, operator<<, basic_ostream, stringstream, basic_ios
+#include <string>      // for allocator, char_traits, string
+#include <string_view> // for operator<<
+#include <vector>      // for vector
 
 #include <hibf/layout/layout.hpp> // for layout, operator<<
 
diff --git a/test/unit/hibf/sketch/hyperloglog_test.cpp b/test/unit/hibf/sketch/hyperloglog_test.cpp
index 6a6f21d1..96e269ef 100644
--- a/test/unit/hibf/sketch/hyperloglog_test.cpp
+++ b/test/unit/hibf/sketch/hyperloglog_test.cpp
@@ -9,14 +9,15 @@
 #include <cstddef>    // for size_t
 #include <filesystem> // for path
 #include <fstream>    // for basic_ofstream, basic_ifstream, ofstream, ifstream, basi...
+#include <functional> // for equal_to
 #include <random>     // for uniform_int_distribution, mt19937_64
-#include <ranges>     // for iterator_t, all_t, iota_view, operator==, _Iota, iota
+#include <ranges>     // for _Iota, iota, iota_view, views
 #include <stdexcept>  // for runtime_error, invalid_argument
 #include <string>     // for allocator, basic_string, char_traits
 #include <vector>     // for vector
 
-#include <hibf/contrib/robin_hood.hpp>              // for unordered_flat_set
-#include <hibf/contrib/std/chunk_view.hpp>          // for chunk_view, operator==, chunk, chunk_fn
+#include <hibf/contrib/robin_hood.hpp>              // for hash, unordered_flat_set
+#include <hibf/contrib/std/chunk_view.hpp>          // for chunk, chunk_fn, chunk_view
 #include <hibf/contrib/std/detail/adaptor_base.hpp> // for operator|
 #include <hibf/misc/divide_and_ceil.hpp>            // for divide_and_ceil
 #include <hibf/sketch/hyperloglog.hpp>              // for hyperloglog
diff --git a/test/unit/hibf/sketch/toolbox_test.cpp b/test/unit/hibf/sketch/toolbox_test.cpp
index 36e6af19..b1dc1008 100644
--- a/test/unit/hibf/sketch/toolbox_test.cpp
+++ b/test/unit/hibf/sketch/toolbox_test.cpp
@@ -4,15 +4,16 @@
 
 #include <gtest/gtest.h> // for Message, TestPartResult, EXPECT_EQ, TestInfo, TEST_F, Test
 
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for size_t
-#include <limits>    // for numeric_limits
-#include <random>    // for uniform_int_distribution, mt19937_64
-#include <string>    // for basic_string, string
-#include <tuple>     // for tie, make_tuple
-#include <vector>    // for vector
-
-#include <hibf/contrib/robin_hood.hpp>   // for unordered_flat_map
+#include <cinttypes>  // for uint64_t
+#include <cstddef>    // for size_t
+#include <functional> // for equal_to, greater
+#include <limits>     // for numeric_limits
+#include <random>     // for uniform_int_distribution, mt19937_64
+#include <string>     // for basic_string, string
+#include <tuple>      // for tie, make_tuple
+#include <vector>     // for vector
+
+#include <hibf/contrib/robin_hood.hpp>   // for hash, pair, unordered_flat_map
 #include <hibf/platform.hpp>             // for _LIBCPP_VERSION
 #include <hibf/sketch/hyperloglog.hpp>   // for hyperloglog
 #include <hibf/sketch/toolbox.hpp>       // for clustering_node, entry, precompute_union_estimates_for, cluster_bins
diff --git a/test/unit/hibf/timer_test.cpp b/test/unit/hibf/timer_test.cpp
index ffb3fad4..8b59a172 100644
--- a/test/unit/hibf/timer_test.cpp
+++ b/test/unit/hibf/timer_test.cpp
@@ -2,11 +2,12 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for AssertionResult, Message, TestPartResult, CmpHelperGE, CmpHelperGT, EXPECT_TRUE
+#include <gtest/gtest.h> // for Message, AssertionResult, TestPartResult, CmpHelperGE, EXPECT_TRUE, CmpHelperGT
 
-#include <chrono> // for operator""ms
 #include <thread> // for sleep_for
 
+#include <bits/chrono.h> // for operator""ms
+
 #include <hibf/misc/timer.hpp> // for concurrent_timer, serial_timer
 
 static inline void waste_time()
diff --git a/test/unit/test/temporary_snippet_file_test.cpp b/test/unit/test/temporary_snippet_file_test.cpp
index fd8374c0..1dfc1f33 100644
--- a/test/unit/test/temporary_snippet_file_test.cpp
+++ b/test/unit/test/temporary_snippet_file_test.cpp
@@ -5,8 +5,9 @@
 #include <gtest/gtest.h> // for Test, AssertionResult, Message, TestInfo, TestPartResult
 
 #include <filesystem> // for path, current_path, operator/, exists
-#include <fstream>    // for char_traits, basic_filebuf, basic_ostream, ifstream, strings...
+#include <fstream>    // for char_traits, basic_ifstream, basic_ostream::operator<<, basi...
 #include <memory>     // for allocator
+#include <sstream>    // for basic_stringstream
 
 #include <hibf/test/temporary_snippet_file.hpp> // for temporary_snippet_file