diff --git a/benchmarks/hash_table/dynamic_map_bench.cu b/benchmarks/hash_table/dynamic_map_bench.cu
index 2ce5b1a48..f92a9044c 100644
--- a/benchmarks/hash_table/dynamic_map_bench.cu
+++ b/benchmarks/hash_table/dynamic_map_bench.cu
@@ -18,6 +18,8 @@
 
 #include <cuco/dynamic_map.cuh>
 
+#include <thrust/device_vector.h>
+
 #include <benchmark/benchmark.h>
 
 #include <iostream>
diff --git a/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu b/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
index b73a14039..d845a9ad3 100644
--- a/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
+++ b/benchmarks/hash_table/static_multimap/pair_retrieve_bench.cu
@@ -21,7 +21,11 @@
 #include <nvbench/nvbench.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 namespace {
 // Custom pair equal
diff --git a/benchmarks/reduce_by_key/reduce_by_key.cu b/benchmarks/reduce_by_key/reduce_by_key.cu
index 3e4776c6b..1de05a42f 100644
--- a/benchmarks/reduce_by_key/reduce_by_key.cu
+++ b/benchmarks/reduce_by_key/reduce_by_key.cu
@@ -17,6 +17,9 @@
 #include <benchmark/benchmark.h>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/pair.h>
diff --git a/examples/static_map/custom_type_example.cu b/examples/static_map/custom_type_example.cu
index 95ca6a21e..0209c8546 100644
--- a/examples/static_map/custom_type_example.cu
+++ b/examples/static_map/custom_type_example.cu
@@ -17,6 +17,8 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
 #include <thrust/logical.h>
 #include <thrust/transform.h>
 
diff --git a/examples/static_map/static_map_example.cu b/examples/static_map/static_map_example.cu
index d6b41948e..c248d5a80 100644
--- a/examples/static_map/static_map_example.cu
+++ b/examples/static_map/static_map_example.cu
@@ -17,6 +17,9 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/pair.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
diff --git a/examples/static_multimap/static_multimap_example.cu b/examples/static_multimap/static_multimap_example.cu
index d229c8455..eb842655b 100644
--- a/examples/static_multimap/static_multimap_example.cu
+++ b/examples/static_multimap/static_multimap_example.cu
@@ -17,6 +17,8 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/pair.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
diff --git a/include/cuco/detail/pair.cuh b/include/cuco/detail/pair.cuh
index fe7e7d7e8..dcaca9edf 100644
--- a/include/cuco/detail/pair.cuh
+++ b/include/cuco/detail/pair.cuh
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <thrust/device_reference.h>
+#include <thrust/memory.h>
 #include <thrust/pair.h>
 #include <thrust/tuple.h>
 
