diff --git a/include/hibf/build/compute_kmers.hpp b/include/hibf/build/compute_kmers.hpp
index 062ad275..ce178127 100644
--- a/include/hibf/build/compute_kmers.hpp
+++ b/include/hibf/build/compute_kmers.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <cinttypes> // for uint64_t
+#include <cstdint> // for uint64_t
 
 #include <hibf/build/build_data.hpp>   // for build_data
 #include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set
diff --git a/include/hibf/build/construct_ibf.hpp b/include/hibf/build/construct_ibf.hpp
index f68cd4c0..66215550 100644
--- a/include/hibf/build/construct_ibf.hpp
+++ b/include/hibf/build/construct_ibf.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for size_t
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t
 
 #include <hibf/build/build_data.hpp>         // for build_data
 #include <hibf/contrib/robin_hood.hpp>       // for unordered_flat_set
 #include <hibf/interleaved_bloom_filter.hpp> // for interleaved_bloom_filter
-#include <hibf/layout/graph.hpp>
+#include <hibf/layout/graph.hpp>             // for graph
 
 namespace seqan::hibf::build
 {
diff --git a/include/hibf/build/insert_into_ibf.hpp b/include/hibf/build/insert_into_ibf.hpp
index e8d41853..853b9c92 100644
--- a/include/hibf/build/insert_into_ibf.hpp
+++ b/include/hibf/build/insert_into_ibf.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for size_t
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t
 
 #include <hibf/build/build_data.hpp>         // for build_data
 #include <hibf/contrib/robin_hood.hpp>       // for unordered_flat_set
 #include <hibf/interleaved_bloom_filter.hpp> // for interleaved_bloom_filter
 #include <hibf/layout/layout.hpp>            // for layout
-#include <hibf/misc/timer.hpp>               // for concurrent, timer
+#include <hibf/misc/timer.hpp>               // for concurrent_timer
 
 namespace seqan::hibf::build
 {
diff --git a/include/hibf/build/update_parent_kmers.hpp b/include/hibf/build/update_parent_kmers.hpp
index 7b2da7e7..53f6e1f6 100644
--- a/include/hibf/build/update_parent_kmers.hpp
+++ b/include/hibf/build/update_parent_kmers.hpp
@@ -8,7 +8,7 @@
  */
 #pragma once
 
-#include <cinttypes>  // for uint64_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for equal_to
 
 #include <hibf/contrib/robin_hood.hpp> // for unordered_flat_set, hash
diff --git a/include/hibf/build/update_user_bins.hpp b/include/hibf/build/update_user_bins.hpp
index e343534e..de10f7c4 100644
--- a/include/hibf/build/update_user_bins.hpp
+++ b/include/hibf/build/update_user_bins.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <algorithm> // for fill_n
-#include <cinttypes> // for int64_t
+#include <cstdint>   // for uint64_t
 #include <vector>    // for vector
 
 #include <hibf/layout/layout.hpp> // for layout
diff --git a/include/hibf/cereal/concepts.hpp b/include/hibf/cereal/concepts.hpp
index 65a97342..b0ef6752 100644
--- a/include/hibf/cereal/concepts.hpp
+++ b/include/hibf/cereal/concepts.hpp
@@ -4,8 +4,10 @@
 
 #pragma once
 
-#include <cereal/details/helpers.hpp> // for InputArchiveBase, OutputArchiveBase
-#include <cereal/details/traits.hpp>  // for InputArchiveBase, OutputArchiveBase
+#include <type_traits> // for is_base_of_v
+
+#include <cereal/details/helpers.hpp> // for OutputArchiveBase, InputArchiveBase, BinaryInputArchive, BinaryOutputA...
+#include <cereal/details/traits.hpp>  // for TextArchive
 
 #include <hibf/platform.hpp>
 
diff --git a/include/hibf/config.hpp b/include/hibf/config.hpp
index 20b0a322..424d4ca4 100644
--- a/include/hibf/config.hpp
+++ b/include/hibf/config.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <cinttypes>  // for uint32_t, uint8_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint32_t, uint8_t
 #include <functional> // for function
 #include <iosfwd>     // for istream, ostream
 
diff --git a/include/hibf/hierarchical_interleaved_bloom_filter.hpp b/include/hibf/hierarchical_interleaved_bloom_filter.hpp
index e8f8899a..8d75972d 100644
--- a/include/hibf/hierarchical_interleaved_bloom_filter.hpp
+++ b/include/hibf/hierarchical_interleaved_bloom_filter.hpp
@@ -6,9 +6,9 @@
 
 #include <algorithm> // for __fn, fill, sort
 #include <cassert>   // for assert
-#include <cinttypes> // for uint64_t, uint16_t, uint32_t
 #include <concepts>  // for integral, unsigned_integral
 #include <cstddef>   // for size_t
+#include <cstdint>   // for uint64_t, uint16_t, uint32_t
 #include <limits>    // for numeric_limits
 #include <memory>    // for addressof
 #include <ranges>    // for forward_range, range_value_t, range
diff --git a/include/hibf/interleaved_bloom_filter.hpp b/include/hibf/interleaved_bloom_filter.hpp
index 998092e3..c01cc151 100644
--- a/include/hibf/interleaved_bloom_filter.hpp
+++ b/include/hibf/interleaved_bloom_filter.hpp
@@ -12,8 +12,8 @@
 #include <algorithm>   // for fill
 #include <array>       // for array
 #include <cassert>     // for assert
-#include <cinttypes>   // for uint32_t, uint16_t, uint64_t
 #include <concepts>    // for integral, same_as, unsigned_integral
+#include <cstdint>     // for uint32_t, uint16_t, uint64_t
 #include <cstring>     // for size_t
 #include <memory>      // for addressof
 #include <ranges>      // for range, range_reference_t, range_value_t, forward_range, input_...
diff --git a/include/hibf/layout/data_store.hpp b/include/hibf/layout/data_store.hpp
index f38b20af..f24928ad 100644
--- a/include/hibf/layout/data_store.hpp
+++ b/include/hibf/layout/data_store.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <cassert>   // for assert
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for size_t
-#include <numeric>   // for iota
-#include <string>    // for string
-#include <vector>    // for vector
+#include <cassert> // for assert
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t
+#include <numeric> // for iota
+#include <string>  // for basic_string, string
+#include <vector>  // for vector
 
 #include <hibf/layout/layout.hpp>      // for layout
 #include <hibf/misc/timer.hpp>         // for concurrent_timer
diff --git a/include/hibf/misc/bit_vector.hpp b/include/hibf/misc/bit_vector.hpp
index 3d437415..a43b3fda 100644
--- a/include/hibf/misc/bit_vector.hpp
+++ b/include/hibf/misc/bit_vector.hpp
@@ -24,17 +24,17 @@
 #include <algorithm>        // for __fn, for_each, all_of, any_of, copy, fill
 #include <bit>              // for countr_zero
 #include <cassert>          // for assert
-#include <cinttypes>        // for uint64_t
 #include <climits>          // for CHAR_BIT
 #include <compare>          // for strong_ordering, operator==
 #include <concepts>         // for assignable_from
 #include <cstddef>          // for size_t, ptrdiff_t
+#include <cstdint>          // for uint64_t
 #include <initializer_list> // for initializer_list
 #include <iterator>         // for iter_reference_t, __fn, back_inserter, distance, iter_differen...
-#include <memory>           // for allocator, assume_aligned, allocator_traits, __compressed_pair
+#include <memory>           // for allocator, allocator_traits, assume_aligned, __compressed_pair
 #include <ranges>           // for __fn, begin, end
 #include <stdexcept>        // for out_of_range
-#include <string>           // for char_traits, operator+, to_string, operator""s
+#include <string>           // for char_traits, operator+, to_string, operator""s, basic_string
 #include <type_traits>      // for conditional_t
 #include <utility>          // for swap
 #include <vector>           // for vector
diff --git a/include/hibf/misc/counting_vector.hpp b/include/hibf/misc/counting_vector.hpp
index f8814625..6129b4ea 100644
--- a/include/hibf/misc/counting_vector.hpp
+++ b/include/hibf/misc/counting_vector.hpp
@@ -12,12 +12,12 @@
 #include <algorithm>   // for transform
 #include <bit>         // for countr_zero
 #include <cassert>     // for assert
-#include <cinttypes>   // for uint64_t
 #include <climits>     // for CHAR_BIT
 #include <concepts>    // for integral
+#include <cstdint>     // for uint64_t, uint8_t
 #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 6ad2c993..30212b82 100644
--- a/include/hibf/misc/insert_iterator.hpp
+++ b/include/hibf/misc/insert_iterator.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t, uint8_t
 #include <cstddef>    // for size_t, ptrdiff_t
+#include <cstdint>    // for uint64_t, uint8_t
 #include <functional> // for function, equal_to
 #include <iterator>   // for output_iterator_tag
 #include <memory>     // for addressof
diff --git a/include/hibf/misc/print.hpp b/include/hibf/misc/print.hpp
index d9d27be5..b37e2a05 100644
--- a/include/hibf/misc/print.hpp
+++ b/include/hibf/misc/print.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <cinttypes> // for int64_t, int16_t, int32_t, int8_t, uint16_t, uint32_t, uint64_t
-#include <iostream>  // for cout, ostream
-#include <vector>    // for vector
+#include <cstdint>  // for uint64_t, int16_t, int32_t, int64_t, int8_t, uint16_t, uint32_t
+#include <iostream> // for cout, ostream
+#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/include/hibf/misc/timer.hpp b/include/hibf/misc/timer.hpp
index 41e1428b..1f60c40e 100644
--- a/include/hibf/misc/timer.hpp
+++ b/include/hibf/misc/timer.hpp
@@ -13,9 +13,9 @@
 #include <atomic>    // for atomic, __atomic_base, memory_order_relaxed
 #include <cassert>   // for assert
 #include <chrono>    // for duration, time_point, operator-, operator<=>, steady_clock
-#include <cinttypes> // for uint64_t
 #include <compare>   // for operator>=, strong_ordering
 #include <concepts>  // for same_as
+#include <cstdint>   // for uint64_t
 
 #include <hibf/platform.hpp>
 
diff --git a/include/hibf/sketch/hyperloglog.hpp b/include/hibf/sketch/hyperloglog.hpp
index acaccd56..5545e31f 100644
--- a/include/hibf/sketch/hyperloglog.hpp
+++ b/include/hibf/sketch/hyperloglog.hpp
@@ -11,11 +11,11 @@
 
 #pragma once
 
-#include <array>     // for array
-#include <cinttypes> // for uint64_t, uint8_t, uint32_t
-#include <cstddef>   // for size_t
-#include <iosfwd>    // for istream, ostream
-#include <vector>    // for vector
+#include <array>   // for array
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t, uint8_t, uint32_t
+#include <iosfwd>  // for istream, ostream
+#include <vector>  // for vector
 
 #include <cereal/access.hpp> // for access
 #include <cereal/cereal.hpp> // for make_nvp, CEREAL_NVP
diff --git a/include/hibf/sketch/toolbox.hpp b/include/hibf/sketch/toolbox.hpp
index 9c3a6042..ac107255 100644
--- a/include/hibf/sketch/toolbox.hpp
+++ b/include/hibf/sketch/toolbox.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <cinttypes>  // for uint64_t, int64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t, int64_t
 #include <functional> // for greater
 #include <queue>      // for priority_queue
 #include <vector>     // for vector
diff --git a/include/hibf/version.hpp b/include/hibf/version.hpp
index 621a7261..dfc750f8 100644
--- a/include/hibf/version.hpp
+++ b/include/hibf/version.hpp
@@ -6,8 +6,8 @@
 
 // IWYU pragma: always_keep
 
-#include <cinttypes> // for uint8_t
-#include <cstddef>   // for size_t
+#include <cstddef> // for size_t
+#include <cstdint> // for uint8_t
 
 /*!\file
  * \brief Provides version macros and global variables.
diff --git a/src/build/compute_kmers.cpp b/src/build/compute_kmers.cpp
index 727569a9..884b4cc3 100644
--- a/src/build/compute_kmers.cpp
+++ b/src/build/compute_kmers.cpp
@@ -7,12 +7,12 @@
  * \author Enrico Seiler <enrico.seiler AT fu-berlin.de>
  */
 
-#include <cinttypes>  // for uint64_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for function
 
 #include <hibf/build/build_data.hpp>    // for build_data
 #include <hibf/build/compute_kmers.hpp> // for compute_kmers
-#include <hibf/config.hpp>              // for config, insert_iterator
+#include <hibf/config.hpp>              // for insert_iterator, config
 #include <hibf/contrib/robin_hood.hpp>  // for unordered_flat_set
 #include <hibf/layout/layout.hpp>       // for layout
 #include <hibf/misc/timer.hpp>          // for serial_timer, concurrent_timer
diff --git a/src/build/construct_ibf.cpp b/src/build/construct_ibf.cpp
index 5328c3f4..2fc7846c 100644
--- a/src/build/construct_ibf.cpp
+++ b/src/build/construct_ibf.cpp
@@ -3,9 +3,9 @@
 // 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 <cstdint>    // for uint64_t
 #include <functional> // for equal_to
 #include <vector>     // for vector
 
diff --git a/src/build/insert_into_ibf.cpp b/src/build/insert_into_ibf.cpp
index 7615dfda..27082891 100644
--- a/src/build/insert_into_ibf.cpp
+++ b/src/build/insert_into_ibf.cpp
@@ -4,10 +4,11 @@
 
 #include <algorithm>  // for __fn, all_of, fill_n
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for equal_to, function
 #include <iterator>   // for counted_iterator
+#include <ranges>     // for subrange
 #include <vector>     // for vector
 
 #include <hibf/build/build_data.hpp>         // for build_data
diff --git a/src/hierarchical_interleaved_bloom_filter.cpp b/src/hierarchical_interleaved_bloom_filter.cpp
index 90eef301..1456e2af 100644
--- a/src/hierarchical_interleaved_bloom_filter.cpp
+++ b/src/hierarchical_interleaved_bloom_filter.cpp
@@ -4,8 +4,8 @@
 
 #include <algorithm>  // for shuffle, __fn, none_of
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t, int64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for equal_to
 #include <mutex>      // for mutex, lock_guard
 #include <numeric>    // for iota
@@ -22,18 +22,18 @@
 #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, hash
-#include <hibf/hierarchical_interleaved_bloom_filter.hpp> // for hierarchical_interleaved_bloom_filter
+#include <hibf/hierarchical_interleaved_bloom_filter.hpp> // for hierarchical_interleaved_bloom_filter, merged
 #include <hibf/interleaved_bloom_filter.hpp>              // for interleaved_bloom_filter
 #include <hibf/layout/compute_fpr_correction.hpp>         // for compute_fpr_correction
 #include <hibf/layout/compute_layout.hpp>                 // for compute_layout
 #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/iota_vector.hpp>
-#include <hibf/misc/timer.hpp>              // for concurrent_timer
-#include <hibf/sketch/compute_sketches.hpp> // for compute_sketches
-#include <hibf/sketch/estimate_kmer_counts.hpp>
-#include <hibf/sketch/hyperloglog.hpp> // for hyperloglog
+#include <hibf/misc/iota_vector.hpp>                      // for iota_vector
+#include <hibf/misc/timer.hpp>                            // for concurrent_timer
+#include <hibf/sketch/compute_sketches.hpp>               // for compute_sketches
+#include <hibf/sketch/estimate_kmer_counts.hpp>           // for estimate_kmer_counts
+#include <hibf/sketch/hyperloglog.hpp>                    // for hyperloglog
 
 namespace seqan::hibf
 {
diff --git a/src/interleaved_bloom_filter.cpp b/src/interleaved_bloom_filter.cpp
index 5b0de811..b418e89e 100644
--- a/src/interleaved_bloom_filter.cpp
+++ b/src/interleaved_bloom_filter.cpp
@@ -6,7 +6,7 @@
 #include <array>      // for array
 #include <bit>        // for bit_ceil, countl_zero
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t
+#include <cstdint>    // for uint64_t
 #include <cstring>    // for size_t, memcpy
 #include <functional> // for equal_to, function
 #include <stdexcept>  // for logic_error, invalid_argument
diff --git a/src/misc/print.cpp b/src/misc/print.cpp
index 439918f8..4afbb622 100644
--- a/src/misc/print.cpp
+++ b/src/misc/print.cpp
@@ -2,9 +2,9 @@
 // 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 ostream, operator<<, basic_ostream
+#include <cstdint>     // for uint16_t, int16_t, int8_t, uint64_t, uint8_t, int32_t, int64_t, uin...
+#include <iostream>    // for ostream, basic_ostream, operator<<
 #include <ranges>      // for range_value_t, empty
 #include <type_traits> // for conditional
 #include <vector>      // for vector
diff --git a/src/sketch/compute_sketches.cpp b/src/sketch/compute_sketches.cpp
index c6d4f19a..fbef5889 100644
--- a/src/sketch/compute_sketches.cpp
+++ b/src/sketch/compute_sketches.cpp
@@ -2,16 +2,16 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <algorithm>  // for __fn, sort_heap, fill, make_heap
+#include <algorithm>  // for __fn, sort_heap, all_of, fill, make_heap
 #include <atomic>     // for atomic_flag
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t, uint8_t
 #include <functional> // for equal_to, function
 #include <limits>     // for numeric_limits
 #include <span>       // for span
 #include <stdexcept>  // for runtime_error
-#include <string>     // for allocator, char_traits, operator+, to_string
+#include <string>     // for operator+, allocator, char_traits, to_string, basic_string
 #include <utility>    // for move
 #include <vector>     // for vector
 
diff --git a/src/sketch/hyperloglog.cpp b/src/sketch/hyperloglog.cpp
index 16239f5b..76b1ac3e 100644
--- a/src/sketch/hyperloglog.cpp
+++ b/src/sketch/hyperloglog.cpp
@@ -7,9 +7,9 @@
 #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 <cstdint>   // for uint64_t, uint8_t, uint32_t
 #include <iostream>  // for basic_ostream, basic_istream, istream, ostream
 #include <memory>    // for addressof
 #include <stdexcept> // for runtime_error, invalid_argument
diff --git a/src/sketch/minhashes.cpp b/src/sketch/minhashes.cpp
index cdc35fe8..fc8f35b0 100644
--- a/src/sketch/minhashes.cpp
+++ b/src/sketch/minhashes.cpp
@@ -4,7 +4,7 @@
 
 #include <algorithm> // for __fn, is_sorted, all_of, find, pop_heap, push_heap
 #include <cassert>   // for assert
-#include <cinttypes> // for uint64_t
+#include <cstdint>   // for uint64_t
 #include <span>      // for span
 #include <vector>    // for vector
 
diff --git a/src/sketch/toolbox.cpp b/src/sketch/toolbox.cpp
index ac0e7cea..f228573e 100644
--- a/src/sketch/toolbox.cpp
+++ b/src/sketch/toolbox.cpp
@@ -4,9 +4,9 @@
 
 #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 <cstdint>    // for uint64_t, int64_t
 #include <functional> // for equal_to
 #include <limits>     // for numeric_limits
 #include <omp.h>      // for omp_get_thread_num
diff --git a/test/include/hibf/test/cereal.hpp b/test/include/hibf/test/cereal.hpp
index 714066f3..c110f6ce 100644
--- a/test/include/hibf/test/cereal.hpp
+++ b/test/include/hibf/test/cereal.hpp
@@ -9,9 +9,10 @@
 
 #pragma once
 
-#include <gtest/gtest.h> // for AssertionResult, EXPECT_TRUE, Message, TestPartResult
+#include <gtest/gtest.h> // for AssertionResult, Message, EXPECT_TRUE, TestPartResult
 
-#include <fstream>     // for basic_ios, ios, basic_ifstream, basic_ofstream, ifstream, ofs...
+#include <fstream>     // for basic_ifstream, basic_ios, basic_ofstream, ios, ifstream, ofs...
+#include <string>      // for basic_string
 #include <type_traits> // for remove_cvref_t
 
 #include <cereal/archives/binary.hpp>          // for BinaryInputArchive, BinaryOutputArchive
diff --git a/test/include/hibf/test/iterator_test_template.hpp b/test/include/hibf/test/iterator_test_template.hpp
index c3e1d2f7..26e68ced 100644
--- a/test/include/hibf/test/iterator_test_template.hpp
+++ b/test/include/hibf/test/iterator_test_template.hpp
@@ -10,11 +10,12 @@
 
 #include <concepts>    // for derived_from, same_as, copy_constructible, equality_comparable_with
 #include <cstddef>     // for size_t
-#include <iterator>    // for random_access_iterator_tag, forward_iterator_tag, bidirectional_iterator_tag, input...
-#include <memory>      // for to_address
-#include <ranges>      // for begin, cbegin, next, end, cend, distance, iterator_t, range_difference_t
+#include <iterator>    // for next, random_access_iterator_tag, forward_iterator_tag, distance, bidirectional_ite...
+#include <memory>      // for to_address, addressof
+#include <ranges>      // for begin, cbegin, end, cend, iterator_t, range_difference_t
+#include <string>      // for basic_string
 #include <type_traits> // for remove_reference_t, conditional_t
-#include <utility>     // for as_const, addressof, pair
+#include <utility>     // for as_const, forward, pair
 
 #include <hibf/platform.hpp>
 
diff --git a/test/include/hibf/test/sandboxed_path.hpp b/test/include/hibf/test/sandboxed_path.hpp
index 701350a1..0a588d71 100644
--- a/test/include/hibf/test/sandboxed_path.hpp
+++ b/test/include/hibf/test/sandboxed_path.hpp
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <filesystem>   // for path, filesystem_error, operator/
+#include <string>       // for basic_string
 #include <system_error> // for errc, make_error_code
 #include <utility>      // for move, forward
 
diff --git a/test/include/hibf/test/tmp_directory.hpp b/test/include/hibf/test/tmp_directory.hpp
index 8acf43c8..0e52267e 100644
--- a/test/include/hibf/test/tmp_directory.hpp
+++ b/test/include/hibf/test/tmp_directory.hpp
@@ -21,8 +21,9 @@
 #endif
 
 #include <cassert>      // for assert
-#include <filesystem>   // for path, exists, is_empty, remove_all, temp_directory_path, filesystem_...
-#include <optional>     // for optional, nullopt
+#include <filesystem>   // for path, exists, filesystem_error, is_empty, remove_all, temp_directory...
+#include <optional>     // for optional, nullopt, nullopt_t
+#include <string>       // for basic_string
 #include <system_error> // for errc, make_error_code
 #include <utility>      // for exchange
 
diff --git a/test/include/hibf/test/type_name_as_string.hpp b/test/include/hibf/test/type_name_as_string.hpp
index 919f8380..c5a92f6c 100644
--- a/test/include/hibf/test/type_name_as_string.hpp
+++ b/test/include/hibf/test/type_name_as_string.hpp
@@ -15,9 +15,10 @@
 
 #include <cstdlib>     // for free
 #include <functional>  // for function
-#include <memory>      // for allocator, addressof, unique_ptr
-#include <string>      // for char_traits, operator+, string, to_string
-#include <type_traits> // for remove_reference_t
+#include <memory>      // for allocator, unique_ptr, addressof
+#include <string>      // for char_traits, basic_string, operator+, string, to_string
+#include <tuple>       // for tuple
+#include <type_traits> // for remove_reference_t, is_const_v, is_lvalue_reference_v, is_rvalue_reference_v
 #include <typeinfo>    // for type_info
 
 #include <hibf/platform.hpp>
diff --git a/test/performance/ibf/bit_vector_benchmark.cpp b/test/performance/ibf/bit_vector_benchmark.cpp
index 79dfb54a..2f1100b0 100644
--- a/test/performance/ibf/bit_vector_benchmark.cpp
+++ b/test/performance/ibf/bit_vector_benchmark.cpp
@@ -4,12 +4,13 @@
 
 // Authored by: Rene Rahn <rene.rahn AT fu-berlin.de>
 
-#include <benchmark/benchmark.h> // for Benchmark, State, BENCHMARK_CAPTURE, DoNotOptimize, BENCHMARK_MAIN
+#include <benchmark/benchmark.h> // for Benchmark, BENCHMARK_CAPTURE, DoNotOptimize, State, BENCHMARK_MAIN
 
 #include <algorithm>   // for __fn, generate
-#include <cinttypes>   // for int32_t, uint8_t
 #include <cstddef>     // for size_t
+#include <cstdint>     // for int32_t, uint8_t
 #include <random>      // for uniform_int_distribution, mt19937_64
+#include <string>      // for basic_string
 #include <type_traits> // for invoke_result_t
 #include <utility>     // for move, pair
 
diff --git a/test/performance/ibf/bit_vector_serialisation_benchmark.cpp b/test/performance/ibf/bit_vector_serialisation_benchmark.cpp
index 0539924e..78bc0235 100644
--- a/test/performance/ibf/bit_vector_serialisation_benchmark.cpp
+++ b/test/performance/ibf/bit_vector_serialisation_benchmark.cpp
@@ -2,16 +2,16 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <benchmark/benchmark.h> // for State, Counter, DoNotOptimize, Benchmark, BENCHMARK, BENCHMARK_MAIN
+#include <benchmark/benchmark.h> // for State, Counter, Benchmark, DoNotOptimize, BENCHMARK, BENCHMARK_MAIN
 
-#include <algorithm>  // for __generate_fn, generate
-#include <cinttypes>  // for int32_t, uint8_t, int64_t
+#include <algorithm>  // for __fn, generate
 #include <cstddef>    // for size_t
+#include <cstdint>    // for int32_t, uint8_t, int64_t
 #include <filesystem> // for exists, file_size
-#include <fstream>    // for basic_ifstream, basic_ios, basic_ofstream, ios, ifstream, ofstream
+#include <fstream>    // for basic_ifstream, basic_ofstream, basic_ios, ios, ifstream, ofstream
 #include <random>     // for uniform_int_distribution, mt19937_64
 #include <stdexcept>  // for logic_error
-#include <string>     // for allocator, to_string, basic_string
+#include <string>     // for basic_string, to_string
 
 #include <cereal/archives/binary.hpp> // for BinaryInputArchive, BinaryOutputArchive
 #include <cereal/cereal.hpp>          // for InputArchive, OutputArchive
diff --git a/test/performance/sketch/compute_sketches_benchmark.cpp b/test/performance/sketch/compute_sketches_benchmark.cpp
index 1f64d518..c42f0cdf 100644
--- a/test/performance/sketch/compute_sketches_benchmark.cpp
+++ b/test/performance/sketch/compute_sketches_benchmark.cpp
@@ -4,10 +4,10 @@
 
 #include <benchmark/benchmark.h> // for Counter, State, BENCHMARK_TEMPLATE, Benchmark, ClobberMemory
 
-#include <cinttypes> // for uint64_t, uint8_t
-#include <cstddef>   // for size_t
-#include <string>    // for basic_string
-#include <vector>    // for vector
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t, uint8_t
+#include <string>  // for basic_string
+#include <vector>  // for vector
 
 #include <hibf/config.hpp>                  // for config, insert_iterator
 #include <hibf/sketch/compute_sketches.hpp> // for compute_sketches
diff --git a/test/performance/sketch/hyperloglog_benchmark.cpp b/test/performance/sketch/hyperloglog_benchmark.cpp
index 9fa3dcb6..68290bcf 100644
--- a/test/performance/sketch/hyperloglog_benchmark.cpp
+++ b/test/performance/sketch/hyperloglog_benchmark.cpp
@@ -2,9 +2,10 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <benchmark/benchmark.h> // for State, DoNotOptimize, Benchmark, BENCHMARK, BENCHMARK_MAIN
+#include <benchmark/benchmark.h> // for DoNotOptimize, State, Benchmark, BENCHMARK, BENCHMARK_MAIN
 
-#include <cinttypes> // for uint8_t
+#include <cstdint> // for uint8_t
+#include <string>  // for basic_string
 
 #include <hibf/sketch/hyperloglog.hpp> // for hyperloglog
 
diff --git a/test/snippet/hibf/config_input_fn_file.cpp b/test/snippet/hibf/config_input_fn_file.cpp
index eb426f98..1937c145 100644
--- a/test/snippet/hibf/config_input_fn_file.cpp
+++ b/test/snippet/hibf/config_input_fn_file.cpp
@@ -2,13 +2,14 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cinttypes>  // for uint64_t
-#include <cstddef>    // for size_t
-#include <filesystem> // for path
-#include <fstream>    // for basic_ifstream, ifstream
-#include <functional> // for function
-#include <string>     // for getline, string
-#include <vector>     // for vector
+#include <cstddef>     // for size_t
+#include <cstdint>     // for uint64_t
+#include <filesystem>  // for path
+#include <fstream>     // for basic_ifstream, getline, ifstream
+#include <functional>  // for function
+#include <string>      // for basic_string, string
+#include <string_view> // for basic_string_view
+#include <vector>      // for vector
 
 #include <hibf/test/temporary_snippet_file.hpp> // for temporary_snippet_file
 
@@ -16,7 +17,7 @@ seqan::hibf::test::temporary_snippet_file file1{"file1.fa", "ACGT"};
 seqan::hibf::test::temporary_snippet_file file2{"file2.fa", "ACGT"};
 
 //![main]
-#include <hibf/config.hpp> // for config, insert_iterator
+#include <hibf/config.hpp> // for insert_iterator, config
 
 int main()
 {
diff --git a/test/snippet/hibf/config_input_fn_vector.cpp b/test/snippet/hibf/config_input_fn_vector.cpp
index e67e385b..d2020f78 100644
--- a/test/snippet/hibf/config_input_fn_vector.cpp
+++ b/test/snippet/hibf/config_input_fn_vector.cpp
@@ -2,12 +2,12 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cinttypes>  // for uint64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for function
 #include <vector>     // for vector
 
-#include <hibf/config.hpp> // for config, insert_iterator
+#include <hibf/config.hpp> // for insert_iterator, config
 
 struct dna
 {
diff --git a/test/snippet/ibf/counting_agent.cpp b/test/snippet/ibf/counting_agent.cpp
index 6e10974f..7cdee448 100644
--- a/test/snippet/ibf/counting_agent.cpp
+++ b/test/snippet/ibf/counting_agent.cpp
@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cinttypes> // for uint8_t
-#include <cstddef>   // for size_t
-#include <ranges>    // for iota_view, operator==, __fn, iota, views
-#include <vector>    // for vector
+#include <cstddef> // for size_t
+#include <cstdint> // for uint8_t
+#include <ranges>  // for iota_view, __fn, iota, views
+#include <vector>  // for vector
 
 #include <hibf/interleaved_bloom_filter.hpp> // for interleaved_bloom_filter, bin_index, bin_count, bin_size, hash_...
 #include <hibf/misc/print.hpp>               // for print, print_t
diff --git a/test/snippet/ibf/counting_vector.cpp b/test/snippet/ibf/counting_vector.cpp
index 21172688..990f6339 100644
--- a/test/snippet/ibf/counting_vector.cpp
+++ b/test/snippet/ibf/counting_vector.cpp
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cinttypes> // for uint16_t
+#include <cstdint> // for uint16_t
 
 #include <hibf/interleaved_bloom_filter.hpp> // for interleaved_bloom_filter, bin_index, bin_count, bin_size
 #include <hibf/misc/counting_vector.hpp>     // for counting_vector
diff --git a/test/snippet/readme.cpp b/test/snippet/readme.cpp
index d228399a..2d60df29 100644
--- a/test/snippet/readme.cpp
+++ b/test/snippet/readme.cpp
@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: CC0-1.0
 
-#include <cinttypes>  // for uint64_t, int64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for function
-#include <iostream>   // for operator<<, basic_ostream, cout
+#include <iostream>   // for basic_ostream, operator<<, cout
 #include <ranges>     // for __fn, iota, views
 #include <vector>     // for vector
 
diff --git a/test/unit/hibf/bit_vector_test.cpp b/test/unit/hibf/bit_vector_test.cpp
index 1734b39b..97b645c3 100644
--- a/test/unit/hibf/bit_vector_test.cpp
+++ b/test/unit/hibf/bit_vector_test.cpp
@@ -11,10 +11,11 @@
 #include <cstddef>          // for size_t
 #include <initializer_list> // for initializer_list
 #include <iterator>         // for output_iterator, random_access_iterator_tag
-#include <ranges>           // for _CBegin, _CEnd, cbegin, cend
+#include <ranges>           // for __fn, cbegin, cend
 #include <stdexcept>        // for out_of_range
+#include <string>           // for basic_string
 #include <utility>          // for as_const, move
-#include <vector>           // for allocator, vector
+#include <vector>           // for vector
 
 #include <hibf/misc/bit_vector.hpp>             // for bit_vector, operator&, operator^, operator|
 #include <hibf/test/cereal.hpp>                 // for test_serialisation
diff --git a/test/unit/hibf/build/bin_size_in_bits_test.cpp b/test/unit/hibf/build/bin_size_in_bits_test.cpp
index c7d9fb3e..e3a28ec3 100644
--- a/test/unit/hibf/build/bin_size_in_bits_test.cpp
+++ b/test/unit/hibf/build/bin_size_in_bits_test.cpp
@@ -2,7 +2,9 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, TestInfo, EXPECT_EQ, Message, TEST, TestPartResult
+#include <gtest/gtest.h> // for Test, Message, DeathTest, TestInfo, TestPartResult, EXPECT_DEATH
+
+#include <string> // for basic_string
 
 #include <hibf/build/bin_size_in_bits.hpp> // for bin_size_in_bits
 
diff --git a/test/unit/hibf/counting_vector_test.cpp b/test/unit/hibf/counting_vector_test.cpp
index 248061d1..71ed8af6 100644
--- a/test/unit/hibf/counting_vector_test.cpp
+++ b/test/unit/hibf/counting_vector_test.cpp
@@ -9,14 +9,15 @@
 #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 <cstdint>   // for int16_t, int32_t, int64_t, int8_t, uint16_t, uint32_t, uint64_t
 #include <limits>    // for numeric_limits
+#include <string>    // for basic_string
 
 #include <hibf/misc/bit_vector.hpp>      // for bit_vector
 #include <hibf/misc/counting_vector.hpp> // for counting_vector
-#include <hibf/platform.hpp>             // for _LIBCPP_HAS_NO_ASAN, _LIBCPP_VERSION
+#include <hibf/platform.hpp>             // for HIBF_COMPILER_IS_GCC, _LIBCPP_HAS_NO_ASAN, _LIBCPP_VERSION
 
 template <typename TypeParam>
 class counting_vector_test : public ::testing::Test
diff --git a/test/unit/hibf/hierarchical_interleaved_bloom_filter_test.cpp b/test/unit/hibf/hierarchical_interleaved_bloom_filter_test.cpp
index 0fa25638..2184c656 100644
--- a/test/unit/hibf/hierarchical_interleaved_bloom_filter_test.cpp
+++ b/test/unit/hibf/hierarchical_interleaved_bloom_filter_test.cpp
@@ -2,13 +2,14 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, Message, TestPartResult, TestInfo, EXPECT_EQ
+#include <gtest/gtest.h> // for Test, Message, TestPartResult, TestInfo, CmpHelperEQ
 
-#include <cinttypes>  // for uint32_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint32_t
 #include <functional> // for function
-#include <ranges>     // for _Iota, iota, views
-#include <sstream>    // for basic_stringstream, char_traits, stringstream
+#include <ranges>     // for __fn, iota, views
+#include <sstream>    // for char_traits, basic_stringstream, stringstream
+#include <string>     // for basic_string
 #include <utility>    // for move
 #include <vector>     // for vector, allocator
 
diff --git a/test/unit/hibf/insert_iterator_test.cpp b/test/unit/hibf/insert_iterator_test.cpp
index e8036597..c6657096 100644
--- a/test/unit/hibf/insert_iterator_test.cpp
+++ b/test/unit/hibf/insert_iterator_test.cpp
@@ -2,13 +2,14 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, Message, TestInfo, TEST, TestPartResult, EXPECT_EQ, EXPEC...
+#include <gtest/gtest.h> // for Test, Message, TestInfo, TEST, TestPartResult, CmpHelperEQ, Cmp...
 
 #include <algorithm>  // for __fn, copy
 #include <array>      // for array
-#include <cinttypes>  // for uint64_t, uint8_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t, uint8_t
 #include <functional> // for equal_to, function
+#include <string>     // for basic_string
 #include <vector>     // for vector
 
 #include <hibf/config.hpp>                   // for insert_iterator
diff --git a/test/unit/hibf/interleaved_bloom_filter_test.cpp b/test/unit/hibf/interleaved_bloom_filter_test.cpp
index 547148cc..ea25c2b4 100644
--- a/test/unit/hibf/interleaved_bloom_filter_test.cpp
+++ b/test/unit/hibf/interleaved_bloom_filter_test.cpp
@@ -6,19 +6,20 @@
 #    define HIBF_HAS_AVX512 0
 #endif
 
-#include <gtest/gtest.h> // for Message, Test, AssertionResult, TestPartResult, TestInfo, EXPEC...
+#include <gtest/gtest.h> // for Message, Test, AssertionResult, TestPartResult, CmpHelperEQ
 
-#include <algorithm>   // for __fn, all_of, for_each
+#include <algorithm>   // for __fn, fill, all_of, for_each
 #include <array>       // for array
-#include <cinttypes>   // for uint64_t
 #include <compare>     // for operator<, strong_ordering
 #include <cstddef>     // for size_t
+#include <cstdint>     // for uint64_t
 #include <functional>  // for function
 #include <ranges>      // for iota_view, __fn, iota, views, operator==
 #include <stdexcept>   // for logic_error, invalid_argument
+#include <string>      // for basic_string
 #include <type_traits> // for is_copy_assignable_v, is_copy_constructible_v, is_default_const...
 #include <utility>     // for move
-#include <vector>      // for vector
+#include <vector>      // for vector, __bit_iterator, operator-
 
 #include <hibf/config.hpp>                   // for insert_iterator, config
 #include <hibf/interleaved_bloom_filter.hpp> // for interleaved_bloom_filter, bin_index, bin_count, bin_size, hash_...
diff --git a/test/unit/hibf/layout/compute_layout_test.cpp b/test/unit/hibf/layout/compute_layout_test.cpp
index 17a2c9cf..ec5157ab 100644
--- a/test/unit/hibf/layout/compute_layout_test.cpp
+++ b/test/unit/hibf/layout/compute_layout_test.cpp
@@ -2,20 +2,21 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, AssertionResult, TestInfo, EXPECT_TRUE, Message, TEST, Tes...
+#include <gtest/gtest.h> // for Test, AssertionResult, Message, TestInfo, EXPECT_TRUE, TEST
 
 #include <cstddef>    // for size_t
 #include <functional> // for function
-#include <vector>     // for vector, allocator
-
-#include <hibf/config.hpp>                // for insert_iterator, config
-#include <hibf/layout/compute_layout.hpp> // for compute_layout
-#include <hibf/layout/layout.hpp>         // for layout
-#include <hibf/misc/iota_vector.hpp>
-#include <hibf/misc/timer.hpp>              // for concurrent_timer
-#include <hibf/sketch/compute_sketches.hpp> // for compute_sketches
-#include <hibf/sketch/estimate_kmer_counts.hpp>
-#include <hibf/sketch/hyperloglog.hpp> // for hyperloglog
+#include <string>     // for basic_string
+#include <vector>     // for vector
+
+#include <hibf/config.hpp>                      // for insert_iterator, config
+#include <hibf/layout/compute_layout.hpp>       // for compute_layout
+#include <hibf/layout/layout.hpp>               // for layout
+#include <hibf/misc/iota_vector.hpp>            // for iota_vector
+#include <hibf/misc/timer.hpp>                  // for concurrent_timer
+#include <hibf/sketch/compute_sketches.hpp>     // for compute_sketches
+#include <hibf/sketch/estimate_kmer_counts.hpp> // for estimate_kmer_counts
+#include <hibf/sketch/hyperloglog.hpp>          // for hyperloglog
 
 TEST(compute_layout, dispatch)
 {
diff --git a/test/unit/hibf/layout/fpr_correction_test.cpp b/test/unit/hibf/layout/fpr_correction_test.cpp
index 6e753b10..f4a1e207 100644
--- a/test/unit/hibf/layout/fpr_correction_test.cpp
+++ b/test/unit/hibf/layout/fpr_correction_test.cpp
@@ -2,10 +2,11 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, Message, TestPartResult, EXPECT_NEAR, TestInfo
+#include <gtest/gtest.h> // for Message, Test, TestPartResult, EXPECT_NEAR, TestInfo, CmpH...
 
 #include <cstddef> // for size_t
-#include <vector>  // for vector, allocator
+#include <string>  // for basic_string
+#include <vector>  // for vector
 
 #include <hibf/layout/compute_fpr_correction.hpp> // for compute_fpr_correction
 
diff --git a/test/unit/hibf/layout/graph_test.cpp b/test/unit/hibf/layout/graph_test.cpp
index 34903846..12d7459d 100644
--- a/test/unit/hibf/layout/graph_test.cpp
+++ b/test/unit/hibf/layout/graph_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 Message, TestPartResult, EXPECT_EQ, Test, ASSERT_EQ, TestInfo, TEST
+#include <gtest/gtest.h> // for Message, TestPartResult, CmpHelperEQ, CmpHelperEQFailure, EXPECT_EQ, Test
 
 #include <cstddef>  // for size_t
 #include <optional> // for optional
-#include <vector>   // for vector, allocator
+#include <string>   // for basic_string
+#include <vector>   // for vector
 
 #include <hibf/layout/graph.hpp>  // for graph
 #include <hibf/layout/layout.hpp> // for layout
diff --git a/test/unit/hibf/layout/hierarchical_binning_test.cpp b/test/unit/hibf/layout/hierarchical_binning_test.cpp
index 4b0e49aa..73766863 100644
--- a/test/unit/hibf/layout/hierarchical_binning_test.cpp
+++ b/test/unit/hibf/layout/hierarchical_binning_test.cpp
@@ -2,10 +2,11 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Test, Message, TestPartResult, TestInfo, TEST, EXP...
+#include <gtest/gtest.h> // for Test, Message, TestPartResult, TestInfo, TEST, Cmp...
 
 #include <cstddef>   // for size_t
 #include <stdexcept> // for invalid_argument
+#include <string>    // for basic_string
 #include <vector>    // for vector
 
 #include <hibf/config.hpp>                                // for config
diff --git a/test/unit/hibf/layout/simple_binning_test.cpp b/test/unit/hibf/layout/simple_binning_test.cpp
index edf7a9d7..78f88daa 100644
--- a/test/unit/hibf/layout/simple_binning_test.cpp
+++ b/test/unit/hibf/layout/simple_binning_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 Test, TestInfo, Message, TestPartResult, TEST, EXPECT_EQ
+#include <gtest/gtest.h> // for Test, Message, TestInfo, TestPartResult, TEST, CmpHelperEQ, CmpHel...
 
 #include <cstddef>   // for size_t
 #include <stdexcept> // for runtime_error
-#include <vector>    // for allocator, vector
+#include <string>    // for basic_string
+#include <vector>    // for vector
 
 #include <hibf/layout/data_store.hpp>     // for data_store
 #include <hibf/layout/layout.hpp>         // for layout
diff --git a/test/unit/hibf/path_test.cpp b/test/unit/hibf/path_test.cpp
index 51866ff1..b088e1db 100644
--- a/test/unit/hibf/path_test.cpp
+++ b/test/unit/hibf/path_test.cpp
@@ -5,6 +5,7 @@
 #include <gtest/gtest.h> // for Test, TestInfo, TEST
 
 #include <filesystem> // for path
+#include <string>     // for basic_string
 #include <utility>    // for move
 
 #include <cereal/specialize.hpp> // for specialization
diff --git a/test/unit/hibf/print_test.cpp b/test/unit/hibf/print_test.cpp
index 758254dc..e51cac67 100644
--- a/test/unit/hibf/print_test.cpp
+++ b/test/unit/hibf/print_test.cpp
@@ -2,13 +2,14 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for EXPECT_EQ, GetCapturedStderr, GetCapturedStdout, Message, TestPartR...
+#include <gtest/gtest.h> // for Message, CmpHelperEQ, CmpHelperEQFailure, EXPECT_EQ, GetCapturedStderr
 
-#include <cinttypes> // for int64_t, int16_t, int32_t, int8_t, uint16_t, uint32_t, uint64_t
-#include <concepts>  // for same_as, unsigned_integral
-#include <iostream>  // for cerr
-#include <ranges>    // for range_value_t
-#include <vector>    // for allocator, vector
+#include <concepts> // for same_as, unsigned_integral
+#include <cstdint>  // for uint64_t, int16_t, int32_t, int64_t, int8_t, uint16_t, uint32_t
+#include <iostream> // for cerr
+#include <ranges>   // for range_value_t
+#include <string>   // for basic_string
+#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/test/unit/hibf/sketch/compute_sketches_test.cpp b/test/unit/hibf/sketch/compute_sketches_test.cpp
index 065362c4..d47e7df3 100644
--- a/test/unit/hibf/sketch/compute_sketches_test.cpp
+++ b/test/unit/hibf/sketch/compute_sketches_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 Message, TestPartResult, TestInfo, AssertionResult, ASSERT_EQ
+#include <gtest/gtest.h> // for Message, TestPartResult, CmpHelperEQ, CmpHelperEQFailure, Assert...
 
 #include <cstddef>    // for size_t
 #include <functional> // for function
 #include <ranges>     // for __fn, iota, views
 #include <stdexcept>  // for runtime_error
+#include <string>     // for basic_string
 #include <vector>     // for vector
 
 #include <hibf/config.hpp>                  // for config, insert_iterator
diff --git a/test/unit/hibf/sketch/estimate_kmer_counts_test.cpp b/test/unit/hibf/sketch/estimate_kmer_counts_test.cpp
index 96d99e51..ddab4564 100644
--- a/test/unit/hibf/sketch/estimate_kmer_counts_test.cpp
+++ b/test/unit/hibf/sketch/estimate_kmer_counts_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, Message, TestPartResult, EXPECT_EQ, TestInfo, ASSERT_EQ
+#include <gtest/gtest.h> // for Test, Message, CmpHelperEQ, CmpHelperEQFailure, TestPartResult
 
-#include <cinttypes> // for uint64_t
-#include <cstddef>   // for size_t
-#include <random>    // for uniform_int_distribution, mt19937_64
-#include <vector>    // for allocator, vector
+#include <cstddef> // for size_t
+#include <cstdint> // for uint64_t
+#include <random>  // for uniform_int_distribution, mt19937_64
+#include <string>  // for basic_string
+#include <vector>  // for vector
 
 #include <hibf/sketch/estimate_kmer_counts.hpp> // for estimate_kmer_counts
 #include <hibf/sketch/hyperloglog.hpp>          // for hyperloglog
diff --git a/test/unit/hibf/sketch/hyperloglog_test.cpp b/test/unit/hibf/sketch/hyperloglog_test.cpp
index aaca9ae1..7ad2ee48 100644
--- a/test/unit/hibf/sketch/hyperloglog_test.cpp
+++ b/test/unit/hibf/sketch/hyperloglog_test.cpp
@@ -2,13 +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, Message, TestInfo, TestPartResult, TEST, EXPECT_EQ
+#include <gtest/gtest.h> // for Test, Message, TestInfo, TestPartResult, TEST, CmpHelperEQ
 
 #include <algorithm>  // for __fn, generate
-#include <cinttypes>  // for uint64_t, uint8_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t, uint8_t
 #include <filesystem> // for path
-#include <fstream>    // for basic_ofstream, basic_ifstream, ofstream, ifstream, basi...
+#include <fstream>    // for basic_ofstream, basic_ifstream, basic_ios, ofstream, ifs...
 #include <functional> // for equal_to
 #include <random>     // for uniform_int_distribution, mt19937_64
 #include <ranges>     // for __fn, iota, iota_view, views
diff --git a/test/unit/hibf/sketch/minhashes_test.cpp b/test/unit/hibf/sketch/minhashes_test.cpp
index 8a8732aa..c239ef0a 100644
--- a/test/unit/hibf/sketch/minhashes_test.cpp
+++ b/test/unit/hibf/sketch/minhashes_test.cpp
@@ -5,10 +5,11 @@
 #include <gtest/gtest.h> // for AssertionResult, Message, Test, TestPartResult, EXPECT_FALSE, TestInfo
 
 #include <algorithm> // for __fn, equal, make_heap
-#include <cinttypes> // for uint64_t
 #include <cstddef>   // for size_t
+#include <cstdint>   // for uint64_t
 #include <ranges>    // for __fn, iota, views
 #include <span>      // for span
+#include <string>    // for basic_string
 #include <utility>   // for move
 #include <vector>    // for vector
 
diff --git a/test/unit/hibf/sketch/toolbox_test.cpp b/test/unit/hibf/sketch/toolbox_test.cpp
index b5ef43db..7de6ab20 100644
--- a/test/unit/hibf/sketch/toolbox_test.cpp
+++ b/test/unit/hibf/sketch/toolbox_test.cpp
@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for Message, TestPartResult, EXPECT_EQ, TestInfo, TEST_F, Test
+#include <gtest/gtest.h> // for Message, TestPartResult, CmpHelperEQ, CmpHelperEQFailure, EXPECT_EQ
 
-#include <cinttypes>  // for uint64_t
 #include <cstddef>    // for size_t
+#include <cstdint>    // for uint64_t
 #include <functional> // for equal_to
 #include <limits>     // for numeric_limits
 #include <random>     // for uniform_int_distribution, mt19937_64
diff --git a/test/unit/hibf/timer_test.cpp b/test/unit/hibf/timer_test.cpp
index ffb3fad4..3762b0ee 100644
--- a/test/unit/hibf/timer_test.cpp
+++ b/test/unit/hibf/timer_test.cpp
@@ -2,10 +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, CmpHelper...
 
-#include <chrono> // for operator""ms
-#include <thread> // for sleep_for
+#include <chrono>      // for operator""ms
+#include <string>      // for basic_string
+#include <thread>      // for sleep_for
+#include <type_traits> // for is_copy_assignable_v, is_copy_constructible_v, is_default_constructible_v
 
 #include <hibf/misc/timer.hpp> // for concurrent_timer, serial_timer
 
diff --git a/test/unit/test/expect_range_eq_test.cpp b/test/unit/test/expect_range_eq_test.cpp
index 69a8116d..0e40c7d3 100644
--- a/test/unit/test/expect_range_eq_test.cpp
+++ b/test/unit/test/expect_range_eq_test.cpp
@@ -8,7 +8,8 @@
 #include <cstddef>     // for ptrdiff_t
 #include <ranges>      // for input_range
 #include <span>        // for span
-#include <string_view> // for string_view
+#include <string>      // for basic_string
+#include <string_view> // for basic_string_view, string_view
 #include <vector>      // for vector
 
 #include <hibf/test/expect_range_eq.hpp> // for expect_range_eq, EXPECT_RANGE_EQ
diff --git a/test/unit/test/expect_same_type_test.cpp b/test/unit/test/expect_same_type_test.cpp
index ad62c457..5518834d 100644
--- a/test/unit/test/expect_same_type_test.cpp
+++ b/test/unit/test/expect_same_type_test.cpp
@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include <gtest/gtest-spi.h> // for EXPECT_NONFATAL_FAILURE
-#include <gtest/gtest.h>     // for Test, AssertionResult, Message, TestPartResult, TestInfo, TEST
+#include <gtest/gtest.h>     // for Test, Message, AssertionResult, TestPartResult, TestInfo, TEST
 
+#include <string>      // for basic_string
 #include <tuple>       // for tuple
 #include <type_traits> // for type_identity
 
diff --git a/test/unit/test/file_access_test.cpp b/test/unit/test/file_access_test.cpp
index f7cecc74..e6095338 100644
--- a/test/unit/test/file_access_test.cpp
+++ b/test/unit/test/file_access_test.cpp
@@ -2,10 +2,11 @@
 // SPDX-FileCopyrightText: 2016-2024, Knut Reinert & MPI für molekulare Genetik
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include <gtest/gtest.h> // for AssertionResult, TestInfo, Message, TEST_F, TestPartResult, EXPECT_EQ
+#include <gtest/gtest.h> // for AssertionResult, Message, TestInfo, TEST_F, TestPartResult, CmpHelperEQ
 
-#include <filesystem> // for remove, path, temp_directory_path, perm_options, permissions, perms
-#include <fstream>    // for basic_ios, fstream, ios, ofstream
+#include <filesystem> // for path, remove, temp_directory_path, perm_options, permissions, perms
+#include <fstream>    // for basic_fstream, basic_ios, basic_ofstream, fstream, ios, ofstream
+#include <string>     // for basic_string
 
 #include <hibf/test/file_access.hpp> // for write_access, read_access
 
diff --git a/test/unit/test/temporary_snippet_file_test.cpp b/test/unit/test/temporary_snippet_file_test.cpp
index 6e5b536d..83c261d5 100644
--- a/test/unit/test/temporary_snippet_file_test.cpp
+++ b/test/unit/test/temporary_snippet_file_test.cpp
@@ -4,10 +4,11 @@
 
 #include <gtest/gtest.h> // for Test, AssertionResult, Message, TestInfo, TestPartResult
 
-#include <filesystem> // for path, current_path, operator/, exists
-#include <fstream>    // for char_traits, basic_ifstream, basic_filebuf, basic_ostream
-#include <memory>     // for allocator
-#include <sstream>    // for basic_stringstream
+#include <filesystem>  // for path, current_path, operator/, exists
+#include <fstream>     // for char_traits, basic_ifstream, basic_filebuf, basic_ostream
+#include <sstream>     // for basic_stringstream
+#include <string>      // for allocator, basic_string
+#include <string_view> // for basic_string_view
 
 #include <hibf/test/temporary_snippet_file.hpp> // for temporary_snippet_file