diff --git a/cub/cub/agent/agent_spmv_orig.cuh b/cub/cub/agent/agent_spmv_orig.cuh
index ca8994e877..64d94c0959 100644
--- a/cub/cub/agent/agent_spmv_orig.cuh
+++ b/cub/cub/agent/agent_spmv_orig.cuh
@@ -51,6 +51,9 @@
 #include <cub/thread/thread_search.cuh>
 #include <cub/util_type.cuh>
 
+#include <thrust/detail/config/namespace.h>
+#include <thrust/iterator/counting_iterator.h>
+
 #include <cuda/std/type_traits>
 
 #include <iterator>
@@ -374,7 +377,7 @@ struct AgentSpmv
     CTA_SYNC();
 
     // Search for the thread's starting coordinate within the merge tile
-    CountingInputIterator<OffsetT> tile_nonzero_indices(tile_start_coord.y);
+    THRUST_NS_QUALIFIER::counting_iterator<OffsetT> tile_nonzero_indices(tile_start_coord.y);
     CoordinateT thread_start_coord;
 
     MergePathSearch(
diff --git a/cub/test/catch2_test_device_reduce.cuh b/cub/test/catch2_test_device_reduce.cuh
index cc02026723..ed9a806d19 100644
--- a/cub/test/catch2_test_device_reduce.cuh
+++ b/cub/test/catch2_test_device_reduce.cuh
@@ -203,12 +203,11 @@ inline __half* unwrap_it(half_t* it)
 }
 
 template <class OffsetT>
-inline THRUST_NS_QUALIFIER::constant_iterator<__half, OffsetT>
-unwrap_it(THRUST_NS_QUALIFIER::constant_iterator<half_t, OffsetT> it)
+inline thrust::constant_iterator<__half, OffsetT> unwrap_it(thrust::constant_iterator<half_t, OffsetT> it)
 {
   half_t wrapped_val = *it;
   __half val         = wrapped_val.operator __half();
-  return THRUST_NS_QUALIFIER::constant_iterator<__half, OffsetT>(val);
+  return thrust::constant_iterator<__half, OffsetT>(val);
 }
 #endif
 
@@ -219,12 +218,11 @@ inline __nv_bfloat16* unwrap_it(bfloat16_t* it)
 }
 
 template <class OffsetT>
-THRUST_NS_QUALIFIER::constant_iterator<__nv_bfloat16, OffsetT> inline unwrap_it(
-  THRUST_NS_QUALIFIER::constant_iterator<bfloat16_t, OffsetT> it)
+thrust::constant_iterator<__nv_bfloat16, OffsetT> inline unwrap_it(thrust::constant_iterator<bfloat16_t, OffsetT> it)
 {
   bfloat16_t wrapped_val = *it;
   __nv_bfloat16 val      = wrapped_val.operator __nv_bfloat16();
-  return THRUST_NS_QUALIFIER::constant_iterator<__nv_bfloat16, OffsetT>(val);
+  return thrust::constant_iterator<__nv_bfloat16, OffsetT>(val);
 }
 #endif