diff --git a/include/cuco/detail/static_map.inl b/include/cuco/detail/static_map.inl
index 59bbf31b5..3a8fea931 100644
--- a/include/cuco/detail/static_map.inl
+++ b/include/cuco/detail/static_map.inl
@@ -19,8 +19,10 @@
 #include <cuco/detail/utils.cuh>
 
 #include <thrust/copy.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/tuple.h>
 
 namespace cuco {
 
diff --git a/include/cuco/detail/static_multimap/device_view_impl.inl b/include/cuco/detail/static_multimap/device_view_impl.inl
index 6451773aa..8d0add2da 100644
--- a/include/cuco/detail/static_multimap/device_view_impl.inl
+++ b/include/cuco/detail/static_multimap/device_view_impl.inl
@@ -17,6 +17,9 @@
 #include <cuco/detail/bitwise_compare.cuh>
 #include <cuco/detail/utils.cuh>
 
+#include <thrust/tuple.h>
+#include <thrust/type_traits/is_contiguous_iterator.h>
+
 namespace cuco {
 
 template <typename Key,
diff --git a/include/cuco/detail/static_multimap/static_multimap.inl b/include/cuco/detail/static_multimap/static_multimap.inl
index d0be7c6c4..450c5d871 100644
--- a/include/cuco/detail/static_multimap/static_multimap.inl
+++ b/include/cuco/detail/static_multimap/static_multimap.inl
@@ -18,6 +18,7 @@
 #include <cuco/detail/utils.hpp>
 
 #include <thrust/count.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/tuple.h>
 
diff --git a/include/cuco/detail/utils.cuh b/include/cuco/detail/utils.cuh
index a848c6695..a25336883 100644
--- a/include/cuco/detail/utils.cuh
+++ b/include/cuco/detail/utils.cuh
@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include <thrust/tuple.h>
+
 namespace cuco {
 namespace detail {
 
diff --git a/tests/dynamic_map/unique_sequence_test.cu b/tests/dynamic_map/unique_sequence_test.cu
index 7aa891278..45891aa51 100644
--- a/tests/dynamic_map/unique_sequence_test.cu
+++ b/tests/dynamic_map/unique_sequence_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/dynamic_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/custom_type_test.cu b/tests/static_map/custom_type_test.cu
index 33a823d10..c5722b03d 100644
--- a/tests/static_map/custom_type_test.cu
+++ b/tests/static_map/custom_type_test.cu
@@ -19,6 +19,10 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/duplicate_keys_test.cu b/tests/static_map/duplicate_keys_test.cu
index edfc9eca8..c76b11a28 100644
--- a/tests/static_map/duplicate_keys_test.cu
+++ b/tests/static_map/duplicate_keys_test.cu
@@ -19,8 +19,12 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/sequence.h>
 #include <thrust/sort.h>
 
 #include <catch2/catch.hpp>
diff --git a/tests/static_map/erase_test.cu b/tests/static_map/erase_test.cu
index fa91adda2..92cae0157 100644
--- a/tests/static_map/erase_test.cu
+++ b/tests/static_map/erase_test.cu
@@ -16,6 +16,10 @@
 
 #include <catch2/catch.hpp>
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <cuco/static_map.cuh>
 
@@ -87,4 +91,4 @@ TEMPLATE_TEST_CASE_SIG("erase key", "", ((typename T), T), (int32_t), (int64_t))
     map.erase(d_keys.begin() + num_keys / 2, d_keys.end());
     REQUIRE(map.get_size() == 0);
   }
-}
\ No newline at end of file
+}
diff --git a/tests/static_map/key_sentinel_test.cu b/tests/static_map/key_sentinel_test.cu
index dd98cc18d..e52c1405e 100644
--- a/tests/static_map/key_sentinel_test.cu
+++ b/tests/static_map/key_sentinel_test.cu
@@ -19,6 +19,8 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/shared_memory_test.cu b/tests/static_map/shared_memory_test.cu
index b66583d9d..67ae88d88 100644
--- a/tests/static_map/shared_memory_test.cu
+++ b/tests/static_map/shared_memory_test.cu
@@ -19,6 +19,11 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/stream_test.cu b/tests/static_map/stream_test.cu
index 70394f224..0aba36ab6 100644
--- a/tests/static_map/stream_test.cu
+++ b/tests/static_map/stream_test.cu
@@ -19,6 +19,13 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_map/unique_sequence_test.cu b/tests/static_map/unique_sequence_test.cu
index f0594aa3e..17ccc024a 100644
--- a/tests/static_map/unique_sequence_test.cu
+++ b/tests/static_map/unique_sequence_test.cu
@@ -19,6 +19,13 @@
 #include <cuco/static_map.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/for_each.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/custom_pair_retrieve_test.cu b/tests/static_multimap/custom_pair_retrieve_test.cu
index 9c2915da5..19c4df305 100644
--- a/tests/static_multimap/custom_pair_retrieve_test.cu
+++ b/tests/static_multimap/custom_pair_retrieve_test.cu
@@ -19,8 +19,14 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/scan.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/custom_type_test.cu b/tests/static_multimap/custom_type_test.cu
index c734d3cb9..1b5114d96 100644
--- a/tests/static_multimap/custom_type_test.cu
+++ b/tests/static_multimap/custom_type_test.cu
@@ -19,7 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
 #include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/insert_if_test.cu b/tests/static_multimap/insert_if_test.cu
index 6465c5396..e40e21be7 100644
--- a/tests/static_multimap/insert_if_test.cu
+++ b/tests/static_multimap/insert_if_test.cu
@@ -19,6 +19,10 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/multiplicity_test.cu b/tests/static_multimap/multiplicity_test.cu
index de89bb1ea..83a110614 100644
--- a/tests/static_multimap/multiplicity_test.cu
+++ b/tests/static_multimap/multiplicity_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/non_match_test.cu b/tests/static_multimap/non_match_test.cu
index 9d0582fed..e41e91a6a 100644
--- a/tests/static_multimap/non_match_test.cu
+++ b/tests/static_multimap/non_match_test.cu
@@ -19,6 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/distance.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/sequence.h>
+#include <thrust/sort.h>
+#include <thrust/transform.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/tests/static_multimap/pair_function_test.cu b/tests/static_multimap/pair_function_test.cu
index 66e3b1d27..86b9dbdbf 100644
--- a/tests/static_multimap/pair_function_test.cu
+++ b/tests/static_multimap/pair_function_test.cu
@@ -19,7 +19,12 @@
 #include <cuco/static_multimap.cuh>
 
 #include <thrust/device_vector.h>
+#include <thrust/execution_policy.h>
+#include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
+#include <thrust/tuple.h>
 
 #include <catch2/catch.hpp>