diff --git a/device/common/include/traccc/device/fill_prefix_sum.hpp b/device/common/include/traccc/device/fill_prefix_sum.hpp
index be7dcbc3e..f432f6f80 100644
--- a/device/common/include/traccc/device/fill_prefix_sum.hpp
+++ b/device/common/include/traccc/device/fill_prefix_sum.hpp
@@ -10,18 +10,16 @@
 // Project include(s).
 #include "traccc/definitions/qualifiers.hpp"
 #include "traccc/edm/container.hpp"
+#include "traccc/utils/pair.hpp"
 
 // VecMem include(s).
 #include <vecmem/memory/memory_resource.hpp>
 #include <vecmem/utils/copy.hpp>
 
-// Thrust include(s).
-#include <thrust/pair.h>
-
 namespace traccc::device {
 
 /// Type for the individual elements in the prefix sum vector
-typedef thrust::pair<unsigned int, unsigned int> prefix_sum_element_t;
+typedef traccc::pair<unsigned int, unsigned int> prefix_sum_element_t;
 
 /// Convenience type definition for the return value of the helper function
 typedef vecmem::vector<prefix_sum_element_t> prefix_sum_t;
diff --git a/device/common/include/traccc/device/impl/fill_prefix_sum.ipp b/device/common/include/traccc/device/impl/fill_prefix_sum.ipp
index 57223871b..14f2eb0c5 100644
--- a/device/common/include/traccc/device/impl/fill_prefix_sum.ipp
+++ b/device/common/include/traccc/device/impl/fill_prefix_sum.ipp
@@ -28,7 +28,7 @@ inline void fill_prefix_sum(
     const prefix_sum_size_t current =
         sizes[static_cast<unsigned int>(globalIndex)];
     for (prefix_sum_size_t i = 0; i < current - previous; ++i) {
-        result.at(previous + i) = {globalIndex, i};
+        result.at(previous + i) = {static_cast<unsigned int>(globalIndex), i};
     }
 }