diff --git a/include/cudecomp.h b/include/cudecomp.h
index 300da23..f84a805 100644
--- a/include/cudecomp.h
+++ b/include/cudecomp.h
@@ -24,6 +24,9 @@
 #ifndef CUDECOMP_H
 #define CUDECOMP_H
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <cuda_runtime.h>
 #include <mpi.h>
 
@@ -35,9 +38,6 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
-
 /**
  * @brief This enum lists the different available transpose backend options.
  */
diff --git a/include/internal/checks.h b/include/internal/checks.h
index 7915617..67a3fc9 100644
--- a/include/internal/checks.h
+++ b/include/internal/checks.h
@@ -19,7 +19,9 @@
 #define CUDECOMP_CHECKS_H
 
 #include <cstdio>
+#include <cstdlib>
 #include <iostream>
+#include <sstream>
 #include <string>
 
 #include <cuda.h>
diff --git a/include/internal/comm_routines.h b/include/internal/comm_routines.h
index aebd048..e56d531 100644
--- a/include/internal/comm_routines.h
+++ b/include/internal/comm_routines.h
@@ -18,8 +18,16 @@
 #ifndef COMM_ROUTINES_H
 #define COMM_ROUTINES_H
 
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <limits>
+#include <sstream>
+#include <string>
 #include <vector>
 
+#include <cuda/std/complex>
 #include <cuda_runtime.h>
 #include <mpi.h>
 #include <nccl.h>
diff --git a/include/internal/common.h b/include/internal/common.h
index 694ad01..17888cd 100644
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -18,20 +18,26 @@
 #ifndef CUDECOMP_COMMON_H
 #define CUDECOMP_COMMON_H
 
+#include <algorithm>
 #include <array>
 #include <complex>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
 #include <sstream>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include <cuda_runtime.h>
+#include <cutensor.h>
 #include <mpi.h>
 #include <nccl.h>
+#include <nvml.h>
 #ifdef ENABLE_NVSHMEM
 #include <nvshmem.h>
 #include <nvshmemx.h>
diff --git a/include/internal/cuda_wrap.h b/include/internal/cuda_wrap.h
index d99ac75..ccb24a4 100644
--- a/include/internal/cuda_wrap.h
+++ b/include/internal/cuda_wrap.h
@@ -18,6 +18,8 @@
 #ifndef CUDECOMP_CUDA_WRAP_H
 #define CUDECOMP_CUDA_WRAP_H
 
+#include <cuda_runtime.h>
+
 #if CUDART_VERSION >= 11030
 #include <cudaTypedefs.h>
 #endif
diff --git a/include/internal/cudecomp_kernels.cuh b/include/internal/cudecomp_kernels.cuh
index ef3685d..66138fd 100644
--- a/include/internal/cudecomp_kernels.cuh
+++ b/include/internal/cudecomp_kernels.cuh
@@ -19,6 +19,8 @@
 #define CUDECOMP_KERNELS_CUH
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 
 #ifdef ENABLE_NVSHMEM
 #include <nvshmem.h>
diff --git a/include/internal/cudecomp_kernels.h b/include/internal/cudecomp_kernels.h
index 17025aa..dfe041a 100644
--- a/include/internal/cudecomp_kernels.h
+++ b/include/internal/cudecomp_kernels.h
@@ -18,6 +18,9 @@
 #ifndef CUDECOMP_KERNELS_H
 #define CUDECOMP_KERNELS_H
 
+#include <cstddef>
+#include <cstdint>
+
 #include <cuda/std/complex>
 
 #include "internal/common.h"
diff --git a/include/internal/halo.h b/include/internal/halo.h
index dd9a5e2..105d032 100644
--- a/include/internal/halo.h
+++ b/include/internal/halo.h
@@ -18,7 +18,11 @@
 #ifndef HALO_H
 #define HALO_H
 
+#include <algorithm>
 #include <array>
+#include <cstddef>
+#include <cstdint>
+#include <sstream>
 #include <vector>
 
 #include <cuda_runtime.h>
diff --git a/include/internal/hashes.h b/include/internal/hashes.h
index d37e057..971f608 100644
--- a/include/internal/hashes.h
+++ b/include/internal/hashes.h
@@ -19,6 +19,7 @@
 #define CUDECOMP_HASHES_H
 
 #include <array>
+#include <cstddef>
 #include <functional>
 #include <tuple>
 #include <utility>
diff --git a/include/internal/nvtx.h b/include/internal/nvtx.h
index ed94d11..9b70d26 100644
--- a/include/internal/nvtx.h
+++ b/include/internal/nvtx.h
@@ -18,6 +18,7 @@
 #ifndef CUDECOMP_NVTX_H
 #define CUDECOMP_NVTX_H
 
+#include <functional>
 #include <string>
 
 #ifdef ENABLE_NVTX
diff --git a/include/internal/performance.h b/include/internal/performance.h
index a3114e0..3561fe0 100644
--- a/include/internal/performance.h
+++ b/include/internal/performance.h
@@ -19,6 +19,7 @@
 #define CUDECOMP_PERFORMANCE_H
 
 #include <array>
+#include <cstdint>
 #include <string>
 #include <tuple>
 #include <unordered_map>
diff --git a/include/internal/transpose.h b/include/internal/transpose.h
index 5275379..745ddad 100644
--- a/include/internal/transpose.h
+++ b/include/internal/transpose.h
@@ -18,8 +18,11 @@
 #ifndef TRANSPOSE_H
 #define TRANSPOSE_H
 
+#include <algorithm>
 #include <array>
+#include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <vector>
 
 #include <cuda/std/complex>
diff --git a/src/autotune.cc b/src/autotune.cc
index 999e372..a1ce48f 100644
--- a/src/autotune.cc
+++ b/src/autotune.cc
@@ -17,6 +17,10 @@
 
 #include <algorithm>
 #include <array>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
 #include <numeric>
 #include <string>
 #include <vector>
diff --git a/src/cudecomp.cc b/src/cudecomp.cc
index 61bbf7e..1715da1 100644
--- a/src/cudecomp.cc
+++ b/src/cudecomp.cc
@@ -16,12 +16,19 @@
  */
 
 #include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <numeric>
 #include <set>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include <cuda.h>
diff --git a/src/cudecomp_kernels_rdc.cu b/src/cudecomp_kernels_rdc.cu
index 2711f2b..92453a6 100644
--- a/src/cudecomp_kernels_rdc.cu
+++ b/src/cudecomp_kernels_rdc.cu
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+#include <algorithm>
+#include <cstdint>
+
 #include <cuda/std/complex>
 
 #include "internal/checks.h"
diff --git a/src/performance.cc b/src/performance.cc
index f38d828..3a91b76 100644
--- a/src/performance.cc
+++ b/src/performance.cc
@@ -16,6 +16,10 @@
  */
 
 #include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
@@ -25,6 +29,9 @@
 #include <numeric>
 #include <sstream>
 #include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 #include <mpi.h>