diff --git a/include/ddc/aligned_allocator.hpp b/include/ddc/aligned_allocator.hpp
index 546330fce..978cf3d31 100644
--- a/include/ddc/aligned_allocator.hpp
+++ b/include/ddc/aligned_allocator.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <cstdint>
+#include <cstddef>
 #include <new>
 #include <type_traits>
 
diff --git a/include/ddc/chunk.hpp b/include/ddc/chunk.hpp
index be22a98d7..d0490856f 100644
--- a/include/ddc/chunk.hpp
+++ b/include/ddc/chunk.hpp
@@ -3,6 +3,9 @@
 #pragma once
 
 #include <string>
+#include <utility>
+
+#include <experimental/mdspan>
 
 #include "ddc/chunk_common.hpp"
 #include "ddc/chunk_span.hpp"
diff --git a/include/ddc/chunk_common.hpp b/include/ddc/chunk_common.hpp
index 00e22ba0f..2f64c7001 100644
--- a/include/ddc/chunk_common.hpp
+++ b/include/ddc/chunk_common.hpp
@@ -2,16 +2,15 @@
 
 #pragma once
 
+#include <array>
 #include <cassert>
-#include <memory>
 #include <type_traits>
-#include <vector>
+#include <utility>
 
 #include <experimental/mdspan>
 
 #include <Kokkos_Core.hpp>
 
-#include "ddc/detail/kokkos.hpp"
 #include "ddc/detail/macros.hpp"
 #include "ddc/discrete_domain.hpp"
 
diff --git a/include/ddc/chunk_span.hpp b/include/ddc/chunk_span.hpp
index c77dec820..7dddd5d80 100644
--- a/include/ddc/chunk_span.hpp
+++ b/include/ddc/chunk_span.hpp
@@ -2,14 +2,16 @@
 
 #pragma once
 
+#include <array>
 #include <cassert>
-#include <memory>
+#include <cstddef>
 #include <type_traits>
-#include <vector>
+#include <utility>
 
 #include <experimental/mdspan>
 
 #include "ddc/chunk_common.hpp"
+#include "ddc/detail/kokkos.hpp"
 #include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 
diff --git a/include/ddc/coordinate_md.hpp b/include/ddc/coordinate_md.hpp
index 658910965..26bc1d2dc 100644
--- a/include/ddc/coordinate_md.hpp
+++ b/include/ddc/coordinate_md.hpp
@@ -2,9 +2,10 @@
 
 #pragma once
 
+#include <type_traits>
+
 #include "ddc/coordinate.hpp"
 #include "ddc/discrete_element.hpp"
