diff --git a/include/hibf/misc/iota_vector.hpp b/include/hibf/misc/iota_vector.hpp
index b6ca7a10..f13cc4fd 100644
--- a/include/hibf/misc/iota_vector.hpp
+++ b/include/hibf/misc/iota_vector.hpp
@@ -9,12 +9,14 @@
 
 #pragma once
 
-#include <cassert>
-#include <limits>
-#include <numeric>
-#include <vector>
+#include <cassert>  // for assert
+#include <concepts> // for unsigned_integral
+#include <cstddef>  // for size_t
+#include <limits>   // for numeric_limits
+#include <numeric>  // for iota
+#include <vector>   // for vector
 
-#include <hibf/platform.hpp>
+#include <hibf/platform.hpp> // for HIBF_CONSTEXPR_VECTOR
 
 namespace seqan::hibf
 {
diff --git a/src/layout/compute_layout.cpp b/src/layout/compute_layout.cpp
index 780482b2..064930d0 100644
--- a/src/layout/compute_layout.cpp
+++ b/src/layout/compute_layout.cpp
@@ -2,9 +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 <algorithm> // for __fn, max, sort
+#include <cassert>   // for assert
 #include <cstddef>   // for size_t
 #include <memory>    // for addressof
+#include <utility>   // for move
 #include <vector>    // for vector
 
 #include <hibf/config.hpp>                        // for config
@@ -13,9 +15,9 @@
 #include <hibf/layout/data_store.hpp>             // for data_store
 #include <hibf/layout/hierarchical_binning.hpp>   // for hierarchical_binning
 #include <hibf/layout/layout.hpp>                 // for layout
-#include <hibf/misc/iota_vector.hpp>
-#include <hibf/misc/timer.hpp>         // for concurrent_timer
-#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/hyperloglog.hpp>            // for hyperloglog
 
 namespace seqan::hibf::layout
 {