-#include "ddc/discrete_space.hpp"
 
 namespace ddc {
 
diff --git a/include/ddc/deepcopy.hpp b/include/ddc/deepcopy.hpp
index d4e468d22..b05780774 100644
--- a/include/ddc/deepcopy.hpp
+++ b/include/ddc/deepcopy.hpp
@@ -6,7 +6,7 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "ddc/chunk_span.hpp"
+#include "ddc/chunk_common.hpp"
 
 namespace ddc {
 
diff --git a/include/ddc/detail/kokkos.hpp b/include/ddc/detail/kokkos.hpp
index 6de7d2771..3d76e6ac0 100644
--- a/include/ddc/detail/kokkos.hpp
+++ b/include/ddc/detail/kokkos.hpp
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <array>
+#include <cstddef>
+#include <type_traits>
+#include <utility>
+
 #include <experimental/mdspan>
 
 #include <Kokkos_Core.hpp>
diff --git a/include/ddc/detail/tagged_vector.hpp b/include/ddc/detail/tagged_vector.hpp
index bc1399bd5..965534666 100644
--- a/include/ddc/detail/tagged_vector.hpp
+++ b/include/ddc/detail/tagged_vector.hpp
@@ -5,6 +5,7 @@
 #include <array>
 #include <cstddef>
 #include <ostream>
+#include <type_traits>
 #include <utility>
 
 #include "ddc/detail/macros.hpp"
diff --git a/include/ddc/detail/type_seq.hpp b/include/ddc/detail/type_seq.hpp
index 2992b661c..7789c657c 100644
--- a/include/ddc/detail/type_seq.hpp
+++ b/include/ddc/detail/type_seq.hpp
@@ -4,6 +4,7 @@
 
 #include <cstddef>
 #include <limits>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/ddc/discrete_domain.hpp b/include/ddc/discrete_domain.hpp
index a40f30caf..8f4a5b2db 100644
--- a/include/ddc/discrete_domain.hpp
+++ b/include/ddc/discrete_domain.hpp
@@ -3,10 +3,11 @@
 #pragma once
 
 #include <cassert>
-#include <cstdint>
+#include <cstddef>
+#include <iterator>
 #include <tuple>
+#include <type_traits>
 
-#include "ddc/coordinate.hpp"
 #include "ddc/detail/type_seq.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_vector.hpp"
diff --git a/include/ddc/discrete_space.hpp b/include/ddc/discrete_space.hpp
index fb870c9d4..77dc933c4 100644
--- a/include/ddc/discrete_space.hpp
+++ b/include/ddc/discrete_space.hpp
@@ -2,23 +2,31 @@
 
 #pragma once
 
+#include <cstddef>
+#include <functional>
 #include <map>
-#include <memory>
 #include <optional>
 #include <ostream>
-#include <sstream>
 #include <stdexcept>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
 
 #include <Kokkos_Core.hpp>
+
+#include "ddc/detail/macros.hpp"
 #if defined(__CUDACC__)
+#include <sstream>
+
 #include <cuda.h>
 #endif
 #if defined(__HIPCC__)
+#include <sstream>
+
 #include <hip/hip_runtime.h>
 #endif
 
-#include "ddc/discrete_domain.hpp"
-#include "ddc/discrete_space.hpp"
 #include "ddc/dual_discretization.hpp"
 
 namespace ddc {
diff --git a/include/ddc/discrete_vector.hpp b/include/ddc/discrete_vector.hpp
index e94727a3a..fda08dea5 100644
--- a/include/ddc/discrete_vector.hpp
+++ b/include/ddc/discrete_vector.hpp
@@ -5,6 +5,7 @@
 #include <array>
 #include <cstddef>
 #include <ostream>
+#include <type_traits>
 #include <utility>
 
 #include <Kokkos_Core.hpp>
diff --git a/include/ddc/dual_discretization.hpp b/include/ddc/dual_discretization.hpp
index 265d9afeb..06a4cdd06 100644
--- a/include/ddc/dual_discretization.hpp
+++ b/include/ddc/dual_discretization.hpp
@@ -2,15 +2,11 @@
 
 #pragma once
 
-#include <functional>
-#include <memory>
 #include <type_traits>
 #include <utility>
 
 #include <Kokkos_Core.hpp>
 
-#include "ddc/detail/macros.hpp"
-
 #if defined(__CUDACC__)
 #include <cuda.h>
 #endif
diff --git a/include/ddc/experimental/single_discretization.hpp b/include/ddc/experimental/single_discretization.hpp
index 7dead5b00..c47996b8e 100644
--- a/include/ddc/experimental/single_discretization.hpp
+++ b/include/ddc/experimental/single_discretization.hpp
@@ -2,7 +2,12 @@
 
 #pragma once
 
+#include <ostream>
+#include <type_traits>
+#include <utility>
+
 #include "ddc/coordinate.hpp"
+#include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_space.hpp"
 
diff --git a/include/ddc/fill.hpp b/include/ddc/fill.hpp
index 513392d28..f2d025e57 100644
--- a/include/ddc/fill.hpp
+++ b/include/ddc/fill.hpp
@@ -6,7 +6,7 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "ddc/chunk_span.hpp"
+#include "ddc/chunk_common.hpp"
 
 namespace ddc {
 
diff --git a/include/ddc/for_each.hpp b/include/ddc/for_each.hpp
index cf27f4352..95d1a0c23 100644
--- a/include/ddc/for_each.hpp
+++ b/include/ddc/for_each.hpp
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <array>
+#include <cstddef>
 #include <type_traits>
 #include <utility>
 
@@ -9,8 +11,6 @@
 
 #include "ddc/chunk_span.hpp"
 #include "ddc/detail/kokkos.hpp"
-#include "ddc/detail/macros.hpp"
-#include "ddc/detail/tagged_vector.hpp"
 #include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_vector.hpp"
diff --git a/include/ddc/kernels/fft.hpp b/include/ddc/kernels/fft.hpp
index d55dbdb84..6568a55df 100644
--- a/include/ddc/kernels/fft.hpp
+++ b/include/ddc/kernels/fft.hpp
@@ -2,22 +2,33 @@
 
 #pragma once
 
-#include <memory>
+#include <type_traits>
+#include <utility>
 
 #include <experimental/mdspan>
 
 #include <ddc/ddc.hpp>
 
+#include <Kokkos_Core.hpp>
+
 #if fftw_AVAIL
 #include <fftw3.h>
 #endif
 
 #if cufft_AVAIL
+#include <functional>
+#include <memory>
+#include <stdexcept>
+
+#include <cuda_runtime_api.h>
 #include <cufft.h>
 #endif
 
 #if hipfft_AVAIL
-#include <hip/hip_runtime.h>
+#include <functional>
+#include <memory>
+#include <stdexcept>
+
 #include <hip/hip_runtime_api.h>
 #include <hipfft/hipfft.h>
 #endif
diff --git a/include/ddc/kokkos_allocator.hpp b/include/ddc/kokkos_allocator.hpp
index 9653f39c2..2d6dbbbf9 100644
--- a/include/ddc/kokkos_allocator.hpp
+++ b/include/ddc/kokkos_allocator.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <cstdint>
+#include <cstddef>
 #include <string>
 #include <type_traits>
 
diff --git a/include/ddc/misc/ginkgo_executors.hpp b/include/ddc/misc/ginkgo_executors.hpp
index 831eeb904..3ae44cfdb 100644
--- a/include/ddc/misc/ginkgo_executors.hpp
+++ b/include/ddc/misc/ginkgo_executors.hpp
@@ -5,6 +5,8 @@
 
 #include <ginkgo/ginkgo.hpp>
 
+#include <Kokkos_Core.hpp>
+
 inline std::shared_ptr<gko::Executor> create_default_host_executor()
 {
 #ifdef KOKKOS_ENABLE_SERIAL
diff --git a/include/ddc/non_uniform_point_sampling.hpp b/include/ddc/non_uniform_point_sampling.hpp
index 648bd2102..53f5d823e 100644
--- a/include/ddc/non_uniform_point_sampling.hpp
+++ b/include/ddc/non_uniform_point_sampling.hpp
@@ -2,14 +2,16 @@
 
 #pragma once
 
-#include <cassert>
+#include <cstddef>
+#include <initializer_list>
+#include <ostream>
 #include <type_traits>
 #include <vector>
 
 #include <Kokkos_Core.hpp>
 
 #include "ddc/coordinate.hpp"
-#include "ddc/detail/macros.hpp"
+#include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_space.hpp"
 #include "ddc/discrete_vector.hpp"
diff --git a/include/ddc/pdi.hpp b/include/ddc/pdi.hpp
index 7a8a7e30a..64899bdc1 100644
--- a/include/ddc/pdi.hpp
+++ b/include/ddc/pdi.hpp
@@ -5,12 +5,12 @@
 #include <memory_resource>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include <pdi.h>
 
-#include "ddc/chunk_span.hpp"
-#include "ddc/discrete_domain.hpp"
+#include "ddc/chunk_common.hpp"
 
 namespace ddc {
 
diff --git a/include/ddc/periodic_sampling.hpp b/include/ddc/periodic_sampling.hpp
index 42dc02ad7..b541eb27b 100644
--- a/include/ddc/periodic_sampling.hpp
+++ b/include/ddc/periodic_sampling.hpp
@@ -3,12 +3,15 @@
 #pragma once
 
 #include <cassert>
+#include <cstddef>
+#include <ostream>
+#include <tuple>
 #include <type_traits>
+#include <utility>
 
 #include <Kokkos_Core.hpp>
 
 #include "ddc/coordinate.hpp"
-#include "ddc/detail/macros.hpp"
 #include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_space.hpp"
diff --git a/include/ddc/reducer.hpp b/include/ddc/reducer.hpp
index 820459e5f..3bb8c85d5 100644
--- a/include/ddc/reducer.hpp
+++ b/include/ddc/reducer.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <limits>
 #include <utility>
 
 #include <Kokkos_Core.hpp>
diff --git a/include/ddc/scope_guard.hpp b/include/ddc/scope_guard.hpp
index aa6a21a6b..fe9b8d06c 100644
--- a/include/ddc/scope_guard.hpp
+++ b/include/ddc/scope_guard.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <functional>
 #include <map>
-#include <memory>
 #include <optional>
+#include <string>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/include/ddc/transform_reduce.hpp b/include/ddc/transform_reduce.hpp
index 3b0d358cd..ea4494b78 100644
--- a/include/ddc/transform_reduce.hpp
+++ b/include/ddc/transform_reduce.hpp
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <cstddef>
+#include <type_traits>
 #include <utility>
 
 #include <Kokkos_Core.hpp>
diff --git a/include/ddc/uniform_point_sampling.hpp b/include/ddc/uniform_point_sampling.hpp
index b5f21012f..4cbb8c321 100644
--- a/include/ddc/uniform_point_sampling.hpp
+++ b/include/ddc/uniform_point_sampling.hpp
@@ -3,12 +3,14 @@
 #pragma once
 
 #include <cassert>
+#include <ostream>
+#include <tuple>
 #include <type_traits>
+#include <utility>
 
 #include <Kokkos_Core.hpp>
 
 #include "ddc/coordinate.hpp"
-#include "ddc/detail/macros.hpp"
 #include "ddc/discrete_domain.hpp"
 #include "ddc/discrete_element.hpp"
 #include "ddc/discrete_space.hpp"