diff --git a/projects/rocprim/test/rocprim/test_device_segmented_topk.cpp b/projects/rocprim/test/rocprim/test_device_segmented_topk.cpp
index 774a3808100c..8ea85172595c 100644
--- a/projects/rocprim/test/rocprim/test_device_segmented_topk.cpp
+++ b/projects/rocprim/test/rocprim/test_device_segmented_topk.cpp
@@ -910,26 +910,6 @@ void segmented_topk_large_sizes_test(bool debug_synchronous)
 
 TEST(RocprimDeviceSegmentedTopkTests, SegmentedTopkLargeSizesStable)
 {
-    // Temporarily disable this test on gfx115x on Windows until we can determine the root cause.
-    // TODO: remove this after the root cause has been found and fixed properly.
-#if defined(_WIN32)
-    rocprim::detail::target_arch arch = rocprim::detail::target_arch::unknown;
-    if (rocprim::detail::host_target_arch(hipStreamDefault, arch) != HIP_SUCCESS)
-    {
-        std::cerr << "Warning: unable to fetch target architecture for disablement check." << std::endl;
-    }
-
-    const std::set<rocprim::detail::target_arch> disabled_arches = {
-        rocprim::detail::target_arch::gfx1150,
-        rocprim::detail::target_arch::gfx1151,
-        rocprim::detail::target_arch::gfx1152,
-        rocprim::detail::target_arch::gfx1153
-    };
-
-    if (disabled_arches.find(arch) != disabled_arches.end())
-        GTEST_SKIP() << "Skipping test on gfx1151 Windows systems due to known issues.";
-#endif
-        
     constexpr bool descending            = false;
     constexpr bool stable                = true;
     using decomposer_t                   = rocprim::identity_decomposer;
@@ -954,26 +934,6 @@ TEST(RocprimDeviceSegmentedTopkTests, SegmentedTopkLargeSizesStable)
 
 TEST(RocprimDeviceSegmentedTopkTests, TopkLargeSizesUnstable)
 {
-    // Temporarily disable this test on gfx115x on Windows until we can determine the root cause.
-    // TODO: remove this after the root cause has been found and fixed properly.
-#if defined(_WIN32)
-    rocprim::detail::target_arch arch = rocprim::detail::target_arch::unknown;
-    if (rocprim::detail::host_target_arch(hipStreamDefault, arch) != HIP_SUCCESS)
-    {
-        std::cerr << "Warning: unable to fetch target architecture for disablement check." << std::endl;
-    }
-
-    const std::set<rocprim::detail::target_arch> disabled_arches = {
-        rocprim::detail::target_arch::gfx1150,
-        rocprim::detail::target_arch::gfx1151,
-        rocprim::detail::target_arch::gfx1152,
-        rocprim::detail::target_arch::gfx1153
-    };
-
-    if (disabled_arches.find(arch) != disabled_arches.end())
-        GTEST_SKIP() << "Skipping test on gfx1151 Windows systems due to known issues.";
-#endif
-    
     constexpr bool descending            = false;
     constexpr bool stable                = false;
     using decomposer_t                   = rocprim::identity_decomposer;
diff --git a/projects/rocprim/test/rocprim/test_device_topk.cpp b/projects/rocprim/test/rocprim/test_device_topk.cpp
index 3ec91b809a61..f885ff9f2291 100644
--- a/projects/rocprim/test/rocprim/test_device_topk.cpp
+++ b/projects/rocprim/test/rocprim/test_device_topk.cpp
@@ -919,26 +919,6 @@ void topk_large_sizes_test(bool debug_synchronous)
 
 TEST(RocprimDeviceTopkTests, TopkLargeSizesStable)
 {
-    // Temporarily disable this test on gfx115x on Windows until we can determine the root cause.
-    // TODO: remove this after the root cause has been found and fixed properly.
-#if defined(_WIN32)
-    rocprim::detail::target_arch arch = rocprim::detail::target_arch::unknown;
-    if (rocprim::detail::host_target_arch(hipStreamDefault, arch) != HIP_SUCCESS)
-    {
-        std::cerr << "Warning: unable to fetch target architecture for disablement check." << std::endl;
-    }
-
-    const std::set<rocprim::detail::target_arch> disabled_arches = {
-        rocprim::detail::target_arch::gfx1150,
-        rocprim::detail::target_arch::gfx1151,
-        rocprim::detail::target_arch::gfx1152,
-        rocprim::detail::target_arch::gfx1153
-    };
-
-    if (disabled_arches.find(arch) != disabled_arches.end())
-        GTEST_SKIP() << "Skipping test on gfx1151 Windows systems due to known issues.";
-#endif
-    
     constexpr bool descending            = false;
     constexpr bool stable                = true;
     using decomposer_t                   = rocprim::identity_decomposer;
@@ -963,26 +943,6 @@ TEST(RocprimDeviceTopkTests, TopkLargeSizesStable)
 
 TEST(RocprimDeviceTopkTests, TopkLargeSizesUnstable)
 {
-    // Temporarily disable this test on gfx115x on Windows until we can determine the root cause.
-    // TODO: remove this after the root cause has been found and fixed properly.
-#if defined(_WIN32)
-    rocprim::detail::target_arch arch = rocprim::detail::target_arch::unknown;
-    if (rocprim::detail::host_target_arch(hipStreamDefault, arch) != HIP_SUCCESS)
-    {
-        std::cerr << "Warning: unable to fetch target architecture for disablement check." << std::endl;
-    }
-
-    const std::set<rocprim::detail::target_arch> disabled_arches = {
-        rocprim::detail::target_arch::gfx1150,
-        rocprim::detail::target_arch::gfx1151,
-        rocprim::detail::target_arch::gfx1152,
-        rocprim::detail::target_arch::gfx1153
-    };
-
-    if (disabled_arches.find(arch) != disabled_arches.end())
-        GTEST_SKIP() << "Skipping test on gfx1151 Windows systems due to known issues.";
-#endif
-    
     constexpr bool descending            = false;
     constexpr bool stable                = false;
     using decomposer_t                   = rocprim::identity_decomposer;
diff --git a/projects/rocthrust/.clang-format b/projects/rocthrust/.clang-format
index 676f9822da5f..ba9b78224095 100644
--- a/projects/rocthrust/.clang-format
+++ b/projects/rocthrust/.clang-format
@@ -30,7 +30,7 @@ AttributeMacros: [
                   'THRUST_HOST',
                   'THRUST_NODISCARD',
                   'THRUST_DEPRECATED',
-                  'THRUST_GLOBAL_CONSTANT',
+                  'THRUST_INLINE_CONSTANT',
                   # thrust
                   '_CCCL_ALIGNAS_TYPE',
                   '_CCCL_ALIGNAS',
diff --git a/projects/rocthrust/CHANGELOG.md b/projects/rocthrust/CHANGELOG.md
index 1e3caeb39ac1..f77dc955cca4 100644
--- a/projects/rocthrust/CHANGELOG.md
+++ b/projects/rocthrust/CHANGELOG.md
@@ -3,15 +3,6 @@
 Documentation for rocThrust available at
 [https://rocm.docs.amd.com/projects/rocThrust/en/latest/](https://rocm.docs.amd.com/projects/rocThrust/en/latest/).
 
-## rocThrust 5.0.0 for ROCm 10.0
-
-### Added
-
-* Largely in feature parity with CCCL/thrust v3.0.3.
-  - `thrust::tuple`, `thrust::pair` and `thrust::zip_iterator` fall back to rocThrust 4.4.0 implementations when a libhipcxx counterpart corresponding to CCCL/libcudacxx >= v3.0.3 is unavailable, ie
-    * `thrust::tuple` and `thrust::pair`: some features may differ from CCCL/thrust v3.0.3.
-    * `thrust::zip_iterator`: some iterator concepts present in CCCL/thrust v3.0.3 are missing.
-
 ## rocThrust 4.5.0 for ROCm 7.14
 
 ### Added
diff --git a/projects/rocthrust/CMakeLists.txt b/projects/rocthrust/CMakeLists.txt
index 9bdb858bfd21..467bb97f7549 100644
--- a/projects/rocthrust/CMakeLists.txt
+++ b/projects/rocthrust/CMakeLists.txt
@@ -8,11 +8,11 @@ cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 # Update these variables at release time
 #
 # Set the library version
-set(VERSION_STRING "5.0.0")
+set(VERSION_STRING "4.5.0")
 # Set the minimum required rocPRIM version
-set(MIN_ROCPRIM_PACKAGE_VERSION "4.1.0" CACHE STRING "Minimum version of rocPRIM to search for when ROCPRIM_FETCH_METHOD is set to PACKAGE.")
+set(MIN_ROCPRIM_PACKAGE_VERSION "4.0.0" CACHE STRING "Minimum version of rocPRIM to search for when ROCPRIM_FETCH_METHOD is set to PACKAGE.")
 # Set the minimum required rocRAND version
-set(MIN_ROCRAND_PACKAGE_VERSION "4.1.0" CACHE STRING "Minimum version of rocRAND to search for when ROCRAND_FETCH_METHOD is set to PACKAGE.")
+set(MIN_ROCRAND_PACKAGE_VERSION "4.0.0" CACHE STRING "Minimum version of rocRAND to search for when ROCRAND_FETCH_METHOD is set to PACKAGE.")
 # Set download branch for dependencies rocPRIM and rocRAND
 set(ROCM_DEP_RELEASE_BRANCH "release/therock-7.14" CACHE STRING "Download branch for ROCm dependencies")
 # --------------------------------------
@@ -35,9 +35,10 @@ endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(ALLOWED_CXX_STANDARDS 17 20 23 26)
-if(NOT CMAKE_CXX_STANDARD IN_LIST ALLOWED_CXX_STANDARDS)
-  message(FATAL_ERROR "Only C++17, C++20, C++23 and C++26 are supported")
+if (CMAKE_CXX_STANDARD EQUAL 14)
+  message(WARNING "C++14 will be deprecated in the next major release")
+elseif(NOT CMAKE_CXX_STANDARD EQUAL 17)
+  message(FATAL_ERROR "Only C++14 and C++17 are supported")
 endif()
 
 # Set HIP flags
@@ -201,6 +202,10 @@ if(NOT DISABLE_WERROR)
   list(APPEND COMPILE_OPTIONS -Werror)
 endif()
 
+if(NOT CMAKE_CXX_STANDARD EQUAL 17)
+  message(FATAL_ERROR "Only C++17 is supported")
+endif()
+
 if (WIN32)
   add_compile_options(-xhip)
   add_compile_definitions(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
diff --git a/projects/rocthrust/benchmark/bench/adjacent_difference/basic.cu b/projects/rocthrust/benchmark/bench/adjacent_difference/basic.cu
index c0fcecdf658f..33f8f023449b 100644
--- a/projects/rocthrust/benchmark/bench/adjacent_difference/basic.cu
+++ b/projects/rocthrust/benchmark/bench/adjacent_difference/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -110,9 +110,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -139,7 +140,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/adjacent_difference/custom.cu b/projects/rocthrust/benchmark/bench/adjacent_difference/custom.cu
index 8626c923135e..2be6dc85c80e 100644
--- a/projects/rocthrust/benchmark/bench/adjacent_difference/custom.cu
+++ b/projects/rocthrust/benchmark/bench/adjacent_difference/custom.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -128,9 +128,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <template <int> class Benchmark, int Val = 42 /*magic number in Thrust's benchmark*/>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -158,7 +159,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<custom>("custom", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/adjacent_difference/in_place.cu b/projects/rocthrust/benchmark/bench/adjacent_difference/in_place.cu
index 14e96915b2b2..6e075f939954 100644
--- a/projects/rocthrust/benchmark/bench/adjacent_difference/in_place.cu
+++ b/projects/rocthrust/benchmark/bench/adjacent_difference/in_place.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -107,9 +107,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -137,7 +138,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<in_place>("in_place", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/copy/basic.cu b/projects/rocthrust/benchmark/bench/copy/basic.cu
index ced41b213b06..ca37e9810a70 100644
--- a/projects/rocthrust/benchmark/bench/copy/basic.cu
+++ b/projects/rocthrust/benchmark/bench/copy/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -139,9 +139,10 @@ static_assert(!_THRUST_STD::is_trivially_copyable<non_trivial>::value, ""); // a
 static_assert(!thrust::is_trivially_relocatable<non_trivial>::value, ""); // thrust uses this check internally
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(uint8_t)
   BENCHMARK_TYPE(int16_t)
@@ -174,7 +175,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/copy/if.cu b/projects/rocthrust/benchmark/bench/copy/if.cu
index 030dee84447d..589320ebd87c 100644
--- a/projects/rocthrust/benchmark/bench/copy/if.cu
+++ b/projects/rocthrust/benchmark/bench/copy/if.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,6 @@
 // rocThrust
 #include <thrust/copy.h>
 #include <thrust/count.h>
-#include <thrust/detail/config/namespace.h>
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 
@@ -94,7 +93,7 @@ void run_benchmark(
   {
     input = bench_utils::generate(elements, seed_type);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -106,7 +105,7 @@ void run_benchmark(
   {
     output = thrust::device_vector<T>(selected_elements);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -154,10 +153,11 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 2, 4200}; // 1.000, 0.544, 0.000;
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
 
   BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reductions)
   BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reductions)
@@ -187,7 +187,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<_if>("if", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/equal/basic.cu b/projects/rocthrust/benchmark/bench/equal/basic.cu
index 20fe7438f214..3f873a135aba 100644
--- a/projects/rocthrust/benchmark/bench/equal/basic.cu
+++ b/projects/rocthrust/benchmark/bench/equal/basic.cu
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2025-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // Benchmark utils
@@ -100,9 +100,10 @@ void run_benchmark(benchmark::State& state,
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -130,7 +131,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/fill/basic.cu b/projects/rocthrust/benchmark/bench/fill/basic.cu
index 49e0f7a52649..2a605d2d2fc5 100644
--- a/projects/rocthrust/benchmark/bench/fill/basic.cu
+++ b/projects/rocthrust/benchmark/bench/fill/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -107,9 +107,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <template <int> class Benchmark, int Val = 42 /*magic number in Thrust's benchmark*/>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -140,7 +141,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/for_each/basic.cu b/projects/rocthrust/benchmark/bench/for_each/basic.cu
index 8722f1085e03..5c5c240881dd 100644
--- a/projects/rocthrust/benchmark/bench/for_each/basic.cu
+++ b/projects/rocthrust/benchmark/bench/for_each/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -117,9 +117,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -150,7 +151,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/inner_product/basic.cu b/projects/rocthrust/benchmark/bench/inner_product/basic.cu
index afc274ffadf5..c529595c5f58 100644
--- a/projects/rocthrust/benchmark/bench/inner_product/basic.cu
+++ b/projects/rocthrust/benchmark/bench/inner_product/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -109,9 +109,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -142,7 +143,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/merge/basic.cu b/projects/rocthrust/benchmark/bench/merge/basic.cu
index 49c1ad050f56..66c8c2182eae 100644
--- a/projects/rocthrust/benchmark/bench/merge/basic.cu
+++ b/projects/rocthrust/benchmark/bench/merge/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -132,13 +132,14 @@ void run_benchmark(benchmark::State& state,
       BENCHMARK_ELEMENTS(type, size, entropy);                             \
   }
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 4}; // 1.000, 0.201;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -169,7 +170,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/partition/basic.cu b/projects/rocthrust/benchmark/bench/partition/basic.cu
index ebf74ea51f48..e2b9af6c39a7 100644
--- a/projects/rocthrust/benchmark/bench/partition/basic.cu
+++ b/projects/rocthrust/benchmark/bench/partition/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -145,13 +145,14 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 2, 4200}; // 1.000, 0.544, 0.000;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -182,7 +183,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/reduce/basic.cu b/projects/rocthrust/benchmark/bench/reduce/basic.cu
index 2b817c8a835e..733df19a6062 100644
--- a/projects/rocthrust/benchmark/bench/reduce/basic.cu
+++ b/projects/rocthrust/benchmark/bench/reduce/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -107,9 +107,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -140,7 +141,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/reduce/by_key.cu b/projects/rocthrust/benchmark/bench/reduce/by_key.cu
index 829814f672d4..9892572ce3c1 100644
--- a/projects/rocthrust/benchmark/bench/reduce/by_key.cu
+++ b/projects/rocthrust/benchmark/bench/reduce/by_key.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -30,7 +30,6 @@
 #include "../../bench_utils/bench_utils.hpp"
 
 // rocThrust
-#include <thrust/detail/config/namespace.h>
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 #include <thrust/reduce.h>
@@ -87,7 +86,7 @@ void run_benchmark(
     out_keys = in_keys;
     in_vals  = thrust::device_vector<ValueT>(elements);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -99,7 +98,7 @@ void run_benchmark(
   {
     out_vals = thrust::device_vector<ValueT>(unique_keys);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -168,9 +167,10 @@ void run_benchmark(
 #endif
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_KEY_TYPE(int8_t)
   BENCHMARK_KEY_TYPE(int16_t)
   BENCHMARK_KEY_TYPE(int32_t)
@@ -200,7 +200,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<by_key>("by_key", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/exclusive/by_key.cu b/projects/rocthrust/benchmark/bench/scan/exclusive/by_key.cu
index 27a4829bdfeb..d458edac2815 100644
--- a/projects/rocthrust/benchmark/bench/scan/exclusive/by_key.cu
+++ b/projects/rocthrust/benchmark/bench/scan/exclusive/by_key.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -131,9 +131,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
 #endif
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_KEY_TYPE(int8_t)
   BENCHMARK_KEY_TYPE(int16_t)
   BENCHMARK_KEY_TYPE(int32_t)
@@ -163,7 +164,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<by_key>("by_key", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/exclusive/max.cu b/projects/rocthrust/benchmark/bench/scan/exclusive/max.cu
index fb72869eb302..c1eff80eb096 100644
--- a/projects/rocthrust/benchmark/bench/scan/exclusive/max.cu
+++ b/projects/rocthrust/benchmark/bench/scan/exclusive/max.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -110,9 +110,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -142,7 +143,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<_max>("max", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/exclusive/sum.cu b/projects/rocthrust/benchmark/bench/scan/exclusive/sum.cu
index 4769ccdf7fc2..af66a04873eb 100644
--- a/projects/rocthrust/benchmark/bench/scan/exclusive/sum.cu
+++ b/projects/rocthrust/benchmark/bench/scan/exclusive/sum.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -110,9 +110,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -143,7 +144,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<sum>("sum", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/inclusive/by_key.cu b/projects/rocthrust/benchmark/bench/scan/inclusive/by_key.cu
index 9bff09751d98..c0d49de10c3d 100644
--- a/projects/rocthrust/benchmark/bench/scan/inclusive/by_key.cu
+++ b/projects/rocthrust/benchmark/bench/scan/inclusive/by_key.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -130,9 +130,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
 #endif
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_KEY_TYPE(int8_t)
   BENCHMARK_KEY_TYPE(int16_t)
   BENCHMARK_KEY_TYPE(int32_t)
@@ -162,7 +163,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<by_key>("by_key", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/inclusive/max.cu b/projects/rocthrust/benchmark/bench/scan/inclusive/max.cu
index 12b77fd47532..52a47833f4fb 100644
--- a/projects/rocthrust/benchmark/bench/scan/inclusive/max.cu
+++ b/projects/rocthrust/benchmark/bench/scan/inclusive/max.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -111,9 +111,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -144,7 +145,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<_max>("max", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/scan/inclusive/sum.cu b/projects/rocthrust/benchmark/bench/scan/inclusive/sum.cu
index 0a399b96692d..fdfd9a0628c5 100644
--- a/projects/rocthrust/benchmark/bench/scan/inclusive/sum.cu
+++ b/projects/rocthrust/benchmark/bench/scan/inclusive/sum.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -110,9 +110,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -143,7 +144,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<sum>("sum", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/base.hpp b/projects/rocthrust/benchmark/bench/set_operations/base.hpp
index 97d7c9c800ac..c46180f3de03 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/base.hpp
+++ b/projects/rocthrust/benchmark/bench/set_operations/base.hpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -149,13 +149,13 @@ void run_benchmark(benchmark::State& state,
 
 template <class OpT>
 void add_benchmarks(
-  const std::string& algo_name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+  const std::string& algo_name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 4}; // 1.000, 0.201;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int32_t, entropy_reduction)
diff --git a/projects/rocthrust/benchmark/bench/set_operations/by_key.hpp b/projects/rocthrust/benchmark/bench/set_operations/by_key.hpp
index 30f50aa4fe81..8d5a044959c6 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/by_key.hpp
+++ b/projects/rocthrust/benchmark/bench/set_operations/by_key.hpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -168,13 +168,13 @@ void run_benchmark(benchmark::State& state,
 
 template <class OpT>
 void add_benchmarks(
-  const std::string& algo_name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+  const std::string& algo_name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 4}; // 1.000, 0.201;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_KEY_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int32_t, entropy_reduction)
diff --git a/projects/rocthrust/benchmark/bench/set_operations/difference.cu b/projects/rocthrust/benchmark/bench/set_operations/difference.cu
index e46965ee28e2..a550d2395b43 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/difference.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/difference.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("difference", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/difference_by_key.cu b/projects/rocthrust/benchmark/bench/set_operations/difference_by_key.cu
index 10be08480a40..e62dfbaf95fb 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/difference_by_key.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/difference_by_key.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("difference", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/intersection.cu b/projects/rocthrust/benchmark/bench/set_operations/intersection.cu
index f64d99f7c006..895ea59709ff 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/intersection.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/intersection.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("intersection", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/intersection_by_key.cu b/projects/rocthrust/benchmark/bench/set_operations/intersection_by_key.cu
index 89cbf3dd7efb..85469784b851 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/intersection_by_key.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/intersection_by_key.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("intersection", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference.cu b/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference.cu
index 2d9744e9c56e..a1e6f3ab2035 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("symmetric_difference", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference_by_key.cu b/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference_by_key.cu
index 0c1686446692..5a132c7093ae 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference_by_key.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/symmetric_difference_by_key.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("symmetric_difference", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/union.cu b/projects/rocthrust/benchmark/bench/set_operations/union.cu
index bd520078127c..f0eb8d3d8d12 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/union.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/union.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("union", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/set_operations/union_by_key.cu b/projects/rocthrust/benchmark/bench/set_operations/union_by_key.cu
index ed0b9bf60691..0757487c027c 100644
--- a/projects/rocthrust/benchmark/bench/set_operations/union_by_key.cu
+++ b/projects/rocthrust/benchmark/bench/set_operations/union_by_key.cu
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<op_t>("union", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/shuffle/basic.cu b/projects/rocthrust/benchmark/bench/shuffle/basic.cu
index d290a63da237..3746fcc44aa4 100644
--- a/projects/rocthrust/benchmark/bench/shuffle/basic.cu
+++ b/projects/rocthrust/benchmark/bench/shuffle/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -146,9 +146,10 @@ void run_benchmark(
   BENCHMARK_RNG_ENGINE(type, "taus88")
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -177,7 +178,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/sort/keys.cu b/projects/rocthrust/benchmark/bench/sort/keys.cu
index 49034fa38aa0..81951c892c65 100644
--- a/projects/rocthrust/benchmark/bench/sort/keys.cu
+++ b/projects/rocthrust/benchmark/bench/sort/keys.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -113,13 +113,14 @@ void run_benchmark(
       bs.push_back(CREATE_BENCHMARK(type, size, entropy));                 \
   }
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 2, 6}; // 1.000, 0.544, 0.000;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -150,7 +151,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<keys>("keys", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/sort/keys_custom.cu b/projects/rocthrust/benchmark/bench/sort/keys_custom.cu
index f1071363b7ab..53dc45c8a1cd 100644
--- a/projects/rocthrust/benchmark/bench/sort/keys_custom.cu
+++ b/projects/rocthrust/benchmark/bench/sort/keys_custom.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -112,15 +112,16 @@ void run_benchmark(
     if (sizeof(type) * size <= bench_utils::system.devProp.totalGlobalMem) \
       bs.push_back(CREATE_BENCHMARK(type, size, entropy));                 \
   }
-
+  
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 4}; // 1.000, 0.201;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -151,7 +152,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<keys_custom>("keys_custom", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/sort/pairs.cu b/projects/rocthrust/benchmark/bench/sort/pairs.cu
index 1f6bb2689a0b..ed8a87385584 100644
--- a/projects/rocthrust/benchmark/bench/sort/pairs.cu
+++ b/projects/rocthrust/benchmark/bench/sort/pairs.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -122,13 +122,14 @@ void run_benchmark(
   BENCHMARK_VALUE_TYPE(key_type, int64_t, entropy)
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 2, 6}; // 1.000, 0.544, 0.000;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_KEY_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -154,7 +155,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<pairs>("pairs", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/sort/pairs_custom.cu b/projects/rocthrust/benchmark/bench/sort/pairs_custom.cu
index 0f6c7783b5e1..0629386a6e1c 100644
--- a/projects/rocthrust/benchmark/bench/sort/pairs_custom.cu
+++ b/projects/rocthrust/benchmark/bench/sort/pairs_custom.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -123,13 +123,14 @@ void run_benchmark(
   BENCHMARK_VALUE_TYPE(key_type, int64_t, entropy)
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
   constexpr int entropy_reductions[] = {0, 2, 6}; // 1.000, 0.544, 0.000;
 
   for (int entropy_reduction : entropy_reductions)
   {
-    std::vector<benchmark::Benchmark*> bs;
+    std::vector<benchmark::internal::Benchmark*> bs;
     BENCHMARK_KEY_TYPE_ENTROPY(int8_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int16_t, entropy_reduction)
     BENCHMARK_KEY_TYPE_ENTROPY(int32_t, entropy_reduction)
@@ -155,7 +156,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<pairs_custom>("pairs_custom", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/tabulate/basic.cu b/projects/rocthrust/benchmark/bench/tabulate/basic.cu
index 2f6988468807..68944a2c89e2 100644
--- a/projects/rocthrust/benchmark/bench/tabulate/basic.cu
+++ b/projects/rocthrust/benchmark/bench/tabulate/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -124,9 +124,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(uint32_t)
   BENCHMARK_TYPE(uint64_t)
 
@@ -150,7 +151,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/transform/basic.cu b/projects/rocthrust/benchmark/bench/transform/basic.cu
index 171dbb3bb64a..e1e2d33a707a 100644
--- a/projects/rocthrust/benchmark/bench/transform/basic.cu
+++ b/projects/rocthrust/benchmark/bench/transform/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -32,8 +32,7 @@
 // rocThrust
 #include <thrust/copy.h>
 #include <thrust/count.h>
-#include <thrust/detail/config/namespace.h>
-#include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
+#include <thrust/detail/functional/address_stability.h>
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 #include <thrust/iterator/zip_iterator.h>
@@ -158,9 +157,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(uint32_t)
   BENCHMARK_TYPE(uint64_t)
   benchmarks.insert(benchmarks.end(), bs.begin(), bs.end());
@@ -187,7 +187,7 @@ struct mul
   {
     const T scalar = startScalar;
     return bench_transform(
-      c.begin(), c.end(), b.begin(), ::internal::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& ci) {
+      c.begin(), c.end(), b.begin(), ::thrust::detail::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& ci) {
         return ci * scalar;
       }));
   }
@@ -205,7 +205,7 @@ struct add
       a.end(),
       b.begin(),
       c.begin(),
-      ::internal::proclaim_copyable_arguments([] THRUST_DEVICE(const T& ai, const T& bi) -> T {
+      ::thrust::detail::proclaim_copyable_arguments([] THRUST_DEVICE(const T& ai, const T& bi) -> T {
         return ai + bi;
       }));
   }
@@ -225,7 +225,7 @@ struct triad
       b.end(),
       c.begin(),
       a.begin(),
-      ::internal::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& bi, const T& ci) {
+      ::thrust::detail::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& bi, const T& ci) {
         return bi + scalar * ci;
       }));
   }
@@ -245,7 +245,7 @@ struct nstream
       thrust::make_zip_iterator(a.end(), b.end(), c.end()),
       a.begin(),
       thrust::make_zip_function(
-        ::internal::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& ai, const T& bi, const T& ci) {
+        ::thrust::detail::proclaim_copyable_arguments([=] THRUST_DEVICE(const T& ai, const T& bi, const T& ci) {
           return ai + bi + scalar * ci;
         })));
   }
@@ -280,7 +280,7 @@ void run_babelstream(benchmark::State& state, const std::size_t n)
     b = thrust::device_vector<T>(n);
     c = thrust::device_vector<T>(n);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -299,7 +299,7 @@ void run_babelstream(benchmark::State& state, const std::size_t n)
     {
       duration = Benchmark::template run<T>(a, b, c);
     }
-    catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+    catch (const ::thrust::system::detail::bad_alloc& e)
     {
       (void) hipGetLastError();
       state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -344,9 +344,9 @@ void run_babelstream(benchmark::State& state, const std::size_t n)
     bs.push_back(CREATE_BABELSTREAM_BENCHMARK(type, (1u << 31), nstream_stable)); \
   }
 
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks)
+void add_benchmarks(const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_BABELSTREAM_TYPE(int8_t)
   BENCHMARK_BABELSTREAM_TYPE(int16_t)
   BENCHMARK_BABELSTREAM_TYPE(float)
@@ -377,7 +377,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmarks
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
   babelstream::add_benchmarks("babelstream", benchmarks);
 
diff --git a/projects/rocthrust/benchmark/bench/transform_reduce/sum.cu b/projects/rocthrust/benchmark/bench/transform_reduce/sum.cu
index b759ac697ce2..ca13c1b7009e 100644
--- a/projects/rocthrust/benchmark/bench/transform_reduce/sum.cu
+++ b/projects/rocthrust/benchmark/bench/transform_reduce/sum.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -118,9 +118,10 @@ void run_benchmark(benchmark::State& state, const std::size_t elements, const st
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -151,7 +152,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<sum>("sum", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/unique/basic.cu b/projects/rocthrust/benchmark/bench/unique/basic.cu
index 528a5735a990..fe18d70a91b8 100644
--- a/projects/rocthrust/benchmark/bench/unique/basic.cu
+++ b/projects/rocthrust/benchmark/bench/unique/basic.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -121,9 +121,10 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -153,7 +154,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/unique/by_key.cu b/projects/rocthrust/benchmark/bench/unique/by_key.cu
index 5ea87ebc7d45..9856a4520d1f 100644
--- a/projects/rocthrust/benchmark/bench/unique/by_key.cu
+++ b/projects/rocthrust/benchmark/bench/unique/by_key.cu
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -30,7 +30,6 @@
 #include "../../bench_utils/bench_utils.hpp"
 
 // rocThrust
-#include <thrust/detail/config/namespace.h>
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 #include <thrust/unique.h>
@@ -86,7 +85,7 @@ void run_benchmark(
     in_vals  = thrust::device_vector<ValueT>(elements);
     out_vals = thrust::device_vector<ValueT>(elements);
   }
-  catch (const THRUST_NS_QUALIFIER::system::detail::bad_alloc& e)
+  catch (const ::thrust::system::detail::bad_alloc& e)
   {
     (void) hipGetLastError();
     state.SkipWithError(("thrust::system::detail::bad_alloc: " + std::string(e.what())).c_str());
@@ -168,9 +167,10 @@ void run_benchmark(
 #endif
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_KEY_TYPE(int8_t)
   BENCHMARK_KEY_TYPE(int16_t)
   BENCHMARK_KEY_TYPE(int32_t)
@@ -198,7 +198,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<by_key>("by_key", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/vectorized_search/basic.cu b/projects/rocthrust/benchmark/bench/vectorized_search/basic.cu
index 2ef443344ff6..70d9f3a58599 100644
--- a/projects/rocthrust/benchmark/bench/vectorized_search/basic.cu
+++ b/projects/rocthrust/benchmark/bench/vectorized_search/basic.cu
@@ -123,9 +123,10 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -150,7 +151,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<basic>("basic", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/vectorized_search/lower_bound.cu b/projects/rocthrust/benchmark/bench/vectorized_search/lower_bound.cu
index fead2faaa21f..efce7e2e1fc4 100644
--- a/projects/rocthrust/benchmark/bench/vectorized_search/lower_bound.cu
+++ b/projects/rocthrust/benchmark/bench/vectorized_search/lower_bound.cu
@@ -123,9 +123,10 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -150,7 +151,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<lower_bound>("lower_bound", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench/vectorized_search/upper_bound.cu b/projects/rocthrust/benchmark/bench/vectorized_search/upper_bound.cu
index d94203843225..dff26f47c705 100644
--- a/projects/rocthrust/benchmark/bench/vectorized_search/upper_bound.cu
+++ b/projects/rocthrust/benchmark/bench/vectorized_search/upper_bound.cu
@@ -122,9 +122,10 @@ void run_benchmark(
   }
 
 template <class Benchmark>
-void add_benchmarks(const std::string& name, std::vector<benchmark::Benchmark*>& benchmarks, const std::string seed_type)
+void add_benchmarks(
+  const std::string& name, std::vector<benchmark::internal::Benchmark*>& benchmarks, const std::string seed_type)
 {
-  std::vector<benchmark::Benchmark*> bs;
+  std::vector<benchmark::internal::Benchmark*> bs;
   BENCHMARK_TYPE(int8_t)
   BENCHMARK_TYPE(int16_t)
   BENCHMARK_TYPE(int32_t)
@@ -149,7 +150,7 @@ int main(int argc, char* argv[])
   benchmark::AddCustomContext("seed", seed_type);
 
   // Add benchmark
-  std::vector<benchmark::Benchmark*> benchmarks;
+  std::vector<benchmark::internal::Benchmark*> benchmarks;
   add_benchmarks<upper_bound>("upper_bound", benchmarks, seed_type);
 
   // Use manual timing
diff --git a/projects/rocthrust/benchmark/bench_utils/bench_utils.hpp b/projects/rocthrust/benchmark/bench_utils/bench_utils.hpp
index 95de320ceb96..7899be8cc5c9 100644
--- a/projects/rocthrust/benchmark/bench_utils/bench_utils.hpp
+++ b/projects/rocthrust/benchmark/bench_utils/bench_utils.hpp
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,7 @@
 
 namespace bench_utils
 {
-#if THRUST_HAS_HIP_COMPILER()
+#if (THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP)
 
 #  define HIP_CHECK(condition)                                                     \
     {                                                                              \
@@ -125,7 +125,9 @@ class gpu_timer
     return elapsed_time / 1000.0;
   }
 };
-#elif THRUST_HAS_CUDA_COMPILER()
+#elif (defined(__NVCC__) || defined(_NVHPC_CUDA)                                    \
+       || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+       || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC)
 
 #  define CUDA_SAFE_CALL_NO_SYNC(call)                                                                              \
     do                                                                                                              \
diff --git a/projects/rocthrust/cmake/Dependencies.cmake b/projects/rocthrust/cmake/Dependencies.cmake
index b710220e278b..6044443c641c 100644
--- a/projects/rocthrust/cmake/Dependencies.cmake
+++ b/projects/rocthrust/cmake/Dependencies.cmake
@@ -1,5 +1,5 @@
 # ########################################################################
-# Copyright 2019-2026 Advanced Micro Devices, Inc.
+# Copyright 2019-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
 # ###########################
@@ -293,7 +293,7 @@ if(BUILD_TEST OR BUILD_HIPSTDPAR_TEST)
       FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG        v1.17.0
+        GIT_TAG        release-1.11.0
       )
     endif()
     set(_ROCTHRUST_DISABLE_ROCM_CHECKS TRUE)
@@ -310,7 +310,7 @@ if(BUILD_TEST OR BUILD_HIPSTDPAR_TEST)
     FetchContent_Declare(
       TBB
       GIT_REPOSITORY      https://github.com/oneapi-src/oneTBB.git
-      GIT_TAG             v2023.0.0
+      GIT_TAG             1c4c93fc5398c4a1acb3492c02db4699f3048dea # v2021.13.0
       INSTALL_DIR         ${CMAKE_CURRENT_BINARY_DIR}/deps/tbb
       CMAKE_ARGS          -DCMAKE_CXX_COMPILER=g++ -DTBB_TEST=OFF -DTBB_BUILD=ON -DTBB_INSTALL=ON -DTBBMALLOC_PROXY_BUILD=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
       LOG_CONFIGURE       TRUE
diff --git a/projects/rocthrust/cmake/FindROCMCmake.cmake b/projects/rocthrust/cmake/FindROCMCmake.cmake
index 02f1e5ee2d3a..c2fe1009853e 100644
--- a/projects/rocthrust/cmake/FindROCMCmake.cmake
+++ b/projects/rocthrust/cmake/FindROCMCmake.cmake
@@ -1,5 +1,5 @@
 # ########################################################################
-# Copyright 2021-2026 Advanced Micro Devices, Inc.
+# Copyright 2021-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
 if(NOT DEPENDENCIES_FORCE_DOWNLOAD)
@@ -18,7 +18,7 @@ if(NOT ROCmCMakeBuildTools_FOUND)
   FetchContent_Declare(
     rocm-cmake
     GIT_REPOSITORY https://github.com/ROCm/rocm-cmake.git
-    GIT_TAG        rocm-7.2.4
+    GIT_TAG        rocm-6.4.4
     ${SOURCE_SUBDIR_ARG}
   )
   FetchContent_MakeAvailable(rocm-cmake)
diff --git a/projects/rocthrust/docs/doxygen/Doxyfile b/projects/rocthrust/docs/doxygen/Doxyfile
index 10f8f7447d8c..91cf371ebe09 100644
--- a/projects/rocthrust/docs/doxygen/Doxyfile
+++ b/projects/rocthrust/docs/doxygen/Doxyfile
@@ -944,6 +944,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ../../thrust \
+                         ../../thrust/async \
                          ../../thrust/iterator \
                          ../../thrust/mr \
                          ../../thrust/random \
@@ -2394,19 +2395,15 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = THRUST_DOXYGEN_INVOKED \
                          THRUST_DEVICE_SYSTEM=5 \
-                         THRUST_STD_VER=2017 \
-                         THRUST_GLOBAL_CONSTANT="inline constexpr" \
+                         THRUST_CPP_DIALECT=2017 \
+                         "THRUST_INLINE_CONSTANT=inline constexpr" \
                          THRUST_NODISCARD=[[nodiscard]] \
                          THRUST_MR_DEFAULT_ALIGNMENT=alignof(std::max_align_t) \
                          __cpp_lib_remove_cvref=201711 \
                          THRUST_PREVENT_MACRO_SUBSTITUTION= \
                          THRUST_EXEC_CHECK_DISABLE= \
-                         THRUST_HOST_DEVICE \
-                         THRUST_SUPPRESS_DEPRECATED_POP \
-                         THRUST_DIAG_SUPPRESS_MSVC(x)= \
+                         THRUST_ALIAS_ATTRIBUTE(x)= \
                          THRUST_DEPRECATED_BECAUSE(x)= \
-                         THRUST_DEPRECATED= \
-                         THRUST_CONSTEXPR_CXX23 \
                          "__attribute__(x)=" \
                          "[[no_unique_address]]="
 
diff --git a/projects/rocthrust/examples/arbitrary_transformation.cu b/projects/rocthrust/examples/arbitrary_transformation.cu
index e27c08fba6d1..3251b1f634bc 100644
--- a/projects/rocthrust/examples/arbitrary_transformation.cu
+++ b/projects/rocthrust/examples/arbitrary_transformation.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,10 +23,13 @@
 #include <thrust/device_vector.h>
 #include <thrust/for_each.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/zip_function.h>
 
 #include <iostream>
 
+#if !defined(THRUST_LEGACY_GCC)
+#  include <thrust/zip_function.h>
+#endif // >= C++11
+
 #include "include/host_device.h"
 
 // This example shows how to implement an arbitrary transformation of
@@ -71,6 +74,7 @@ struct arbitrary_functor1
   }
 };
 
+#if !defined(THRUST_LEGACY_GCC)
 struct arbitrary_functor2
 {
   __host__ __device__ void operator()(const float& a, const float& b, const float& c, float& d)
@@ -79,8 +83,9 @@ struct arbitrary_functor2
     d = a + b * c;
   }
 };
+#endif // >= C++11
 
-int main()
+int main(void)
 {
   // allocate storage
   thrust::device_vector<float> A(5);
@@ -88,14 +93,22 @@ int main()
   thrust::device_vector<float> C(5);
   thrust::device_vector<float> D1(5);
 
-  // clang-format off
   // initialize input vectors
-  A[0] = 3;  B[0] = 6;  C[0] = 2;
-  A[1] = 4;  B[1] = 7;  C[1] = 5;
-  A[2] = 0;  B[2] = 2;  C[2] = 7;
-  A[3] = 8;  B[3] = 1;  C[3] = 4;
-  A[4] = 2;  B[4] = 8;  C[4] = 3;
-  // clang-format on
+  A[0] = 3;
+  B[0] = 6;
+  C[0] = 2;
+  A[1] = 4;
+  B[1] = 7;
+  C[1] = 5;
+  A[2] = 0;
+  B[2] = 2;
+  C[2] = 7;
+  A[3] = 8;
+  B[3] = 1;
+  C[3] = 4;
+  A[4] = 2;
+  B[4] = 8;
+  C[4] = 3;
 
   // apply the transformation
   thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin(), D1.begin())),
@@ -110,6 +123,7 @@ int main()
   }
 
   // apply the transformation using zip_function
+#if !defined(THRUST_LEGACY_GCC)
   thrust::device_vector<float> D2(5);
   thrust::for_each(thrust::make_zip_iterator(thrust::make_tuple(A.begin(), B.begin(), C.begin(), D2.begin())),
                    thrust::make_zip_iterator(thrust::make_tuple(A.end(), B.end(), C.end(), D2.end())),
@@ -121,4 +135,5 @@ int main()
   {
     std::cout << A[i] << " + " << B[i] << " * " << C[i] << " = " << D2[i] << std::endl;
   }
+#endif // >= C++11
 }
diff --git a/projects/rocthrust/examples/counting_iterator.cu b/projects/rocthrust/examples/counting_iterator.cu
index 24a4e546895e..a04685c2f15d 100644
--- a/projects/rocthrust/examples/counting_iterator.cu
+++ b/projects/rocthrust/examples/counting_iterator.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -19,7 +19,6 @@
 // SOFTWARE.
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
diff --git a/projects/rocthrust/examples/cuda/custom_temporary_allocation.cu b/projects/rocthrust/examples/cuda/custom_temporary_allocation.cu
index 370ef4088ca1..563d12b6f257 100644
--- a/projects/rocthrust/examples/cuda/custom_temporary_allocation.cu
+++ b/projects/rocthrust/examples/cuda/custom_temporary_allocation.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <stdexcept>
 
 // This example demonstrates how to control how Thrust allocates temporary
 // storage during algorithms such as thrust::sort. The idea will be to create a
@@ -46,16 +45,19 @@
 // (host) threads use the same cached_allocator then they should gain exclusive
 // access to the allocator before accessing its methods.
 
-struct not_my_pointer_exception : std::exception
+struct not_my_pointer
 {
-  explicit not_my_pointer_exception(void* p)
+  not_my_pointer(void* p)
+      : message()
   {
     std::stringstream s;
     s << "Pointer `" << p << "` was not allocated by this allocator.";
     message = s.str();
   }
 
-  const char* what() const noexcept override
+  virtual ~not_my_pointer() {}
+
+  virtual const char* what() const
   {
     return message.c_str();
   }
@@ -65,11 +67,12 @@ private:
 };
 
 // A simple allocator for caching cudaMalloc allocations.
-// A minimum allocator needs to provide at least `value_type`, `allocate` and `deallocate`.
 struct cached_allocator
 {
   using value_type = char;
 
+  cached_allocator() {}
+
   ~cached_allocator()
   {
     free_all();
@@ -79,26 +82,40 @@ struct cached_allocator
   {
     std::cout << "cached_allocator::allocate(): num_bytes == " << num_bytes << std::endl;
 
-    char* result = nullptr;
+    char* result = 0;
 
     // Search the cache for a free block.
-    auto free_block_it = free_blocks.find(num_bytes);
-    if (free_block_it != free_blocks.end())
+    free_blocks_type::iterator free_block = free_blocks.find(num_bytes);
+
+    if (free_block != free_blocks.end())
     {
       std::cout << "cached_allocator::allocate(): found a free block" << std::endl;
-      result = free_block_it->second;
-      free_blocks.erase(free_block_it);
+
+      result = free_block->second;
+
+      // Erase from the `free_blocks` map.
+      free_blocks.erase(free_block);
     }
     else
     {
-      // No allocation of the right size exists, so create a new one with `thrust::cuda::malloc`.
-      std::cout << "cached_allocator::allocate(): allocating new block" << std::endl;
-      // Allocate memory and convert the resulting `thrust::cuda::pointer` to a raw pointer.
-      result = thrust::cuda::malloc<char>(num_bytes).get();
+      // No allocation of the right size exists, so create a new one with
+      // `thrust::cuda::malloc`.
+      try
+      {
+        std::cout << "cached_allocator::allocate(): allocating new block" << std::endl;
+
+        // Allocate memory and convert the resulting `thrust::cuda::pointer` to
+        // a raw pointer.
+        result = thrust::cuda::malloc<char>(num_bytes).get();
+      }
+      catch (std::runtime_error&)
+      {
+        throw;
+      }
     }
 
     // Insert the allocated pointer into the `allocated_blocks` map.
-    allocated_blocks.insert(std::pair{result, num_bytes});
+    allocated_blocks.insert(std::make_pair(result, num_bytes));
 
     return result;
   }
@@ -108,36 +125,42 @@ struct cached_allocator
     std::cout << "cached_allocator::deallocate(): ptr == " << reinterpret_cast<void*>(ptr) << std::endl;
 
     // Erase the allocated block from the allocated blocks map.
-    auto it = allocated_blocks.find(ptr);
-    if (it == allocated_blocks.end())
+    allocated_blocks_type::iterator iter = allocated_blocks.find(ptr);
+
+    if (iter == allocated_blocks.end())
     {
-      throw not_my_pointer_exception(ptr);
+      throw not_my_pointer(reinterpret_cast<void*>(ptr));
     }
 
-    const std::ptrdiff_t num_bytes = it->second;
-    allocated_blocks.erase(it);
+    std::ptrdiff_t num_bytes = iter->second;
+    allocated_blocks.erase(iter);
 
     // Insert the block into the free blocks map.
     free_blocks.insert(std::make_pair(num_bytes, ptr));
   }
 
 private:
-  std::multimap<std::ptrdiff_t, char*> free_blocks;
-  std::map<char*, std::ptrdiff_t> allocated_blocks;
+  using free_blocks_type      = std::multimap<std::ptrdiff_t, char*>;
+  using allocated_blocks_type = std::map<char*, std::ptrdiff_t>;
+
+  free_blocks_type free_blocks;
+  allocated_blocks_type allocated_blocks;
 
   void free_all()
   {
     std::cout << "cached_allocator::free_all()" << std::endl;
 
     // Deallocate all outstanding blocks in both lists.
-    for (auto [bytes, ptr] : free_blocks)
+    for (free_blocks_type::iterator i = free_blocks.begin(); i != free_blocks.end(); ++i)
     {
-      thrust::cuda::free(thrust::cuda::pointer<char>(ptr));
+      // Transform the pointer to cuda::pointer before calling cuda::free.
+      thrust::cuda::free(thrust::cuda::pointer<char>(i->second));
     }
 
-    for (auto [ptr, bytes] : allocated_blocks)
+    for (allocated_blocks_type::iterator i = allocated_blocks.begin(); i != allocated_blocks.end(); ++i)
     {
-      thrust::cuda::free(thrust::cuda::pointer<char>(ptr));
+      // Transform the pointer to cuda::pointer before calling cuda::free.
+      thrust::cuda::free(thrust::cuda::pointer<char>(i->first));
     }
   }
 };
@@ -162,7 +185,8 @@ int main()
   {
     d_result = d_input;
 
-    // Pass alloc to execution policy cuda::par. It will handle allocations needed inside sort.
+    // Pass alloc through cuda::par as the first parameter to sort
+    // to cause allocations to be handled by alloc during sort.
     thrust::sort(thrust::cuda::par(alloc), d_result.begin(), d_result.end());
 
     // Ensure the result is sorted.
diff --git a/projects/rocthrust/examples/cuda/range_view.cu b/projects/rocthrust/examples/cuda/range_view.cu
index b32c82bc5f0b..f90f9e82e17a 100644
--- a/projects/rocthrust/examples/cuda/range_view.cu
+++ b/projects/rocthrust/examples/cuda/range_view.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,6 @@
 #include <thrust/for_each.h>
 #include <thrust/iterator/counting_iterator.h>
 
-#include <cuda/std/iterator>
-
 #include <iostream>
 
 #include "../include/host_device.h"
@@ -42,10 +40,10 @@ class range_view
 {
 public:
   using iterator        = Iterator;
-  using value_type      = typename cuda::std::iterator_traits<iterator>::value_type;
-  using pointer         = typename cuda::std::iterator_traits<iterator>::pointer;
-  using difference_type = typename cuda::std::iterator_traits<iterator>::difference_type;
-  using reference       = typename cuda::std::iterator_traits<iterator>::reference;
+  using value_type      = typename thrust::iterator_traits<iterator>::value_type;
+  using pointer         = typename thrust::iterator_traits<iterator>::pointer;
+  using difference_type = typename thrust::iterator_traits<iterator>::difference_type;
+  using reference       = typename thrust::iterator_traits<iterator>::reference;
 
 private:
   const iterator first;
diff --git a/projects/rocthrust/examples/device_ptr.cu b/projects/rocthrust/examples/device_ptr.cu
index 75c658adf653..11b2d9c649e6 100644
--- a/projects/rocthrust/examples/device_ptr.cu
+++ b/projects/rocthrust/examples/device_ptr.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@
 #include <cassert>
 #include <iostream>
 
-int main()
+int main(void)
 {
   // allocate memory buffer to store 10 integers on the device
   thrust::device_ptr<int> d_ptr = thrust::device_malloc<int>(10);
@@ -58,6 +58,9 @@ int main()
   assert(wrapped_ptr == d_ptr);
   (void) wrapped_ptr; // for when NDEBUG is defined
 
+  // Avoid warning
+  THRUST_UNUSED_VAR(wrapped_ptr);
+
   // deallocate device memory
   thrust::device_free(d_ptr);
 
diff --git a/projects/rocthrust/examples/expand.cu b/projects/rocthrust/examples/expand.cu
index 974a58fd444b..30f6daa94392 100644
--- a/projects/rocthrust/examples/expand.cu
+++ b/projects/rocthrust/examples/expand.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,9 +40,7 @@
 template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
 OutputIterator expand(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator output)
 {
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  using difference_type = typename _THRUST_STD::iterator_traits<InputIterator1>::difference_type;
+  using difference_type = typename thrust::iterator_difference<InputIterator1>::type;
 
   difference_type input_size  = thrust::distance(first1, last1);
   difference_type output_size = thrust::reduce(first1, last1);
@@ -82,7 +80,7 @@ void print(const std::string& s, const Vector& v)
   std::cout << std::endl;
 }
 
-int main()
+int main(void)
 {
   int counts[] = {3, 5, 2, 0, 1, 3, 4, 2, 4};
   int values[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
diff --git a/projects/rocthrust/examples/include/host_device.h b/projects/rocthrust/examples/include/host_device.h
index 60754ad57b95..b3950f9b3263 100644
--- a/projects/rocthrust/examples/include/host_device.h
+++ b/projects/rocthrust/examples/include/host_device.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2009 NVIDIA Corporation
- *  Modifications Copyright© 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#if !THRUST_HAS_CUDA_COMPILER() || !THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER != THRUST_DEVICE_COMPILER_HIP
 
 #  ifndef __host__
 #    define __host__
diff --git a/projects/rocthrust/examples/minimal_custom_backend.cu b/projects/rocthrust/examples/minimal_custom_backend.cu
index 4d9213cf3ee8..50b2ca18bfc7 100644
--- a/projects/rocthrust/examples/minimal_custom_backend.cu
+++ b/projects/rocthrust/examples/minimal_custom_backend.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,6 @@
 #  include <functional>
 #endif
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-
 // This example demonstrates how to build a minimal custom
 // Thrust backend by intercepting for_each's dispatch.
 
@@ -69,9 +67,7 @@ int main()
   my_system sys;
 
   // To invoke our version of for_each, pass sys as the first parameter
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  thrust::for_each(sys, vec.begin(), vec.end(), _THRUST_STD::negate{});
+  thrust::for_each(sys, vec.begin(), vec.end(), _THRUST_STD::negate<>{});
 
   // Other algorithms that Thrust implements with thrust::for_each will also
   // cause our version of for_each to be invoked when we pass an instance of my_system as the first parameter.
@@ -80,9 +76,7 @@ int main()
   thrust::transform(sys, vec.begin(), vec.end(), vec.begin(), ::internal::identity{});
 
   // Invocations without my_system are handled normally.
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  thrust::for_each(vec.begin(), vec.end(), _THRUST_STD::negate{});
+  thrust::for_each(vec.begin(), vec.end(), _THRUST_STD::negate<>{});
 
   return 0;
 }
diff --git a/projects/rocthrust/examples/repeated_range.cu b/projects/rocthrust/examples/repeated_range.cu
index ea6afb7aa84d..6b4840ebdd07 100644
--- a/projects/rocthrust/examples/repeated_range.cu
+++ b/projects/rocthrust/examples/repeated_range.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to make repeated access to a range of values
 // examples:
 //   repeated_range([0, 1, 2, 3], 1) -> [0, 1, 2, 3]
@@ -45,9 +41,7 @@ template <typename Iterator>
 class repeated_range
 {
 public:
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  using difference_type = typename _THRUST_STD::iterator_traits<Iterator>::difference_type;
+  using difference_type = typename thrust::iterator_difference<Iterator>::type;
 
   struct repeat_functor
   {
@@ -77,12 +71,12 @@ public:
       , repeats(repeats)
   {}
 
-  iterator begin() const
+  iterator begin(void) const
   {
     return PermutationIterator(first, TransformIterator(CountingIterator(0), repeat_functor(repeats)));
   }
 
-  iterator end() const
+  iterator end(void) const
   {
     return begin() + repeats * (last - first);
   }
@@ -93,7 +87,7 @@ protected:
   difference_type repeats;
 };
 
-int main()
+int main(void)
 {
   thrust::device_vector<int> data(4);
   data[0] = 10;
diff --git a/projects/rocthrust/examples/set_operations.cu b/projects/rocthrust/examples/set_operations.cu
index d384c9b435ff..2e7f8a5fc3e9 100644
--- a/projects/rocthrust/examples/set_operations.cu
+++ b/projects/rocthrust/examples/set_operations.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -19,7 +19,6 @@
 // SOFTWARE.
 
 #include <thrust/device_vector.h>
-#include <thrust/extrema.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/merge.h>
 #include <thrust/set_operations.h>
@@ -154,7 +153,7 @@ void SetIntersectionSize(const Vector& A, const Vector& B)
   std::cout << "SetIntersectionSize(A,B) " << (C_end - C_begin) << std::endl;
 }
 
-int main()
+int main(void)
 {
   int a[] = {0, 2, 4, 5, 6, 8, 9};
   int b[] = {0, 1, 2, 3, 5, 7, 8};
diff --git a/projects/rocthrust/examples/strided_range.cu b/projects/rocthrust/examples/strided_range.cu
index 484b0575d0d0..c84ce2199053 100644
--- a/projects/rocthrust/examples/strided_range.cu
+++ b/projects/rocthrust/examples/strided_range.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to make strided access to a range of values
 // examples:
 //   strided_range([0, 1, 2, 3, 4, 5, 6], 1) -> [0, 1, 2, 3, 4, 5, 6]
@@ -45,9 +41,7 @@ template <typename Iterator>
 class strided_range
 {
 public:
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  using difference_type = typename _THRUST_STD::iterator_traits<Iterator>::difference_type;
+  using difference_type = typename thrust::iterator_difference<Iterator>::type;
 
   struct stride_functor
   {
@@ -77,12 +71,12 @@ public:
       , stride(stride)
   {}
 
-  iterator begin() const
+  iterator begin(void) const
   {
     return PermutationIterator(first, TransformIterator(CountingIterator(0), stride_functor(stride)));
   }
 
-  iterator end() const
+  iterator end(void) const
   {
     return begin() + ((last - first) + (stride - 1)) / stride;
   }
@@ -93,7 +87,7 @@ protected:
   difference_type stride;
 };
 
-int main()
+int main(void)
 {
   thrust::device_vector<int> data(8);
   data[0] = 10;
diff --git a/projects/rocthrust/examples/tiled_range.cu b/projects/rocthrust/examples/tiled_range.cu
index e658a7b10ae9..332c01d7238f 100644
--- a/projects/rocthrust/examples/tiled_range.cu
+++ b/projects/rocthrust/examples/tiled_range.cu
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,10 +30,6 @@
 
 #include "include/host_device.h"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 // this example illustrates how to tile a range multiple times
 // examples:
 //   tiled_range([0, 1, 2, 3], 1) -> [0, 1, 2, 3]
@@ -45,9 +41,7 @@ template <typename Iterator>
 class tiled_range
 {
 public:
-  // Note: _THRUST_STD refers to ::hip::std if libhipcxx is available;
-  // otherwise it falls back to ::std.
-  using difference_type = typename _THRUST_STD::iterator_traits<Iterator>::difference_type;
+  using difference_type = typename thrust::iterator_difference<Iterator>::type;
 
   struct tile_functor
   {
@@ -77,12 +71,12 @@ public:
       , tiles(tiles)
   {}
 
-  iterator begin() const
+  iterator begin(void) const
   {
     return PermutationIterator(first, TransformIterator(CountingIterator(0), tile_functor(last - first)));
   }
 
-  iterator end() const
+  iterator end(void) const
   {
     return begin() + tiles * (last - first);
   }
@@ -93,7 +87,7 @@ protected:
   difference_type tiles;
 };
 
-int main()
+int main(void)
 {
   thrust::device_vector<int> data(4);
   data[0] = 10;
diff --git a/projects/rocthrust/extra/CMakeLists.txt b/projects/rocthrust/extra/CMakeLists.txt
index 39fc74c58fc2..51e0174ec698 100644
--- a/projects/rocthrust/extra/CMakeLists.txt
+++ b/projects/rocthrust/extra/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ########################################################################
-# Copyright 2019-2026 Advanced Micro Devices, Inc.
+# Copyright 2019-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
 cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
@@ -31,8 +31,8 @@ if(NOT DEFINED ROCPRIM_ROOT)
   set(ROCPRIM_ROOT "${CMAKE_CURRENT_BINARY_DIR}/rocprim" CACHE PATH "")
   download_project(
     PROJ                rocprim
-    GIT_REPOSITORY      https://github.com/ROCm/rocm-libraries.git
-    GIT_TAG             rocm-7.2.4
+    GIT_REPOSITORY      https://github.com/ROCmSoftwarePlatform/rocPRIM.git
+    GIT_TAG             master
     INSTALL_DIR         ${ROCPRIM_ROOT}
     CMAKE_ARGS          -DBUILD_TEST=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     LOG_DOWNLOAD        TRUE
diff --git a/projects/rocthrust/test/CMakeLists.txt b/projects/rocthrust/test/CMakeLists.txt
index afd4d6cb9ff6..031be6512739 100644
--- a/projects/rocthrust/test/CMakeLists.txt
+++ b/projects/rocthrust/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ########################################################################
-# Copyright 2019-2026 Advanced Micro Devices, Inc.
+# Copyright 2019-2025 Advanced Micro Devices, Inc.
 # ########################################################################
 
 set(INSTALL_TEST_FILE "${CMAKE_CURRENT_BINARY_DIR}/install_CTestTestfile.cmake")
@@ -161,6 +161,13 @@ if(BUILD_TEST)
     add_rocthrust_test("alignment")
     add_rocthrust_test("allocator")
     add_rocthrust_test("allocator_aware_policies")
+    add_rocthrust_test("async_copy")
+    add_rocthrust_test("async_for_each")
+    add_rocthrust_test("async_reduce")
+    add_rocthrust_test("async_reduce_into")
+    add_rocthrust_test("async_scan")
+    add_rocthrust_test("async_sort")
+    add_rocthrust_test("async_transform")
     add_rocthrust_test("binary_search")
     add_rocthrust_test("binary_search_descending")
     add_rocthrust_test("binary_search_vector")
@@ -175,6 +182,7 @@ if(BUILD_TEST)
     add_rocthrust_test("count")
     add_rocthrust_test("counting_iterator")
     add_rocthrust_test("decompose")
+    add_rocthrust_test("dependencies_aware_policies")
     add_rocthrust_test("dereference")
     add_rocthrust_test("device_delete")
     add_rocthrust_test("device_ptr")
@@ -182,6 +190,7 @@ if(BUILD_TEST)
     add_rocthrust_test("discard_iterator")
     add_rocthrust_test("distance")
     add_rocthrust_test("equal")
+    add_rocthrust_test("event")
     add_rocthrust_test("fill")
     add_rocthrust_test("find")
     add_rocthrust_test("for_each")
@@ -195,8 +204,10 @@ if(BUILD_TEST)
     add_rocthrust_test("functional_placeholders_logical")
     add_rocthrust_test("functional_placeholders_miscellaneous")
     add_rocthrust_test("functional_placeholders_relational")
+    add_rocthrust_test("future")
     add_rocthrust_test("gather")
     add_rocthrust_test("generate")
+    # add_rocthrust_test("generate_const_iterators") # not been added
     add_rocthrust_test("inner_product")
     add_rocthrust_test("is_contiguous_iterator")
     add_rocthrust_test("is_operator_function_object")
@@ -218,7 +229,6 @@ if(BUILD_TEST)
     add_rocthrust_test("mr_new")
     add_rocthrust_test("mr_pool")
     add_rocthrust_test("mr_pool_options")
-    add_rocthrust_test("offset_iterator")
     add_rocthrust_test("out_of_memory_recovery")
     add_rocthrust_test("pair")
     add_rocthrust_test("pair_reduce")
@@ -233,7 +243,6 @@ if(BUILD_TEST)
     add_rocthrust_test("permutation_iterator")
     add_rocthrust_test("preprocessor")
     add_rocthrust_test("random")
-    add_rocthrust_test("raw_reference_cast")
     add_rocthrust_test("reduce")
     add_rocthrust_test("reduce_by_key")
     add_rocthrust_test("reduce_large")
@@ -293,6 +302,7 @@ if(BUILD_TEST)
     add_rocthrust_test("transform_scan")
     add_rocthrust_test("trivial_sequence")
     add_rocthrust_test("tuple")
+    add_rocthrust_test("tuple_algorithms")
     add_rocthrust_test("tuple_reduce")
     add_rocthrust_test("tuple_scan")
     add_rocthrust_test("tuple_sort")
diff --git a/projects/rocthrust/test/test_address_stability.cpp b/projects/rocthrust/test/test_address_stability.cpp
index f7f4a619ae48..06fb19243ccb 100644
--- a/projects/rocthrust/test/test_address_stability.cpp
+++ b/projects/rocthrust/test/test_address_stability.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2024 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
+#include <thrust/detail/functional/address_stability.h>
 
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
@@ -38,8 +38,8 @@ TEST(AddressStabilityTests, TestAddressStabilityLibcuxx)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // libcu++ function objects with known types
   static_assert(proclaims_copyable_arguments<_THRUST_STD::plus<int>>::value, "");
@@ -59,8 +59,8 @@ TEST(AddressStabilityTests, TestAddressStabilityThrust)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // thrust function objects with known types
   static_assert(proclaims_copyable_arguments<thrust::plus<int>>::value, "");
@@ -89,8 +89,8 @@ TEST(AddressStabilityTests, TestAddressStabilityUserDefinedFunctionObject)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // by-value overload
   static_assert(!proclaims_copyable_arguments<my_plus<int>>::value, "");
@@ -115,8 +115,8 @@ TEST(AddressStabilityTests, TestAddressStabilityLambda)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   {
     auto l = [](const int& i) {
diff --git a/projects/rocthrust/test/test_allocator.cpp b/projects/rocthrust/test/test_allocator.cpp
index 28dde4c6897b..824f7bdcde0d 100644
--- a/projects/rocthrust/test/test_allocator.cpp
+++ b/projects/rocthrust/test/test_allocator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 #include <thrust/detail/config.h>
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/system/cpp/vector.h>
 
@@ -133,7 +134,7 @@ struct my_allocator_with_custom_destroy
 
   THRUST_HOST_DEVICE void destroy(T*) noexcept
   {
-    _THRUST_IF_TARGET(_THRUST_IS_HOST, (g_state = true;));
+    NV_IF_TARGET(NV_IS_HOST, (g_state = true;));
   }
 
   value_type* allocate(std::ptrdiff_t n)
diff --git a/projects/rocthrust/test/test_allocator_aware_policies.cpp b/projects/rocthrust/test/test_allocator_aware_policies.cpp
index a272fce9852e..e4c9a46677f0 100644
--- a/projects/rocthrust/test/test_allocator_aware_policies.cpp
+++ b/projects/rocthrust/test/test_allocator_aware_policies.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,11 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__cccl_config.h>
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies here and inside type traits
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/seq.h>
 #include <thrust/system/cpp/detail/par.h>
 #include <thrust/system/hip/detail/par.h>
@@ -113,6 +117,10 @@ struct TestAllocatorAttachment
     test_temporary_allocation_valid(policy(alloc));
     test_temporary_allocation_valid(policy(const_alloc));
     test_temporary_allocation_valid(policy(&test_memory_resource));
+
+    test_temporary_allocation_valid(policy(std::allocator<int>()).after(1));
+    test_temporary_allocation_valid(policy(alloc).after(1));
+    test_temporary_allocation_valid(policy(const_alloc).after(1));
   }
 };
 
@@ -137,3 +145,5 @@ TYPED_TEST(AllocatorAwarePoliciesTests, TestAllocatorAttachment)
   TestAllocatorAttachment<T> test;
   test();
 }
+
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/test/test_async_copy.cpp b/projects/rocthrust/test/test_async_copy.cpp
new file mode 100644
index 000000000000..9c1446dfc0e2
--- /dev/null
+++ b/projects/rocthrust/test/test_async_copy.cpp
@@ -0,0 +1,422 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2014
+
+#  include <thrust/async/copy.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+#  include <thrust/limits.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+using BuiltinNumericTypes = ::testing::Types<
+  Params<char>,
+  Params<signed char>,
+  Params<unsigned char>,
+  Params<short>,
+  Params<unsigned short>,
+  Params<int>,
+  Params<unsigned int>,
+  Params<long>,
+  Params<unsigned long>,
+  Params<long long>,
+  Params<unsigned long long>,
+  Params<float>,
+  Params<double>>;
+
+TESTS_DEFINE(AsyncCopyTests, BuiltinNumericTypes);
+
+#  define DEFINE_ASYNC_COPY_CALLABLE(name, ...)                                                \
+    struct THRUST_PP_CAT2(name, _fn)                                                           \
+    {                                                                                          \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt>                      \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output) const \
+        THRUST_RETURNS(::thrust::async::copy(                                                  \
+          __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first),      \
+          THRUST_FWD(last),                                                                    \
+          THRUST_FWD(output)))                                                                 \
+    };                                                                                         \
+    /**/
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy);
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device, thrust::device);
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host_to_device, thrust::host, thrust::device);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device_to_host, thrust::device, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host_to_host, thrust::host, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device_to_device, thrust::device, thrust::device);
+
+#  undef DEFINE_ASYNC_COPY_CALLABLE
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename AsyncCopyCallable>
+THRUST_HOST void test_async_copy_host_to_device()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0(
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed));
+      thrust::device_vector<T> d0(size);
+
+      auto f0 = AsyncCopyCallable{}(h0.begin(), h0.end(), d0.begin());
+
+      f0.wait();
+
+      ASSERT_EQ(h0, d0);
+    }
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_trivially_relocatable_elements_host_to_device)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_host_to_device<T, invoke_async_copy_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_trivially_relocatable_elements_host_to_device_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_host_to_device<T, invoke_async_copy_host_to_device_fn>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename AsyncCopyCallable>
+THRUST_HOST void test_async_copy_device_to_host()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0(
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed));
+      thrust::host_vector<T> h1(size);
+      thrust::device_vector<T> d0(size);
+
+      thrust::copy(h0.begin(), h0.end(), d0.begin());
+
+      ASSERT_EQ(h0, d0);
+
+      auto f0 = AsyncCopyCallable{}(d0.begin(), d0.end(), h1.begin());
+
+      f0.wait();
+
+      ASSERT_EQ(h0, d0);
+      ASSERT_EQ(d0, h1);
+    }
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_trivially_relocatable_elements_device_to_host)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_device_to_host<T, invoke_async_copy_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_trivially_relocatable_elements_device_to_host_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_device_to_host<T, invoke_async_copy_device_to_host_fn>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename AsyncCopyCallable>
+THRUST_HOST void test_async_copy_device_to_device()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(size);
+    thrust::device_vector<T> d1(size);
+
+    thrust::copy(h0.begin(), h0.end(), d0.begin());
+
+    ASSERT_EQ(h0, d0);
+
+    auto f0 = AsyncCopyCallable{}(d0.begin(), d0.end(), d1.begin());
+
+    f0.wait();
+
+    ASSERT_EQ(h0, d0);
+    ASSERT_EQ(d0, d1);
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_device_to_device)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_device_to_device<T, invoke_async_copy_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_device_to_device_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_device_to_device<T, invoke_async_copy_device_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_device_to_device_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_device_to_device<T, invoke_async_copy_device_to_device_fn>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Non ContiguousIterator input.
+template <typename T, typename AsyncCopyCallable>
+THRUST_HOST void test_async_copy_counting_iterator_input_to_device_vector()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::counting_iterator<T> first(0);
+    thrust::counting_iterator<T> last(truncate_to_max_representable<T>(size));
+
+    thrust::device_vector<T> d0(size);
+    thrust::device_vector<T> d1(size);
+
+    thrust::copy(first, last, d0.begin());
+
+    auto f0 = AsyncCopyCallable{}(first, last, d1.begin());
+
+    f0.wait();
+
+    ASSERT_EQ(d0, d1);
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_device_vector<T, invoke_async_copy_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests,
+           test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_device_vector<T, invoke_async_copy_device_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests,
+           test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_device_vector<T, invoke_async_copy_device_to_device_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_counting_iterator_input_host_to_device_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_device_vector<T, invoke_async_copy_host_to_device_fn>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Non ContiguousIterator input.
+template <typename T, typename AsyncCopyCallable>
+THRUST_HOST void test_async_copy_counting_iterator_input_to_host_vector()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::counting_iterator<T> first(0);
+    thrust::counting_iterator<T> last(truncate_to_max_representable<T>(size));
+
+    thrust::host_vector<T> d0(size);
+    thrust::host_vector<T> d1(size);
+
+    thrust::copy(first, last, d0.begin());
+
+    auto f0 = AsyncCopyCallable{}(first, last, d1.begin());
+
+    f0.wait();
+
+    ASSERT_EQ(d0, d1);
+
+#  if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
+    // ICC fails this for some unknown reason - see #1468.
+    GTEST_NONFATAL_FAILURE_("Known failure");
+#  endif
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_host)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_host_vector<T, invoke_async_copy_fn>();
+}
+
+TYPED_TEST(AsyncCopyTests,
+           test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_host_policies)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_counting_iterator_input_to_host_vector<T, invoke_async_copy_device_to_host_fn>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+THRUST_HOST void test_async_copy_roundtrip()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(size);
+
+    auto e0 = thrust::async::copy(thrust::host, thrust::device, h0.begin(), h0.end(), d0.begin());
+
+    auto e1 = thrust::async::copy(thrust::device.after(e0), thrust::host, d0.begin(), d0.end(), h0.begin());
+
+    TEST_EVENT_WAIT(e1);
+
+    ASSERT_EQ(h0, d0);
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_trivially_relocatable_elements_roundtrip)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_roundtrip<T>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+THRUST_HOST void test_async_copy_after()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::host_vector<T> h1(size);
+    thrust::device_vector<T> d0(size);
+    thrust::device_vector<T> d1(size);
+    thrust::device_vector<T> d2(size);
+
+    auto e0 = thrust::async::copy(h0.begin(), h0.end(), d0.begin());
+
+    ASSERT_EQ(true, e0.valid_stream());
+
+    auto const e0_stream = e0.stream().native_handle();
+
+    auto e1 = thrust::async::copy(thrust::device.after(e0), d0.begin(), d0.end(), d1.begin());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROWS_EQ(auto x = thrust::async::copy(thrust::device.after(e0), d0.begin(), d0.end(), d1.begin());
+                     THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQ_QUIET(e0_stream, e1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(e1);
+
+    auto e2 = thrust::async::copy(thrust::host, after_policy2, h0.begin(), h0.end(), d2.begin());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROWS_EQ(auto x = thrust::async::copy(thrust::host, after_policy2, h0.begin(), h0.end(), d2.begin());
+                     THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQ_QUIET(e0_stream, e2.stream().native_handle());
+
+    auto e3 = thrust::async::copy(thrust::device.after(e2), thrust::host, d1.begin(), d1.end(), h1.begin());
+
+    ASSERT_EQ_QUIET(e0_stream, e3.stream().native_handle());
+
+    TEST_EVENT_WAIT(e3);
+
+    ASSERT_EQ(h0, h1);
+    ASSERT_EQ(h0, d0);
+    ASSERT_EQ(h0, d1);
+    ASSERT_EQ(h0, d2);
+  }
+}
+
+TYPED_TEST(AsyncCopyTests, test_async_copy_after_test)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_copy_after<T>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: device_to_device NonContiguousIterator output (discard_iterator).
+
+// TODO: host_to_device non trivially relocatable.
+
+// TODO: device_to_host non trivially relocatable.
+
+// TODO: host_to_device NonContiguousIterator input (counting_iterator).
+
+// TODO: host_to_device NonContiguousIterator output (discard_iterator).
+
+// TODO: device_to_host NonContiguousIterator input (counting_iterator).
+
+// TODO: device_to_host NonContiguousIterator output (discard_iterator).
+
+// TODO: Mixed types, needs loosening of `is_trivially_relocatable_to` logic.
+
+// TODO: H->D copy, then dependent D->H copy (round trip).
+// Can't do this today because we can't do cross-system with explicit policies.
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/test/test_async_for_each.cpp b/projects/rocthrust/test/test_async_for_each.cpp
new file mode 100644
index 000000000000..2354a5c66081
--- /dev/null
+++ b/projects/rocthrust/test/test_async_for_each.cpp
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/for_each.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_utils.hpp"
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#  define DEFINE_ASYNC_FOR_EACH_CALLABLE(name, ...)                                            \
+    struct THRUST_PP_CAT2(name, _fn)                                                           \
+    {                                                                                          \
+      template <typename ForwardIt, typename Sentinel, typename UnaryFunction>                 \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, UnaryFunction&& f) const \
+        THRUST_RETURNS(::thrust::async::for_each(                                              \
+          __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first),      \
+          THRUST_FWD(last),                                                                    \
+          THRUST_FWD(f)))                                                                      \
+    };                                                                                         \
+    /**/
+
+DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each);
+DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each_device, thrust::device);
+
+#  undef DEFINE_ASYNC_FOR_EACH_CALLABLE
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct inplace_divide_by_2
+{
+  template <typename T>
+  THRUST_HOST_DEVICE void operator()(T& x) const
+  {
+    x /= 2;
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+TESTS_DEFINE(AsyncForEachTests, NumericalTestsParams);
+
+template <typename T, typename AsyncForEachCallable, typename UnaryFunction>
+THRUST_HOST void test_async_for_each()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0_data(random_integers<T>(size));
+    thrust::device_vector<T> d0_data(h0_data);
+
+    thrust::for_each(h0_data.begin(), h0_data.end(), UnaryFunction{});
+
+    auto f0 = AsyncForEachCallable{}(d0_data.begin(), d0_data.end(), UnaryFunction{});
+
+    f0.wait();
+
+    ASSERT_EQ(h0_data, d0_data);
+  }
+}
+
+TYPED_TEST(AsyncForEachTests, test_async_for_each)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_for_each<T, invoke_async_for_each_fn, inplace_divide_by_2>();
+}
+
+TYPED_TEST(AsyncForEachTests, test_async_for_each_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_for_each<T, invoke_async_for_each_device_fn, inplace_divide_by_2>();
+}
+
+#endif
diff --git a/projects/rocthrust/test/test_async_reduce.cpp b/projects/rocthrust/test/test_async_reduce.cpp
new file mode 100644
index 000000000000..f085709bd647
--- /dev/null
+++ b/projects/rocthrust/test/test_async_reduce.cpp
@@ -0,0 +1,1019 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#define THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside several thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/reduce.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+TESTS_DEFINE(AsyncReduceTests, NumericalTestsParams);
+
+template <typename T>
+struct custom_plus
+{
+  THRUST_HOST_DEVICE T operator()(T lhs, T rhs) const
+  {
+    return lhs + rhs;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...) \
+    template <typename T>                                                                \
+    struct NAME                                                                          \
+    {                                                                                    \
+      MEMBERS                                                                            \
+                                                                                         \
+      NAME()                                                                             \
+      {                                                                                  \
+        CTOR                                                                             \
+      }                                                                                  \
+                                                                                         \
+      ~NAME()                                                                            \
+      {                                                                                  \
+        DTOR                                                                             \
+      }                                                                                  \
+                                                                                         \
+      template <typename Event>                                                          \
+      void validate_event(Event& e)                                                      \
+      {                                                                                  \
+        THRUST_UNUSED_VAR(e);                                                            \
+        VALIDATE                                                                         \
+      }                                                                                  \
+                                                                                         \
+      template <typename ForwardIt, typename Sentinel>                                   \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last)                    \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::reduce(__VA_ARGS__))                    \
+    };                                                                                   \
+    /**/
+
+#  define DEFINE_ASYNC_REDUCE_INVOKER(NAME, ...)                                                     \
+    DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(                                                            \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_REDUCE_INVOKER(NAME, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct NAME                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::reduce(__VA_ARGS__)) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker, THRUST_FWD(first), THRUST_FWD(last));
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker_device, thrust::device, THRUST_FWD(first), THRUST_FWD(last));
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker_device_allocator,
+                            thrust::device(thrust::device_allocator<void>{}),
+                            THRUST_FWD(first),
+                            THRUST_FWD(last));
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last));
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last));
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker, THRUST_FWD(first), THRUST_FWD(last));
+
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker_init, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init, thrust::device, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker_init, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>());
+
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  thrust::plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), thrust::plus<T>());
+
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_init_custom_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init_custom_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init_custom_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  random_integer<T>(),
+  custom_plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_custom_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), custom_plus<T>());
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class AsyncReduceInvoker, template <typename> class SyncReduceInvoker>
+THRUST_HOST void test_async_reduce()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+    thrust::device_vector<T> d0c(h0);
+    thrust::device_vector<T> d0d(h0);
+
+    AsyncReduceInvoker<T> invoke_async;
+    SyncReduceInvoker<T> invoke_sync;
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+
+    auto f0a = invoke_async(d0a.begin(), d0a.end());
+    auto f0b = invoke_async(d0b.begin(), d0b.end());
+    auto f0c = invoke_async(d0c.begin(), d0c.end());
+    auto f0d = invoke_async(d0d.begin(), d0d.end());
+
+    invoke_async.validate_event(f0a);
+    invoke_async.validate_event(f0b);
+    invoke_async.validate_event(f0c);
+    invoke_async.validate_event(f0d);
+
+    // This potentially runs concurrently with the copies.
+    auto const r0 = invoke_sync(h0.begin(), h0.end());
+
+    decltype(f0a.extract()) r1a;
+    decltype(f0b.extract()) r1b;
+    decltype(f0c.extract()) r1c;
+    decltype(f0d.extract()) r1d;
+
+    test_future_value_retrieval(f0a, r1a);
+    test_future_value_retrieval(f0b, r1b);
+    test_future_value_retrieval(f0c, r1c);
+    test_future_value_retrieval(f0d, r1d);
+
+    ASSERT_EQ(r0, r1a);
+    ASSERT_EQ(r0, r1b);
+    ASSERT_EQ(r0, r1c);
+    ASSERT_EQ(r0, r1d);
+  }
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_on)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_on, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_on)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_on, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_on_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_on_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_on_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_on_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_on_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_on_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_on_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_on_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_on_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_on_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_allocator_on_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce<T, reduce_async_invoker_device_allocator_on_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class AsyncReduceInvoker, template <typename> class SyncReduceInvoker>
+THRUST_HOST void test_async_reduce_counting_iterator()
+{
+  constexpr std::size_t n = 15 * sizeof(T);
+
+  ASSERT_LE(T(n), truncate_to_max_representable<T>(n));
+
+  thrust::counting_iterator<T> first(0);
+  thrust::counting_iterator<T> last(n);
+
+  AsyncReduceInvoker<T> invoke_async;
+  SyncReduceInvoker<T> invoke_sync;
+
+  auto f0a = invoke_async(first, last);
+  auto f0b = invoke_async(first, last);
+  auto f0c = invoke_async(first, last);
+  auto f0d = invoke_async(first, last);
+
+  invoke_async.validate_event(f0a);
+  invoke_async.validate_event(f0b);
+  invoke_async.validate_event(f0c);
+  invoke_async.validate_event(f0d);
+
+  // This potentially runs concurrently with the copies.
+  auto const r0 = invoke_sync(first, last);
+
+  decltype(f0a.extract()) r1a;
+  decltype(f0b.extract()) r1b;
+  decltype(f0c.extract()) r1c;
+  decltype(f0d.extract()) r1d;
+
+  test_future_value_retrieval(f0a, r1a);
+  test_future_value_retrieval(f0b, r1b);
+  test_future_value_retrieval(f0c, r1c);
+  test_future_value_retrieval(f0d, r1d);
+
+  ASSERT_EQ(r0, r1a);
+  ASSERT_EQ(r0, r1b);
+  ASSERT_EQ(r0, r1c);
+  ASSERT_EQ(r0, r1d);
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_counting_iterator)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_counting_iterator)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_device, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_counting_iterator_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_counting_iterator_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_device_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_counting_iterator_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_counting_iterator_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_counting_iterator_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T, reduce_async_invoker_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_policy_counting_iterator_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_counting_iterator<T,
+                                      reduce_async_invoker_device_init_custom_plus,
+                                      reduce_sync_invoker_init_custom_plus>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_using)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+
+    thrust::device_future<T> f0a;
+    thrust::device_future<T> f0b;
+
+    // When you import the customization points into the global namespace,
+    // they should be selected instead of the synchronous algorithms.
+    {
+      using namespace thrust::async;
+      f0a = reduce(d0a.begin(), d0a.end());
+    }
+    {
+      using thrust::async::reduce;
+      f0b = reduce(d0b.begin(), d0b.end());
+    }
+
+    // ADL should find the synchronous algorithms.
+    // This potentially runs concurrently with the copies.
+    T const r0 = reduce(h0.begin(), h0.end());
+
+    T r1a;
+    T r1b;
+
+    test_future_value_retrieval(f0a, r1a);
+    test_future_value_retrieval(f0b, r1b);
+
+    ASSERT_EQ(r0, r1a);
+    ASSERT_EQ(r0, r1b);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_after)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQ(h0, d0);
+
+    auto f0 = thrust::async::reduce(d0.begin(), d0.end());
+
+    ASSERT_EQ(true, f0.valid_stream());
+
+    auto const f0_stream = f0.stream().native_handle();
+
+    auto f1 = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROW(auto x = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+                 THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    ASSERT_EQ_QUIET(f0_stream, f1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(f1);
+
+    auto f2 = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROW(auto x = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+                 THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    ASSERT_EQ_QUIET(f0_stream, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T r1;
+
+    test_future_value_retrieval(f2, r1);
+
+    ASSERT_EQ(r0, r1);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_on_then_after)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQ(h0, d0);
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    auto f0 = thrust::async::reduce(thrust::device.on(stream), d0.begin(), d0.end());
+
+    ASSERT_EQ_QUIET(stream, f0.stream().native_handle());
+
+    auto f1 = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROW(auto x = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+                 THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    ASSERT_EQ_QUIET(stream, f1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(f1);
+
+    auto f2 = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROW(auto x = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+                 THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    ASSERT_EQ_QUIET(stream, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T r1;
+
+    test_future_value_retrieval(f2, r1);
+
+    ASSERT_EQ(r0, r1);
+
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream));
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_allocator_on_then_after)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQ(h0, d0);
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream0;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream0, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream1;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream1, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    auto f0 = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).on(stream0), d0.begin(), d0.end());
+
+    ASSERT_EQ_QUIET(stream0, f0.stream().native_handle());
+
+    auto f1 = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).after(f0), d0.begin(), d0.end());
+
+    ASSERT_THROW(
+      auto x = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).after(f0), d0.begin(), d0.end());
+      THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    ASSERT_EQ_QUIET(stream0, f1.stream().native_handle());
+
+    auto f2 = thrust::async::reduce(
+      thrust::device(thrust::device_allocator<void>{}).on(stream1).after(f1), d0.begin(), d0.end());
+
+    ASSERT_THROW(auto x = thrust::async::reduce(
+                   thrust::device(thrust::device_allocator<void>{}).on(stream1).after(f1), d0.begin(), d0.end());
+                 THRUST_UNUSED_VAR(x), thrust::event_error);
+
+    // KNOWN_FAILURE;
+    // FIXME: The below fails because you can't combine allocator attachment,
+    // `.on`, and `.after`.
+    // The `#if 0` can be removed once the KNOWN_FAILURE is resolved.
+#  if 0
+    ASSERT_EQ_QUIET(stream1, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T r1;
+
+    test_future_value_retrieval(f2, r1);
+
+    ASSERT_EQ(r0, r1);
+
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream0));
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream1));
+#  endif
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_reduce_caching)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    constexpr std::int64_t m = 32;
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQ(h0, d0);
+
+    T const* f0_raw_data;
+
+    {
+      // Perform one reduction to ensure there's an entry in the caching
+      // allocator.
+      auto f0 = thrust::async::reduce(d0.begin(), d0.end());
+
+      TEST_EVENT_WAIT(f0);
+
+      f0_raw_data = f0.raw_data();
+    }
+
+    for (std::int64_t i = 0; i < m; ++i)
+    {
+      auto f1 = thrust::async::reduce(d0.begin(), d0.end());
+
+      ASSERT_EQ(true, f1.valid_stream());
+      ASSERT_EQ(true, f1.valid_content());
+
+      ASSERT_EQ_QUIET(f0_raw_data, f1.raw_data());
+
+      // This potentially runs concurrently with the copies.
+      T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+      T r1;
+      test_future_value_retrieval(f1, r1);
+
+      ASSERT_EQ(r0, r1);
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(AsyncReduceTests, test_async_copy_then_reduce)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0a(random_integers<T>(size));
+    thrust::host_vector<T> h0b(random_integers<T>(size));
+    thrust::host_vector<T> h0c(random_integers<T>(size));
+    thrust::host_vector<T> h0d(random_integers<T>(size));
+
+    thrust::device_vector<T> d0a(size);
+    thrust::device_vector<T> d0b(size);
+    thrust::device_vector<T> d0c(size);
+    thrust::device_vector<T> d0d(size);
+
+    auto f0a = thrust::async::copy(h0a.begin(), h0a.end(), d0a.begin());
+    auto f0b = thrust::async::copy(h0b.begin(), h0b.end(), d0b.begin());
+    auto f0c = thrust::async::copy(h0c.begin(), h0c.end(), d0c.begin());
+    auto f0d = thrust::async::copy(h0d.begin(), h0d.end(), d0d.begin());
+
+    ASSERT_EQ(true, f0a.valid_stream());
+    ASSERT_EQ(true, f0b.valid_stream());
+    ASSERT_EQ(true, f0c.valid_stream());
+    ASSERT_EQ(true, f0d.valid_stream());
+
+    auto const f0a_stream = f0a.stream().native_handle();
+    auto const f0b_stream = f0b.stream().native_handle();
+    auto const f0c_stream = f0c.stream().native_handle();
+    auto const f0d_stream = f0d.stream().native_handle();
+
+    auto f1a = thrust::async::reduce(thrust::device.after(f0a), d0a.begin(), d0a.end());
+    auto f1b = thrust::async::reduce(thrust::device.after(f0b), d0b.begin(), d0b.end());
+    auto f1c = thrust::async::reduce(thrust::device.after(f0c), d0c.begin(), d0c.end());
+    auto f1d = thrust::async::reduce(thrust::device.after(f0d), d0d.begin(), d0d.end());
+
+    ASSERT_EQ(false, f0a.valid_stream());
+    ASSERT_EQ(false, f0b.valid_stream());
+    ASSERT_EQ(false, f0c.valid_stream());
+    ASSERT_EQ(false, f0d.valid_stream());
+
+    ASSERT_EQ(true, f1a.valid_stream());
+    ASSERT_EQ(true, f1a.valid_content());
+    ASSERT_EQ(true, f1b.valid_stream());
+    ASSERT_EQ(true, f1b.valid_content());
+    ASSERT_EQ(true, f1c.valid_stream());
+    ASSERT_EQ(true, f1c.valid_content());
+    ASSERT_EQ(true, f1d.valid_stream());
+    ASSERT_EQ(true, f1d.valid_content());
+
+    // Verify that streams were stolen.
+    ASSERT_EQ_QUIET(f0a_stream, f1a.stream().native_handle());
+    ASSERT_EQ_QUIET(f0b_stream, f1b.stream().native_handle());
+    ASSERT_EQ_QUIET(f0c_stream, f1c.stream().native_handle());
+    ASSERT_EQ_QUIET(f0d_stream, f1d.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0a.begin(), h0a.end());
+
+    T r1a;
+    T r1b;
+    T r1c;
+    T r1d;
+
+    test_future_value_retrieval(f1a, r1a);
+    test_future_value_retrieval(f1b, r1b);
+    test_future_value_retrieval(f1c, r1c);
+    test_future_value_retrieval(f1d, r1d);
+
+    ASSERT_EQ(r0, r1a);
+    ASSERT_EQ(r0, r1b);
+    ASSERT_EQ(r0, r1c);
+    ASSERT_EQ(r0, r1d);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: when_all from reductions.
+
+// See also issue: https://github.com/NVIDIA/cccl/issues/1886
+struct tuple_sum
+{
+  __device__ thrust::tuple<int, int>
+  operator()(const thrust::tuple<int, int>& t1, const thrust::tuple<int, int>& t2) const
+  {
+    return thrust::make_tuple(thrust::get<0>(t1) + thrust::get<0>(t2), thrust::get<1>(t1) + thrust::get<1>(t2));
+  }
+};
+
+TEST(AsyncReduceTests, test_async_reduce_bug1886)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+	GTEST_SKIP() << "This test is disabled in ASAN builds due to its memory usage.";
+#endif
+	
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  // Initialize input data
+  thrust::device_vector<int> d_data1{1, 2, 3, 4, 5};
+  thrust::device_vector<int> d_data2{10, 20, 30, 40, 50};
+
+  using TupleType = thrust::tuple<int, int>;
+  using IteratorType =
+    thrust::zip_iterator<thrust::tuple<thrust::device_vector<int>::iterator, thrust::device_vector<int>::iterator>>;
+
+  TupleType result;
+  try
+  {
+    // Create zip_begin and zip_end iterators
+    IteratorType zip_begin = thrust::make_zip_iterator(thrust::make_tuple(d_data1.begin(), d_data2.begin()));
+    IteratorType zip_end   = thrust::make_zip_iterator(thrust::make_tuple(d_data2.end(), d_data2.end()));
+
+    // Initialize the starting tuple
+    TupleType init = thrust::make_tuple(0, 0);
+
+    // Perform async reduce using zip_begin and zip_end
+    auto future = thrust::async::reduce(thrust::device, zip_begin, zip_end, init, tuple_sum());
+
+    // Get the result
+    result = future.get();
+  }
+  catch (const ::std::bad_alloc& e)
+  {
+    (void) hipGetLastError();
+    GTEST_SKIP() << "std::bad_alloc: " << e.what();
+  }
+
+  // Print the result
+  std::cout << "Sum: (" << thrust::get<0>(result) << ", " << thrust::get<1>(result) << ")" << std::endl;
+}
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/test/test_async_reduce_into.cpp b/projects/rocthrust/test/test_async_reduce_into.cpp
new file mode 100644
index 000000000000..44d73c1c767c
--- /dev/null
+++ b/projects/rocthrust/test/test_async_reduce_into.cpp
@@ -0,0 +1,573 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#define THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/reduce.h>
+#  include <thrust/device_make_unique.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+TESTS_DEFINE(AsyncReduceIntoTests, NumericalTestsParams);
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+template <typename T>
+struct custom_plus
+{
+  THRUST_HOST_DEVICE T operator()(T lhs, T rhs) const
+  {
+    return lhs + rhs;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...) \
+    template <typename T>                                                                     \
+    struct NAME                                                                               \
+    {                                                                                         \
+      MEMBERS                                                                                 \
+                                                                                              \
+      NAME()                                                                                  \
+      {                                                                                       \
+        CTOR                                                                                  \
+      }                                                                                       \
+                                                                                              \
+      ~NAME()                                                                                 \
+      {                                                                                       \
+        DTOR                                                                                  \
+      }                                                                                       \
+                                                                                              \
+      template <typename Event>                                                               \
+      void validate_event(Event& e)                                                           \
+      {                                                                                       \
+        THRUST_UNUSED_VAR(e);                                                                 \
+        VALIDATE                                                                              \
+      }                                                                                       \
+                                                                                              \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt>                     \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output)      \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::reduce_into(__VA_ARGS__))                    \
+    };                                                                                        \
+    /**/
+
+#  define DEFINE_ASYNC_REDUCE_INTO_INVOKER(NAME, ...)                                                \
+    DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(                                                       \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_REDUCE_INVOKER(NAME, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct NAME                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::reduce(__VA_ARGS__)) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(reduce_into_async_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output));
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device, thrust::device, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output));
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker, THRUST_FWD(first), THRUST_FWD(last));
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output), random_integer<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker_init, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>());
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  thrust::plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), thrust::plus<T>());
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init_custom_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init_custom_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init_custom_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  random_integer<T>(),
+  custom_plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_custom_plus, THRUST_FWD(first), THRUST_FWD(last), random_integer<T>(), custom_plus<T>());
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class AsyncReduceIntoInvoker, template <typename> class SyncReduceIntoInvoker>
+THRUST_HOST void test_async_reduce_into()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+    thrust::device_vector<T> d0c(h0);
+    thrust::device_vector<T> d0d(h0);
+
+    auto s0a = thrust::device_make_unique<T>();
+    auto s0b = thrust::device_make_unique<T>();
+    auto s0c = thrust::device_make_unique<T>();
+    auto s0d = thrust::device_make_unique<T>();
+
+    auto const s0a_ptr = s0a.get();
+    auto const s0b_ptr = s0b.get();
+    auto const s0c_ptr = s0c.get();
+    auto const s0d_ptr = s0d.get();
+
+    AsyncReduceIntoInvoker<T> invoke_async;
+    SyncReduceIntoInvoker<T> invoke_sync;
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+
+    auto f0a = invoke_async(d0a.begin(), d0a.end(), s0a_ptr);
+    auto f0b = invoke_async(d0b.begin(), d0b.end(), s0b_ptr);
+    auto f0c = invoke_async(d0c.begin(), d0c.end(), s0c_ptr);
+    auto f0d = invoke_async(d0d.begin(), d0d.end(), s0d_ptr);
+
+    invoke_async.validate_event(f0a);
+    invoke_async.validate_event(f0b);
+    invoke_async.validate_event(f0c);
+    invoke_async.validate_event(f0d);
+
+    // This potentially runs concurrently with the copies.
+    auto const r0 = invoke_sync(h0.begin(), h0.end());
+
+    TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+    ASSERT_EQ(r0, *s0a_ptr);
+    ASSERT_EQ(r0, *s0b_ptr);
+    ASSERT_EQ(r0, *s0c_ptr);
+    ASSERT_EQ(r0, *s0d_ptr);
+  }
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_on)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_on, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_on)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator_on, reduce_sync_invoker>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_init)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_on_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_on_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_on_init)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator_on_init, reduce_sync_invoker_init>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_init_plus)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_on_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_on_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_on_init_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_allocator_on_init_plus, reduce_sync_invoker_init_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_init_custom_plus)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T,
+                         reduce_into_async_invoker_device_allocator_init_custom_plus,
+                         reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_on_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T, reduce_into_async_invoker_device_on_init_custom_plus, reduce_sync_invoker_init_custom_plus>();
+}
+
+TYPED_TEST(AsyncReduceIntoTests, test_async_reduce_into_policy_allocator_on_init_custom_plus)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_reduce_into<T,
+                         reduce_into_async_invoker_device_allocator_on_init_custom_plus,
+                         reduce_sync_invoker_init_custom_plus>();
+}
+
+#endif
diff --git a/projects/rocthrust/test/test_async_scan.cpp b/projects/rocthrust/test/test_async_scan.cpp
new file mode 100644
index 000000000000..38a6f5a096de
--- /dev/null
+++ b/projects/rocthrust/test/test_async_scan.cpp
@@ -0,0 +1,227 @@
+/*
+ *  Copyright© 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#include <thrust/async/scan.h>
+#include <thrust/device_vector.h>
+#include <thrust/host_vector.h>
+
+#include "test_param_fixtures.hpp"
+#include "test_utils.hpp"
+
+TESTS_DEFINE(AsyncScanTests, NumericalTestsParams)
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+enum wait_policy
+{
+  wait_for_futures,
+  do_not_wait_for_futures
+};
+
+#define FIRST_ARG(N, ...)  N
+#define SECOND_ARG(N, ...) FIRST_ARG(__VA_ARGS__)
+
+#define DEFINE_INCLUSIVE_SCAN_INVOKER(name, ...)                                                                \
+  template <typename T>                                                                                         \
+  struct name                                                                                                   \
+  {                                                                                                             \
+    template <typename ForwardIt, typename Sentinel, typename OutputIt>                                         \
+    __host__ static void sync(ForwardIt&& first, Sentinel&& last, OutputIt&& out)                               \
+    {                                                                                                           \
+      ::thrust::inclusive_scan(                                                                                 \
+        THRUST_FWD(first),                                                                                      \
+        THRUST_FWD(last),                                                                                       \
+        THRUST_FWD(out) THRUST_PP_COMMA_IF(THRUST_PP_ARITY(FIRST_ARG(__VA_ARGS__))) FIRST_ARG(__VA_ARGS__));    \
+    }                                                                                                           \
+                                                                                                                \
+    template <typename ForwardIt, typename Sentinel, typename OutputIt>                                         \
+    __host__ static auto async(ForwardIt&& first, Sentinel&& last, OutputIt&& out)                              \
+      THRUST_DECLTYPE_RETURNS(::thrust::async::inclusive_scan(                                                  \
+        SECOND_ARG(__VA_ARGS__) THRUST_PP_COMMA_IF(THRUST_PP_ARITY(SECOND_ARG(__VA_ARGS__))) THRUST_FWD(first), \
+        THRUST_FWD(last),                                                                                       \
+        THRUST_FWD(out) THRUST_PP_COMMA_IF(THRUST_PP_ARITY(FIRST_ARG(__VA_ARGS__))) FIRST_ARG(__VA_ARGS__)))    \
+  } /**/
+
+#define DEFINE_EXCLUSIVE_SCAN_INVOKER(name, init, ...)                                                          \
+  template <typename T>                                                                                         \
+  struct name                                                                                                   \
+  {                                                                                                             \
+    template <typename ForwardIt, typename Sentinel, typename OutputIt>                                         \
+    __host__ static void sync(ForwardIt&& first, Sentinel&& last, OutputIt&& out)                               \
+    {                                                                                                           \
+      ::thrust::exclusive_scan(                                                                                 \
+        THRUST_FWD(first),                                                                                      \
+        THRUST_FWD(last),                                                                                       \
+        THRUST_FWD(out),                                                                                        \
+        init THRUST_PP_COMMA_IF(THRUST_PP_ARITY(FIRST_ARG(__VA_ARGS__))) FIRST_ARG(__VA_ARGS__));               \
+    }                                                                                                           \
+                                                                                                                \
+    template <typename ForwardIt, typename Sentinel, typename OutputIt>                                         \
+    __host__ static auto async(ForwardIt&& first, Sentinel&& last, OutputIt&& out)                              \
+      THRUST_DECLTYPE_RETURNS(::thrust::async::exclusive_scan(                                                  \
+        SECOND_ARG(__VA_ARGS__) THRUST_PP_COMMA_IF(THRUST_PP_ARITY(SECOND_ARG(__VA_ARGS__))) THRUST_FWD(first), \
+        THRUST_FWD(last),                                                                                       \
+        THRUST_FWD(out),                                                                                        \
+        init THRUST_PP_COMMA_IF(THRUST_PP_ARITY(FIRST_ARG(__VA_ARGS__))) FIRST_ARG(__VA_ARGS__)))               \
+  } /**/
+
+DEFINE_INCLUSIVE_SCAN_INVOKER(inclusive_scan_invoker);
+DEFINE_INCLUSIVE_SCAN_INVOKER(inclusive_scan_invoker_device, thrust::plus<T>{}, thrust::device);
+DEFINE_EXCLUSIVE_SCAN_INVOKER(exclusive_scan_invoker, T(0));
+DEFINE_EXCLUSIVE_SCAN_INVOKER(exclusive_scan_invoker_device, T(0), thrust::plus<T>{}, thrust::device);
+
+DEFINE_INCLUSIVE_SCAN_INVOKER(inclusive_scan_invoker_maximum, thrust::maximum<T>{});
+DEFINE_INCLUSIVE_SCAN_INVOKER(inclusive_scan_invoker_maximum_device, thrust::maximum<T>{}, thrust::device);
+DEFINE_EXCLUSIVE_SCAN_INVOKER(exclusive_scan_invoker_maximum, T(1), thrust::maximum<T>{});
+DEFINE_EXCLUSIVE_SCAN_INVOKER(exclusive_scan_invoker_maximum_device, T(1), thrust::maximum<T>{}, thrust::device);
+
+#undef DEFINE_SCAN_INVOKER
+#undef DEFINE_SCAN_OP_INVOKER
+#undef FIRST_ARG
+#undef SECOND_ARD
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class ScanInvoker, wait_policy WaitPolicy>
+void TestAsyncScan()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0_data =
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed);
+      thrust::device_vector<T> d0_data(h0_data);
+      thrust::host_vector<T> h0_output(h0_data);
+      thrust::device_vector<T> d0_output(d0_data);
+
+      ScanInvoker<T>::sync(h0_data.begin(), h0_data.end(), h0_output.begin());
+
+      auto f0 = ScanInvoker<T>::async(d0_data.begin(), d0_data.end(), d0_output.begin());
+
+      THRUST_IF_CONSTEXPR (wait_for_futures == WaitPolicy)
+      {
+        f0.wait();
+        test_equality_scan(h0_output, d0_output);
+      }
+    }
+  }
+}
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScan)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker, do_not_wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanPolicy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker_device, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanMaximum)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker_maximum, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanMaximumNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker_maximum, do_not_wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanPolicyMaximum)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker_maximum_device, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncInclusiveScanPolicyMaximumNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, inclusive_scan_invoker_maximum_device, do_not_wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScan)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker, do_not_wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanPolicy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker_device, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanMaximum)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker_maximum, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanMaximumNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker_maximum, do_not_wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanPolicyMaximum)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker_maximum_device, wait_for_futures>();
+};
+
+TYPED_TEST(AsyncScanTests, AsyncExclusiveScanPolicyMaximumNoWait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  TestAsyncScan<T, exclusive_scan_invoker_maximum_device, do_not_wait_for_futures>();
+};
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/projects/rocthrust/test/test_async_sort.cpp b/projects/rocthrust/test/test_async_sort.cpp
new file mode 100644
index 000000000000..902352c648f5
--- /dev/null
+++ b/projects/rocthrust/test/test_async_sort.cpp
@@ -0,0 +1,314 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+// Disabled on MSVC && NVCC < 11.1 for GH issue #1098.
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && defined(__CUDACC__)
+#  if (__CUDACC_VER_MAJOR__ < 11) || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 1)
+#    define THRUST_BUG_1098_ACTIVE
+#  endif // NVCC version check
+#endif // MSVC + NVCC check
+
+#if THRUST_CPP_DIALECT >= 2017 && !defined(THRUST_BUG_1098_ACTIVE)
+
+#  include <thrust/async/sort.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_utils.hpp"
+
+TESTS_DEFINE(AsyncSortTests, NumericalTestsParams);
+
+enum wait_policy
+{
+  wait_for_futures,
+  do_not_wait_for_futures
+};
+
+template <typename T>
+struct custom_greater
+{
+  THRUST_HOST_DEVICE bool operator()(T rhs, T lhs) const
+  {
+    return lhs > rhs;
+  }
+};
+
+#  define DEFINE_SORT_INVOKER(name, ...)                                                                      \
+    template <typename T>                                                                                     \
+    struct name                                                                                               \
+    {                                                                                                         \
+      template <typename ForwardIt, typename Sentinel>                                                        \
+      THRUST_HOST static void sync(ForwardIt&& first, Sentinel&& last)                                        \
+      {                                                                                                       \
+        ::thrust::sort(THRUST_FWD(first), THRUST_FWD(last));                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename ForwardIt, typename Sentinel>                                                        \
+      THRUST_HOST static auto async(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::async::sort( \
+        __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first), THRUST_FWD(last)))    \
+    };                                                                                                        \
+    /**/
+
+DEFINE_SORT_INVOKER(sort_invoker);
+DEFINE_SORT_INVOKER(sort_invoker_device, thrust::device);
+
+#  define DEFINE_SORT_OP_INVOKER(name, op, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct name                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST static void sync(ForwardIt&& first, Sentinel&& last)                                              \
+      {                                                                                                             \
+        ::thrust::sort(THRUST_FWD(first), THRUST_FWD(last), op<T>{});                                               \
+      }                                                                                                             \
+                                                                                                                    \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST static auto async(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::async::sort(       \
+        __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first), THRUST_FWD(last), op<T>{})) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_less, thrust::less);
+DEFINE_SORT_OP_INVOKER(sort_invoker_less_device, thrust::less, thrust::device);
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_greater, thrust::greater);
+DEFINE_SORT_OP_INVOKER(sort_invoker_greater_device, thrust::greater, thrust::device);
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_custom_greater, custom_greater);
+DEFINE_SORT_OP_INVOKER(sort_invoker_custom_greater_device, custom_greater, thrust::device);
+
+#  undef DEFINE_SORT_INVOKER
+#  undef DEFINE_SORT_OP_INVOKER
+
+TYPED_TEST(AsyncSortTests, AsyncSortInstance)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0_data =
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed);
+      thrust::device_vector<T> d0_data(h0_data);
+
+      ASSERT_EQ(h0_data, d0_data);
+
+      thrust::sort(h0_data.begin(), h0_data.end());
+
+      auto f0 = thrust::async::sort(d0_data.begin(), d0_data.end());
+
+      f0.wait();
+
+      ASSERT_EQ(h0_data, d0_data);
+    }
+  }
+}
+
+TYPED_TEST(AsyncSortTests, AsyncSortWithPolicyInstance)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0_data =
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed);
+      thrust::device_vector<T> d0_data(h0_data);
+
+      ASSERT_EQ(h0_data, d0_data);
+
+      thrust::sort(h0_data.begin(), h0_data.end());
+
+      auto f0 = thrust::async::sort(thrust::device, d0_data.begin(), d0_data.end());
+
+      f0.wait();
+
+      ASSERT_EQ(h0_data, d0_data);
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class SortInvoker, wait_policy WaitPolicy>
+THRUST_HOST void test_async_sort()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<T> h0_data(
+        get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed));
+      thrust::device_vector<T> d0_data(h0_data);
+
+      ASSERT_EQ(h0_data, d0_data);
+
+      SortInvoker<T>::sync(h0_data.begin(), h0_data.end());
+
+      auto f0 = SortInvoker<T>::async(d0_data.begin(), d0_data.end());
+
+      THRUST_IF_CONSTEXPR (wait_for_futures == WaitPolicy)
+      {
+        f0.wait();
+
+        ASSERT_EQ(h0_data, d0_data);
+      }
+    }
+  }
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_device, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_device, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_less)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_less, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_less_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_less, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_less)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_less_device, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_less_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_less_device, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_greater)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_greater, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_greater_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_greater, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_greater)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_greater_device, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_greater_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_greater_device, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_custom_greater)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_custom_greater, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_custom_greater_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_custom_greater, do_not_wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_custom_greater)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_custom_greater_device, wait_for_futures>();
+}
+
+TYPED_TEST(AsyncSortTests, test_async_sort_policy_custom_greater_no_wait)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_sort<T, sort_invoker_custom_greater_device, do_not_wait_for_futures>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: Async copy then sort.
+
+// TODO: Test future return type.
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/test/test_async_transform.cpp b/projects/rocthrust/test/test_async_transform.cpp
new file mode 100644
index 000000000000..970d1bb099d4
--- /dev/null
+++ b/projects/rocthrust/test/test_async_transform.cpp
@@ -0,0 +1,513 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/transform.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+using BuiltinNumericTypes = ::testing::Types<
+  Params<char>,
+  Params<signed char>,
+  Params<unsigned char>,
+  Params<short>,
+  Params<unsigned short>,
+  Params<int>,
+  Params<unsigned int>,
+  Params<long>,
+  Params<unsigned long>,
+  Params<long long>,
+  Params<unsigned long long>,
+  Params<float>,
+  Params<double>>;
+
+TESTS_DEFINE(AsyncTransformTests, NumericalTestsParams);
+TESTS_DEFINE(AsyncTransformBuiltinTests, BuiltinNumericTypes);
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+template <typename T>
+struct divide_by_2
+{
+  THRUST_HOST_DEVICE T operator()(T x) const
+  {
+    return x / 2;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...)             \
+    template <typename T>                                                                                     \
+    struct NAME                                                                                               \
+    {                                                                                                         \
+      MEMBERS                                                                                                 \
+                                                                                                              \
+      NAME()                                                                                                  \
+      {                                                                                                       \
+        CTOR                                                                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      ~NAME()                                                                                                 \
+      {                                                                                                       \
+        DTOR                                                                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename Event>                                                                               \
+      void validate_event(Event& e)                                                                           \
+      {                                                                                                       \
+        THRUST_UNUSED_VAR(e);                                                                                 \
+        VALIDATE                                                                                              \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>            \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output, UnaryOperation&& op) \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::transform(__VA_ARGS__))                                      \
+    };                                                                                                        \
+    /**/
+
+#  define DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(NAME, ...)                                            \
+    DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(                                                   \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_TRANSFORM_UNARY_INVOKER(NAME, ...)                                                      \
+    template <typename T>                                                                                     \
+    struct NAME                                                                                               \
+    {                                                                                                         \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>            \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output, UnaryOperation&& op) \
+        THRUST_RETURNS(::thrust::transform(__VA_ARGS__))                                                      \
+    };                                                                                                        \
+    /**/
+
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output), THRUST_FWD(op));
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_allocator,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::transform`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQ_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::transform`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+
+DEFINE_SYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_sync_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output), THRUST_FWD(op));
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T,
+          template <typename>
+          class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+THRUST_HOST void test_async_transform_unary()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+    thrust::device_vector<T> d0c(h0);
+    thrust::device_vector<T> d0d(h0);
+
+    thrust::host_vector<T> h1(size);
+
+    thrust::device_vector<T> d1a(size);
+    thrust::device_vector<T> d1b(size);
+    thrust::device_vector<T> d1c(size);
+    thrust::device_vector<T> d1d(size);
+
+    AsyncTransformUnaryInvoker<T> invoke_async;
+    SyncTransformUnaryInvoker<T> invoke_sync;
+
+    UnaryOperation<T> op;
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+
+    auto f0a = invoke_async(d0a.begin(), d0a.end(), d1a.begin(), op);
+    auto f0b = invoke_async(d0b.begin(), d0b.end(), d1b.begin(), op);
+    auto f0c = invoke_async(d0c.begin(), d0c.end(), d1c.begin(), op);
+    auto f0d = invoke_async(d0d.begin(), d0d.end(), d1d.begin(), op);
+
+    invoke_async.validate_event(f0a);
+    invoke_async.validate_event(f0b);
+    invoke_async.validate_event(f0c);
+    invoke_async.validate_event(f0d);
+
+    // This potentially runs concurrently with the copies.
+    invoke_sync(h0.begin(), h0.end(), h1.begin(), op);
+
+    TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+
+    ASSERT_EQ(h1, d1a);
+    ASSERT_EQ(h1, d1b);
+    ASSERT_EQ(h1, d1c);
+    ASSERT_EQ(h1, d1d);
+  }
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_divide_by_2)
+{
+#ifdef ADDRESS_SANITIZER_BUILD
+  GTEST_SKIP() << "Skipping test due to memory constraints in address sanitizer build.";
+#endif
+  
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary<T, transform_unary_async_invoker, transform_unary_sync_invoker, divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_policy_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary<T, transform_unary_async_invoker_device, transform_unary_sync_invoker, divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_policy_allocator_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary<T,
+                             transform_unary_async_invoker_device_allocator,
+                             transform_unary_sync_invoker,
+                             divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_policy_on_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary<T, transform_unary_async_invoker_device_on, transform_unary_sync_invoker, divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_policy_allocator_on_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary<T,
+                             transform_unary_async_invoker_device_allocator_on,
+                             transform_unary_sync_invoker,
+                             divide_by_2>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T,
+          template <typename>
+          class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+THRUST_HOST void test_async_transform_unary_inplace()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+    thrust::device_vector<T> d0c(h0);
+    thrust::device_vector<T> d0d(h0);
+
+    AsyncTransformUnaryInvoker<T> invoke_async;
+    SyncTransformUnaryInvoker<T> invoke_sync;
+
+    UnaryOperation<T> op;
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+
+    auto f0a = invoke_async(d0a.begin(), d0a.end(), d0a.begin(), op);
+    auto f0b = invoke_async(d0b.begin(), d0b.end(), d0b.begin(), op);
+    auto f0c = invoke_async(d0c.begin(), d0c.end(), d0c.begin(), op);
+    auto f0d = invoke_async(d0d.begin(), d0d.end(), d0d.begin(), op);
+
+    invoke_async.validate_event(f0a);
+    invoke_async.validate_event(f0b);
+    invoke_async.validate_event(f0c);
+    invoke_async.validate_event(f0d);
+
+    // This potentially runs concurrently with the copies.
+    invoke_sync(h0.begin(), h0.end(), h0.begin(), op);
+
+    TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+    ASSERT_EQ(h0, d0c);
+    ASSERT_EQ(h0, d0d);
+  }
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_inplace_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_inplace<T, transform_unary_async_invoker, transform_unary_sync_invoker, divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_inplace_policy_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_inplace<T, transform_unary_async_invoker_device, transform_unary_sync_invoker, divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_inplace_policy_allocator_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_inplace<T,
+                                     transform_unary_async_invoker_device_allocator,
+                                     transform_unary_sync_invoker,
+                                     divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_inplace_policy_on_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_inplace<T,
+                                     transform_unary_async_invoker_device_on,
+                                     transform_unary_sync_invoker,
+                                     divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_unary_inplace_policy_allocator_on_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_inplace<T,
+                                     transform_unary_async_invoker_device_allocator_on,
+                                     transform_unary_sync_invoker,
+                                     divide_by_2>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T,
+          template <typename>
+          class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+THRUST_HOST void test_async_transform_unary_counting_iterator()
+{
+  constexpr std::size_t n = 15 * sizeof(T);
+
+  ASSERT_LE(T(n), truncate_to_max_representable<T>(n));
+
+  thrust::counting_iterator<T> first(0);
+  thrust::counting_iterator<T> last(n);
+
+  thrust::host_vector<T> h0(n);
+
+  thrust::device_vector<T> d0a(n);
+  thrust::device_vector<T> d0b(n);
+  thrust::device_vector<T> d0c(n);
+  thrust::device_vector<T> d0d(n);
+
+  AsyncTransformUnaryInvoker<T> invoke_async;
+  SyncTransformUnaryInvoker<T> invoke_sync;
+
+  UnaryOperation<T> op;
+
+  auto f0a = invoke_async(first, last, d0a.begin(), op);
+  auto f0b = invoke_async(first, last, d0b.begin(), op);
+  auto f0c = invoke_async(first, last, d0c.begin(), op);
+  auto f0d = invoke_async(first, last, d0d.begin(), op);
+
+  invoke_async.validate_event(f0a);
+  invoke_async.validate_event(f0b);
+  invoke_async.validate_event(f0c);
+  invoke_async.validate_event(f0d);
+
+  // This potentially runs concurrently with the copies.
+  invoke_sync(first, last, h0.begin(), op);
+
+  TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+  ASSERT_EQ(h0, d0a);
+  ASSERT_EQ(h0, d0b);
+  ASSERT_EQ(h0, d0c);
+  ASSERT_EQ(h0, d0d);
+}
+
+TYPED_TEST(AsyncTransformBuiltinTests, test_async_transform_unary_counting_iterator_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_counting_iterator<T,
+                                               transform_unary_async_invoker,
+                                               transform_unary_sync_invoker,
+                                               divide_by_2>();
+}
+
+TYPED_TEST(AsyncTransformBuiltinTests, test_async_transform_unary_counting_iterator_policy_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_unary_counting_iterator<T,
+                                               transform_unary_async_invoker_device,
+                                               transform_unary_sync_invoker,
+                                               divide_by_2>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, template <typename> class UnaryOperation>
+THRUST_HOST void test_async_transform_using()
+{
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size = " << size);
+
+    thrust::host_vector<T> h0(random_integers<T>(size));
+
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+
+    thrust::host_vector<T> h1(size);
+
+    thrust::device_vector<T> d1a(size);
+    thrust::device_vector<T> d1b(size);
+
+    UnaryOperation<T> op;
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+
+    thrust::device_event f0a;
+    thrust::device_event f0b;
+
+    // When you import the customization points into the global namespace,
+    // they should be selected instead of the synchronous algorithms.
+    {
+      THRUST_SUPPRESS_DEPRECATED_PUSH
+      using namespace thrust::async;
+      f0a = transform(d0a.begin(), d0a.end(), d1a.begin(), op);
+      THRUST_SUPPRESS_DEPRECATED_POP
+    }
+    {
+      THRUST_SUPPRESS_DEPRECATED_PUSH
+      using thrust::async::transform;
+      f0b = transform(d0b.begin(), d0b.end(), d1b.begin(), op);
+      THRUST_SUPPRESS_DEPRECATED_POP
+    }
+
+    // ADL should find the synchronous algorithms.
+    // This potentially runs concurrently with the copies.
+    transform(h0.begin(), h0.end(), h1.begin(), op);
+
+    TEST_EVENT_WAIT(thrust::when_all(f0a, f0b));
+
+    ASSERT_EQ(h0, d0a);
+    ASSERT_EQ(h0, d0b);
+
+    ASSERT_EQ(h1, d1a);
+    ASSERT_EQ(h1, d1b);
+  }
+}
+
+TYPED_TEST(AsyncTransformTests, test_async_transform_using_divide_by_2)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+  using T = typename TestFixture::input_type;
+  test_async_transform_using<T, divide_by_2>();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/test/test_binary_search.cpp b/projects/rocthrust/test/test_binary_search.cpp
index 71a243d41aa3..dd20ba3700a1 100644
--- a/projects/rocthrust/test/test_binary_search.cpp
+++ b/projects/rocthrust/test/test_binary_search.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 TESTS_DEFINE(SingleValueTests, NumericalTestsParams);
 
 template <typename T>
@@ -1013,10 +1011,10 @@ void TestBoundsWithBigIndexesHelper(int magnitude)
   thrust::counting_iterator<long long> end = begin + (1ll << magnitude);
   ASSERT_EQ(thrust::distance(begin, end), 1ll << magnitude);
 
-  _THRUST_STD::intmax_t distance_low_value =
+  thrust::detail::intmax_t distance_low_value =
     thrust::distance(begin, thrust::lower_bound(thrust::device, begin, end, 17));
 
-  _THRUST_STD::intmax_t distance_high_value =
+  thrust::detail::intmax_t distance_high_value =
     thrust::distance(begin, thrust::lower_bound(thrust::device, begin, end, (1ll << magnitude) - 17));
 
   ASSERT_EQ(distance_low_value, 16);
diff --git a/projects/rocthrust/test/test_complex.cpp b/projects/rocthrust/test/test_complex.cpp
index 5b0ea8583312..4a39a1a9bbe4 100644
--- a/projects/rocthrust/test/test_complex.cpp
+++ b/projects/rocthrust/test/test_complex.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2024 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -147,11 +147,11 @@ TYPED_TEST(ComplexTests, TestComplexSizeAndAlignment)
 
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  static_assert(sizeof(thrust::complex<T>) == sizeof(T) * 2);
-  static_assert(alignof(thrust::complex<T>) == alignof(T) * 2);
+  THRUST_STATIC_ASSERT(sizeof(thrust::complex<T>) == sizeof(T) * 2);
+  THRUST_STATIC_ASSERT(alignof(thrust::complex<T>) == alignof(T) * 2);
 
-  static_assert(sizeof(thrust::complex<T const>) == sizeof(T) * 2);
-  static_assert(alignof(thrust::complex<T const>) == alignof(T) * 2);
+  THRUST_STATIC_ASSERT(sizeof(thrust::complex<T const>) == sizeof(T) * 2);
+  THRUST_STATIC_ASSERT(alignof(thrust::complex<T const>) == alignof(T) * 2);
 }
 
 TYPED_TEST(ComplexTests, TestComplexConstructionAndAssignment)
@@ -972,11 +972,11 @@ TYPED_TEST(ComplexPairsTests, TestCompoundPlusOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
       lhs        = std::complex<type>(lhs.real() + rhs.real(), lhs.imag() + rhs.imag());
     },
     [=](std::complex<T>& lhs, const U& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
       lhs        = std::complex<type>(lhs.real() + rhs, lhs.imag());
     },
     [=](thrust::complex<T>& lhs, const thrust::complex<U>& rhs) {
@@ -996,11 +996,11 @@ TYPED_TEST(ComplexPairsTests, TestCompoundMinusOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
       lhs        = std::complex<type>(lhs.real() - rhs.real(), lhs.imag() - rhs.imag());
     },
     [=](std::complex<T>& lhs, const U& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
       lhs        = std::complex<type>(lhs.real() - rhs, lhs.imag());
     },
     [=](thrust::complex<T>& lhs, const thrust::complex<U>& rhs) {
@@ -1021,7 +1021,7 @@ TYPED_TEST(ComplexPairsTests, TestCompoundMultiplyOperator)
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
       // (a + bi)(c + di) = ac + i(ad + bc) - bd
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
 
       type a = static_cast<type>(lhs.real());
       type b = static_cast<type>(lhs.imag());
@@ -1055,7 +1055,7 @@ TYPED_TEST(ComplexPairsTests, TestCompoundDivisionOperator)
 
   run_compound_tests<T, U>(
     [=](std::complex<T>& lhs, const std::complex<U>& rhs) {
-      using type = ::internal::common_type_t<T, U>;
+      using type = typename ::internal::promoted_numerical_type<T, U>::type;
 
       // (a + bi) / (c + di) = ((ac + bd) + (bc -ad)i) / (c^2 + d^2)
       type a = static_cast<type>(lhs.real());
diff --git a/projects/rocthrust/test/test_constant_iterator.cpp b/projects/rocthrust/test/test_constant_iterator.cpp
index 4ef7e1f477bd..9f7357fba802 100644
--- a/projects/rocthrust/test/test_constant_iterator.cpp
+++ b/projects/rocthrust/test/test_constant_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/reduce.h>
 #include <thrust/transform.h>
@@ -24,13 +23,8 @@
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#include _THRUST_STD_INCLUDE(cstdint)
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 TESTS_DEFINE(ConstantIteratorTests, VectorSignedTestsParams);
 
 TEST(ConstantIteratorTests, UsingHip)
@@ -40,37 +34,6 @@ TEST(ConstantIteratorTests, UsingHip)
   ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
-// ensure that we properly support thrust::constant_iterator from _THRUST_STD
-TEST(ConstantIteratorTests, TestConstantIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using it       = thrust::constant_iterator<int>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, signed int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 TEST(ConstantIteratorTests, TestConstantIteratorConstructFromConvertibleSystem)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -170,7 +133,7 @@ TEST(ConstantIteratorTests, TestMakeConstantIterator)
   ASSERT_EQ(13, *iter0);
 
   // test two argument version
-  constant_iterator<int, _THRUST_STD::intmax_t> iter1 = make_constant_iterator<int, _THRUST_STD::intmax_t>(13, 7);
+  constant_iterator<int, thrust::detail::intmax_t> iter1 = make_constant_iterator<int, thrust::detail::intmax_t>(13, 7);
 
   ASSERT_EQ(13, *iter1);
   ASSERT_EQ(7, iter1 - iter0);
diff --git a/projects/rocthrust/test/test_copy.cpp b/projects/rocthrust/test/test_copy.cpp
index 40d492d8b5de..9039ee727d77 100644
--- a/projects/rocthrust/test/test_copy.cpp
+++ b/projects/rocthrust/test/test_copy.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -37,10 +37,6 @@
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
 using IntegralVariableParams =
   ::testing::Types<Params<signed char>,
                    Params<unsigned char>,
@@ -970,32 +966,15 @@ template <>
 struct is_non_const_reference<only_set_when_expected_it> : thrust::true_type
 {};
 } // end namespace detail
-THRUST_NAMESPACE_END
 
-namespace std
-{
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
   using value_type        = long long;
   using reference         = only_set_when_expected_it;
   using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
 };
-} // namespace std
-
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-_THRUST_STD_NAMESPACE_BEGIN
-template <>
-struct iterator_traits<only_set_when_expected_it>
-{
-  using value_type        = long long;
-  using reference         = only_set_when_expected_it;
-  using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
-};
-_THRUST_STD_NAMESPACE_END
-#  endif
+THRUST_NAMESPACE_END
 
 void TestCopyWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/rocthrust/test/test_counting_iterator.cpp b/projects/rocthrust/test/test_counting_iterator.cpp
index bc09f769d456..ff6e1fbb25fa 100644
--- a/projects/rocthrust/test/test_counting_iterator.cpp
+++ b/projects/rocthrust/test/test_counting_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 #include <thrust/binary_search.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/detail/iterator_traits.h>
 #include <thrust/sort.h>
 
 #include <cstdint>
@@ -32,67 +32,26 @@
 
 TESTS_DEFINE(CountingIteratorTests, NumericalTestsParams);
 
-template <typename ValueType, typename DifferenceType>
-inline constexpr bool diff_type_is =
-  _THRUST_STD::is_same_v<typename thrust::counting_iterator<ValueType>::difference_type, DifferenceType>;
-
-static_assert(diff_type_is<int8_t, int>);
-static_assert(diff_type_is<uint8_t, int>);
-static_assert(diff_type_is<int16_t, int>);
-static_assert(diff_type_is<uint16_t, int>);
-static_assert(diff_type_is<int32_t, ptrdiff_t>);
-static_assert(diff_type_is<uint32_t, ptrdiff_t>);
-static_assert(diff_type_is<int64_t, ptrdiff_t>);
-static_assert(diff_type_is<uint64_t, ptrdiff_t>);
-#if !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__)) \
-  && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
-static_assert(diff_type_is<__int128_t, ptrdiff_t>);
-static_assert(diff_type_is<__uint128_t, ptrdiff_t>);
-#endif
-static_assert(diff_type_is<float, ptrdiff_t>);
-static_assert(diff_type_is<double, ptrdiff_t>);
-
-struct custom_int
-{
-  THRUST_HOST_DEVICE custom_int(int) {}
-  THRUST_HOST_DEVICE operator int() const;
-};
-static_assert(thrust::detail::is_numeric<custom_int>::value);
-
-static_assert(diff_type_is<custom_int, ptrdiff_t>);
-
 THRUST_DIAG_PUSH
 THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 // ensure that we properly support thrust::counting_iterator from _THRUST_STD
-TEST(CountingIteratorTests, TestCountingIteratorTraits)
+TEST(CountingIteratorTests, TestIteratorTraits)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using it       = thrust::counting_iterator<int>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
+  using It       = _THRUST_STD::iterator_traits<thrust::counting_iterator<int>>;
+  using category = thrust::detail::iterator_category_with_system_and_traversal<::std::random_access_iterator_tag,
                                                                                thrust::any_system_tag,
                                                                                thrust::random_access_traversal_tag>;
 
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, signed int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
+  static_assert(_THRUST_STD::is_same<It::difference_type, ptrdiff_t>::value, "");
+  static_assert(_THRUST_STD::is_same<It::value_type, int>::value, "");
+  static_assert(_THRUST_STD::is_same<It::pointer, void>::value, "");
+  static_assert(_THRUST_STD::is_same<It::reference, signed int>::value, "");
+  static_assert(_THRUST_STD::is_same<It::iterator_category, category>::value, "");
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
+  static_assert(::thrust::detail::is_cpp17_random_access_iterator<thrust::counting_iterator<int>>::value, "");
 }
 
 TYPED_TEST(CountingIteratorTests, TestCountingDefaultConstructor)
@@ -318,7 +277,7 @@ TEST(CountingIteratorTests, TestCountingIteratorLowerBound)
 TEST(CountingIteratorTests, TestCountingIteratorDifference)
 {
   using Iterator   = thrust::counting_iterator<std::uint64_t>;
-  using Difference = thrust::detail::it_difference_t<Iterator>;
+  using Difference = thrust::iterator_difference<Iterator>::type;
 
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
diff --git a/projects/rocthrust/test/test_dependencies_aware_policies.cpp b/projects/rocthrust/test/test_dependencies_aware_policies.cpp
new file mode 100644
index 000000000000..561e7ede6423
--- /dev/null
+++ b/projects/rocthrust/test/test_dependencies_aware_policies.cpp
@@ -0,0 +1,143 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies inside type traits
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#include <thrust/detail/seq.h>
+#include <thrust/system/cpp/detail/par.h>
+#include <thrust/system/hip/detail/par.h>
+#include <thrust/system/omp/detail/par.h>
+#include <thrust/system/tbb/detail/par.h>
+
+#include "test_param_fixtures.hpp"
+#include "test_utils.hpp"
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+template <typename T>
+struct test_allocator_t
+{};
+
+test_allocator_t<int> test_allocator = test_allocator_t<int>();
+
+template <int I>
+struct test_dependency_t
+{};
+
+template <int I>
+test_dependency_t<I> test_dependency()
+{
+  return {};
+}
+
+template <typename Policy, template <typename> class CRTPBase>
+struct policy_info
+{
+  using policy = Policy;
+
+  template <template <template <typename> class, typename...> class Template, typename... Arguments>
+  using apply_base_first = Template<CRTPBase, Arguments...>;
+
+  template <template <typename, template <typename> class, typename...> class Template,
+            typename First,
+            typename... Arguments>
+  using apply_base_second = Template<First, CRTPBase, Arguments...>;
+};
+
+template <typename PolicyInfo>
+struct TestDependencyAttachment
+{
+  template <typename... Expected, typename T>
+  static void assert_correct(T)
+  {
+    ASSERT_EQ(
+      (_THRUST_STD::is_same<
+        T,
+        typename PolicyInfo::template apply_base_first<thrust::detail::execute_with_dependencies, Expected...>>::value),
+      true);
+  }
+
+  template <typename Allocator, typename... Expected, typename T>
+  static void assert_correct_with_allocator(T)
+  {
+    ASSERT_EQ((_THRUST_STD::is_same<
+                T,
+                typename PolicyInfo::template apply_base_second<thrust::detail::execute_with_allocator_and_dependencies,
+                                                                Allocator,
+                                                                Expected...>>::value),
+              true);
+  }
+
+  void operator()()
+  {
+    typename PolicyInfo::policy policy;
+
+    assert_correct<test_dependency_t<1>>(policy.after(test_dependency<1>()));
+
+    assert_correct<test_dependency_t<1>, test_dependency_t<2>>(
+      policy.after(test_dependency<1>(), test_dependency<2>()));
+
+    assert_correct<test_dependency_t<1>, test_dependency_t<2>, test_dependency_t<3>>(
+      policy.after(test_dependency<1>(), test_dependency<2>(), test_dependency<3>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&, test_dependency_t<1>>(
+      policy(test_allocator).after(test_dependency<1>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&, test_dependency_t<1>, test_dependency_t<2>>(
+      policy(test_allocator).after(test_dependency<1>(), test_dependency<2>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&,
+                                  test_dependency_t<1>,
+                                  test_dependency_t<2>,
+                                  test_dependency_t<3>>(
+      policy(test_allocator).after(test_dependency<1>(), test_dependency<2>(), test_dependency<3>()));
+  }
+};
+
+using sequential_info = policy_info<thrust::detail::seq_t, thrust::system::detail::sequential::execution_policy>;
+using cpp_par_info    = policy_info<thrust::system::cpp::detail::par_t, thrust::system::cpp::detail::execution_policy>;
+using omp_par_info    = policy_info<thrust::system::omp::detail::par_t, thrust::system::omp::detail::execution_policy>;
+using tbb_par_info    = policy_info<thrust::system::tbb::detail::par_t, thrust::system::tbb::detail::execution_policy>;
+
+using hip_par_info = policy_info<thrust::system::hip::detail::par_t, thrust::hip_rocprim::execute_on_stream_base>;
+
+using PolicyTestsParams = ::testing::Types<
+  // TODO: uncomment when dependencies are generalized to all backends
+  // Params<sequential_info>,
+  // Params<cpp_par_info>,
+  // Params<omp_par_info>,
+  // Params<tbb_par_info>,
+  Params<hip_par_info>>;
+
+TESTS_DEFINE(DependenciesAwarePoliciesTests, PolicyTestsParams);
+
+TYPED_TEST(DependenciesAwarePoliciesTests, TestDependencyAttachmentInstance)
+{
+  using T = typename TestFixture::input_type;
+
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  TestDependencyAttachment<T> test;
+  test();
+}
+
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/test/test_dereference.cpp b/projects/rocthrust/test/test_dereference.cpp
index 566de2dc67d7..c7874027cb83 100644
--- a/projects/rocthrust/test/test_dereference.cpp
+++ b/projects/rocthrust/test/test_dereference.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/device_ptr.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
diff --git a/projects/rocthrust/test/test_device_delete.cpp b/projects/rocthrust/test/test_device_delete.cpp
index 4d4c6173b0fc..2b6e216e8042 100644
--- a/projects/rocthrust/test/test_device_delete.cpp
+++ b/projects/rocthrust/test/test_device_delete.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_delete.h>
 #include <thrust/device_new.h>
 #include <thrust/device_ptr.h>
@@ -31,8 +32,7 @@ struct Foo
 
   THRUST_HOST_DEVICE ~Foo()
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (if (set_me_upon_destruction != nullptr) { *set_me_upon_destruction = true; }));
+    NV_IF_TARGET(NV_IS_DEVICE, (if (set_me_upon_destruction != nullptr) { *set_me_upon_destruction = true; }));
   }
 
   bool* set_me_upon_destruction;
diff --git a/projects/rocthrust/test/test_discard_iterator.cpp b/projects/rocthrust/test/test_discard_iterator.cpp
index 3f493c90b5ae..b8f5da7427d0 100644
--- a/projects/rocthrust/test/test_discard_iterator.cpp
+++ b/projects/rocthrust/test/test_discard_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,55 +15,26 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/discard_iterator.h>
 
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#include _THRUST_STD_INCLUDE(type_traits)
+using namespace thrust;
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// ensure that we properly support thrust::discard_iterator from _THRUST_STD
-TEST(DiscardIteratorTests, TestDiscardIteratorTraits)
+TEST(DiscardIteratorTests, UsingHip)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using it       = thrust::discard_iterator<>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, thrust::detail::any_assign>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, thrust::detail::any_assign&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
+  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
-TEST(DiscardIteratorTests, TestDiscardIteratorIncrement)
+TEST(DiscardIteratorTests, DiscardIteratorIncrement)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  thrust::discard_iterator<> lhs(0);
-  thrust::discard_iterator<> rhs(0);
+  discard_iterator<> lhs(0);
+  discard_iterator<> rhs(0);
 
   ASSERT_EQ(0, lhs - rhs);
 
@@ -84,15 +55,13 @@ TEST(DiscardIteratorTests, TestDiscardIteratorIncrement)
 
   ASSERT_EQ(-2, lhs - rhs);
 }
-static_assert(_THRUST_STD::is_trivially_copy_constructible<thrust::discard_iterator<>>::value, "");
-static_assert(_THRUST_STD::is_trivially_copyable<thrust::discard_iterator<>>::value, "");
 
-TEST(DiscardIteratorTests, TestDiscardIteratorComparison)
+TEST(DiscardIteratorTests, DiscardIteratorComparison)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  thrust::discard_iterator<> iter1(0);
-  thrust::discard_iterator<> iter2(0);
+  discard_iterator<> iter1(0);
+  discard_iterator<> iter2(0);
 
   ASSERT_EQ(0, iter1 - iter2);
   ASSERT_EQ(true, iter1 == iter2);
@@ -114,45 +83,43 @@ TEST(DiscardIteratorTests, TestDiscardIteratorComparison)
   ASSERT_EQ(true, iter1 == iter2);
 }
 
-TEST(DiscardIteratorTests, TestMakeDiscardIterator)
+TEST(DiscardIteratorTests, MakeDiscardIterator)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  thrust::discard_iterator<> iter0 = thrust::make_discard_iterator(13);
+  discard_iterator<> iter0 = make_discard_iterator(13);
 
   *iter0 = 7;
 
-  thrust::discard_iterator<> iter1 = thrust::make_discard_iterator(7);
+  discard_iterator<> iter1 = make_discard_iterator(7);
 
   *iter1 = 13;
 
   ASSERT_EQ(6, iter0 - iter1);
 }
 
-TEST(DiscardIteratorTests, TestZippedDiscardIterator)
+TEST(DiscardIteratorTests, ZippedDiscardIterator)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using namespace thrust;
-
   using IteratorTuple1 = tuple<discard_iterator<>>;
   using ZipIterator1   = zip_iterator<IteratorTuple1>;
 
-  IteratorTuple1 t = thrust::make_tuple(thrust::make_discard_iterator());
+  IteratorTuple1 t = make_tuple(make_discard_iterator());
 
-  ZipIterator1 z_iter1_first = thrust::make_zip_iterator(t);
+  ZipIterator1 z_iter1_first = make_zip_iterator(t);
   ZipIterator1 z_iter1_last  = z_iter1_first + 10;
   for (; z_iter1_first != z_iter1_last; ++z_iter1_first)
   {
     ;
   }
 
-  ASSERT_EQ(10, thrust::get<0>(z_iter1_first.get_iterator_tuple()) - thrust::make_discard_iterator());
+  ASSERT_EQ(10, get<0>(z_iter1_first.get_iterator_tuple()) - make_discard_iterator());
 
   using IteratorTuple2 = tuple<int*, discard_iterator<>>;
   using ZipIterator2   = zip_iterator<IteratorTuple2>;
 
-  ZipIterator2 z_iter_first = thrust::make_zip_iterator(thrust::make_tuple((int*) 0, thrust::make_discard_iterator()));
+  ZipIterator2 z_iter_first = make_zip_iterator(make_tuple((int*) 0, make_discard_iterator()));
   ZipIterator2 z_iter_last  = z_iter_first + 10;
 
   for (; z_iter_first != z_iter_last; ++z_iter_first)
@@ -160,12 +127,5 @@ TEST(DiscardIteratorTests, TestZippedDiscardIterator)
     ;
   }
 
-  ASSERT_EQ(10, thrust::get<1>(z_iter_first.get_iterator_tuple()) - thrust::make_discard_iterator());
-}
-
-TEST(DiscardIteratorTests, UsingHip)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
+  ASSERT_EQ(10, get<1>(z_iter_first.get_iterator_tuple()) - make_discard_iterator());
 }
diff --git a/projects/rocthrust/test/test_event.cpp b/projects/rocthrust/test/test_event.cpp
new file mode 100644
index 000000000000..900ce72a4a2d
--- /dev/null
+++ b/projects/rocthrust/test/test_event.cpp
@@ -0,0 +1,181 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/event.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+TESTS_DEFINE(EventTests, FullTestsParams);
+
+// note: there is no matching THRUST_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+///////////////////////////////////////////////////////////////////////////////
+
+TEST(EventTests, test_event_default_constructed)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  THRUST_STATIC_ASSERT((
+    std::is_same<thrust::event<decltype(thrust::device)>, thrust::unique_eager_event<decltype(thrust::device)>>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::event<decltype(thrust::device)>, thrust::device_event>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::device_event, thrust::device_unique_eager_event>::value));
+
+  thrust::device_event e0;
+
+  ASSERT_EQ(false, e0.valid_stream());
+
+  ASSERT_THROWS_EQ(e0.wait(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+  ASSERT_THROWS_EQ(e0.stream(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TEST(EventTests, test_event_new_stream)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  auto e0 = thrust::device_event(thrust::new_stream);
+
+  ASSERT_EQ(true, e0.valid_stream());
+
+  ASSERT_NE_QUIET(nullptr, e0.stream().native_handle());
+
+  e0.wait();
+
+  ASSERT_EQ(true, e0.ready());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TEST(EventTests, test_event_linear_chaining)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  constexpr std::int64_t n = 1024;
+
+  // Create a new stream.
+  auto e0 = thrust::when_all();
+
+  auto const e0_stream = e0.stream().native_handle();
+
+  ASSERT_EQ(true, e0.valid_stream());
+
+  ASSERT_NE_QUIET(nullptr, e0_stream);
+
+  thrust::device_event e1;
+
+  for (std::int64_t i = 0; i < n; ++i)
+  {
+    ASSERT_EQ(true, e0.valid_stream());
+
+    ASSERT_EQ(false, e1.valid_stream());
+    ASSERT_EQ(false, e1.ready());
+
+    ASSERT_EQ_QUIET(e0_stream, e0.stream().native_handle());
+
+    e1 = thrust::when_all(e0);
+
+    ASSERT_EQ(false, e0.valid_stream());
+    ASSERT_EQ(false, e0.ready());
+
+    ASSERT_EQ(true, e1.valid_stream());
+
+    ASSERT_EQ(e0_stream, e1.stream().native_handle());
+
+    std::swap(e0, e1);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TEST(EventTests, test_event_when_all)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  // Create events with new streams.
+  auto e0 = thrust::when_all();
+  auto e1 = thrust::when_all();
+  auto e2 = thrust::when_all();
+  auto e3 = thrust::when_all();
+  auto e4 = thrust::when_all();
+  auto e5 = thrust::when_all();
+  auto e6 = thrust::when_all();
+  auto e7 = thrust::when_all();
+
+  auto const e0_stream = e0.stream().native_handle();
+
+  ASSERT_EQ(true, e0.valid_stream());
+  ASSERT_EQ(true, e1.valid_stream());
+  ASSERT_EQ(true, e2.valid_stream());
+  ASSERT_EQ(true, e3.valid_stream());
+  ASSERT_EQ(true, e4.valid_stream());
+  ASSERT_EQ(true, e5.valid_stream());
+  ASSERT_EQ(true, e6.valid_stream());
+  ASSERT_EQ(true, e7.valid_stream());
+
+  ASSERT_NE_QUIET(nullptr, e0_stream);
+  ASSERT_NE_QUIET(nullptr, e1.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e2.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e3.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e4.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e5.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e6.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, e7.stream().native_handle());
+
+  auto e8 = thrust::when_all(e0, e1, e2, e3, e4, e5, e6, e7);
+
+  ASSERT_EQ(false, e0.valid_stream());
+  ASSERT_EQ(false, e1.valid_stream());
+  ASSERT_EQ(false, e2.valid_stream());
+  ASSERT_EQ(false, e3.valid_stream());
+  ASSERT_EQ(false, e4.valid_stream());
+  ASSERT_EQ(false, e5.valid_stream());
+  ASSERT_EQ(false, e6.valid_stream());
+  ASSERT_EQ(false, e7.valid_stream());
+
+  ASSERT_EQ(true, e8.valid_stream());
+
+  ASSERT_EQ(e0_stream, e8.stream().native_handle());
+
+  TEST_EVENT_WAIT(e8);
+
+  ASSERT_EQ(false, e0.ready());
+  ASSERT_EQ(false, e1.ready());
+  ASSERT_EQ(false, e2.ready());
+  ASSERT_EQ(false, e3.ready());
+  ASSERT_EQ(false, e4.ready());
+  ASSERT_EQ(false, e5.ready());
+  ASSERT_EQ(false, e6.ready());
+  ASSERT_EQ(false, e7.ready());
+
+  ASSERT_EQ(true, e8.ready());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/test/test_find.cpp b/projects/rocthrust/test/test_find.cpp
index 0426cd4c8858..12bc4bc1ff1a 100644
--- a/projects/rocthrust/test/test_find.cpp
+++ b/projects/rocthrust/test/test_find.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/find.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
@@ -24,8 +23,6 @@
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 TESTS_DEFINE(FindTestsVector, FullTestsParams);
 TESTS_DEFINE(FindTests, NumericalTestsParams);
 
@@ -349,9 +346,9 @@ void TestFindWithBigIndexesHelper(int magnitude)
   thrust::counting_iterator<long long> end = begin + (1ll << magnitude);
   ASSERT_EQ(thrust::distance(begin, end), 1ll << magnitude);
 
-  _THRUST_STD::intmax_t distance_low_value = thrust::distance(begin, thrust::find(thrust::device, begin, end, 17));
+  thrust::detail::intmax_t distance_low_value = thrust::distance(begin, thrust::find(thrust::device, begin, end, 17));
 
-  _THRUST_STD::intmax_t distance_high_value =
+  thrust::detail::intmax_t distance_high_value =
     thrust::distance(begin, thrust::find(thrust::device, begin, end, (1ll << magnitude) - 17));
 
   ASSERT_EQ(distance_low_value, 16);
@@ -390,6 +387,8 @@ class Weird
 
 TEST(FindTests, TestFindAsymmetricEquality)
 { // Regression test for NVIDIA/thrust#1229
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
   thrust::host_vector<int> v(1000);
   thrust::sequence(v.begin(), v.end());
   thrust::device_vector<int> dv(v);
diff --git a/projects/rocthrust/test/test_functional.cpp b/projects/rocthrust/test/test_functional.cpp
index c3ffa62b6be2..97c9ef50b482 100644
--- a/projects/rocthrust/test/test_functional.cpp
+++ b/projects/rocthrust/test/test_functional.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/transform.h>
 #include <thrust/universal_vector.h>
@@ -29,6 +28,7 @@
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
+#  include <utility>
 #endif
 
 THRUST_DIAG_PUSH
@@ -86,7 +86,7 @@ TESTS_DEFINE(IntegralVectorTests, IntegralVectorTestsParams);
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
@@ -212,6 +212,45 @@ typename _THRUST_STD::add_const<_Tp>::type& as_const(_Tp& __t) noexcept
   return __t;
 }
 
+// Ad-hoc testing for other functionals
+TEST(AllTypesTests, TestIdentityFunctional) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  int i    = 42;
+  double d = 3.14;
+
+  // pass through
+  ASSERT_EQ(thrust::identity<int>{}(i), 42);
+  ASSERT_EQ(thrust::identity<int>{}(d), 3);
+
+  // modification through
+  thrust::identity<int>{}(i) = 1337;
+  ASSERT_EQ(i, 1337);
+
+  // value categories and const
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(42)), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(i)), int&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(as_const(i))), const int&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(_THRUST_STD::move(i))), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(static_cast<const int&&>(i))), const int&>::value,
+                "");
+
+  // value categories when casting to different type
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(3.14)), int&&>::value, "");
+  // unfortunately, old versions of MSVC pick the `const int&` overload instead of `int&&`
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && THRUST_MSVC_VERSION >= 1929
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(d)), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(as_const(d))), int&&>::value, "");
+#endif
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(_THRUST_STD::move(d))), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(static_cast<const double&&>(d))), int&&>::value,
+                "");
+  THRUST_SUPPRESS_DEPRECATED_POP
+}
+
 TYPED_TEST(VectorTests, TestIdentityFunctionalVector) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -309,6 +348,15 @@ TYPED_TEST(IntegralVectorTests, TestNot1) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
   ASSERT_EQ(output, ref);
 }
 
+// GCC 11 fails to build this test case with a spurious error in a
+// very specific scenario:
+// - GCC 11
+// - CPP system for both host and device
+// - C++11 dialect
+#if !(defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 110000 && THRUST_GCC_VERSION < 120000          \
+      && THRUST_HOST_SYSTEM == THRUST_HOST_SYSTEM_CPP && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CPP \
+      && THRUST_CPP_DIALECT == 2011)
+
 TYPED_TEST(VectorTests, TestNot2) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -327,4 +375,6 @@ TYPED_TEST(VectorTests, TestNot2) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
   ASSERT_EQ(output, ref);
 }
 
+#endif // Weird GCC11 failure case
+
 THRUST_DIAG_POP
diff --git a/projects/rocthrust/test/test_future.cpp b/projects/rocthrust/test/test_future.cpp
new file mode 100644
index 000000000000..702cdb04c254
--- /dev/null
+++ b/projects/rocthrust/test/test_future.cpp
@@ -0,0 +1,221 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/future.h>
+
+#  include "test_param_fixtures.hpp"
+#  include "test_real_assertions.hpp"
+#  include "test_utils.hpp"
+
+// note: there is no matching THRUST_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+struct mock
+{};
+
+using future_value_types = ::testing::Types<
+  Params<char>,
+  Params<signed char>,
+  Params<unsigned char>,
+  Params<short>,
+  Params<unsigned short>,
+  Params<int>,
+  Params<unsigned int>,
+  Params<long>,
+  Params<unsigned long>,
+  Params<long long>,
+  Params<unsigned long long>,
+  Params<float>,
+  Params<double>,
+  Params<float2>,
+  Params<mock>>;
+
+TESTS_DEFINE(FutureTests, future_value_types);
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(FutureTests, test_future_default_constructed)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  using T = typename TestFixture::input_type;
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::future<decltype(thrust::device), T>,
+                                     thrust::unique_eager_future<decltype(thrust::device), T>>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::future<decltype(thrust::device), T>, thrust::device_future<T>>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::device_future<T>, thrust::device_unique_eager_future<T>>::value));
+
+  thrust::device_future<T> f0;
+
+  ASSERT_EQ(false, f0.valid_stream());
+  ASSERT_EQ(false, f0.valid_content());
+
+  ASSERT_THROWS_EQ(f0.wait(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+  ASSERT_THROWS_EQ(f0.stream(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+  ASSERT_THROWS_EQ(f0.get(), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+
+  ASSERT_THROWS_EQ(
+    THRUST_UNUSED_VAR(f0.extract()), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(FutureTests, test_future_new_stream)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  using T = typename TestFixture::input_type;
+
+  auto f0 = thrust::device_future<T>(thrust::new_stream);
+
+  ASSERT_EQ(true, f0.valid_stream());
+  ASSERT_EQ(false, f0.valid_content());
+
+  ASSERT_NE_QUIET(nullptr, f0.stream().native_handle());
+
+  TEST_EVENT_WAIT(f0);
+
+  ASSERT_EQ(true, f0.ready());
+
+  ASSERT_THROWS_EQ(f0.get(), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+
+  ASSERT_THROWS_EQ(
+    THRUST_UNUSED_VAR(f0.extract()), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(FutureTests, test_future_convert_to_event)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  using T = typename TestFixture::input_type;
+
+  auto f0 = thrust::device_future<T>(thrust::new_stream);
+
+  auto const f0_stream = f0.stream().native_handle();
+
+  ASSERT_EQ(true, f0.valid_stream());
+  ASSERT_EQ(false, f0.valid_content());
+
+  ASSERT_NE_QUIET(nullptr, f0_stream);
+
+  auto f1 = thrust::device_event(std::move(f0));
+
+  ASSERT_EQ(false, f0.valid_stream());
+  ASSERT_EQ(true, f1.valid_stream());
+
+  ASSERT_EQ(f0_stream, f1.stream().native_handle());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+TYPED_TEST(FutureTests, test_future_when_all)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  using T = typename TestFixture::input_type;
+
+  // Create futures with new streams.
+  auto f0 = thrust::device_future<T>(thrust::new_stream);
+  auto f1 = thrust::device_future<T>(thrust::new_stream);
+  auto f2 = thrust::device_future<T>(thrust::new_stream);
+  auto f3 = thrust::device_future<T>(thrust::new_stream);
+  auto f4 = thrust::device_future<T>(thrust::new_stream);
+  auto f5 = thrust::device_future<T>(thrust::new_stream);
+  auto f6 = thrust::device_future<T>(thrust::new_stream);
+  auto f7 = thrust::device_future<T>(thrust::new_stream);
+
+  auto const f0_stream = f0.stream().native_handle();
+
+  ASSERT_EQ(true, f0.valid_stream());
+  ASSERT_EQ(true, f1.valid_stream());
+  ASSERT_EQ(true, f2.valid_stream());
+  ASSERT_EQ(true, f3.valid_stream());
+  ASSERT_EQ(true, f4.valid_stream());
+  ASSERT_EQ(true, f5.valid_stream());
+  ASSERT_EQ(true, f6.valid_stream());
+  ASSERT_EQ(true, f7.valid_stream());
+
+  ASSERT_EQ(false, f0.valid_content());
+  ASSERT_EQ(false, f1.valid_content());
+  ASSERT_EQ(false, f2.valid_content());
+  ASSERT_EQ(false, f3.valid_content());
+  ASSERT_EQ(false, f4.valid_content());
+  ASSERT_EQ(false, f5.valid_content());
+  ASSERT_EQ(false, f6.valid_content());
+  ASSERT_EQ(false, f7.valid_content());
+
+  ASSERT_NE_QUIET(nullptr, f0_stream);
+  ASSERT_NE_QUIET(nullptr, f1.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f2.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f3.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f4.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f5.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f6.stream().native_handle());
+  ASSERT_NE_QUIET(nullptr, f7.stream().native_handle());
+
+  auto e0 = thrust::when_all(f0, f1, f2, f3, f4, f5, f6, f7);
+
+  ASSERT_EQ(false, f0.valid_stream());
+  ASSERT_EQ(false, f1.valid_stream());
+  ASSERT_EQ(false, f2.valid_stream());
+  ASSERT_EQ(false, f3.valid_stream());
+  ASSERT_EQ(false, f4.valid_stream());
+  ASSERT_EQ(false, f5.valid_stream());
+  ASSERT_EQ(false, f6.valid_stream());
+  ASSERT_EQ(false, f7.valid_stream());
+
+  ASSERT_EQ(false, f0.valid_content());
+  ASSERT_EQ(false, f1.valid_content());
+  ASSERT_EQ(false, f2.valid_content());
+  ASSERT_EQ(false, f3.valid_content());
+  ASSERT_EQ(false, f4.valid_content());
+  ASSERT_EQ(false, f5.valid_content());
+  ASSERT_EQ(false, f6.valid_content());
+  ASSERT_EQ(false, f7.valid_content());
+
+  ASSERT_EQ(true, e0.valid_stream());
+
+  ASSERT_EQ(f0_stream, e0.stream().native_handle());
+
+  TEST_EVENT_WAIT(e0);
+
+  ASSERT_EQ(false, f0.ready());
+  ASSERT_EQ(false, f1.ready());
+  ASSERT_EQ(false, f2.ready());
+  ASSERT_EQ(false, f3.ready());
+  ASSERT_EQ(false, f4.ready());
+  ASSERT_EQ(false, f5.ready());
+  ASSERT_EQ(false, f6.ready());
+  ASSERT_EQ(false, f7.ready());
+
+  ASSERT_EQ(true, e0.ready());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/test/test_is_contiguous_iterator.cpp b/projects/rocthrust/test/test_is_contiguous_iterator.cpp
index 9444a0a161dd..24a4869d40c4 100644
--- a/projects/rocthrust/test/test_is_contiguous_iterator.cpp
+++ b/projects/rocthrust/test/test_is_contiguous_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
-#include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
 #include <array>
 #include <deque>
@@ -44,11 +43,15 @@
 
 TESTS_DEFINE(IsContiguousIteratorTests, FullTestsParams);
 
-static_assert(thrust::is_contiguous_iterator<std::string::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::wstring::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::string_view::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::wstring_view::iterator>::value);
-static_assert(!thrust::is_contiguous_iterator<std::vector<bool>::iterator>::value);
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::string::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::wstring::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::string_view::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::wstring_view::iterator>::value));
+
+THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::vector<bool>::iterator>::value));
 
 TYPED_TEST(IsContiguousIteratorTests, test_is_contiguous_iterator)
 {
@@ -57,24 +60,41 @@ TYPED_TEST(IsContiguousIteratorTests, test_is_contiguous_iterator)
 
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  static_assert(thrust::is_contiguous_iterator<T*>::value);
-  static_assert(thrust::is_contiguous_iterator<T const*>::value);
-  static_assert(thrust::is_contiguous_iterator<thrust::device_ptr<T>>::value);
-  static_assert(thrust::is_contiguous_iterator<typename std::vector<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::vector<T>::reverse_iterator>::value);
-  static_assert(thrust::is_contiguous_iterator<typename std::array<T, 1>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::list<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::deque<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::set<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::multiset<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::map<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::multimap<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_set<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_multiset<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_map<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_multimap<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<std::istream_iterator<T>>::value);
-  static_assert(!thrust::is_contiguous_iterator<std::ostream_iterator<T>>::value);
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<T*>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<T const*>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<thrust::device_ptr<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename std::vector<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::vector<T>::reverse_iterator>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename std::array<T, 1>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::list<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::deque<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::set<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::multiset<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::map<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::multimap<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_set<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_multiset<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_map<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_multimap<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::istream_iterator<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::ostream_iterator<T>>::value));
 }
 
 TYPED_TEST(IsContiguousIteratorTests, test_is_contiguous_iterator_vectors)
@@ -83,7 +103,7 @@ TYPED_TEST(IsContiguousIteratorTests, test_is_contiguous_iterator_vectors)
 
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  static_assert(thrust::is_contiguous_iterator<typename Vector::iterator>::value);
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename Vector::iterator>::value));
 }
 
 struct expect_pointer
@@ -111,33 +131,37 @@ TYPED_TEST(IsContiguousIteratorTests, test_try_unwrap_contiguous_iterator)
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
   // Raw pointers should pass whether expecting pointers or passthrough.
-  static_assert(check_unwrapped_iterator<T*, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<T*, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<T const*, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<T const*, T const*, expect_passthrough>::value);
-
-  static_assert(check_unwrapped_iterator<thrust::device_ptr<T>, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<thrust::device_ptr<T const>, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::vector<T>::iterator, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::vector<T>::reverse_iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::array<T, 1>::iterator, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::array<T const, 1>::iterator, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::list<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::deque<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::set<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::multiset<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::multimap<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_set<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_multiset<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::unordered_map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::
-      value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_multimap<T, T>::iterator,
-                                         std::pair<T const, T>*,
-                                         expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<std::istream_iterator<T>, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<std::ostream_iterator<T>, void, expect_passthrough>::value);
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T*, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T*, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T const*, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T const*, T const*, expect_passthrough>::value));
+
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<thrust::device_ptr<T>, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<thrust::device_ptr<T const>, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::vector<T>::iterator, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::vector<T>::reverse_iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::array<T, 1>::iterator, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::array<T const, 1>::iterator, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::list<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::deque<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::set<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::multiset<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((
+    check_unwrapped_iterator<typename std::multimap<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_set<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_multiset<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::
+       value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::unordered_multimap<T, T>::iterator,
+                                                 std::pair<T const, T>*,
+                                                 expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<std::istream_iterator<T>, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<std::ostream_iterator<T>, void, expect_passthrough>::value));
 }
diff --git a/projects/rocthrust/test/test_is_operator_function_object.cpp b/projects/rocthrust/test/test_is_operator_function_object.cpp
index 9bb9fae8dc87..fae46ac17608 100644
--- a/projects/rocthrust/test/test_is_operator_function_object.cpp
+++ b/projects/rocthrust/test/test_is_operator_function_object.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,11 +33,15 @@ using GenericTestParams =
 
 TESTS_DEFINE(IsOperatorFunctionObjectTest, GenericTestParams);
 
-static_assert(thrust::is_operator_less_function_object<std::less<>>::value);
-static_assert(thrust::is_operator_greater_function_object<std::greater<>>::value);
-static_assert(thrust::is_operator_less_or_greater_function_object<std::less<>>::value);
-static_assert(thrust::is_operator_less_or_greater_function_object<std::greater<>>::value);
-static_assert(thrust::is_operator_plus_function_object<std::plus<>>::value);
+THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<std::less<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<std::greater<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::less<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::greater<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<std::plus<>>::value));
 
 TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_less_function_object)
 {
@@ -45,15 +49,23 @@ TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_less_function_object)
 
   using T = typename TestFixture::input_type;
 
-  static_assert(thrust::is_operator_less_function_object<thrust::less<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::greater_equal<T>>::value);
-  static_assert(thrust::is_operator_less_function_object<std::less<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<T>::value));
 }
 
 TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_greater_function_object)
@@ -62,15 +74,23 @@ TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_greater_function_objec
 
   using T = typename TestFixture::input_type;
 
-  static_assert(!thrust::is_operator_greater_function_object<thrust::less<T>>::value);
-  static_assert(thrust::is_operator_greater_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<thrust::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::less<T>>::value);
-  static_assert(thrust::is_operator_greater_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<T>::value);
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<T>::value));
 }
 
 TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_less_or_greater_function_object)
@@ -79,15 +99,23 @@ TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_less_or_greater_functi
 
   using T = typename TestFixture::input_type;
 
-  static_assert(thrust::is_operator_less_or_greater_function_object<thrust::less<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<thrust::greater_equal<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<std::less<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<T>::value));
 }
 
 TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_plus_function_object)
@@ -96,13 +124,21 @@ TYPED_TEST(IsOperatorFunctionObjectTest, test_is_operator_plus_function_object)
 
   using T = typename TestFixture::input_type;
 
-  static_assert(thrust::is_operator_plus_function_object<thrust::plus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::minus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::less<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::greater<T>>::value);
-  static_assert(thrust::is_operator_plus_function_object<std::plus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::minus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::less<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<thrust::plus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::minus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<std::plus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::minus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<T>::value));
 }
diff --git a/projects/rocthrust/test/test_is_partitioned.cpp b/projects/rocthrust/test/test_is_partitioned.cpp
index 500360df6c10..730447bb8515 100644
--- a/projects/rocthrust/test/test_is_partitioned.cpp
+++ b/projects/rocthrust/test/test_is_partitioned.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/partition.h>
diff --git a/projects/rocthrust/test/test_logical.cpp b/projects/rocthrust/test/test_logical.cpp
index a52ad713c051..f4d2d8874fc1 100644
--- a/projects/rocthrust/test/test_logical.cpp
+++ b/projects/rocthrust/test/test_logical.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/logical.h>
diff --git a/projects/rocthrust/test/test_memory.cpp b/projects/rocthrust/test/test_memory.cpp
index 5236f351268d..725348c76b48 100644
--- a/projects/rocthrust/test/test_memory.cpp
+++ b/projects/rocthrust/test/test_memory.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/execution_policy.h>
 #include <thrust/fill.h>
 #include <thrust/logical.h>
 #include <thrust/memory.h>
@@ -23,21 +24,57 @@
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
 
-#include <iostream>
+#include <cstddef>
 
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
+TEST(HipThrustMemory, VoidMalloc)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  const size_t size = 9001;
+  thrust::device_system_tag dev_tag;
+
+  using pointer = thrust::pointer<int, thrust::device_system_tag>;
+  // Malloc on device
+  auto void_ptr = thrust::malloc(dev_tag, sizeof(int) * size);
+  pointer ptr   = pointer(static_cast<int*>(void_ptr.get()));
+  // Free
+  thrust::free(dev_tag, ptr);
+}
+
+TEST(HipThrustMemory, TypeMalloc)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  const size_t size = 9001;
+  thrust::device_system_tag dev_tag;
+
+  // Malloc on device
+  auto ptr = thrust::malloc<int>(dev_tag, sizeof(int) * size);
+  // Free
+  thrust::free(dev_tag, ptr);
+}
 
-// WAR NVIDIA/cccl#1731
-// Some tests miscompile for non-CUDA backends on MSVC 2017 and 2019 (though 2022 is fine).
-// This is due to a bug in the compiler that breaks __THRUST_DEFINE_HAS_MEMBER_FUNCTION.
-#if defined(_MSC_VER) && _MSC_VER <= 1929 && THRUST_DEVICE_SYSTEM != THRUST_DEVICE_SYSTEM_CUDA
-#  define WAR_BUG_1731
-#endif
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+TEST(HipThrustMemory, MallocUseMemory)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  const size_t size = 1024;
+  thrust::device_system_tag dev_tag;
+
+  // Malloc on device
+  auto ptr = thrust::malloc<int>(dev_tag, sizeof(int) * size);
+
+  // Try allocated memory with HIP function
+  HIP_CHECK(hipMemset(ptr.get(), 0, size * sizeof(int)));
+
+  // Free
+  thrust::free(dev_tag, ptr);
+}
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 // Define a new system class, as the my_system one is already used with a thrust::sort template definition
 // that calls back into sort.cu
@@ -115,10 +152,11 @@ get_temporary_buffer(my_new_temporary_allocation_system, std::ptrdiff_t)
 }
 
 template <typename Pointer>
-void return_temporary_buffer(my_new_temporary_allocation_system, Pointer)
+void return_temporary_buffer(my_new_temporary_allocation_system, Pointer p)
 {
   // This should never be called (the three-argument with size overload below
   // should be preferred) and shouldn't be ambiguous.
+  THRUST_UNUSED_VAR(p);
   ASSERT_EQ(true, false);
 }
 
@@ -189,20 +227,20 @@ TEST(MemoryTests, TestGetTemporaryBuffer)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  const std::ptrdiff_t n = 9001;
+  const size_t size = 9001;
 
   thrust::device_system_tag dev_tag;
   using pointer                                    = thrust::pointer<int, thrust::device_system_tag>;
-  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(dev_tag, n);
+  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(dev_tag, size);
 
-  ASSERT_EQ(ptr_and_sz.second, n);
+  ASSERT_EQ(ptr_and_sz.second, size);
 
   const int ref_val = 13;
-  thrust::device_vector<int> ref(n, ref_val);
+  thrust::device_vector<int> ref(size, ref_val);
 
-  thrust::fill_n(ptr_and_sz.first, n, ref_val);
+  thrust::fill_n(ptr_and_sz.first, size, ref_val);
 
-  ASSERT_EQ(true, thrust::all_of(ptr_and_sz.first, ptr_and_sz.first + n, thrust::placeholders::_1 == ref_val));
+  ASSERT_EQ(true, thrust::all_of(ptr_and_sz.first, ptr_and_sz.first + size, thrust::placeholders::_1 == ref_val));
 
   thrust::return_temporary_buffer(dev_tag, ptr_and_sz.first, ptr_and_sz.second);
 }
@@ -211,18 +249,18 @@ TEST(MemoryTests, TestMalloc)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  const std::ptrdiff_t n = 9001;
+  const size_t size = 9001;
 
   thrust::device_system_tag dev_tag;
   using pointer = thrust::pointer<int, thrust::device_system_tag>;
-  pointer ptr   = pointer(static_cast<int*>(thrust::malloc(dev_tag, sizeof(int) * n).get()));
+  pointer ptr   = pointer(static_cast<int*>(thrust::malloc(dev_tag, sizeof(int) * size).get()));
 
   const int ref_val = 13;
-  thrust::device_vector<int> ref(n, ref_val);
+  thrust::device_vector<int> ref(size, ref_val);
 
-  thrust::fill_n(ptr, n, ref_val);
+  thrust::fill_n(ptr, size, ref_val);
 
-  ASSERT_EQ(true, thrust::all_of(ptr, ptr + n, thrust::placeholders::_1 == ref_val));
+  ASSERT_EQ(true, thrust::all_of(ptr, ptr + size, thrust::placeholders::_1 == ref_val));
 
   thrust::free(dev_tag, ptr);
 }
@@ -238,10 +276,10 @@ TEST(MemoryTests, TestMallocDispatchExplicit)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  const size_t n = 0;
+  const size_t size = 0;
 
   my_memory_system sys(0);
-  thrust::malloc(sys, n);
+  thrust::malloc(sys, size);
 
   ASSERT_EQ(true, sys.is_valid());
 }
@@ -266,55 +304,51 @@ TEST(MemoryTests, TestFreeDispatchExplicit)
 
 template <typename T>
 thrust::pair<thrust::pointer<T, my_memory_system>, std::ptrdiff_t>
-get_temporary_buffer(my_memory_system& system, std::ptrdiff_t n)
+get_temporary_buffer(my_memory_system& system, std::ptrdiff_t size)
 {
   system.validate_dispatch();
 
   thrust::device_system_tag device_sys;
   thrust::pair<thrust::pointer<T, thrust::device_system_tag>, std::ptrdiff_t> result =
-    thrust::get_temporary_buffer<T>(device_sys, n);
+    thrust::get_temporary_buffer<T>(device_sys, size);
   return thrust::make_pair(thrust::pointer<T, my_memory_system>(result.first.get()), result.second);
 }
 
-// [NON-CCCL PARITY BEGIN]
 template <typename Pointer>
 void return_temporary_buffer(my_memory_system& system, Pointer p, std::ptrdiff_t n)
 {
   system.validate_dispatch();
 
   thrust::device_system_tag device_sys;
-  thrust::pointer<typename _THRUST_STD::iterator_traits<Pointer>::value_type, thrust::device_system_tag> device_ptr(
-    p.get());
+  thrust::pointer<typename thrust::iterator_traits<Pointer>::value_type, 
+                           thrust::device_system_tag> device_ptr(p.get());
   thrust::return_temporary_buffer(device_sys, device_ptr, n);
 }
-// [NON-CCCL PARITY END]
 
-TEST(MemoryTests, TestGetTemporaryBufferDispatchExplicit)
+TEST(MemoryTests, TestGetTemporaryBufferDispatchImplicit)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  const std::ptrdiff_t n = 9001;
+  const size_t size = 9001;
 
   my_memory_system sys(0);
   using pointer                                    = thrust::pointer<int, thrust::device_system_tag>;
-  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(sys, n);
+  thrust::pair<pointer, std::ptrdiff_t> ptr_and_sz = thrust::get_temporary_buffer<int>(sys, size);
 
-  ASSERT_EQ(ptr_and_sz.second, n);
+  ASSERT_EQ(ptr_and_sz.second, size);
   ASSERT_EQ(true, sys.is_valid());
 
   const int ref_val = 13;
-  thrust::device_vector<int> ref(n, ref_val);
+  thrust::device_vector<int> ref(size, ref_val);
 
-  thrust::fill_n(ptr_and_sz.first, n, ref_val);
+  thrust::fill_n(ptr_and_sz.first, size, ref_val);
 
-  ASSERT_EQ(true, thrust::all_of(ptr_and_sz.first, ptr_and_sz.first + n, thrust::placeholders::_1 == ref_val));
+  ASSERT_EQ(true, thrust::all_of(ptr_and_sz.first, ptr_and_sz.first + size, thrust::placeholders::_1 == ref_val));
 
   thrust::return_temporary_buffer(sys, ptr_and_sz.first, ptr_and_sz.second);
 }
 
-#ifndef WAR_BUG_1731
-
-TEST(MemoryTests, TestGetTemporaryBufferDispatchImplicit)
+TEST(MemoryTests, TestGetTemporaryBufferDispatchExplicit)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
@@ -332,7 +366,6 @@ TEST(MemoryTests, TestGetTemporaryBufferDispatchImplicit)
 
     // call something we know will invoke get_temporary_buffer
     my_memory_system sys(0);
-
     thrust::sort(sys, vec.begin(), vec.end());
 
     ASSERT_EQ(true, thrust::is_sorted(vec.begin(), vec.end()));
@@ -340,12 +373,9 @@ TEST(MemoryTests, TestGetTemporaryBufferDispatchImplicit)
   }
 }
 
-#endif
-
 TEST(MemoryTests, TestTemporaryBufferOldCustomization)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
   using system           = my_old_namespace::my_old_temporary_allocation_system;
   using pointer          = thrust::pointer<int, system>;
   using pointer_and_size = thrust::pair<pointer, std::ptrdiff_t>;
@@ -381,50 +411,3 @@ TEST(MemoryTests, TestTemporaryBufferNewCustomization)
     thrust::return_temporary_buffer(sys, ps.first, ps.second);
   }
 }
-
-TEST(HipThrustMemory, VoidMalloc)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  const size_t size = 9001;
-  thrust::device_system_tag dev_tag;
-
-  using pointer = thrust::pointer<int, thrust::device_system_tag>;
-  // Malloc on device
-  auto void_ptr = thrust::malloc(dev_tag, sizeof(int) * size);
-  pointer ptr   = pointer(static_cast<int*>(void_ptr.get()));
-  // Free
-  thrust::free(dev_tag, ptr);
-}
-
-TEST(HipThrustMemory, TypeMalloc)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  const size_t size = 9001;
-  thrust::device_system_tag dev_tag;
-
-  // Malloc on device
-  auto ptr = thrust::malloc<int>(dev_tag, sizeof(int) * size);
-  // Free
-  thrust::free(dev_tag, ptr);
-}
-
-#if THRUST_HAS_HIP_COMPILER()
-TEST(HipThrustMemory, MallocUseMemory)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  const size_t size = 1024;
-  thrust::device_system_tag dev_tag;
-
-  // Malloc on device
-  auto ptr = thrust::malloc<int>(dev_tag, sizeof(int) * size);
-
-  // Try allocated memory with HIP function
-  HIP_CHECK(hipMemset(ptr.get(), 0, size * sizeof(int)));
-
-  // Free
-  thrust::free(dev_tag, ptr);
-}
-#endif // THRUST_HAS_HIP_COMPILER()
diff --git a/projects/rocthrust/test/test_merge_by_key.cpp b/projects/rocthrust/test/test_merge_by_key.cpp
index e35c9bb5c5d0..e35f17e4ce14 100644
--- a/projects/rocthrust/test/test_merge_by_key.cpp
+++ b/projects/rocthrust/test/test_merge_by_key.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -181,7 +181,7 @@ TEST(MergeByKeyTests, TestMergeByKeyDispatchImplicit)
 template <typename T, typename CompareOp, typename... Args>
 auto call_merge_by_key(Args&&... args) -> decltype(thrust::merge_by_key(std::forward<Args>(args)...))
 {
-  if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+  THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
   {
     return thrust::merge_by_key(std::forward<Args>(args)...);
   }
@@ -226,7 +226,7 @@ TYPED_TEST(MergeByKeyTestsClass, TestMergeByKey)
         const thrust::host_vector<T> h_a_vals(random_vals.begin(), random_vals.begin() + size_a);
         const thrust::host_vector<T> h_b_vals(random_vals.begin() + size_a, random_vals.end());
 
-        if constexpr (_THRUST_STD::is_void<compare_function>::value)
+        THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<compare_function>::value)
         {
           thrust::stable_sort(h_a_keys.begin(), h_a_keys.end());
           thrust::stable_sort(h_b_keys.begin(), h_b_keys.end());
diff --git a/projects/rocthrust/test/test_merge_key_value.cpp b/projects/rocthrust/test/test_merge_key_value.cpp
index b6577ec85311..c8d7cf10edd7 100644
--- a/projects/rocthrust/test/test_merge_key_value.cpp
+++ b/projects/rocthrust/test/test_merge_key_value.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ TESTS_DEFINE(MergeKeyValueTests, FullTestsParams);
 template <typename T, typename CompareOp, typename... Args>
 auto call_merge(Args&&... args) -> decltype(thrust::merge(std::forward<Args>(args)...))
 {
-  if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+  THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
   {
     return thrust::merge(std::forward<Args>(args)...);
   }
@@ -113,7 +113,7 @@ TYPED_TEST(MergeKeyValueTestsClass, TestMergeKeyValue)
         h_b[i] = T(h_keys_b[i], h_values_b[i]);
       }
 
-      if constexpr (_THRUST_STD::is_void<compare_function>::value)
+      THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<compare_function>::value)
       {
         thrust::stable_sort(h_a.begin(), h_a.end());
         thrust::stable_sort(h_b.begin(), h_b.end());
diff --git a/projects/rocthrust/test/test_min_and_max.cpp b/projects/rocthrust/test/test_min_and_max.cpp
index 431934df3418..dbff47050850 100644
--- a/projects/rocthrust/test/test_min_and_max.cpp
+++ b/projects/rocthrust/test/test_min_and_max.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -46,28 +46,32 @@ TYPED_TEST(MinAndMaxTests, TestMin)
 
   // 2 < 3
   T two(2), three(3);
-  ASSERT_EQ(two, _THRUST_STD::min(two, three));
-  ASSERT_EQ(two, _THRUST_STD::min(two, three, thrust::less<T>()));
+  ASSERT_EQ(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three));
+  ASSERT_EQ(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::less<T>()));
 
-  ASSERT_EQ(two, _THRUST_STD::min(three, two));
-  ASSERT_EQ(two, _THRUST_STD::min(three, two, thrust::less<T>()));
+  ASSERT_EQ(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two));
+  ASSERT_EQ(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::less<T>()));
 
-  ASSERT_EQ(three, _THRUST_STD::min(two, three, thrust::greater<T>()));
-  ASSERT_EQ(three, _THRUST_STD::min(three, two, thrust::greater<T>()));
+  ASSERT_EQ(three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::greater<T>()));
+  ASSERT_EQ(three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::greater<T>()));
 
   using KV = key_value<T, T>;
   KV two_and_two(two, two);
   KV two_and_three(two, three);
 
   // the first element breaks ties
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two));
-
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three, thrust::less<KV>()));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two, thrust::less<KV>()));
-
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three, thrust::greater<KV>()));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two, thrust::greater<KV>()));
+  ASSERT_EQ_QUIET(two_and_two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three));
+  ASSERT_EQ_QUIET(two_and_three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two));
+
+  ASSERT_EQ_QUIET(two_and_two,
+                  thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::less<KV>()));
+  ASSERT_EQ_QUIET(two_and_three,
+                  thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::less<KV>()));
+
+  ASSERT_EQ_QUIET(two_and_two,
+                  thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::greater<KV>()));
+  ASSERT_EQ_QUIET(two_and_three,
+                  thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::greater<KV>()));
 }
 
 TYPED_TEST(MinAndMaxTests, TestMax)
@@ -78,26 +82,30 @@ TYPED_TEST(MinAndMaxTests, TestMax)
 
   // 2 < 3
   T two(2), three(3);
-  ASSERT_EQ(three, _THRUST_STD::max(two, three));
-  ASSERT_EQ(three, _THRUST_STD::max(two, three, thrust::less<T>()));
+  ASSERT_EQ(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three));
+  ASSERT_EQ(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::less<T>()));
 
-  ASSERT_EQ(three, _THRUST_STD::max(three, two));
-  ASSERT_EQ(three, _THRUST_STD::max(three, two, thrust::less<T>()));
+  ASSERT_EQ(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two));
+  ASSERT_EQ(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::less<T>()));
 
-  ASSERT_EQ(two, _THRUST_STD::max(two, three, thrust::greater<T>()));
-  ASSERT_EQ(two, _THRUST_STD::max(three, two, thrust::greater<T>()));
+  ASSERT_EQ(two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::greater<T>()));
+  ASSERT_EQ(two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::greater<T>()));
 
   using KV = key_value<T, T>;
   KV two_and_two(two, two);
   KV two_and_three(two, three);
 
   // the first element breaks ties
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two));
-
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three, thrust::less<KV>()));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two, thrust::less<KV>()));
-
-  ASSERT_EQ_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three, thrust::greater<KV>()));
-  ASSERT_EQ_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two, thrust::greater<KV>()));
+  ASSERT_EQ_QUIET(two_and_two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three));
+  ASSERT_EQ_QUIET(two_and_three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two));
+
+  ASSERT_EQ_QUIET(two_and_two,
+                  thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::less<KV>()));
+  ASSERT_EQ_QUIET(two_and_three,
+                  thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::less<KV>()));
+
+  ASSERT_EQ_QUIET(two_and_two,
+                  thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::greater<KV>()));
+  ASSERT_EQ_QUIET(two_and_three,
+                  thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::greater<KV>()));
 }
diff --git a/projects/rocthrust/test/test_offset_iterator.cpp b/projects/rocthrust/test/test_offset_iterator.cpp
deleted file mode 100644
index 42a16fa1cae3..000000000000
--- a/projects/rocthrust/test/test_offset_iterator.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
-#include <thrust/distance.h>
-#include <thrust/iterator/offset_iterator.h>
-#include <thrust/universal_vector.h>
-
-#include "test_param_fixtures.hpp"
-#include "test_real_assertions.hpp"
-#include "test_utils.hpp"
-
-#include _THRUST_STD_INCLUDE(iterator)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-using VectorTestsParams = ::testing::Types<
-  Params<thrust::host_vector<signed char>>,
-  Params<thrust::host_vector<short>>,
-  Params<thrust::host_vector<int>>,
-  Params<thrust::host_vector<float>>,
-  Params<thrust::host_vector<int, thrust::mr::stateless_resource_allocator<int, thrust::host_memory_resource>>>,
-  Params<thrust::device_vector<signed char>>,
-  Params<thrust::device_vector<short>>,
-  Params<thrust::device_vector<int>>,
-  Params<thrust::device_vector<float>>,
-  Params<thrust::device_vector<int, thrust::mr::stateless_resource_allocator<int, thrust::device_memory_resource>>>,
-  Params<thrust::universal_vector<int>>,
-  Params<thrust::universal_host_pinned_vector<int>>>;
-
-TESTS_DEFINE(OffsetIteratorTests, VectorTestsParams);
-
-// ensure that we properly support thrust::counting_iterator from _THRUST_STD
-TEST(OffsetIteratorTests, TestOffsetIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using base_it    = thrust::host_vector<int>::iterator;
-  using it         = thrust::offset_iterator<base_it>;
-  using traits     = _THRUST_STD::iterator_traits<it>;
-  using vec_traits = _THRUST_STD::iterator_traits<base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, vec_traits::difference_type>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, vec_traits::value_type>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, vec_traits::pointer>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, vec_traits::reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, vec_traits::iterator_category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetConstructor)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  thrust::offset_iterator<int*> iter0;
-  ASSERT_EQ(iter0.base(), static_cast<int*>(nullptr));
-  ASSERT_EQ(iter0.offset(), 0);
-
-  Vector v{42, 43};
-  thrust::offset_iterator iter1(v.begin());
-  ASSERT_EQ_QUIET(iter1.base(), v.begin());
-  ASSERT_EQ(iter1.offset(), 0);
-  ASSERT_EQ(*iter1, 42);
-
-  thrust::offset_iterator iter2(v.begin(), 1);
-  ASSERT_EQ_QUIET(iter2.base(), v.begin());
-  ASSERT_EQ(iter2.offset(), 1);
-  ASSERT_EQ(*iter2, 43);
-
-  ptrdiff_t offset = 1;
-  thrust::offset_iterator iter3(v.begin(), &offset);
-  ASSERT_EQ_QUIET(iter3.base(), v.begin());
-  ASSERT_EQ(iter3.offset(), &offset);
-  ASSERT_EQ(*iter3.offset(), 1);
-  ASSERT_EQ(*iter3, 43);
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorCopyConstructorAndAssignment)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  Vector v{42, 43};
-
-  // value offset
-  {
-    thrust::offset_iterator iter0(v.begin());
-#if THRUST_COMPILER(MSVC) // MSVC cannot deduce the template arguments from the copy ctor
-    decltype(iter0) iter1(iter0);
-#else // THRUST_COMPILER(MSVC)
-    thrust::offset_iterator iter1(iter0);
-#endif // THRUST_COMPILER(MSVC)
-    ASSERT_EQ(iter0 == iter1, true);
-    ASSERT_EQ(*iter0 == *iter1, true);
-
-    thrust::offset_iterator iter2(v.begin() + 1);
-    ASSERT_EQ(iter0 != iter2, true);
-    ASSERT_EQ(*iter0 != *iter2, true);
-
-    iter2 = iter0;
-    ASSERT_EQ(iter0 == iter2, true);
-    ASSERT_EQ(*iter0 == *iter2, true);
-  }
-
-  // indirect offset
-  {
-    const typename Vector::iterator::difference_type offset = 0;
-    thrust::offset_iterator iter0(v.begin(), &offset);
-
-#if THRUST_COMPILER(MSVC) // MSVC cannot deduce the template arguments from the copy ctor
-    decltype(iter0) iter1(iter0);
-#else // THRUST_COMPILER(MSVC)
-    thrust::offset_iterator iter1(iter0);
-#endif // THRUST_COMPILER(MSVC)
-    ASSERT_EQ(iter0 == iter1, true);
-    ASSERT_EQ(*iter0 == *iter1, true);
-
-    thrust::offset_iterator iter2(v.begin() + 1, &offset);
-    ASSERT_EQ(iter0 != iter2, true);
-    ASSERT_EQ(*iter0 != *iter2, true);
-
-    iter2 = iter0;
-    ASSERT_EQ(iter0 == iter2, true);
-    ASSERT_EQ(*iter0 == *iter2, true);
-  }
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorIncrement)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  auto test = [](auto iter) {
-    ASSERT_EQ(*iter, 0);
-    iter++;
-    ASSERT_EQ(*iter, 1);
-    iter++;
-    iter++;
-    ASSERT_EQ(*iter, 3);
-    iter += 5;
-    ASSERT_EQ(*iter, 8);
-    iter -= 10;
-    ASSERT_EQ(*iter, -2);
-  };
-
-  const Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-  test(thrust::offset_iterator(v.begin() + 1, 1));
-  const typename Vector::iterator::difference_type offset = 1;
-  test(thrust::offset_iterator(v.begin() + 1, &offset));
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorMutation)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  {
-    Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-    thrust::offset_iterator it(v.begin() + 1, 1);
-    *it = 42;
-    ++it;
-    *it = 43;
-    ++it.offset();
-    *it = 44;
-    ASSERT_EQ(v, (Vector{-2, -1, 42, 43, 44, 3, 4, 5, 6, 7, 8}));
-  }
-  {
-    Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-    typename Vector::iterator::difference_type offset = 1;
-    thrust::offset_iterator it(v.begin() + 1, &offset);
-    *it = 42;
-    ++it;
-    *it    = 43;
-    offset = 2;
-    *it    = 44;
-    ASSERT_EQ(v, (Vector{-2, -1, 42, 43, 44, 3, 4, 5, 6, 7, 8}));
-  }
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorComparisonAndDistance)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  auto test = [](auto iter1, auto iter2) {
-    ASSERT_EQ(iter1 == iter2, true);
-    ASSERT_EQ(iter1 - iter2, 0);
-    ASSERT_EQ(thrust::distance(iter1, iter2), 0);
-
-    iter1++;
-    ASSERT_EQ(iter1 == iter2, false);
-    ASSERT_EQ(iter1 - iter2, 1);
-    ASSERT_EQ(thrust::distance(iter1, iter2), -1);
-
-    iter2++;
-    ASSERT_EQ(iter1 == iter2, true);
-    ASSERT_EQ(iter1 - iter2, 0);
-    ASSERT_EQ(thrust::distance(iter1, iter2), 0);
-
-    iter1 += 100;
-    iter2 += 100;
-    ASSERT_EQ(iter1 == iter2, true);
-    ASSERT_EQ(iter1 - iter2, 0);
-    ASSERT_EQ(thrust::distance(iter1, iter2), 0);
-
-    iter1 -= 5;
-    ASSERT_EQ(iter1 == iter2, false);
-    ASSERT_EQ(iter1 - iter2, -5);
-    ASSERT_EQ(thrust::distance(iter1, iter2), 5);
-  };
-
-  Vector v(101);
-  test(thrust::offset_iterator(v.begin()), thrust::offset_iterator(v.begin()));
-  const typename Vector::iterator::difference_type offset = 0;
-  test(thrust::offset_iterator(v.begin(), &offset), thrust::offset_iterator(v.begin(), &offset));
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorLateValue)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  typename Vector::difference_type offset;
-  Vector v{0, 1, 2, 3, 4, 5, 6, 7, 8};
-  thrust::offset_iterator iter(v.begin(), &offset);
-  offset = 2; // we provide the offset value **after** constructing the iterator
-  ASSERT_EQ(*iter, 2);
-}
-
-TYPED_TEST(OffsetIteratorTests, TestOffsetIteratorIndirectValueFancyIterator)
-{
-  using Vector = typename TestFixture::input_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using thrust::placeholders::_1;
-
-  Vector v{0, 1, 2, 3, 4, 5, 6, 7, 8};
-  thrust::device_vector<typename Vector::difference_type> offsets{2};
-  auto it = thrust::make_transform_iterator(offsets.begin(), _1 * 3);
-  thrust::offset_iterator iter(v.begin(), it);
-  ASSERT_EQ(*iter, 6);
-}
diff --git a/projects/rocthrust/test/test_pair.cpp b/projects/rocthrust/test/test_pair.cpp
index ba560553084c..17e07149402c 100644
--- a/projects/rocthrust/test/test_pair.cpp
+++ b/projects/rocthrust/test/test_pair.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -349,6 +349,7 @@ TEST(PairTests, TestPairSwap)
   ASSERT_EQ_QUIET(ref, (swappable_pair) d_v1[0]);
 }
 
+#if THRUST_CPP_DIALECT >= 2017
 TEST(PairTests, TestPairStructuredBindings)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -374,3 +375,4 @@ TEST(PairTests, TestPairCTAD)
   ASSERT_EQ(a, a2);
   ASSERT_EQ(b, b2);
 }
+#endif // THRUST_CPP_DIALECT >= 2017
diff --git a/projects/rocthrust/test/test_partition.cpp b/projects/rocthrust/test/test_partition.cpp
index f590e53feb8e..9440b5826ab3 100644
--- a/projects/rocthrust/test/test_partition.cpp
+++ b/projects/rocthrust/test/test_partition.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 #include <thrust/count.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/iterator/zip_iterator.h>
@@ -27,7 +27,7 @@
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#if THRUST_COMPILER(GCC, >=, 11) && THRUST_COMPILER(GCC, <, 12)
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 110000 && THRUST_GCC_VERSION < 120000
 #  define WAIVE_GCC11_FAILURES
 #endif
 
diff --git a/projects/rocthrust/test/test_partition_point.cpp b/projects/rocthrust/test/test_partition_point.cpp
index 8aa752d15570..ac2f38ae8115 100644
--- a/projects/rocthrust/test/test_partition_point.cpp
+++ b/projects/rocthrust/test/test_partition_point.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/partition.h>
diff --git a/projects/rocthrust/test/test_permutation_iterator.cpp b/projects/rocthrust/test/test_permutation_iterator.cpp
index 68fffe034a9e..4ee229c5691c 100644
--- a/projects/rocthrust/test/test_permutation_iterator.cpp
+++ b/projects/rocthrust/test/test_permutation_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/permutation_iterator.h>
 #include <thrust/reduce.h>
@@ -29,10 +28,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 using IntegralVectorTestsParams =
   ::testing::Types<Params<thrust::host_vector<signed char>>,
                    Params<thrust::host_vector<short>>,
@@ -46,35 +41,11 @@ using IntegralVectorTestsParams =
 TESTS_DEFINE(PermutationIteratorTests, FullTestsParams);
 TESTS_DEFINE(PermutationIteratorIntegralVectorTests, IntegralVectorTestsParams);
 
-// ensure that we properly support thrust::permutation_iterator from _THRUST_STD
-TEST(PermutationIteratorTests, TestPermutationIteratorTraits)
+TEST(PermutationIteratorTests, UsingHip)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it       = thrust::permutation_iterator<base_it, base_it>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = _THRUST_STD::random_access_iterator_tag;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
+  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
 TYPED_TEST(PermutationIteratorTests, TestPermutationIteratorSimple)
@@ -213,7 +184,7 @@ TYPED_TEST(PermutationIteratorIntegralVectorTests, TestPermutationIteratorReduce
     T(0),
     thrust::plus<T>());
   ASSERT_EQ(result2, -19);
-}
+};
 
 TEST(PermutationIteratorTests, TestPermutationIteratorHostDeviceGather)
 {
@@ -327,10 +298,3 @@ TYPED_TEST(PermutationIteratorTests, TestPermutationIteratorWithCountingIterator
     ASSERT_EQ(output, ref);
   }
 }
-
-TEST(PermutationIteratorTests, UsingHip)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
-}
diff --git a/projects/rocthrust/test/test_random.cpp b/projects/rocthrust/test/test_random.cpp
index cc497ba40283..918cd2c7ae44 100644
--- a/projects/rocthrust/test/test_random.cpp
+++ b/projects/rocthrust/test/test_random.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -235,7 +235,7 @@ struct ValidateDistributionUnqual
   Distribution d0, d1;
 };
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 TEST(RandomTests, UsingHip)
 {
diff --git a/projects/rocthrust/test/test_raw_reference_cast.cpp b/projects/rocthrust/test/test_raw_reference_cast.cpp
deleted file mode 100644
index 6cd45ea8b1f5..000000000000
--- a/projects/rocthrust/test/test_raw_reference_cast.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/detail/raw_reference_cast.h>
-#include <thrust/device_vector.h>
-#include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/zip_iterator.h>
-
-#include <vector>
-
-#include "test_param_fixtures.hpp"
-#include "test_utils.hpp"
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-TESTS_DEFINE(RawReferenceCastTests, FullTestsParams);
-
-template <>
-struct thrust::detail::is_proxy_reference<std::vector<bool>::reference> : true_type
-{};
-
-TEST(RawReferenceCastTests, TestRawReferenceCast)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using _THRUST_STD::is_same_v;
-
-  {
-    [[maybe_unused]] int i        = 42;
-    [[maybe_unused]] const int ci = 42;
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(i)), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(ci)), const int&>);
-  }
-  {
-    [[maybe_unused]] thrust::host_vector<int> vec(1);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.begin())), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.cbegin())), const int&>);
-
-    [[maybe_unused]] auto zip = thrust::make_zip_iterator(vec.begin(), vec.begin());
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip)), thrust::detail::tuple_of_iterator_references<int&, int&>>);
-
-    [[maybe_unused]] auto zip2 = thrust::make_zip_iterator(zip, zip);
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip2)),
-                thrust::detail::tuple_of_iterator_references<thrust::detail::tuple_of_iterator_references<int&, int&>,
-                                                             thrust::detail::tuple_of_iterator_references<int&, int&>>>);
-  }
-  {
-    [[maybe_unused]] thrust::device_vector<int> vec(1);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.begin())), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.cbegin())), const int&>);
-
-    [[maybe_unused]] auto zip = thrust::make_zip_iterator(vec.begin(), vec.begin());
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip)), thrust::detail::tuple_of_iterator_references<int&, int&>>);
-
-    [[maybe_unused]] auto zip2 = thrust::make_zip_iterator(zip, zip);
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip2)),
-                thrust::detail::tuple_of_iterator_references<thrust::detail::tuple_of_iterator_references<int&, int&>,
-                                                             thrust::detail::tuple_of_iterator_references<int&, int&>>>);
-  }
-
-  // proxy references
-  {
-    [[maybe_unused]] std::vector<bool> vb;
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(vb[0])), std::vector<bool>::reference>);
-  }
-}
diff --git a/projects/rocthrust/test/test_remove.cpp b/projects/rocthrust/test/test_remove.cpp
index 9a4e07fbbc8c..c8e86c51b52f 100644
--- a/projects/rocthrust/test/test_remove.cpp
+++ b/projects/rocthrust/test/test_remove.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/count.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
@@ -98,7 +97,6 @@ ForwardIterator remove(my_tag, ForwardIterator first, ForwardIterator, const T&)
 TEST(RemoveTests, TestRemoveDispatchImplicit)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
   thrust::device_vector<int> vec(1);
 
   thrust::remove(thrust::retag<my_tag>(vec.begin()), thrust::retag<my_tag>(vec.begin()), 0);
@@ -478,7 +476,7 @@ TYPED_TEST(RemoveVariableTests, TestRemoveIfStencil)
       thrust::device_vector<T> d_data = h_data;
 
       thrust::host_vector<bool> h_stencil = get_random_data<bool>(
-        size, get_default_limits<bool>::min(), get_default_limits<bool>::max(), seed + seed_value_addition);
+        size, std::numeric_limits<bool>::min(), std::numeric_limits<bool>::max(), seed + seed_value_addition);
       thrust::device_vector<bool> d_stencil = h_stencil;
 
       size_t h_size = thrust::remove_if(h_data.begin(), h_data.end(), h_stencil.begin(), is_true<T>()) - h_data.begin();
@@ -702,8 +700,8 @@ TYPED_TEST(RemoveVariableTests, TestRemoveCopyIfStencil)
         get_random_data<T>(size, get_default_limits<T>::min(), get_default_limits<T>::max(), seed);
       thrust::device_vector<T> d_data = h_data;
 
-      thrust::host_vector<bool> h_stencil = get_random_data<bool>(
-        size, get_default_limits<bool>::min(), get_default_limits<bool>::max(), seed + seed_value_addition);
+      thrust::host_vector<bool> h_stencil =
+        get_random_data<bool>(size, get_default_limits<bool>::min(), get_default_limits<bool>::max(), seed);
       thrust::device_vector<bool> d_stencil = h_stencil;
 
       thrust::host_vector<T> h_result(size);
@@ -763,3 +761,41 @@ TYPED_TEST(RemoveVariableTests, TestRemoveCopyIfStencilToDiscardIterator)
     }
   }
 }
+
+__global__ THRUST_HIP_LAUNCH_BOUNDS_DEFAULT void RemoveKernel(int const N, int* array, int remove_value)
+{
+  if (threadIdx.x == 0)
+  {
+    thrust::device_ptr<int> begin(array);
+    thrust::device_ptr<int> end(array + N);
+    thrust::remove(thrust::hip::par, begin, end, remove_value) - begin;
+  }
+}
+
+TEST(RemoveTests, TestRemoveDevice)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  for (auto size : get_sizes())
+  {
+    SCOPED_TRACE(testing::Message() << "with size= " << size);
+
+    for (auto seed : get_seeds())
+    {
+      SCOPED_TRACE(testing::Message() << "with seed= " << seed);
+
+      thrust::host_vector<int> h_data   = get_random_data<int>(size, 0, size, seed);
+      thrust::device_vector<int> d_data = h_data;
+
+      int remove_value = get_random_data<int>(1, 0, size, seed)[0];
+      SCOPED_TRACE(testing::Message() << "with remove_value= " << remove_value);
+
+      thrust::remove(h_data.begin(), h_data.end(), remove_value);
+      hipLaunchKernelGGL(
+        RemoveKernel, dim3(1, 1, 1), dim3(128, 1, 1), 0, 0, size, thrust::raw_pointer_cast(&d_data[0]), remove_value);
+      HIP_CHECK(hipGetLastError());
+
+      ASSERT_EQ(h_data, d_data);
+    }
+  }
+}
diff --git a/projects/rocthrust/test/test_replace.cpp b/projects/rocthrust/test/test_replace.cpp
index 0adec3330e1e..c90ff3eef2f7 100644
--- a/projects/rocthrust/test/test_replace.cpp
+++ b/projects/rocthrust/test/test_replace.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,14 +25,20 @@
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 #endif
 
+// GCC 12 + omp + c++11 miscompiles some test cases and emits spurious warnings.
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ == 12 && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_OMP \
+  && THRUST_CPP_DIALECT == 2011
+#  define THRUST_GCC12_OMP_MISCOMPILE
+#endif
+
 // New GCC, new miscompile. 13 + TBB this time.
-#if THRUST_COMPILER(GCC, ==, 13) && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_TBB
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ == 13 && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_TBB
 #  define THRUST_GCC13_TBB_MISCOMPILE
 #endif
 
@@ -127,6 +133,7 @@ TYPED_TEST(PrimitiveReplaceTests, TestReplace)
 }
 
 #ifndef THRUST_GCC13_TBB_MISCOMPILE
+#  ifndef THRUST_GCC12_OMP_MISCOMPILE
 TYPED_TEST(ReplaceTests, TestReplaceCopySimple)
 {
   using Vector = typename TestFixture::input_type;
@@ -144,6 +151,7 @@ TYPED_TEST(ReplaceTests, TestReplaceCopySimple)
   Vector result{4, 5, 4, 3, 5};
   ASSERT_EQ(dest, result);
 }
+#  endif
 #endif
 
 template <typename InputIterator, typename OutputIterator, typename T>
diff --git a/projects/rocthrust/test/test_reverse.cpp b/projects/rocthrust/test/test_reverse.cpp
index 0e061c6f9d5e..46b971b5fe28 100644
--- a/projects/rocthrust/test/test_reverse.cpp
+++ b/projects/rocthrust/test/test_reverse.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -101,14 +101,6 @@ TYPED_TEST(ReverseTests, TestReverseCopySimple)
 
   using Vector = typename TestFixture::input_type;
 
-#if THRUST_COMPILER(GCC, >=, 8) && THRUST_COMPILER(GCC, <, 10)
-
-  if (typeid(Vector) == typeid(thrust::host_vector<custom_numeric>))
-  {
-    KNOWN_FAILURE // WAR NVBug 2481122
-  }
-#endif // THRUST_COMPILER(GCC, >=, 8) && THRUST_COMPILER(GCC, <, 10)
-
   using Iterator = typename Vector::iterator;
 
   Vector input{1, 2, 3, 4, 5};
diff --git a/projects/rocthrust/test/test_reverse_iterator.cpp b/projects/rocthrust/test/test_reverse_iterator.cpp
index b64099e71d73..7189809878df 100644
--- a/projects/rocthrust/test/test_reverse_iterator.cpp
+++ b/projects/rocthrust/test/test_reverse_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/reverse_iterator.h>
 #include <thrust/scan.h>
 #include <thrust/sequence.h>
@@ -26,10 +25,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 TESTS_DEFINE(ReverseIteratorTests, FullTestsParams);
 
 TESTS_DEFINE(PrimitiveReverseIteratorTests, NumericalTestsParams);
@@ -41,37 +36,6 @@ TEST(ReverseIteratorTests, UsingHip)
   ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(ReverseIteratorTests, TestReverseIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it       = thrust::reverse_iterator<base_it>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = _THRUST_STD::random_access_iterator_tag;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 TEST(ReverseIteratorTests, TestReverseIteratorCopyConstructor)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
diff --git a/projects/rocthrust/test/test_scan.cpp b/projects/rocthrust/test/test_scan.cpp
index a86a9fd2fcaf..445aa38538df 100644
--- a/projects/rocthrust/test/test_scan.cpp
+++ b/projects/rocthrust/test/test_scan.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 #include <thrust/detail/config.h>
 
-#include <thrust/detail/libcxx_wrapper/__functional/maximum.h>
 #include <thrust/device_free.h>
 #include <thrust/device_malloc.h>
 #include <thrust/functional.h>
@@ -30,15 +29,8 @@
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(functional)
-#endif
 #include _THRUST_STD_INCLUDE(array)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
 TESTS_DEFINE(ScanTests, FullTestsParams);
 
 TESTS_DEFINE(ScanVariablesTests, NumericalTestsParams);
@@ -50,6 +42,15 @@ using MixedParams = ::testing::Types<Params<std::tuple<thrust::host_vector<int>,
 
 TESTS_DEFINE(ScanMixedTests, MixedParams);
 
+template <typename T>
+struct max_functor
+{
+  THRUST_HOST_DEVICE T operator()(T rhs, T lhs) const
+  {
+    return thrust::max(rhs, lhs);
+  }
+};
+
 TYPED_TEST(ScanVectorTests, TestScanSimple)
 {
   using Vector = typename TestFixture::input_type;
@@ -350,12 +351,12 @@ TYPED_TEST(ScanVariablesTests, TestScanWithOperator)
       thrust::host_vector<T> h_output(size);
       thrust::device_vector<T> d_output(size);
 
-      thrust::inclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), ::internal::maximum<T>{});
-      thrust::inclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), ::internal::maximum<T>{});
+      thrust::inclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), max_functor<T>());
+      thrust::inclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), max_functor<T>());
       ASSERT_EQ(d_output, h_output);
 
-      thrust::exclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), T(13), ::internal::maximum<T>{});
-      thrust::exclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), T(13), ::internal::maximum<T>{});
+      thrust::exclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), T(13), max_functor<T>());
+      thrust::exclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), T(13), max_functor<T>());
       ASSERT_EQ(d_output, h_output);
     }
   }
@@ -381,20 +382,20 @@ TYPED_TEST(ScanVariablesTests, TestScanWithOperatorToDiscardIterator)
 
       thrust::discard_iterator<> reference(size);
 
-      thrust::discard_iterator<> h_result = thrust::inclusive_scan(
-        h_input.begin(), h_input.end(), thrust::make_discard_iterator(), ::internal::maximum<T>{});
+      thrust::discard_iterator<> h_result =
+        thrust::inclusive_scan(h_input.begin(), h_input.end(), thrust::make_discard_iterator(), max_functor<T>());
 
-      thrust::discard_iterator<> d_result = thrust::inclusive_scan(
-        d_input.begin(), d_input.end(), thrust::make_discard_iterator(), ::internal::maximum<T>{});
+      thrust::discard_iterator<> d_result =
+        thrust::inclusive_scan(d_input.begin(), d_input.end(), thrust::make_discard_iterator(), max_functor<T>());
 
       ASSERT_EQ_QUIET(reference, h_result);
       ASSERT_EQ_QUIET(reference, d_result);
 
       h_result = thrust::exclusive_scan(
-        h_input.begin(), h_input.end(), thrust::make_discard_iterator(), T(13), ::internal::maximum<T>{});
+        h_input.begin(), h_input.end(), thrust::make_discard_iterator(), T(13), max_functor<T>());
 
       d_result = thrust::exclusive_scan(
-        d_input.begin(), d_input.end(), thrust::make_discard_iterator(), T(13), ::internal::maximum<T>{});
+        d_input.begin(), d_input.end(), thrust::make_discard_iterator(), T(13), max_functor<T>());
 
       ASSERT_EQ_QUIET(reference, h_result);
       ASSERT_EQ_QUIET(reference, d_result);
@@ -770,29 +771,24 @@ struct only_set_when_expected_it
   }
 };
 
-namespace std
-{
+THRUST_NAMESPACE_BEGIN
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
-  using value_type      = long long;
-  using reference       = only_set_when_expected_it;
-  using difference_type = _THRUST_STD::ptrdiff_t;
+  using value_type = long long;
+  using reference  = only_set_when_expected_it;
 };
-} // namespace std
+THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-_THRUST_STD_NAMESPACE_BEGIN
+namespace std
+{
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
-  using value_type        = long long;
-  using reference         = only_set_when_expected_it;
-  using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
+  using value_type = long long;
+  using reference  = only_set_when_expected_it;
 };
-_THRUST_STD_NAMESPACE_END
-#endif
+} // namespace std
 
 void TestInclusiveScanWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/rocthrust/test/test_set_difference.cpp b/projects/rocthrust/test/test_set_difference.cpp
index 7a6e34a79a4c..0644a5dd4894 100644
--- a/projects/rocthrust/test/test_set_difference.cpp
+++ b/projects/rocthrust/test/test_set_difference.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -230,7 +230,7 @@ TYPED_TEST(SetDifferencePrimitiveTests, TestSetDifferenceMultiset)
 
 // FIXME: disabled on Windows, because it causes a failure on the internal CI system in one specific configuration.
 // That failure will be tracked in a new NVBug, this is disabled to unblock submitting all the other changes.
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 void TestSetDifferenceWithBigIndexesHelper(int magnitude)
 {
   thrust::counting_iterator<long long> begin(0);
diff --git a/projects/rocthrust/test/test_set_intersection.cpp b/projects/rocthrust/test/test_set_intersection.cpp
index 5a87476cb816..9659b5fab620 100644
--- a/projects/rocthrust/test/test_set_intersection.cpp
+++ b/projects/rocthrust/test/test_set_intersection.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -279,7 +279,7 @@ TYPED_TEST(SetIntersectionPrimitiveTests, TestSetIntersectionMultiset)
 
 // FIXME: disabled on Windows, because it causes a failure on the internal CI system in one specific configuration.
 // That failure will be tracked in a new NVBug, this is disabled to unblock submitting all the other changes.
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 void TestSetDifferenceWithBigIndexesHelper(int magnitude)
 {
   thrust::counting_iterator<long long> begin1(0);
diff --git a/projects/rocthrust/test/test_sort_permutation_iterator.cpp b/projects/rocthrust/test/test_sort_permutation_iterator.cpp
index b2972b15c850..b303a2918bca 100644
--- a/projects/rocthrust/test/test_sort_permutation_iterator.cpp
+++ b/projects/rocthrust/test/test_sort_permutation_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ template <typename Iterator>
 class strided_range
 {
 public:
-  using difference_type = thrust::detail::it_difference_t<Iterator>;
+  using difference_type = typename thrust::iterator_difference<Iterator>::type;
 
   struct stride_functor
   {
diff --git a/projects/rocthrust/test/test_tabulate.cpp b/projects/rocthrust/test/test_tabulate.cpp
index 945f6c60c69c..7b249344d2fe 100644
--- a/projects/rocthrust/test/test_tabulate.cpp
+++ b/projects/rocthrust/test/test_tabulate.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
@@ -104,6 +103,34 @@ TYPED_TEST(TabulateVectorTests, TestTabulateSimple)
   ASSERT_EQ(v, ref);
 }
 
+template <class OutputType>
+struct nonconst_op
+{
+  THRUST_HIP_FUNCTION
+  OutputType operator()(size_t idx)
+  {
+    return (OutputType) (idx >= 3);
+  }
+};
+
+TYPED_TEST(TabulateTests, TestTabulateSimpleNonConstOP)
+{
+  using Vector = typename TestFixture::input_type;
+  using T      = typename Vector::value_type;
+
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  Vector v(5);
+
+  thrust::tabulate(v.begin(), v.end(), nonconst_op<T>());
+
+  ASSERT_EQ(v[0], T(0));
+  ASSERT_EQ(v[1], T(0));
+  ASSERT_EQ(v[2], T(0));
+  ASSERT_EQ(v[3], T(1));
+  ASSERT_EQ(v[4], T(1));
+}
+
 TYPED_TEST(TabulatePrimitiveTests, TestTabulate)
 {
   using T = typename TestFixture::input_type;
@@ -145,31 +172,3 @@ TEST(TabulateTests, TestTabulateToDiscardIterator)
 
   // nothing to check -- just make sure it compiles
 }
-
-template <typename OutputType>
-struct nonconst_op
-{
-  THRUST_HIP_FUNCTION
-  OutputType operator()(size_t idx)
-  {
-    return (OutputType) (idx >= 3);
-  }
-};
-
-TYPED_TEST(TabulateTests, TestTabulateSimpleNonConstOP)
-{
-  using Vector = typename TestFixture::input_type;
-  using T      = typename Vector::value_type;
-
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  Vector v(5);
-
-  thrust::tabulate(v.begin(), v.end(), nonconst_op<T>());
-
-  ASSERT_EQ(v[0], 0);
-  ASSERT_EQ(v[1], 0);
-  ASSERT_EQ(v[2], 0);
-  ASSERT_EQ(v[3], 1);
-  ASSERT_EQ(v[4], 1);
-}
diff --git a/projects/rocthrust/test/test_tabulate_output_iterator.cpp b/projects/rocthrust/test/test_tabulate_output_iterator.cpp
index 788f9c633194..98725ea4559b 100644
--- a/projects/rocthrust/test/test_tabulate_output_iterator.cpp
+++ b/projects/rocthrust/test/test_tabulate_output_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2024 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
 #include <thrust/gather.h>
@@ -34,10 +33,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 using VectorTestsParams = ::testing::Types<
   Params<thrust::host_vector<signed char>>,
   Params<thrust::host_vector<short>>,
@@ -117,42 +112,6 @@ struct index_to_gather_index_op
   }
 };
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(TabulateOutputIteratorTests, TestTabulateOutputIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using base_it = thrust::host_vector<int>::iterator;
-  using Op      = host_write_op<base_it>;
-
-  using it       = thrust::tabulate_output_iterator<Op>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(
-    _THRUST_STD::is_same_v<traits::reference, thrust::detail::tabulate_output_iterator_proxy<Op, ptrdiff_t>>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-  // FIXME(bgruber): all up to and including random access should be true
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(!_THRUST_STD::input_iterator<it>);
-  static_assert(!_THRUST_STD::forward_iterator<it>);
-  static_assert(!_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(!_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 TYPED_TEST(TabulateOutputIteratorVectorTests, TestTabulateOutputIterator)
 {
   using Vector = typename TestFixture::input_type;
diff --git a/projects/rocthrust/test/test_transform.cpp b/projects/rocthrust/test/test_transform.cpp
index a1f8ad3480c5..eeaa4668c29f 100644
--- a/projects/rocthrust/test/test_transform.cpp
+++ b/projects/rocthrust/test/test_transform.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
@@ -31,7 +31,7 @@
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
@@ -935,7 +935,7 @@ TYPED_TEST(TransformInOutTests, TestTransformIfBinaryToDiscardIterator) THRUST_D
   }
 }
 
-#if ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) == 40400) || defined(__INTEL_COMPILER)
+#if ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) == 40400) || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
 TYPED_TEST(TransformInOutTests, TestTransformUnaryCountingIterator) THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -957,18 +957,18 @@ TYPED_TEST(TransformInOutTests, TestTransformUnaryCountingIterator) THRUST_DISAB
 
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  size_t const size = 15 * sizeof(T);
+  size_t const n = 15 * sizeof(T);
 
-  ASSERT_LE(T(size), truncate_to_max_representable<T>(size));
+  ASSERT_LE(T(n), truncate_to_max_representable<T>(n));
 
   thrust::counting_iterator<T, thrust::host_system_tag> h_first   = thrust::make_counting_iterator<T>(0);
   thrust::counting_iterator<T, thrust::device_system_tag> d_first = thrust::make_counting_iterator<T>(0);
 
-  thrust::host_vector<U> h_result(size);
-  thrust::device_vector<U> d_result(size);
+  thrust::host_vector<U> h_result(n);
+  thrust::device_vector<U> d_result(n);
 
-  thrust::transform(h_first, h_first + size, h_result.begin(), ::internal::identity{});
-  thrust::transform(d_first, d_first + size, d_result.begin(), ::internal::identity{});
+  thrust::transform(h_first, h_first + n, h_result.begin(), ::internal::identity{});
+  thrust::transform(d_first, d_first + n, d_result.begin(), ::internal::identity{});
 
   ASSERT_EQ(h_result, d_result);
 }
diff --git a/projects/rocthrust/test/test_transform_input_output_iterator.cpp b/projects/rocthrust/test/test_transform_input_output_iterator.cpp
index 7f2ed77a9b38..a73533ca7605 100644
--- a/projects/rocthrust/test/test_transform_input_output_iterator.cpp
+++ b/projects/rocthrust/test/test_transform_input_output_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_input_output_iterator.h>
@@ -28,16 +26,11 @@
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 // There is an unfortunate miscompilation of the gcc-13 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 13)
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 13
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
-#else // THRUST_COMPILER(GCC, <, 13)
+#else // defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ < 13
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 #endif
 
@@ -71,39 +64,6 @@ using IntegralTypes = ::testing::Types<
 TESTS_DEFINE(TransformInputOutputIteratorVectorTests, VectorTestsParams);
 TESTS_DEFINE(TransformInputOutputIteratorVariableUnitTests, IntegralTypes);
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(TransformInputOutputIteratorVectorTests, TestTransformInputOutputIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using input_func  = thrust::negate<int>;
-  using output_func = thrust::square<int>;
-  using base_it     = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::transform_input_output_iterator<input_func, output_func, base_it>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::transform_input_output_iterator_proxy<input_func, output_func, base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 TYPED_TEST(TransformInputOutputIteratorVectorTests, TestTransformInputOutputIterator)
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 {
diff --git a/projects/rocthrust/test/test_transform_iterator.cpp b/projects/rocthrust/test/test_transform_iterator.cpp
index d18fce851622..5e4862e2af4f 100644
--- a/projects/rocthrust/test/test_transform_iterator.cpp
+++ b/projects/rocthrust/test/test_transform_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,13 +15,17 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/config.h>
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+// suppress warnings on thrust::identity
+THRUST_SUPPRESS_DEPRECATED_PUSH
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
-#include <thrust/logical.h>
 #include <thrust/reduce.h>
 #include <thrust/sequence.h>
 #include <thrust/universal_vector.h>
@@ -35,10 +39,14 @@
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <functional>
-#  include <iterator>
 #  include <type_traits>
+#  include <utility>
 #endif
 
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+
 using VectorTestsParams = ::testing::Types<
   Params<thrust::host_vector<signed char>>,
   Params<thrust::host_vector<short>>,
@@ -55,40 +63,16 @@ using VectorTestsParams = ::testing::Types<
 
 TESTS_DEFINE(TransformIteratorTests, FullTestsParams);
 TESTS_DEFINE(PrimitiveTransformIteratorTests, NumericalTestsParams);
-TESTS_DEFINE(TransformIteratorVectorTests, VectorTestsParams);
+TESTS_DEFINE(VectorTransformIteratorTests, VectorTestsParams);
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(TransformIteratorTests, TestTransformIteratorTraits)
+TEST(TransformIteratorTests, UsingHip)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
-  using func    = thrust::negate<int>;
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it     = thrust::transform_iterator<func, base_it>;
-  using traits = _THRUST_STD::iterator_traits<it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
+  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
-TYPED_TEST(TransformIteratorVectorTests, TestTransformIterator)
+TYPED_TEST(VectorTransformIteratorTests, TestTransformIterator)
 {
   using Vector = typename TestFixture::input_type;
   using T      = typename Vector::value_type;
@@ -113,7 +97,7 @@ TYPED_TEST(TransformIteratorVectorTests, TestTransformIterator)
   ASSERT_EQ(output, ref);
 }
 
-TYPED_TEST(TransformIteratorVectorTests, TestMakeTransformIterator)
+TYPED_TEST(VectorTransformIteratorTests, TestMakeTransformIterator)
 {
   using Vector = typename TestFixture::input_type;
   using T      = typename Vector::value_type;
@@ -175,6 +159,8 @@ struct ExtractValue
 
 TEST(TransformIteratorTests, TestTransformIteratorNonCopyable)
 {
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
   thrust::host_vector<std::unique_ptr<int>> hv(4);
   hv[0].reset(new int{1});
   hv[1].reset(new int{2});
@@ -188,6 +174,24 @@ TEST(TransformIteratorTests, TestTransformIteratorNonCopyable)
   ASSERT_EQ(transformed[3], 4);
 }
 
+struct DeviceOp
+{
+  __device__ int operator()(int)
+  {
+    return int{};
+  }
+};
+
+/// Tests compilation of device-only operators.
+TEST(TransformIteratorTests, TestDeviceOperator)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  thrust::device_vector<int> dv(1);
+  auto iter = thrust::make_transform_iterator(dv.begin(), DeviceOp{});
+  THRUST_UNUSED_VAR(iter);
+}
+
 struct flip_value
 {
   THRUST_HOST_DEVICE bool operator()(bool b) const
@@ -216,6 +220,10 @@ struct forward
 
 TEST(TransformIteratorTests, TestTransformIteratorReferenceAndValueType)
 {
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
   using _THRUST_STD::is_same;
   using _THRUST_STD::negate;
   {
@@ -240,6 +248,11 @@ TEST(TransformIteratorTests, TestTransformIteratorReferenceAndValueType)
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
@@ -269,6 +282,11 @@ TEST(TransformIteratorTests, TestTransformIteratorReferenceAndValueType)
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
@@ -298,42 +316,37 @@ TEST(TransformIteratorTests, TestTransformIteratorReferenceAndValueType)
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_ide = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_ide)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_ide)::value_type, bool>::value, "");
+    (void) it_tr_ide;
+
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
     static_assert(is_same<decltype(it_tr_cid)::value_type, bool>::value, "");
     (void) it_tr_cid;
   }
+  THRUST_SUPPRESS_DEPRECATED_POP
 }
 
 TEST(TransformIteratorTests, TestTransformIteratorIdentity)
 {
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
   thrust::device_vector<int> v(3, 42);
 
+  ASSERT_EQ(*thrust::make_transform_iterator(v.begin(), thrust::identity<int>{}), 42);
+  ASSERT_EQ(*thrust::make_transform_iterator(v.begin(), thrust::identity<>{}), 42);
   ASSERT_EQ(*thrust::make_transform_iterator(v.begin(), ::internal::identity{}), 42);
   using namespace thrust::placeholders;
   ASSERT_EQ(*thrust::make_transform_iterator(v.begin(), _1), 42);
-}
-
-TEST(TransformIteratorTests, UsingHip)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
-}
-
-struct DeviceOp
-{
-  __device__ int operator()(int)
-  {
-    return int{};
-  }
-};
-
-/// Tests compilation of device-only operators.
-TEST(TransformIteratorTests, TestDeviceOperator)
-{
-  thrust::device_vector<int> dv(1);
-  auto iter = thrust::make_transform_iterator(dv.begin(), DeviceOp{});
-  (void) iter;
+  THRUST_SUPPRESS_DEPRECATED_POP
 }
diff --git a/projects/rocthrust/test/test_transform_output_iterator.cpp b/projects/rocthrust/test/test_transform_output_iterator.cpp
index 225a34fe9f44..4da0eeca7156 100644
--- a/projects/rocthrust/test/test_transform_output_iterator.cpp
+++ b/projects/rocthrust/test/test_transform_output_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
 #include <thrust/host_vector.h>
@@ -29,11 +28,6 @@
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 using VectorTestsParams = ::testing::Types<
   Params<thrust::host_vector<signed char>>,
   Params<thrust::host_vector<short>>,
@@ -54,39 +48,6 @@ using SignedIntegralTestsParams =
 TESTS_DEFINE(TransformOutputIteratorVectorTests, VectorTestsParams);
 TESTS_DEFINE(TransformOutputIteratorSignedIntegralTests, SignedIntegralTestsParams);
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(TransformOutputIteratorVectorTests, TestTransformOutputIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using func    = thrust::negate<int>;
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::transform_output_iterator<func, base_it>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::transform_output_iterator_proxy<func, base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  // FIXME(bgruber): all up to and including random access should be true
-  static_assert(!_THRUST_STD::input_iterator<it>);
-  static_assert(!_THRUST_STD::forward_iterator<it>);
-  static_assert(!_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(!_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 TYPED_TEST(TransformOutputIteratorVectorTests, TestTransformOutputIterator)
 {
   using Vector = typename TestFixture::input_type;
diff --git a/projects/rocthrust/test/test_transform_scan.cpp b/projects/rocthrust/test/test_transform_scan.cpp
index 031a4c7d70c3..4ee2e0803e0b 100644
--- a/projects/rocthrust/test/test_transform_scan.cpp
+++ b/projects/rocthrust/test/test_transform_scan.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
diff --git a/projects/rocthrust/test/test_trivial_sequence.cpp b/projects/rocthrust/test/test_trivial_sequence.cpp
index 15c066f0acf4..64e551893f4c 100644
--- a/projects/rocthrust/test/test_trivial_sequence.cpp
+++ b/projects/rocthrust/test/test_trivial_sequence.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,10 +24,6 @@
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 using VectorTestsParams = ::testing::Types<
   Params<thrust::host_vector<signed char>>,
   Params<thrust::host_vector<short>>,
@@ -50,7 +46,7 @@ void test_func(Iterator first, Iterator last)
   using System = typename thrust::iterator_system<Iterator>::type;
   System system;
   thrust::detail::trivial_sequence<Iterator, System> ts(system, first, last);
-  using ValueType = typename _THRUST_STD::iterator_traits<Iterator>::value_type;
+  using ValueType = typename thrust::iterator_traits<Iterator>::value_type;
 
   ASSERT_EQ_QUIET((ValueType) ts.begin()[0], ValueType(0, 11));
   ASSERT_EQ_QUIET((ValueType) ts.begin()[1], ValueType(2, 11));
diff --git a/projects/rocthrust/test/test_tuple.cpp b/projects/rocthrust/test/test_tuple.cpp
index f8f10b06c3d5..f0de36c9fc34 100644
--- a/projects/rocthrust/test/test_tuple.cpp
+++ b/projects/rocthrust/test/test_tuple.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2024 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/config/namespace.h>
 #include <thrust/generate.h>
 #include <thrust/swap.h>
 #include <thrust/tuple.h>
@@ -30,6 +29,11 @@
 
 TESTS_DEFINE(TupleTests, NumericalTestsParams);
 
+// Yes we're using 'thrust::null_type', I don't care >:(
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+THRUST_SUPPRESS_DEPRECATED_PUSH
+#endif
+
 TYPED_TEST(TupleTests, TestTupleConstructor)
 {
   using T = typename TestFixture::input_type;
@@ -508,11 +512,7 @@ TEST(TupleTests, TestTupleSwap)
   thrust::tuple<int, int, int> t1(a, b, c);
   thrust::tuple<int, int, int> t2(x, y, z);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   using _THRUST_STD::swap;
-#else
-  using THRUST_NS_QUALIFIER::swap;
-#endif
   swap(t1, t2);
 
   ASSERT_EQ(x, thrust::get<0>(t1));
@@ -538,6 +538,7 @@ TEST(TupleTests, TestTupleSwap)
   ASSERT_EQ_QUIET(ref, (swappable_tuple) d_v1[0]);
 }
 
+#if THRUST_CPP_DIALECT >= 2017
 TEST(TupleTests, TestTupleStructuredBindings)
 {
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
@@ -567,21 +568,108 @@ TEST(TupleTests, TestTupleCTAD)
   ASSERT_EQ(b, b2);
   ASSERT_EQ(c, c2);
 }
+#endif // THRUST_CPP_DIALECT >= 2017
 
-TEST(TupleTests, TestTupleOfIteratorReferenceAssignsFromConst)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  // tuple of mutable references
-  thrust::device_vector<int> v(10);
-  using devref = decltype(v[0]);
-  auto refs    = thrust::detail::tuple_of_iterator_references<devref>{thrust::tuple<devref>(v[0])};
-
-  // tuple of const references
-  const thrust::device_vector<int> cv(10);
-  using devcref = decltype(cv[0]);
-  auto crefs    = thrust::detail::tuple_of_iterator_references<devcref>{thrust::tuple<devcref>(cv[0])};
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif
 
-  // should compile:
-  refs = crefs;
-}
+// Ensure that we are backwards compatible with the old thrust::tuple implementation
+THRUST_SUPPRESS_DEPRECATED_PUSH
+static_assert(
+  thrust::tuple_size<thrust::tuple<thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 0,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 1,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 2,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 3,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 4,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 5,
+  "");
+static_assert(
+  thrust::tuple_size<
+    thrust::
+      tuple<int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type, thrust::null_type>>::value
+    == 6,
+  "");
+static_assert(
+  thrust::tuple_size<
+    thrust::tuple<int, int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type>>::value
+    == 7,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, thrust::null_type, thrust::null_type>>::value
+    == 8,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, thrust::null_type>>::value == 9, "");
+static_assert(thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, int>>::value == 10, "");
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/test/test_tuple_algorithms.cpp b/projects/rocthrust/test/test_tuple_algorithms.cpp
new file mode 100644
index 000000000000..4648c102f0b8
--- /dev/null
+++ b/projects/rocthrust/test/test_tuple_algorithms.cpp
@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/tuple_algorithms.h>
+#include <thrust/type_traits/integer_sequence.h>
+
+#include "test_param_fixtures.hpp"
+#include "test_real_assertions.hpp"
+#include "test_utils.hpp"
+
+// FIXME: Replace with C++14 style `thrust::square<>` when we have it.
+struct custom_square
+{
+  template <typename T>
+  THRUST_HOST_DEVICE T operator()(T v) const
+  {
+    return v * v;
+  }
+};
+
+struct custom_square_inplace
+{
+  template <typename T>
+  THRUST_HOST_DEVICE void operator()(T& v) const
+  {
+    v *= v;
+  }
+};
+
+TEST(TupleAlgorithmsTests, test_tuple_subset)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  auto t0 = std::make_tuple(0, 2, 3.14);
+
+  auto t1 = thrust::tuple_subset(t0, thrust::index_sequence<2, 0>{});
+
+  ASSERT_EQ_QUIET(t1, std::make_tuple(3.14, 0));
+}
+
+TEST(TupleAlgorithmsTests, test_tuple_transform)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  auto t0 = std::make_tuple(0, 2, 3.14);
+
+  auto t1 = thrust::tuple_transform(t0, custom_square{});
+
+  ASSERT_EQ_QUIET(t1, std::make_tuple(0, 4, 9.8596));
+}
+
+TEST(TupleAlgorithmsTests, test_tuple_for_each)
+{
+  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
+
+  auto t = std::make_tuple(0, 2, 3.14);
+
+  thrust::tuple_for_each(t, custom_square_inplace{});
+
+  ASSERT_EQ_QUIET(t, std::make_tuple(0, 4, 9.8596));
+}
diff --git a/projects/rocthrust/test/test_tuple_reduce.cpp b/projects/rocthrust/test/test_tuple_reduce.cpp
index 02de880ea638..0a67781d96f5 100644
--- a/projects/rocthrust/test/test_tuple_reduce.cpp
+++ b/projects/rocthrust/test/test_tuple_reduce.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ TYPED_TEST(TupleReduceTests, TestTupleReduce)
 
       // zip up the data
       host_vector<tuple<T, T>> h_tuples(size);
-      thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
+      transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
 
       // copy to device
       device_vector<tuple<T, T>> d_tuples = h_tuples;
diff --git a/projects/rocthrust/test/test_tuple_scan.cpp b/projects/rocthrust/test/test_tuple_scan.cpp
index 8a4fb5b2ebe1..5ffe4f6b67b3 100644
--- a/projects/rocthrust/test/test_tuple_scan.cpp
+++ b/projects/rocthrust/test/test_tuple_scan.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ TYPED_TEST(TupleScanTests, TestTupleScan)
 
     // initialize input
     host_vector<tuple<T, T>> h_input(size);
-    thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_input.begin(), MakeTupleFunctor());
+    transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_input.begin(), MakeTupleFunctor());
     device_vector<tuple<T, T>> d_input = h_input;
 
     // allocate output
diff --git a/projects/rocthrust/test/test_tuple_sort.cpp b/projects/rocthrust/test/test_tuple_sort.cpp
index 83ed8656f71b..5b77e6e7515f 100644
--- a/projects/rocthrust/test/test_tuple_sort.cpp
+++ b/projects/rocthrust/test/test_tuple_sort.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -66,30 +66,30 @@ TYPED_TEST(TupleSortTests, TestTupleStableSort)
 
       // zip up the data
       host_vector<tuple<T, T>> h_tuples(size);
-      thrust::transform(h_keys.begin(), h_keys.end(), h_values.begin(), h_tuples.begin(), MakeTupleFunctor());
+      transform(h_keys.begin(), h_keys.end(), h_values.begin(), h_tuples.begin(), MakeTupleFunctor());
 
       // copy to device
       device_vector<tuple<T, T>> d_tuples = h_tuples;
 
       // sort on host
-      thrust::stable_sort(h_tuples.begin(), h_tuples.end());
+      stable_sort(h_tuples.begin(), h_tuples.end());
 
       // sort on device
-      thrust::stable_sort(d_tuples.begin(), d_tuples.end());
+      stable_sort(d_tuples.begin(), d_tuples.end());
 
-      ASSERT_EQ(true, thrust::is_sorted(d_tuples.begin(), d_tuples.end()));
+      ASSERT_EQ(true, is_sorted(d_tuples.begin(), d_tuples.end()));
 
       // select keys
-      thrust::transform(h_tuples.begin(), h_tuples.end(), h_keys.begin(), GetFunctor<0>());
+      transform(h_tuples.begin(), h_tuples.end(), h_keys.begin(), GetFunctor<0>());
 
       device_vector<T> d_keys(h_keys.size());
-      thrust::transform(d_tuples.begin(), d_tuples.end(), d_keys.begin(), GetFunctor<0>());
+      transform(d_tuples.begin(), d_tuples.end(), d_keys.begin(), GetFunctor<0>());
 
       // select values
-      thrust::transform(h_tuples.begin(), h_tuples.end(), h_values.begin(), GetFunctor<1>());
+      transform(h_tuples.begin(), h_tuples.end(), h_values.begin(), GetFunctor<1>());
 
       device_vector<T> d_values(h_values.size());
-      thrust::transform(d_tuples.begin(), d_tuples.end(), d_values.begin(), GetFunctor<1>());
+      transform(d_tuples.begin(), d_tuples.end(), d_values.begin(), GetFunctor<1>());
 
       ASSERT_EQ(h_keys, d_keys);
       ASSERT_EQ(h_values, d_values);
diff --git a/projects/rocthrust/test/test_tuple_transform.cpp b/projects/rocthrust/test/test_tuple_transform.cpp
index 92910f6157ac..42b0d34f7260 100644
--- a/projects/rocthrust/test/test_tuple_transform.cpp
+++ b/projects/rocthrust/test/test_tuple_transform.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ TYPED_TEST(TupleTransformTests, TestTupleTransform)
 
       // zip up the data
       host_vector<tuple<T, T>> h_tuples(size);
-      thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
+      transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
 
       // copy to device
       device_vector<tuple<T, T>> d_tuples = h_tuples;
@@ -72,10 +72,10 @@ TYPED_TEST(TupleTransformTests, TestTupleTransform)
       device_vector<T> d_t1(size), d_t2(size);
 
       // select 0th
-      thrust::transform(d_tuples.begin(), d_tuples.end(), d_t1.begin(), GetFunctor<0>());
+      transform(d_tuples.begin(), d_tuples.end(), d_t1.begin(), GetFunctor<0>());
 
       // select 1st
-      thrust::transform(d_tuples.begin(), d_tuples.end(), d_t2.begin(), GetFunctor<1>());
+      transform(d_tuples.begin(), d_tuples.end(), d_t2.begin(), GetFunctor<1>());
 
       ASSERT_EQ(h_t1, d_t1);
       ASSERT_EQ(h_t2, d_t2);
diff --git a/projects/rocthrust/test/test_type_traits.cpp b/projects/rocthrust/test/test_type_traits.cpp
index 4ff2d19cc71b..5255333f7acb 100644
--- a/projects/rocthrust/test/test_type_traits.cpp
+++ b/projects/rocthrust/test/test_type_traits.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__cccl_config.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/detail/config.h>
+
 #include <thrust/detail/type_traits.h>
 #include <thrust/device_ptr.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
@@ -31,10 +32,10 @@
 #include "test_param_fixtures.hpp"
 #include "test_utils.hpp"
 
-#if THRUST_COMPILER(GCC, >=, 7)
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 // This header pulls in an unsuppressable warning on GCC 6
 #  include _THRUST_STD_INCLUDE(complex)
-#endif // THRUST_COMPILER(GCC, >=, 7)
+#endif // defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 #include _THRUST_STD_INCLUDE(tuple)
 #include _THRUST_STD_INCLUDE(utility)
 
@@ -64,14 +65,23 @@ TEST(TypeTraitsTests, TestIsContiguousIterator)
 
   using HostIteratorTuple = thrust::tuple<HostVector::iterator, HostVector::iterator>;
 
-  using ConstantIterator  = thrust::constant_iterator<int>;
-  using CountingIterator  = thrust::counting_iterator<int>;
-  using TransformIterator = thrust::transform_iterator<::internal::identity, HostVector::iterator>;
-  using ZipIterator       = thrust::zip_iterator<HostIteratorTuple>;
+  using ConstantIterator = thrust::constant_iterator<int>;
+  using CountingIterator = thrust::counting_iterator<int>;
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  using TransformIterator1 = thrust::transform_iterator<thrust::identity<int>, HostVector::iterator>;
+  THRUST_SUPPRESS_DEPRECATED_POP
+  using TransformIterator2 = thrust::transform_iterator<::internal::identity, HostVector::iterator>;
+  using ZipIterator        = thrust::zip_iterator<HostIteratorTuple>;
 
   ASSERT_EQ((bool) thrust::is_contiguous_iterator<ConstantIterator>::value, false);
   ASSERT_EQ((bool) thrust::is_contiguous_iterator<CountingIterator>::value, false);
-  ASSERT_EQ((bool) thrust::is_contiguous_iterator<TransformIterator>::value, false);
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVHPC
+  // thrust::identity creates a deprecated warning that could not be worked around
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  ASSERT_EQ((bool) thrust::is_contiguous_iterator<TransformIterator1>::value, false);
+  THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVHPC
+  ASSERT_EQ((bool) thrust::is_contiguous_iterator<TransformIterator2>::value, false);
   ASSERT_EQ((bool) thrust::is_contiguous_iterator<ZipIterator>::value, false);
 }
 
@@ -198,19 +208,20 @@ TEST(TypeTraitsTests, TestTriviallyRelocatable)
   SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
 
   static_assert(thrust::is_trivially_relocatable<int>::value, "");
-#if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
   static_assert(thrust::is_trivially_relocatable<__half>::value, "");
   static_assert(thrust::is_trivially_relocatable<int1>::value, "");
   static_assert(thrust::is_trivially_relocatable<int2>::value, "");
   static_assert(thrust::is_trivially_relocatable<int3>::value, "");
   static_assert(thrust::is_trivially_relocatable<int4>::value, "");
-#  if !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__)) \
-    && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
+#if !(THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC                                          \
+      || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC && !defined(__CUDACC_RTC_INT128__)) \
+      || (defined(__NVCC__) && __CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__ < 1105)         \
+      || !defined(__SIZEOF_INT128__))
   static_assert(thrust::is_trivially_relocatable<__int128>::value, "");
-#  endif // !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__))
-         // && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
-#endif // THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
-#if THRUST_COMPILER(GCC, >=, 7)
+#endif // (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC &&
+       // !defined(__CUDACC_RTC_INT128__)) || (defined(__NVCC__) && __CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__ <
+       // 1105) || !defined(__SIZEOF_INT128__))
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
   static_assert(thrust::is_trivially_relocatable<thrust::complex<float>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::complex<float>>::value, "");
   static_assert(thrust::is_trivially_relocatable<thrust::pair<int, thrust::complex<float>>>::value, "");
@@ -218,7 +229,7 @@ TEST(TypeTraitsTests, TestTriviallyRelocatable)
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<int, thrust::complex<float>, char>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, _THRUST_STD::complex<float>, char>>::value,
                 "");
-#endif // THRUST_COMPILER(GCC, >=, 7)
+#endif // defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<
                   _THRUST_STD::tuple<thrust::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
diff --git a/projects/rocthrust/test/test_uninitialized_copy.cpp b/projects/rocthrust/test/test_uninitialized_copy.cpp
index ed94beba26df..336ab7788d30 100644
--- a/projects/rocthrust/test/test_uninitialized_copy.cpp
+++ b/projects/rocthrust/test/test_uninitialized_copy.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/uninitialized_copy.h>
@@ -139,9 +140,9 @@ struct CopyConstructTest
 
   THRUST_HOST_DEVICE CopyConstructTest(const CopyConstructTest&)
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (copy_constructed_on_device = true; copy_constructed_on_host = false;),
-                      (copy_constructed_on_device = false; copy_constructed_on_host = true;));
+    NV_IF_TARGET(NV_IS_DEVICE,
+                 (copy_constructed_on_device = true; copy_constructed_on_host = false;),
+                 (copy_constructed_on_device = false; copy_constructed_on_host = true;));
   }
 
   THRUST_HOST_DEVICE CopyConstructTest& operator=(const CopyConstructTest& x)
diff --git a/projects/rocthrust/test/test_uninitialized_fill.cpp b/projects/rocthrust/test/test_uninitialized_fill.cpp
index cc319dae1bd3..8916d177a6fb 100644
--- a/projects/rocthrust/test/test_uninitialized_fill.cpp
+++ b/projects/rocthrust/test/test_uninitialized_fill.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/uninitialized_fill.h>
@@ -145,9 +146,9 @@ struct CopyConstructTest
 
   THRUST_HOST_DEVICE CopyConstructTest(const CopyConstructTest&)
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (copy_constructed_on_device = true; copy_constructed_on_host = false;),
-                      (copy_constructed_on_device = false; copy_constructed_on_host = true;));
+    NV_IF_TARGET(NV_IS_DEVICE,
+                 (copy_constructed_on_device = true; copy_constructed_on_host = false;),
+                 (copy_constructed_on_device = false; copy_constructed_on_host = true;));
   }
 
   THRUST_HOST_DEVICE CopyConstructTest& operator=(const CopyConstructTest& x)
diff --git a/projects/rocthrust/test/test_unique.cpp b/projects/rocthrust/test/test_unique.cpp
index c4323756022c..bc9d882d5ff4 100644
--- a/projects/rocthrust/test/test_unique.cpp
+++ b/projects/rocthrust/test/test_unique.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 #  include _THRUST_STD_INCLUDE(array)
-#else
-#  include <iterator>
 #endif
 
 TESTS_DEFINE(UniqueTests, FullTestsParams);
@@ -110,7 +108,7 @@ TEST(UniqueTests, TestUniqueCopyDispatchImplicit)
 }
 
 template <typename ForwardIterator>
-typename _THRUST_STD::iterator_traits<ForwardIterator>::difference_type
+typename thrust::iterator_traits<ForwardIterator>::difference_type
 unique_count(my_system& system, ForwardIterator, ForwardIterator)
 {
   system.validate_dispatch();
@@ -130,8 +128,7 @@ TEST(UniqueTests, TestUniqueCountDispatchExplicit)
 }
 
 template <typename ForwardIterator>
-typename _THRUST_STD::iterator_traits<ForwardIterator>::difference_type
-unique_count(my_tag, ForwardIterator, ForwardIterator)
+typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(my_tag, ForwardIterator, ForwardIterator)
 {
   return 13;
 }
diff --git a/projects/rocthrust/test/test_universal_memory.cpp b/projects/rocthrust/test/test_universal_memory.cpp
index 866ed16a7f1f..6e0ce21b3731 100644
--- a/projects/rocthrust/test/test_universal_memory.cpp
+++ b/projects/rocthrust/test/test_universal_memory.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2021-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2021-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ namespace
 
 // The managed_memory_pointer class should be identified as a
 // contiguous_iterator
-static_assert(thrust::is_contiguous_iterator<thrust::universal_allocator<int>::pointer>::value);
+THRUST_STATIC_ASSERT(thrust::is_contiguous_iterator<thrust::universal_allocator<int>::pointer>::value);
 
 template <typename T>
 struct some_object
@@ -152,11 +152,13 @@ TYPED_TEST(UniversalTests, TestUniversalThrustVector)
     thrust::host_vector<T> host(size);
     thrust::universal_vector<T> universal(size);
 
-    static_assert(std::is_same_v<typename std::decay_t<decltype(universal)>::pointer, thrust::universal_ptr<T>>,
-                  "Unexpected thrust::universal_vector pointer type.");
+    static_assert(
+      std::is_same<typename std::decay<decltype(universal)>::type::pointer, thrust::universal_ptr<T>>::value,
+      "Unexpected thrust::universal_vector pointer type.");
 
     thrust::sequence(host.begin(), host.end(), 0);
     thrust::sequence(universal.begin(), universal.end(), 0);
+
     ASSERT_EQ(host.size(), size);
     ASSERT_EQ(universal.size(), size);
     for (unsigned int i = 0; i < size; ++i)
@@ -179,8 +181,10 @@ TYPED_TEST(UniversalTests, TestUniversalHostPinnedThrustVector)
     thrust::host_vector<T> host(size);
     thrust::universal_host_pinned_vector<T> universal(size);
 
-    static_assert(std::is_same_v<typename std::decay_t<decltype(universal)>::pointer, thrust::universal_ptr<T>>,
-                  "Unexpected thrust::universal_vector pointer type.");
+    // FIXME(bgruber): only the CUDA system uses a universal_ptr here. Other systems have a native pointer.
+    // static_assert(std::is_same<typename std::decay<decltype(universal)>::type::pointer,
+    // thrust::universal_ptr<T>>::value,
+    //              "Unexpected thrust::universal_vector pointer type.");
 
     thrust::sequence(host.begin(), host.end(), 0);
     thrust::sequence(universal.begin(), universal.end(), 0);
diff --git a/projects/rocthrust/test/test_utils.hpp b/projects/rocthrust/test/test_utils.hpp
index 06cca8d82cc0..bff58e7885a3 100644
--- a/projects/rocthrust/test/test_utils.hpp
+++ b/projects/rocthrust/test/test_utils.hpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <thrust/detail/event_error.h>
 #include <thrust/execution_policy.h>
 #include <thrust/host_vector.h>
+#include <thrust/limits.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/random.h>
 
@@ -30,17 +31,13 @@
 #include <random>
 #include <type_traits>
 #include <vector>
-
-#include "test_seed.hpp"
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#else
-#  include <thrust/detail/algorithm_wrapper.h>
-
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+// Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
 #  include <limits>
 #endif
 
+#include "test_seed.hpp"
+
 #define TEST_EVENT_WAIT(e) test_event_wait(e)
 
 // for demangling the result of type_info.name()
@@ -58,7 +55,7 @@
 #endif
 
 // HIP API
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <hip/hip_runtime.h>
 #  include <hip/hip_runtime_api.h>
 
@@ -779,18 +776,21 @@ thrust::host_vector<T> random_samples(const size_t N)
 // Use this with counting_iterator to avoid generating a range larger than we
 // can represent.
 template <typename T>
-typename thrust::detail::disable_if<_THRUST_STD::is_floating_point<T>::value, T>::type
+typename THRUST_NS_QUALIFIER::detail::disable_if<_THRUST_STD::is_floating_point<T>::value, T>::type
 truncate_to_max_representable(std::size_t n)
 {
-  return _THRUST_STD::min<std::size_t>(n, static_cast<std::size_t>(_THRUST_STD::numeric_limits<T>::max()));
+  // Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
+  return static_cast<T>(
+    THRUST_NS_QUALIFIER::min<std::size_t>(n, static_cast<std::size_t>(_THRUST_STD::numeric_limits<T>::max())));
 }
 
 // TODO: This probably won't work for `half`.
 template <typename T>
-typename _THRUST_STD::enable_if<_THRUST_STD::is_floating_point<T>::value, T>::type
+typename _THRUST_STD::enable_if_t<_THRUST_STD::is_floating_point<T>::value, T>
 truncate_to_max_representable(std::size_t n)
 {
-  return _THRUST_STD::min<T>(n, _THRUST_STD::numeric_limits<T>::max());
+  // Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
+  return THRUST_NS_QUALIFIER::min<T>(static_cast<T>(n), _THRUST_STD::numeric_limits<T>::max());
 }
 
 enum threw_status
@@ -851,7 +851,7 @@ __host__ void test_future_value_retrieval(Future&& f, decltype(f.extract())& ret
   auto const r2 = f.extract();
 
   ASSERT_THROW(auto x = f.extract(); // cppcheck-suppress unknownMacro
-               (void) x, thrust::event_error);
+               THRUST_UNUSED_VAR(x), thrust::event_error);
 
   ASSERT_EQ(false, f.ready());
   ASSERT_EQ(false, f.valid_stream());
@@ -963,11 +963,13 @@ void test_equality_pair_scan(const thrust::host_vector<Pair<X, Y>>& hvalue,
   }
 }
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  define THRUST_DEVICE_BACKEND                 hip
 #  define THRUST_DEVICE_BACKEND_DETAIL          hip_rocprim
 #  define SPECIALIZE_DEVICE_RESOURCE_NAME(name) hip##name
-#elif THRUST_HAS_CUDA_COMPILER()
+#elif defined(__NVCC__) || defined(_NVHPC_CUDA)                                \
+  || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+  || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
 #  define THRUST_DEVICE_BACKEND                 cuda
 #  define THRUST_DEVICE_BACKEND_DETAIL          cuda_cub
 #  define SPECIALIZE_DEVICE_RESOURCE_NAME(name) cuda##name
diff --git a/projects/rocthrust/test/test_vector_manipulation.cpp b/projects/rocthrust/test/test_vector_manipulation.cpp
index f36475ef42d0..81c4f9d08788 100644
--- a/projects/rocthrust/test/test_vector_manipulation.cpp
+++ b/projects/rocthrust/test/test_vector_manipulation.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ TYPED_TEST(VectorManipulationTests, TestVectorManipulation)
       ASSERT_EQ(test1.size(), size);
       ASSERT_EQ((test1 == std::vector<T>(size, T(3))), true);
 
-#if THRUST_COMPILER(MSVC, <=, 14)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (_MSC_VER <= 1400)
       // XXX MSVC 2005's STL unintentionally uses adl to dispatch advance which
       //     produces an ambiguity between std::advance & thrust::advance
       //     don't produce a KNOWN_FAILURE, just ignore the issue
diff --git a/projects/rocthrust/test/test_zip_function.cpp b/projects/rocthrust/test/test_zip_function.cpp
index f4fbdb316c5f..ede46c19fd8f 100644
--- a/projects/rocthrust/test/test_zip_function.cpp
+++ b/projects/rocthrust/test/test_zip_function.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,21 +17,23 @@
 
 #include <thrust/detail/config.h>
 
-#include <thrust/device_vector.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/remove.h>
-#include <thrust/sort.h>
-#include <thrust/transform.h>
-#include <thrust/zip_function.h>
+#if !defined(THRUST_LEGACY_GCC)
 
-#include <iostream>
+#  include <thrust/device_vector.h>
+#  include <thrust/iterator/zip_iterator.h>
+#  include <thrust/remove.h>
+#  include <thrust/sort.h>
+#  include <thrust/transform.h>
+#  include <thrust/zip_function.h>
 
-#include "test_param_fixtures.hpp"
-#include "test_utils.hpp"
+#  include <iostream>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
+#  include "test_param_fixtures.hpp"
+#  include "test_utils.hpp"
+
+#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#    include <iterator>
+#  endif
 
 using IntType = ::testing::Types<Params<int>>;
 
@@ -62,9 +64,9 @@ TYPED_TEST(ZipFunctionIntTests, TestZipFunctionCtor)
 
   ASSERT_EQ(thrust::zip_function<SumThree>()(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
   ASSERT_EQ(thrust::zip_function<SumThree>(SumThree{})(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
-#ifdef __cpp_deduction_guides
+#  ifdef __cpp_deduction_guides
   ASSERT_EQ(thrust::zip_function(SumThree{})(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
-#endif // __cpp_deduction_guides
+#  endif // __cpp_deduction_guides
 }
 
 TYPED_TEST(ZipFunctionThirtyTwoBitTests, TestZipFunctionTransform)
@@ -91,20 +93,19 @@ TYPED_TEST(ZipFunctionThirtyTwoBitTests, TestZipFunctionTransform)
     device_vector<T> d_result_zip(size);
 
     // Tuple base case
-
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result_tuple.begin(),
-                      SumThreeTuple{});
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result_tuple.begin(),
+              SumThreeTuple{});
     // Zip Function
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result_zip.begin(),
-                      make_zip_function(SumThree{}));
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
-                      d_result_zip.begin(),
-                      make_zip_function(SumThree{}));
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result_zip.begin(),
+              make_zip_function(SumThree{}));
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
+              d_result_zip.begin(),
+              make_zip_function(SumThree{}));
 
     ASSERT_EQ(h_result_tuple, h_result_zip);
     ASSERT_EQ(h_result_tuple, d_result_zip);
@@ -196,3 +197,4 @@ TYPED_TEST(ZipFunctionIntFloatTests, TestNestedZipFunction2)
   auto nestedTupleIt = thrust::make_zip_iterator(tupleIt, _THRUST_STD::begin(C));
   thrust::sort(nestedTupleIt, nestedTupleIt + n, SortPred{});
 }
+#endif // !THRUST_LEGACY_GCC
diff --git a/projects/rocthrust/test/test_zip_iterator.cpp b/projects/rocthrust/test/test_zip_iterator.cpp
index 293be471004b..67e094dcdeb8 100644
--- a/projects/rocthrust/test/test_zip_iterator.cpp
+++ b/projects/rocthrust/test/test_zip_iterator.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,23 +16,18 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 #include <thrust/universal_vector.h>
 
+#include _THRUST_STD_INCLUDE(type_traits)
+
 #include "test_param_fixtures.hpp"
 #include "test_real_assertions.hpp"
 #include "test_utils.hpp"
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 using ZipIteratorTests32BitParams = ::testing::Types<Params<int>, Params<unsigned int>, Params<float>>;
 
 using VectorTestsParams = ::testing::Types<
@@ -62,42 +57,6 @@ TEST(ZipIterator32BitTests, UsingHip)
   ASSERT_EQ(THRUST_DEVICE_SYSTEM, THRUST_DEVICE_SYSTEM_HIP);
 }
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-TEST(ZipIterator32BitTests, TestZipIteratorTraits)
-{
-  SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest());
-
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::zip_iterator<thrust::tuple<base_it, base_it>>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::tuple_of_iterator_references<int&, int&>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, thrust::tuple<int, int>>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD // The fallback version of zip_iterator lacks these iterator concepts.
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-
 template <typename Vector>
 void TestZipIteratorManipulation_test()
 {
@@ -196,7 +155,7 @@ TYPED_TEST(ZipIteratorNumericTests, TestZipIteratorReference)
   using IteratorTuple1 = tuple<Iterator1, Iterator2>;
   using ZipIterator1   = zip_iterator<IteratorTuple1>;
 
-  using zip_iterator_reference_type1 = thrust::detail::it_reference_t<ZipIterator1>;
+  using zip_iterator_reference_type1 = typename iterator_reference<ZipIterator1>::type;
 
   host_vector<T> h_variable(1);
 
@@ -215,7 +174,7 @@ TYPED_TEST(ZipIteratorNumericTests, TestZipIteratorReference)
   using IteratorTuple2 = tuple<Iterator3, Iterator4>;
   using ZipIterator2   = zip_iterator<IteratorTuple2>;
 
-  using zip_iterator_reference_type2 = thrust::detail::it_reference_t<ZipIterator2>;
+  using zip_iterator_reference_type2 = typename iterator_reference<ZipIterator2>::type;
 
   device_vector<T> d_variable(1);
 
@@ -418,25 +377,25 @@ TYPED_TEST(ZipIterator32BitTests, TestZipIteratorTransform)
     device_vector<T> d_result(size);
 
     // Tuples with 2 elements
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end()),
-                      h_result.begin(),
-                      SumTwoTuple());
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end()),
-                      d_result.begin(),
-                      SumTwoTuple());
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end()),
+              h_result.begin(),
+              SumTwoTuple());
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end()),
+              d_result.begin(),
+              SumTwoTuple());
     ASSERT_EQ(h_result, d_result);
 
     // Tuples with 3 elements
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result.begin(),
-                      SumThreeTuple());
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
-                      d_result.begin(),
-                      SumThreeTuple());
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result.begin(),
+              SumThreeTuple());
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
+              d_result.begin(),
+              SumThreeTuple());
     ASSERT_EQ(h_result, d_result);
   }
 }
@@ -525,15 +484,15 @@ TEST(ZipIterator32BitTests, TestZipIteratorCopySoAToAoS)
   thrust::fill(d_aos.begin(), d_aos.end(), make_tuple(0, 0));
 
   thrust::copy(h_soa, h_soa + n, d_aos.begin());
-  ASSERT_EQ_QUIET(7, static_cast<int>(get<0>(d_soa[0]))); // needs casting due to GoogleTest limitation
-  ASSERT_EQ_QUIET(13, static_cast<int>(get<1>(d_soa[0]))); // needs casting due to GoogleTest limitation
+  ASSERT_EQ_QUIET(7, get<0>(d_soa[0]));
+  ASSERT_EQ_QUIET(13, get<1>(d_soa[0]));
 
   // device to device
   thrust::fill(d_aos.begin(), d_aos.end(), make_tuple(0, 0));
 
   thrust::copy(d_soa, d_soa + n, d_aos.begin());
-  ASSERT_EQ_QUIET(7, static_cast<int>(get<0>(d_soa[0]))); // needs casting due to GoogleTest limitation
-  ASSERT_EQ_QUIET(13, static_cast<int>(get<1>(d_soa[0]))); // needs casting due to GoogleTest limitation
+  ASSERT_EQ_QUIET(7, get<0>(d_soa[0]));
+  ASSERT_EQ_QUIET(13, get<1>(d_soa[0]));
 
   // device to host
   thrust::fill(h_aos.begin(), h_aos.end(), make_tuple(0, 0));
diff --git a/projects/rocthrust/testing/CMakeLists.txt b/projects/rocthrust/testing/CMakeLists.txt
index 4adc3a327726..0ddb6bf03e91 100644
--- a/projects/rocthrust/testing/CMakeLists.txt
+++ b/projects/rocthrust/testing/CMakeLists.txt
@@ -166,6 +166,12 @@ add_thrust_test("advance")
 add_thrust_test("alignment")
 add_thrust_test("allocator")
 add_thrust_test("allocator_aware_policies")
+add_thrust_test("async_copy")
+add_thrust_test("async_for_each")
+add_thrust_test("async_reduce")
+add_thrust_test("async_reduce_into")
+add_thrust_test("async_sort")
+add_thrust_test("async_transform")
 add_thrust_test("binary_search")
 add_thrust_test("binary_search_descending")
 add_thrust_test("binary_search_vector")
@@ -179,6 +185,7 @@ add_thrust_test("copy_n")
 add_thrust_test("count")
 add_thrust_test("counting_iterator")
 add_thrust_test("decompose")
+add_thrust_test("dependencies_aware_policies")
 add_thrust_test("dereference")
 add_thrust_test("device_delete")
 add_thrust_test("device_ptr")
@@ -186,6 +193,7 @@ add_thrust_test("device_reference")
 add_thrust_test("discard_iterator")
 add_thrust_test("distance")
 add_thrust_test("equal")
+add_thrust_test("event")
 add_thrust_test("fill")
 add_thrust_test("find")
 add_thrust_test("for_each")
@@ -199,8 +207,10 @@ add_thrust_test("functional_placeholders_compound_assignment")
 add_thrust_test("functional_placeholders_logical")
 add_thrust_test("functional_placeholders_miscellaneous")
 add_thrust_test("functional_placeholders_relational")
+add_thrust_test("future")
 add_thrust_test("gather")
 add_thrust_test("generate")
+add_thrust_test("generate_const_iterators")
 add_thrust_test("inner_product")
 add_thrust_test("is_contiguous_iterator")
 add_thrust_test("is_operator_function_object")
@@ -222,7 +232,6 @@ add_thrust_test("mr_disjoint_pool")
 add_thrust_test("mr_new")
 add_thrust_test("mr_pool")
 add_thrust_test("mr_pool_options")
-add_thrust_test("offset_iterator")
 add_thrust_test("out_of_memory_recovery")
 add_thrust_test("pair")
 add_thrust_test("pair_reduce")
@@ -236,7 +245,6 @@ add_thrust_test("partition_point")
 add_thrust_test("permutation_iterator")
 add_thrust_test("preprocessor")
 add_thrust_test("random")
-add_thrust_test("raw_reference_cast")
 add_thrust_test("reduce")
 add_thrust_test("reduce_by_key")
 add_thrust_test("reduce_large")
@@ -295,6 +303,7 @@ add_thrust_test("transform_reduce")
 add_thrust_test("transform_scan")
 add_thrust_test("trivial_sequence")
 add_thrust_test("tuple")
+add_thrust_test("tuple_algorithms")
 add_thrust_test("tuple_reduce")
 add_thrust_test("tuple_scan")
 add_thrust_test("tuple_sort")
@@ -304,6 +313,7 @@ add_thrust_test("uninitialized_copy")
 add_thrust_test("uninitialized_fill")
 add_thrust_test("unique")
 add_thrust_test("unique_by_key")
+add_thrust_test("unittest_static_assert")
 add_thrust_test("unittest_tester")
 add_thrust_test("universal_memory")
 add_thrust_test("vector")
@@ -317,3 +327,6 @@ add_thrust_test("zip_iterator_reduce_by_key")
 add_thrust_test("zip_iterator_scan")
 add_thrust_test("zip_iterator_sort")
 add_thrust_test("zip_iterator_sort_by_key")
+
+# async test
+add_subdirectory(async)
diff --git a/projects/rocthrust/testing/address_stability.cu b/projects/rocthrust/testing/address_stability.cu
index 2dabcf1dc041..01f9e5837541 100644
--- a/projects/rocthrust/testing/address_stability.cu
+++ b/projects/rocthrust/testing/address_stability.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2024 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
+#include <thrust/detail/functional/address_stability.h>
 
 #include <unittest/unittest.h>
 
@@ -33,8 +33,8 @@ struct addable
 
 void TestAddressStabilityLibcuxx()
 {
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // libcu++ function objects with known types
   static_assert(proclaims_copyable_arguments<_THRUST_STD::plus<int>>::value, "");
@@ -53,8 +53,8 @@ DECLARE_UNITTEST(TestAddressStabilityLibcuxx);
 
 void TestAddressStabilityThrust()
 {
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // thrust function objects with known types
   static_assert(proclaims_copyable_arguments<thrust::plus<int>>::value, "");
@@ -82,8 +82,8 @@ struct my_plus
 
 void TestAddressStabilityUserDefinedFunctionObject()
 {
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   // by-value overload
   static_assert(!proclaims_copyable_arguments<my_plus<int>>::value, "");
@@ -107,8 +107,8 @@ DECLARE_UNITTEST(TestAddressStabilityUserDefinedFunctionObject);
 
 void TestAddressStabilityLambda()
 {
-  using ::internal::proclaim_copyable_arguments;
-  using ::internal::proclaims_copyable_arguments;
+  using ::thrust::detail::proclaim_copyable_arguments;
+  using ::thrust::detail::proclaims_copyable_arguments;
 
   {
     auto l = [](const int& i) {
diff --git a/projects/rocthrust/testing/allocator.cu b/projects/rocthrust/testing/allocator.cu
index 14a6f33bc4ec..43332eccdd25 100644
--- a/projects/rocthrust/testing/allocator.cu
+++ b/projects/rocthrust/testing/allocator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 #include <thrust/detail/config.h>
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/system/cpp/vector.h>
 
@@ -105,7 +106,7 @@ struct my_allocator_with_custom_destroy
 
   THRUST_HOST_DEVICE void destroy(T*) noexcept
   {
-    _THRUST_IF_TARGET(_THRUST_IS_HOST, (g_state = true;));
+    NV_IF_TARGET(NV_IS_HOST, (g_state = true;));
   }
 
   value_type* allocate(std::ptrdiff_t n)
diff --git a/projects/rocthrust/testing/allocator_aware_policies.cu b/projects/rocthrust/testing/allocator_aware_policies.cu
index 59a27bc93f2b..df34f0f915d8 100644
--- a/projects/rocthrust/testing/allocator_aware_policies.cu
+++ b/projects/rocthrust/testing/allocator_aware_policies.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,11 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__cccl_config.h>
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies here and inside type traits
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
 #include <thrust/detail/seq.h>
 #include <thrust/system/cpp/detail/par.h>
 #include <thrust/system/hip/detail/par.h>
@@ -112,6 +116,10 @@ struct TestAllocatorAttachment
     test_temporary_allocation_valid(policy(alloc));
     test_temporary_allocation_valid(policy(const_alloc));
     test_temporary_allocation_valid(policy(&test_memory_resource));
+
+    test_temporary_allocation_valid(policy(std::allocator<int>()).after(1));
+    test_temporary_allocation_valid(policy(alloc).after(1));
+    test_temporary_allocation_valid(policy(const_alloc).after(1));
   }
 };
 
@@ -125,3 +133,5 @@ using hip_par_info = policy_info<thrust::system::hip::detail::par_t, thrust::hip
 SimpleUnitTest<TestAllocatorAttachment,
                unittest::type_list<sequential_info, hip_par_info, cpp_par_info, omp_par_info, tbb_par_info>>
   TestAllocatorAttachmentInstance;
+
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/testing/async/CMakeLists.txt b/projects/rocthrust/testing/async/CMakeLists.txt
new file mode 100644
index 000000000000..00fa5c0ec45f
--- /dev/null
+++ b/projects/rocthrust/testing/async/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(exclusive_scan)
+add_subdirectory(inclusive_scan)
diff --git a/projects/rocthrust/testing/async/exclusive_scan/CMakeLists.txt b/projects/rocthrust/testing/async/exclusive_scan/CMakeLists.txt
new file mode 100644
index 000000000000..4852afda654f
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/CMakeLists.txt
@@ -0,0 +1,68 @@
+function(add_thrust_test_exclusive TEST)
+    set(TEST_SOURCE "${TEST}.cu")
+    set(TEST_TARGET "test_thrust_exclusive_${TEST}")
+    # Unless this property isn't set, CMake silently discards .cu files when
+    # CUDA language has not been enabled. If enabled, it will do the regular compiler
+    # detection and search for a fully functioning CUDA compiler, which hipcc isn't (yet).
+    # Note that removing this property builds will continue to pass, running the tests
+    # will also succeed, however the tests will be empty and be near empty main functions.
+    # This code path used to add "-x c++" to the compiler flags too, but that was
+    # superfluous as "-x hip" was already present on the command-line due to linking to
+    # hip::device transitively from roc::rocprim_hip.
+    if(USE_HIPCXX)
+        set_source_files_properties(${TEST_SOURCE}
+            PROPERTIES
+            LANGUAGE HIP
+        )
+    else()
+        set_source_files_properties(${TEST_SOURCE}
+            PROPERTIES
+            LANGUAGE CXX
+        )
+    endif()
+    if(NOT CMAKE_VERSION VERSION_LESS 3.13)
+        add_executable(${TEST_TARGET} ${TEST_SOURCE} $<TARGET_OBJECTS:testframework>)
+        target_link_libraries(${TEST_TARGET}
+            PRIVATE
+                testing_common
+        )
+    else() # Workaround
+        add_executable(${TEST_TARGET} ${TEST_SOURCE} ../../unittest/testframework.cu)
+        target_link_libraries(${TEST_TARGET}
+            PRIVATE
+                testing_common
+                testframework
+        )
+    endif()
+    target_compile_options(${TEST_TARGET} PRIVATE ${COMPILE_OPTIONS})
+    set_target_properties(${TEST_TARGET}
+        PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/testing/"
+    )
+    if (AMDGPU_TEST_TARGETS)
+        foreach(AMDGPU_TARGET IN LISTS AMDGPU_TEST_TARGETS)
+            add_test(NAME "${AMDGPU_TARGET}-exclusive_${TEST}" COMMAND ${TEST_TARGET})
+            set_tests_properties("${AMDGPU_TARGET}-exclusive_${TEST}"
+                PROPERTIES
+                    RESOURCE_GROUPS "1,${AMDGPU_TARGET}:1"
+                    LABELS "upstream;${AMDGPU_TARGET}"
+            )
+        endforeach()
+    else()
+        add_test(NAME "exclusive_${TEST}" COMMAND ${TEST_TARGET})
+        set_tests_properties("exclusive_${TEST}"
+            PROPERTIES
+                RESOURCE_GROUPS "1,${DEFAULT_GPU_RESOURCE}:1"
+                LABELS upstream
+        )                
+    endif()
+endfunction()
+
+add_thrust_test_exclusive("counting_iterator")
+add_thrust_test_exclusive("discard_output")
+add_thrust_test_exclusive("large_indices")
+add_thrust_test_exclusive("large_types")
+add_thrust_test_exclusive("mixed_types")
+add_thrust_test_exclusive("simple")
+add_thrust_test_exclusive("stateful_operator")
+add_thrust_test_exclusive("using_vs_adl")
diff --git a/projects/rocthrust/testing/async/exclusive_scan/counting_iterator.cu b/projects/rocthrust/testing/async/exclusive_scan/counting_iterator.cu
new file mode 100644
index 000000000000..1817bd6f44ce
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/counting_iterator.cu
@@ -0,0 +1,66 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <algorithm>
+#  include <limits>
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct invoker
+    : testing::async::mixin::input::counting_iterator_from_0<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "fancy input iterator (counting_iterator)";
+  }
+};
+
+template <typename T>
+struct test_counting_iterator
+{
+  void operator()(std::size_t num_values) const
+  {
+    num_values = unittest::truncate_to_max_representable<T>(num_values);
+    testing::async::test_policy_overloads<invoker<T>>::run(num_values);
+  }
+};
+// Use built-in types only, counting_iterator doesn't seem to be compatible with
+// the custom_numeric.
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_counting_iterator, UnsignedIntegralTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/discard_output.cu b/projects/rocthrust/testing/async/exclusive_scan/discard_output.cu
new file mode 100644
index 000000000000..9659f4f72520
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/discard_output.cu
@@ -0,0 +1,63 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Compilation test with discard iterators. No runtime validation is actually
+// performed, other than testing whether the algorithm completes without
+// exception.
+
+template <typename input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct discard_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::discard_iterator
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::noop
+{
+  static std::string description()
+  {
+    return "discard output";
+  }
+};
+
+template <typename T>
+struct test_discard
+{
+  void operator()(std::size_t num_values) const
+  {
+    testing::async::test_policy_overloads<discard_invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_discard, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/large_indices.cu b/projects/rocthrust/testing/async/exclusive_scan/large_indices.cu
new file mode 100644
index 000000000000..a68006f6a019
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/large_indices.cu
@@ -0,0 +1,269 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/device_free.h>
+#  include <thrust/device_malloc.h>
+#  include <thrust/device_ptr.h>
+#  include <thrust/iterator/detail/device_system_tag.h>
+#  include <thrust/iterator/detail/iterator_facade_category.h>
+#  include <thrust/optional.h>
+
+#  include <cinttypes>
+#  include <cstdint>
+#  include <iostream>
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// This test is an adaptation of TestInclusiveScanWithBigIndices from scan.cu.
+
+namespace
+{
+
+// Fake iterator that asserts
+// (a) it is written with a sequence and
+// (b) a defined maximum value is written at some point
+//
+// This allows us to test very large problem sizes without actually allocating
+// large amounts of memory that would exceed most devices' capacity.
+struct assert_sequence_iterator
+{
+  using value_type      = std::int64_t;
+  using difference_type = std::int64_t;
+
+  // Defined for thrust::iterator_traits:
+  using pointer           = value_type*;
+  using reference         = assert_sequence_iterator; // weird but convenient
+  using iterator_category = typename thrust::detail::
+    iterator_facade_category<thrust::device_system_tag, thrust::random_access_traversal_tag, value_type, reference>::type;
+
+  std::int64_t expected{0};
+  std::int64_t max{0};
+  mutable thrust::device_ptr<bool> found_max{nullptr};
+  mutable thrust::device_ptr<bool> unexpected_value{nullptr};
+
+  // Should be called on the first iterator generated. This needs to be
+  // done explicitly from the host.
+  void initialize_shared_state()
+  {
+    found_max         = thrust::device_malloc<bool>(1);
+    unexpected_value  = thrust::device_malloc<bool>(1);
+    *found_max        = false;
+    *unexpected_value = false;
+  }
+
+  // Should be called only once on the initialized iterator. This needs to be
+  // done explicitly from the host.
+  void free_shared_state() const
+  {
+    thrust::device_free(found_max);
+    thrust::device_free(unexpected_value);
+    found_max        = nullptr;
+    unexpected_value = nullptr;
+  }
+
+  __host__ __device__ assert_sequence_iterator operator+(difference_type i) const
+  {
+    return clone(expected + i);
+  }
+
+  __host__ __device__ reference operator[](difference_type i) const
+  {
+    return clone(expected + i);
+  }
+
+  // Some weirdness, this iterator acts like its own reference
+  __device__ assert_sequence_iterator operator=(value_type val)
+  {
+    if (val != expected)
+    {
+      printf("Error: expected %" PRId64 ", got %" PRId64 "\n", expected, val);
+      *unexpected_value = true;
+    }
+    else if (val == max)
+    {
+      *found_max = true;
+    }
+
+    return *this;
+  }
+
+private:
+  __host__ __device__ assert_sequence_iterator clone(value_type new_expected) const
+  {
+    return {new_expected, max, found_max, unexpected_value};
+  }
+};
+
+// output mixin that generates assert_sequence_iterators.
+// Must be paired with validate_assert_sequence_iterators mixin to free
+// shared state.
+struct assert_sequence_output
+{
+  struct output_type
+  {
+    using iterator = assert_sequence_iterator;
+
+    iterator iter;
+
+    explicit output_type(iterator&& it)
+        : iter{std::move(it)}
+    {
+      iter.initialize_shared_state();
+    }
+
+    ~output_type()
+    {
+      iter.free_shared_state();
+    }
+
+    iterator begin()
+    {
+      return iter;
+    }
+  };
+
+  template <typename InputType>
+  static output_type generate_output(std::size_t num_values, InputType&)
+  {
+    using value_type = typename assert_sequence_iterator::value_type;
+    assert_sequence_iterator it{
+      0,
+      // minus one bc exclusive scan:
+      static_cast<value_type>(num_values - 1),
+      nullptr,
+      nullptr};
+    return output_type{std::move(it)};
+  }
+};
+
+struct validate_assert_sequence_iterators
+{
+  using output_t = assert_sequence_output::output_type;
+
+  template <typename EventType>
+  static void compare_outputs(EventType& e, output_t const&, output_t const& test)
+  {
+    testing::async::mixin::compare_outputs::detail::basic_event_validation(e);
+
+    ASSERT_EQUAL(*test.iter.unexpected_value, false);
+    ASSERT_EQUAL(*test.iter.found_max, true);
+  }
+};
+
+//------------------------------------------------------------------------------
+// Overloads without custom binary operators use thrust::plus<>, so use
+// constant input iterator to generate the output sequence:
+struct default_bin_op_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<>, // - no extra args
+    std::tuple<uint64_t> // - initial_value
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::tuple<>{}, std::tuple<uint64_t>{0}};
+  }
+};
+
+struct default_bin_op_invoker
+    : testing::async::mixin::input::constant_iterator_1<std::int64_t>
+    , assert_sequence_output
+    , default_bin_op_overloads
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , validate_assert_sequence_iterators
+{
+  static std::string description()
+  {
+    return "test large array indices with default binary operator";
+  }
+};
+
+} // namespace
+
+void test_large_indices_default_scan_op()
+{
+  CHECK_ASAN_ENABLEMENT();
+	
+  // Test problem sizes around signed/unsigned int max:
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 30);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 31);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 32);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 33);
+}
+DECLARE_UNITTEST(test_large_indices_default_scan_op);
+
+namespace
+{
+
+//------------------------------------------------------------------------------
+// Generate the output sequence using counting iterators and thrust::max<> for
+// custom operator overloads.
+struct custom_bin_op_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<uint64_t, thrust::maximum<>> // - initial_value, binop
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::make_tuple(0, thrust::maximum<>{})};
+  }
+};
+
+struct custom_bin_op_invoker
+    : testing::async::mixin::input::counting_iterator_from_1<std::int64_t>
+    , assert_sequence_output
+    , custom_bin_op_overloads
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , validate_assert_sequence_iterators
+{
+  static std::string description()
+  {
+    return "test large array indices with custom binary operator";
+  }
+};
+
+} // namespace
+
+void test_large_indices_custom_scan_op()
+{
+  CHECK_ASAN_ENABLEMENT();
+
+  // Test problem sizes around signed/unsigned int max:
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 30);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 31);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 32);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 33);
+}
+DECLARE_UNITTEST(test_large_indices_custom_scan_op);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/large_types.cu b/projects/rocthrust/testing/async/exclusive_scan/large_types.cu
new file mode 100644
index 000000000000..36ce5542a3be
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/large_types.cu
@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+#  include <unittest/special_types.h>
+
+// This test is an adaptation of TestScanWithLargeTypes from scan.cu.
+
+// Need special initialization for the FixedVector type:
+template <typename value_type>
+struct device_vector_fill
+{
+  using input_type = thrust::device_vector<value_type>;
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    input_type input(num_values);
+    thrust::fill(input.begin(), input.end(), value_type{2});
+    return input;
+  }
+};
+
+template <typename value_type, typename alternate_binary_op = thrust::maximum<>>
+struct invoker
+    : device_vector_fill<value_type>
+    , testing::async::mixin::output::device_vector<value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<value_type, alternate_binary_op>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "scan with large value types.";
+  }
+};
+
+struct test_large_types
+{
+  void operator()(std::size_t num_values) const
+  {
+    using testing::async::test_policy_overloads;
+
+    test_policy_overloads<invoker<FixedVector<int, 1>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 8>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 32>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 64>>>::run(num_values);
+  }
+};
+DECLARE_UNITTEST(test_large_types);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/mixed_types.cu b/projects/rocthrust/testing/async/exclusive_scan/mixed_types.cu
new file mode 100644
index 000000000000..9bcb7e8f2972
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/mixed_types.cu
@@ -0,0 +1,143 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Test using mixed int/float types for:
+// - input_value_type       | (int, float)
+// - output_value_type      | (int, float)
+// - initial_value_type     | (int, float, <none>)
+// - thrust::plus<T> T-type | (int, float, void>)
+//
+// The initial_value_type and thrust::plus<T> types are covered by the
+// mixin::postfix_args::scan_mixed_types_overloads component.
+//
+// The testing/scan.cu TestMixedTypes test spells out the expected behavior,
+// which is defined by https://wg21.link/P0571.
+
+namespace
+{
+
+template <typename value_type>
+struct mixed_type_input_generator
+{
+  using input_type = thrust::device_vector<value_type>;
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    input_type input(num_values);
+    thrust::sequence(
+      input.begin(),
+      input.end(),
+      // fractional values are chosen deliberately to test
+      // casting orders and accumulator types:
+      static_cast<value_type>(1.5),
+      static_cast<value_type>(1));
+    return input;
+  }
+};
+
+// A fractional value is used to ensure that a different result is obtained when
+// using float vs. int.
+template <typename value_type>
+struct mixed_types_postfix_args
+{
+  using postfix_args_type = std::tuple< // Overloads to test:
+    std::tuple<>, // - no extra args
+    std::tuple<value_type>, // - initial_value
+    std::tuple<value_type, thrust::plus<>>, // - initial_value, plus<>
+    std::tuple<value_type, thrust::plus<int>>, // - initial_value, plus<int>
+    std::tuple<value_type, thrust::plus<float>> // - initial_value, plus<float>
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{
+      std::tuple<>{},
+      std::make_tuple(static_cast<value_type>(5.5)),
+      std::make_tuple(static_cast<value_type>(5.5), thrust::plus<>{}),
+      std::make_tuple(static_cast<value_type>(5.5), thrust::plus<int>{}),
+      std::make_tuple(static_cast<value_type>(5.5), thrust::plus<float>{})};
+  }
+};
+
+template <typename input_value_type, typename output_value_type, typename initial_value_type>
+struct invoker
+    : mixed_type_input_generator<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , mixed_types_postfix_args<initial_value_type>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    // Use almost_equal instead of almost_equal_if_fp because floating point
+    // addition may be hidden in the scan_op (thrust::plus<float> is always
+    // tested).
+    , testing::async::mixin::compare_outputs::assert_almost_equal
+{
+  static std::string description()
+  {
+    return "mixed input/output/initial type tests";
+  }
+};
+
+} // namespace
+
+void test_scan_mixed_types(size_t num_values)
+{
+  CHECK_ASAN_ENABLEMENT();
+	
+  // Since fp addition is non-associative, the results may be slightly off
+  // from the reference.
+  // This is primarily handled by using `compare_almost_equal` to do a fuzzy
+  // comparison. But for large enough test sizes, eventually the scan results
+  // will wrap for integral value_types. If a float accumulator is used, the
+  // small errors from non-associative addition may cause the wrap to happen in
+  // a different location, resulting in an error too large for almost_equal to
+  // ignore.
+  // This wrap seems to happen around 2^16 values, so skip when num_values is
+  // close to that.
+  if (num_values > ((1ll << 16) - 10))
+  {
+    return;
+  }
+
+  // invoker template params are input_value_type, output_vt, initial_vt:
+  using testing::async::test_policy_overloads;
+  test_policy_overloads<invoker<int, int, int>>::run(num_values);
+  test_policy_overloads<invoker<int, int, float>>::run(num_values);
+  test_policy_overloads<invoker<int, float, int>>::run(num_values);
+  test_policy_overloads<invoker<int, float, float>>::run(num_values);
+  test_policy_overloads<invoker<float, int, int>>::run(num_values);
+  test_policy_overloads<invoker<float, int, float>>::run(num_values);
+  test_policy_overloads<invoker<float, float, int>>::run(num_values);
+  // We all float down here
+  test_policy_overloads<invoker<float, float, float>>::run(num_values);
+}
+DECLARE_SIZED_UNITTEST(test_scan_mixed_types);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/mixin.h b/projects/rocthrust/testing/async/exclusive_scan/mixin.h
new file mode 100644
index 000000000000..f04e006fec19
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/mixin.h
@@ -0,0 +1,132 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/scan.h>
+#  include <thrust/scan.h>
+
+#  include <async/mixin.h>
+
+namespace testing
+{
+namespace async
+{
+namespace exclusive_scan
+{
+
+namespace mixin
+{
+
+//------------------------------------------------------------------------------
+namespace postfix_args
+{
+
+template <typename value_type, typename alternate_binary_op = thrust::maximum<>>
+struct all_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<>, // - no extra args
+    std::tuple<value_type>, // - initial_value
+    std::tuple<value_type, alternate_binary_op> // - initial_value, binary_op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{
+      std::tuple<>{}, std::make_tuple(value_type{42}), std::make_tuple(value_type{42}, alternate_binary_op{})};
+  }
+};
+
+} // namespace postfix_args
+
+//------------------------------------------------------------------------------
+namespace invoke_reference
+{
+
+template <typename input_value_type, typename output_value_type = input_value_type>
+struct host_synchronous
+{
+  template <typename InputType, typename OutputType, typename PostfixArgTuple, std::size_t... PostfixArgIndices>
+  static void invoke_reference(
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Create host versions of the input/output:
+    thrust::host_vector<input_value_type> host_input(input.cbegin(), input.cend());
+    thrust::host_vector<output_value_type> host_output(host_input.size());
+
+    // Run host synchronous algorithm to generate reference.
+    thrust::exclusive_scan(
+      host_input.cbegin(),
+      host_input.cend(),
+      host_output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+
+    // Copy back to device.
+    output = host_output;
+  }
+};
+
+} // namespace invoke_reference
+
+//------------------------------------------------------------------------------
+namespace invoke_async
+{
+
+struct simple
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    auto e = thrust::async::exclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+} // namespace invoke_async
+
+} // namespace mixin
+} // namespace exclusive_scan
+} // namespace async
+} // namespace testing
+
+#endif // C++14
diff --git a/projects/rocthrust/testing/async/exclusive_scan/simple.cu b/projects/rocthrust/testing/async/exclusive_scan/simple.cu
new file mode 100644
index 000000000000..9ec8c71edda2
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/simple.cu
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct simple_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "simple invocation with device vectors";
+  }
+};
+
+template <typename T>
+struct test_simple
+{
+  void operator()(std::size_t num_values) const
+  {
+#ifdef ADDRESS_SANITIZER_BUILD
+    std::cerr << "Skipping test due to memory constraints in address sanitizer build." << std::endl;
+    return;
+#endif
+    testing::async::test_policy_overloads<simple_invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple, NumericTypes);
+
+// Testing the in-place algorithm uses the exact same instantiations of the
+// underlying scan implementation as above. Test them here to avoid compiling
+// them twice.
+template <typename input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct simple_inplace_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector_reuse_input<input_value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "simple in-place invocation with device vectors";
+  }
+};
+
+template <typename T>
+struct test_simple_in_place
+{
+  void operator()(std::size_t num_values) const
+  {
+    CHECK_ASAN_ENABLEMENT();
+	
+    using invoker = simple_inplace_invoker<T>;
+    testing::async::test_policy_overloads<invoker>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple_in_place, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/stateful_operator.cu b/projects/rocthrust/testing/async/exclusive_scan/stateful_operator.cu
new file mode 100644
index 000000000000..a00992b018a7
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/stateful_operator.cu
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+namespace
+{
+
+// Custom binary operator for scan:
+template <typename T>
+struct stateful_operator
+{
+  T offset;
+
+  __host__ __device__ T operator()(T v1, T v2)
+  {
+    return v1 + v2 + offset;
+  }
+};
+
+// Postfix args overload definition that uses a stateful custom binary operator
+template <typename value_type>
+struct use_stateful_operator
+{
+  using postfix_args_type = std::tuple< // Single overload:
+    std::tuple<value_type, stateful_operator<value_type>> // init_val, bin_op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::make_tuple(value_type{42}, stateful_operator<value_type>{value_type{2}})};
+  }
+};
+
+template <typename value_type>
+struct invoker
+    : testing::async::mixin::input::device_vector<value_type>
+    , testing::async::mixin::output::device_vector<value_type>
+    , use_stateful_operator<value_type>
+    , testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous<value_type>
+    , testing::async::exclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "scan with stateful operator";
+  }
+};
+
+} // namespace
+
+template <typename T>
+struct test_stateful_operator
+{
+  void operator()(std::size_t num_values) const
+  {
+    testing::async::test_policy_overloads<invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_stateful_operator, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/exclusive_scan/using_vs_adl.cu b/projects/rocthrust/testing/async/exclusive_scan/using_vs_adl.cu
new file mode 100644
index 000000000000..47ac349fafb5
--- /dev/null
+++ b/projects/rocthrust/testing/async/exclusive_scan/using_vs_adl.cu
@@ -0,0 +1,196 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_traits.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/exclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Verify what happens when calling the algorithm without any namespace
+// qualifiers:
+// - If the async entry point is available in the global namespace due to a
+//   using statement, the async algorithm should be called.
+// - Otherwise, ADL should resolve the call to the synchronous algo in the
+//   thrust:: namespace.
+
+namespace invoke_reference
+{
+
+template <typename input_value_type, typename output_value_type = input_value_type>
+struct adl_host_synchronous
+{
+  template <typename InputType, typename OutputType, typename PostfixArgTuple, std::size_t... PostfixArgIndices>
+  static void invoke_reference(
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Create host versions of the input/output:
+    thrust::host_vector<input_value_type> host_input(input.cbegin(), input.cend());
+    thrust::host_vector<output_value_type> host_output(host_input.size());
+
+    using OutIter = ::internal::remove_cvref_t<decltype(host_output.begin())>;
+
+    // ADL should resolve this to the synchronous `thrust::` algorithm.
+    // This is checked by ensuring that the call returns an output iterator.
+    OutIter result = exclusive_scan(
+      host_input.cbegin(),
+      host_input.cend(),
+      host_output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    (void) result;
+
+    // Copy back to device.
+    output = host_output;
+  }
+};
+
+} // namespace invoke_reference
+
+namespace invoke_async
+{
+
+struct using_namespace
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Importing the CPO into the current namespace should unambiguously resolve
+    // this call to the CPO, as opposed to resolving to the thrust:: algorithm
+    // via ADL. This is verified by checking that an event is returned.
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    using namespace thrust::async;
+    thrust::device_event e = exclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+struct using_cpo
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Importing the CPO into the current namespace should unambiguously resolve
+    // this call to the CPO, as opposed to resolving to the thrust:: algorithm
+    // via ADL. This is verified by checking that an event is returned.
+    using thrust::async::exclusive_scan;
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    thrust::device_event e = exclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+} // namespace invoke_async
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct using_namespace_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , invoke_reference::adl_host_synchronous<input_value_type, output_value_type>
+    , invoke_async::using_namespace
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "importing async CPO with `using namespace thrust::async`";
+  }
+};
+
+void test_using_namespace()
+{
+  using invoker = using_namespace_invoker<int>;
+  testing::async::test_policy_overloads<invoker>::run(128);
+}
+DECLARE_UNITTEST(test_using_namespace);
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename initial_value_type  = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct using_cpo_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::exclusive_scan::mixin::postfix_args::all_overloads<initial_value_type, alternate_binary_op>
+    , invoke_reference::adl_host_synchronous<input_value_type, output_value_type>
+    , invoke_async::using_cpo
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "importing async CPO with "
+           "`using namespace thrust::async::exclusive_scan`";
+  }
+};
+
+void test_using_cpo()
+{
+  using invoker = using_cpo_invoker<int>;
+  testing::async::test_policy_overloads<invoker>::run(128);
+}
+DECLARE_UNITTEST(test_using_cpo);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/CMakeLists.txt b/projects/rocthrust/testing/async/inclusive_scan/CMakeLists.txt
new file mode 100644
index 000000000000..9081084e8efc
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/CMakeLists.txt
@@ -0,0 +1,69 @@
+function(add_thrust_test_inclusive TEST)
+    set(TEST_SOURCE "${TEST}.cu")
+    set(TEST_TARGET "test_thrust_inclusive_${TEST}")
+    # Unless this property isn't set, CMake silently discards .cu files when
+    # CUDA language has not been enabled. If enabled, it will do the regular compiler
+    # detection and search for a fully functioning CUDA compiler, which hipcc isn't (yet).
+    # Note that removing this property builds will continue to pass, running the tests
+    # will also succeed, however the tests will be empty and be near empty main functions.
+    # This code path used to add "-x c++" to the compiler flags too, but that was
+    # superfluous as "-x hip" was already present on the command-line due to linking to
+    # hip::device transitively from roc::rocprim_hip.
+    if(USE_HIPCXX)
+        set_source_files_properties(${TEST_SOURCE}
+            PROPERTIES
+            LANGUAGE HIP
+        )
+    else()
+        set_source_files_properties(${TEST_SOURCE}
+            PROPERTIES
+            LANGUAGE CXX
+        )
+    endif()
+    if(NOT CMAKE_VERSION VERSION_LESS 3.13)
+        add_executable(${TEST_TARGET} ${TEST_SOURCE} $<TARGET_OBJECTS:testframework>)
+        target_link_libraries(${TEST_TARGET}
+            PRIVATE
+                testing_common
+        )
+    else() # Workaround
+        add_executable(${TEST_TARGET} ${TEST_SOURCE} ../../unittest/testframework.cu)
+        target_link_libraries(${TEST_TARGET}
+            PRIVATE
+                testing_common
+                testframework
+        )
+    endif()
+    target_compile_options(${TEST_TARGET} PRIVATE ${COMPILE_OPTIONS})
+    set_target_properties(${TEST_TARGET}
+        PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/testing/"
+    )
+    if (AMDGPU_TEST_TARGETS)
+        foreach(AMDGPU_TARGET IN LISTS AMDGPU_TEST_TARGETS)
+            add_test(NAME "${AMDGPU_TARGET}-inclusive_${TEST}" COMMAND ${TEST_TARGET})
+            set_tests_properties("${AMDGPU_TARGET}-inclusive_${TEST}"
+                PROPERTIES
+                    RESOURCE_GROUPS "1,${AMDGPU_TARGET}:1"
+                    LABELS "upstream;${AMDGPU_TARGET}"
+            )
+        endforeach()
+    else()
+        add_test(NAME "inclusive_${TEST}" COMMAND ${TEST_TARGET})
+        set_tests_properties("inclusive_${TEST}"
+            PROPERTIES
+                RESOURCE_GROUPS "1,${DEFAULT_GPU_RESOURCE}:1"
+                LABELS upstream
+        )
+    endif()
+endfunction()
+
+
+add_thrust_test_inclusive("counting_iterator")
+add_thrust_test_inclusive("discard_output")
+add_thrust_test_inclusive("large_indices")
+add_thrust_test_inclusive("large_types")
+add_thrust_test_inclusive("mixed_types")
+add_thrust_test_inclusive("simple")
+add_thrust_test_inclusive("stateful_operator")
+add_thrust_test_inclusive("using_vs_adl")
diff --git a/projects/rocthrust/testing/async/inclusive_scan/counting_iterator.cu b/projects/rocthrust/testing/async/inclusive_scan/counting_iterator.cu
new file mode 100644
index 000000000000..d594a53511c1
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/counting_iterator.cu
@@ -0,0 +1,65 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <algorithm>
+#  include <limits>
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct invoker
+    : testing::async::mixin::input::counting_iterator_from_0<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "fancy input iterator (counting_iterator)";
+  }
+};
+
+template <typename T>
+struct test_counting_iterator
+{
+  void operator()(std::size_t num_values) const
+  {
+    num_values = unittest::truncate_to_max_representable<T>(num_values);
+    testing::async::test_policy_overloads<invoker<T>>::run(num_values);
+  }
+};
+// Use built-in types only, counting_iterator doesn't seem to be compatible with
+// the custom_numeric.
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_counting_iterator, UnsignedIntegralTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/discard_output.cu b/projects/rocthrust/testing/async/inclusive_scan/discard_output.cu
new file mode 100644
index 000000000000..3a3046578250
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/discard_output.cu
@@ -0,0 +1,61 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Compilation test with discard iterators. No runtime validation is actually
+// performed, other than testing whether the algorithm completes without
+// exception.
+
+template <typename input_value_type, typename alternate_binary_op = thrust::maximum<>>
+struct discard_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::discard_iterator
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::noop
+{
+  static std::string description()
+  {
+    return "discard output";
+  }
+};
+
+template <typename T>
+struct test_discard
+{
+  void operator()(std::size_t num_values) const
+  {
+    testing::async::test_policy_overloads<discard_invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_discard, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/large_indices.cu b/projects/rocthrust/testing/async/inclusive_scan/large_indices.cu
new file mode 100644
index 000000000000..9ce6d843f83e
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/large_indices.cu
@@ -0,0 +1,263 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/device_free.h>
+#  include <thrust/device_malloc.h>
+#  include <thrust/device_ptr.h>
+#  include <thrust/iterator/detail/device_system_tag.h>
+#  include <thrust/iterator/detail/iterator_facade_category.h>
+#  include <thrust/optional.h>
+
+#  include <cinttypes>
+#  include <cstdint>
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// This test is an adaptation of TestInclusiveScanWithBigIndices from scan.cu.
+
+namespace
+{
+
+// Fake iterator that asserts
+// (a) it is written with a sequence and
+// (b) a defined maximum value is written at some point
+//
+// This allows us to test very large problem sizes without actually allocating
+// large amounts of memory that would exceed most devices' capacity.
+struct assert_sequence_iterator
+{
+  using value_type      = std::int64_t;
+  using difference_type = std::int64_t;
+
+  // Defined for thrust::iterator_traits:
+  using pointer           = value_type*;
+  using reference         = assert_sequence_iterator; // weird but convenient
+  using iterator_category = typename thrust::detail::
+    iterator_facade_category<thrust::device_system_tag, thrust::random_access_traversal_tag, value_type, reference>::type;
+
+  std::int64_t expected{0};
+  std::int64_t max{0};
+  mutable thrust::device_ptr<bool> found_max{nullptr};
+  mutable thrust::device_ptr<bool> unexpected_value{nullptr};
+
+  // Should be called on the first iterator generated. This needs to be done
+  // explicitly from the host.
+  void initialize_shared_state()
+  {
+    found_max         = thrust::device_malloc<bool>(1);
+    unexpected_value  = thrust::device_malloc<bool>(1);
+    *found_max        = false;
+    *unexpected_value = false;
+  }
+
+  // Should be called only once on the initialized iterator. This needs to be
+  // done explicitly from the host.
+  void free_shared_state() const
+  {
+    thrust::device_free(found_max);
+    thrust::device_free(unexpected_value);
+    found_max        = nullptr;
+    unexpected_value = nullptr;
+  }
+
+  __host__ __device__ assert_sequence_iterator operator+(difference_type i) const
+  {
+    return clone(expected + i);
+  }
+
+  __host__ __device__ reference operator[](difference_type i) const
+  {
+    return clone(expected + i);
+  }
+
+  // Some weirdness, this iterator acts like its own reference
+  __device__ assert_sequence_iterator operator=(value_type val)
+  {
+    if (val != expected)
+    {
+      printf("Error: expected %" PRId64 ", got %" PRId64 "\n", expected, val);
+
+      *unexpected_value = true;
+    }
+    else if (val == max)
+    {
+      *found_max = true;
+    }
+
+    return *this;
+  }
+
+private:
+  __host__ __device__ assert_sequence_iterator clone(value_type new_expected) const
+  {
+    return {new_expected, max, found_max, unexpected_value};
+  }
+};
+
+// output mixin that generates assert_sequence_iterators.
+// Must be paired with validate_assert_sequence_iterators mixin to free
+// shared state.
+struct assert_sequence_output
+{
+  struct output_type
+  {
+    using iterator = assert_sequence_iterator;
+
+    iterator iter;
+
+    explicit output_type(iterator&& it)
+        : iter{std::move(it)}
+    {
+      iter.initialize_shared_state();
+    }
+
+    ~output_type()
+    {
+      iter.free_shared_state();
+    }
+
+    iterator begin()
+    {
+      return iter;
+    }
+  };
+
+  template <typename InputType>
+  static output_type generate_output(std::size_t num_values, InputType&)
+  {
+    using value_type = typename assert_sequence_iterator::value_type;
+    assert_sequence_iterator it{1, static_cast<value_type>(num_values), nullptr, nullptr};
+    return output_type{std::move(it)};
+  }
+};
+
+struct validate_assert_sequence_iterators
+{
+  using output_t = assert_sequence_output::output_type;
+
+  template <typename EventType>
+  static void compare_outputs(EventType& e, output_t const&, output_t const& test)
+  {
+    testing::async::mixin::compare_outputs::detail::basic_event_validation(e);
+
+    ASSERT_EQUAL(*test.iter.unexpected_value, false);
+    ASSERT_EQUAL(*test.iter.found_max, true);
+  }
+};
+
+//------------------------------------------------------------------------------
+// Overloads without custom binary operators use thrust::plus<>, so use
+// constant input iterator to generate the output sequence:
+struct default_bin_op_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<> // - no extra args
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return std::tuple<std::tuple<>>{};
+  }
+};
+
+struct default_bin_op_invoker
+    : testing::async::mixin::input::constant_iterator_1<std::int64_t>
+    , assert_sequence_output
+    , default_bin_op_overloads
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , validate_assert_sequence_iterators
+{
+  static std::string description()
+  {
+    return "test large array indices with default binary operator";
+  }
+};
+
+} // namespace
+
+void test_large_indices_default_scan_op()
+{
+  CHECK_ASAN_ENABLEMENT();
+  
+  // Test problem sizes around signed/unsigned int max:
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 30);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 31);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 32);
+  testing::async::test_policy_overloads<default_bin_op_invoker>::run(1ll << 33);
+}
+DECLARE_UNITTEST(test_large_indices_default_scan_op);
+
+namespace
+{
+
+//------------------------------------------------------------------------------
+// Generate the output sequence using counting iterators and thrust::max<> for
+// custom operator overloads.
+struct custom_bin_op_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<thrust::maximum<>> // - custom binary op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::make_tuple(thrust::maximum<>{})};
+  }
+};
+
+struct custom_bin_op_invoker
+    : testing::async::mixin::input::counting_iterator_from_1<std::int64_t>
+    , assert_sequence_output
+    , custom_bin_op_overloads
+    , testing::async::mixin::invoke_reference::noop
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , validate_assert_sequence_iterators
+{
+  static std::string description()
+  {
+    return "test large array indices with custom binary operator";
+  }
+};
+
+} // namespace
+
+void test_large_indices_custom_scan_op()
+{
+  CHECK_ASAN_ENABLEMENT();
+  
+  // Test problem sizes around signed/unsigned int max:
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 30);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 31);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 32);
+  testing::async::test_policy_overloads<custom_bin_op_invoker>::run(1ll << 33);
+}
+DECLARE_UNITTEST(test_large_indices_custom_scan_op);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/large_types.cu b/projects/rocthrust/testing/async/inclusive_scan/large_types.cu
new file mode 100644
index 000000000000..0f9bd9ec1fa5
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/large_types.cu
@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+#  include <unittest/special_types.h>
+
+// This test is an adaptation of TestScanWithLargeTypes from scan.cu.
+
+// Need special initialization for the FixedVector type:
+template <typename value_type>
+struct device_vector_fill
+{
+  using input_type = thrust::device_vector<value_type>;
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    input_type input(num_values);
+    thrust::fill(input.begin(), input.end(), value_type{2});
+    return input;
+  }
+};
+
+template <typename value_type, typename alternate_binary_op = thrust::maximum<>>
+struct invoker
+    : device_vector_fill<value_type>
+    , testing::async::mixin::output::device_vector<value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "scan with large value types.";
+  }
+};
+
+struct test_large_types
+{
+  void operator()(std::size_t num_values) const
+  {
+    using testing::async::test_policy_overloads;
+
+    test_policy_overloads<invoker<FixedVector<int, 1>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 8>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 32>>>::run(num_values);
+    test_policy_overloads<invoker<FixedVector<int, 64>>>::run(num_values);
+  }
+};
+DECLARE_UNITTEST(test_large_types);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/mixed_types.cu b/projects/rocthrust/testing/async/inclusive_scan/mixed_types.cu
new file mode 100644
index 000000000000..e7da5ee0194f
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/mixed_types.cu
@@ -0,0 +1,132 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Test using mixed int/float types for:
+// - input_value_type       | (int, float)
+// - output_value_type      | (int, float)
+// - thrust::plus<T> T-type | (int, float, void>)
+//
+// The thrust::plus<T> types are covered by the
+// scan_mixed_types_overloads component.
+//
+// The testing/scan.cu TestMixedTypes test spells out the expected behavior,
+// which is defined by https://wg21.link/P0571.
+
+namespace
+{
+
+template <typename value_type>
+struct mixed_type_input_generator
+{
+  using input_type = thrust::device_vector<value_type>;
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    input_type input(num_values);
+    thrust::sequence(
+      input.begin(),
+      input.end(),
+      // fractional values are chosen deliberately to test
+      // casting orders and accumulator types:
+      static_cast<value_type>(1.5),
+      static_cast<value_type>(1));
+    return input;
+  }
+};
+
+// A fractional value is used to ensure that a different result is obtained when
+// using float vs. int.
+struct mixed_types_postfix_args
+{
+  using postfix_args_type = std::tuple< // Overloads to test:
+    std::tuple<>, // - no extra args
+    std::tuple<thrust::plus<>>, // - plus<>
+    std::tuple<thrust::plus<int>>, // - plus<int>
+    std::tuple<thrust::plus<float>> // - plus<float>
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{
+      std::tuple<>{},
+      std::make_tuple(thrust::plus<>{}),
+      std::make_tuple(thrust::plus<int>{}),
+      std::make_tuple(thrust::plus<float>{})};
+  }
+};
+
+template <typename input_value_type, typename output_value_type>
+struct invoker
+    : mixed_type_input_generator<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , mixed_types_postfix_args
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    // Use almost_equal instead of almost_equal_if_fp because floating point
+    // addition may be hidden in the scan_op (thrust::plus<float> is always
+    // tested).
+    , testing::async::mixin::compare_outputs::assert_almost_equal
+{
+  static std::string description()
+  {
+    return "mixed input/output/functor value_type tests";
+  }
+};
+
+} // namespace
+
+void test_scan_mixed_types(size_t num_values)
+{
+  // Since fp addition is non-associative, the results may be slightly off
+  // from the reference.
+  // This is primarily handled by using `compare_almost_equal` to do a fuzzy
+  // comparison. But for large enough test sizes, eventually the scan results
+  // will wrap for integral value_types. If a float accumulator is used, the
+  // small errors from non-associative addition may cause the wrap to happen in
+  // a different location, resulting in an error too large for almost_equal to
+  // ignore.
+  // This wrap seems to happen around 2^16 values, so skip when num_values is
+  // close to that.
+  if (num_values > ((1ll << 16) - 10))
+  {
+    return;
+  }
+
+  // invoker template params are input_value_type, output_vt:
+  using testing::async::test_policy_overloads;
+  test_policy_overloads<invoker<int, int>>::run(num_values);
+  test_policy_overloads<invoker<int, float>>::run(num_values);
+  test_policy_overloads<invoker<float, int>>::run(num_values);
+  test_policy_overloads<invoker<float, float>>::run(num_values);
+}
+DECLARE_SIZED_UNITTEST(test_scan_mixed_types);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/mixin.h b/projects/rocthrust/testing/async/inclusive_scan/mixin.h
new file mode 100644
index 000000000000..101280f4e2a1
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/mixin.h
@@ -0,0 +1,148 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/scan.h>
+#  include <thrust/scan.h>
+
+#  include <async/mixin.h>
+
+namespace testing
+{
+namespace async
+{
+namespace inclusive_scan
+{
+
+namespace mixin
+{
+
+namespace postfix_args_init
+{
+
+template <typename ValueType, typename AltBinaryOp = thrust::maximum<>>
+struct all_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<ValueType, AltBinaryOp> // - initial_value with binary_op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::make_tuple(ValueType{42}, AltBinaryOp{})};
+  }
+};
+
+} // namespace postfix_args_init
+
+//------------------------------------------------------------------------------
+namespace postfix_args
+{
+
+template <typename alternate_binary_op = thrust::maximum<>>
+struct all_overloads
+{
+  using postfix_args_type = std::tuple< // List any extra arg overloads:
+    std::tuple<>, // - no extra args
+    std::tuple<alternate_binary_op> // - binary_op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::tuple<>{}, std::make_tuple(alternate_binary_op{})};
+  }
+};
+
+} // namespace postfix_args
+
+//------------------------------------------------------------------------------
+namespace invoke_reference
+{
+
+template <typename input_value_type, typename output_value_type = input_value_type>
+struct host_synchronous
+{
+  template <typename InputType, typename OutputType, typename PostfixArgTuple, std::size_t... PostfixArgIndices>
+  static void invoke_reference(
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Create host versions of the input/output:
+    thrust::host_vector<input_value_type> host_input(input.cbegin(), input.cend());
+    thrust::host_vector<output_value_type> host_output(host_input.size());
+
+    // Run host synchronous algorithm to generate reference.
+    thrust::inclusive_scan(
+      host_input.cbegin(),
+      host_input.cend(),
+      host_output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+
+    // Copy back to device.
+    output = host_output;
+  }
+};
+
+} // namespace invoke_reference
+
+//------------------------------------------------------------------------------
+namespace invoke_async
+{
+
+struct simple
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    auto e = thrust::async::inclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+} // namespace invoke_async
+
+} // namespace mixin
+} // namespace inclusive_scan
+} // namespace async
+} // namespace testing
+
+#endif // C++14
diff --git a/projects/rocthrust/testing/async/inclusive_scan/simple.cu b/projects/rocthrust/testing/async/inclusive_scan/simple.cu
new file mode 100644
index 000000000000..1833366fe02c
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/simple.cu
@@ -0,0 +1,121 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename value_type          = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct simple_init_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args_init::all_overloads<value_type, alternate_binary_op>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "simple invocation with device vectors and initial value";
+  }
+};
+
+template <typename T>
+struct test_simple_init
+{
+  void operator()(std::size_t num_values) const
+  {
+    CHECK_ASAN_ENABLEMENT();
+	
+    testing::async::test_policy_overloads<simple_init_invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple_init, NumericTypes);
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct simple_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type, output_value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "simple invocation with device vectors";
+  }
+};
+
+template <typename T>
+struct test_simple
+{
+  void operator()(std::size_t num_values) const
+  {
+    CHECK_ASAN_ENABLEMENT();
+    testing::async::test_policy_overloads<simple_invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple, NumericTypes);
+
+// Testing the in-place algorithm uses the exact same instantiations of the
+// underlying scan implementation as above. Test them here to avoid compiling
+// them twice.
+template <typename input_value_type, typename alternate_binary_op = thrust::maximum<>>
+struct simple_inplace_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector_reuse_input<input_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<input_value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "simple in-place invocation with device vectors";
+  }
+};
+
+template <typename T>
+struct test_simple_in_place
+{
+  void operator()(std::size_t num_values) const
+  {
+    CHECK_ASAN_ENABLEMENT();
+	
+    using invoker = simple_inplace_invoker<T>;
+    testing::async::test_policy_overloads<invoker>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_simple_in_place, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/stateful_operator.cu b/projects/rocthrust/testing/async/inclusive_scan/stateful_operator.cu
new file mode 100644
index 000000000000..5ac573849496
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/stateful_operator.cu
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+namespace
+{
+
+// Custom binary operator for scan:
+template <typename T>
+struct stateful_operator
+{
+  T offset;
+
+  __host__ __device__ T operator()(T v1, T v2)
+  {
+    return v1 + v2 + offset;
+  }
+};
+
+// Postfix args overload definition that uses a stateful custom binary operator
+template <typename value_type>
+struct use_stateful_operator
+{
+  using postfix_args_type = std::tuple< // Single overload:
+    std::tuple<stateful_operator<value_type>> // bin_op
+    >;
+
+  static postfix_args_type generate_postfix_args()
+  {
+    return postfix_args_type{std::make_tuple(stateful_operator<value_type>{value_type{2}})};
+  }
+};
+
+template <typename value_type>
+struct invoker
+    : testing::async::mixin::input::device_vector<value_type>
+    , testing::async::mixin::output::device_vector<value_type>
+    , use_stateful_operator<value_type>
+    , testing::async::inclusive_scan::mixin::invoke_reference::host_synchronous<value_type>
+    , testing::async::inclusive_scan::mixin::invoke_async::simple
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "scan with stateful operator";
+  }
+};
+
+} // namespace
+
+template <typename T>
+struct test_stateful_operator
+{
+  void operator()(std::size_t num_values) const
+  {
+    testing::async::test_policy_overloads<invoker<T>>::run(num_values);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_stateful_operator, NumericTypes);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/inclusive_scan/using_vs_adl.cu b/projects/rocthrust/testing/async/inclusive_scan/using_vs_adl.cu
new file mode 100644
index 000000000000..091d46061c6a
--- /dev/null
+++ b/projects/rocthrust/testing/async/inclusive_scan/using_vs_adl.cu
@@ -0,0 +1,194 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_traits.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <async/inclusive_scan/mixin.h>
+#  include <async/test_policy_overloads.h>
+
+// Verify what happens when calling the algorithm without any namespace
+// qualifiers:
+// - If the async entry point is available in the global namespace due to a
+//   using statement, the async algorithm should be called.
+// - Otherwise, ADL should resolve the call to the synchronous algo in the
+//   thrust:: namespace.
+
+namespace invoke_reference
+{
+
+template <typename input_value_type, typename output_value_type = input_value_type>
+struct adl_host_synchronous
+{
+  template <typename InputType, typename OutputType, typename PostfixArgTuple, std::size_t... PostfixArgIndices>
+  static void invoke_reference(
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Create host versions of the input/output:
+    thrust::host_vector<input_value_type> host_input(input.cbegin(), input.cend());
+    thrust::host_vector<output_value_type> host_output(host_input.size());
+
+    using OutIter = ::internal::remove_cvref_t<decltype(host_output.begin())>;
+
+    // ADL should resolve this to the synchronous `thrust::` algorithm.
+    // This is checked by ensuring that the call returns an output iterator.
+    OutIter result = inclusive_scan(
+      host_input.cbegin(),
+      host_input.cend(),
+      host_output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    (void) result;
+
+    // Copy back to device.
+    output = host_output;
+  }
+};
+
+} // namespace invoke_reference
+
+namespace invoke_async
+{
+
+struct using_namespace
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Importing the CPO into the current namespace should unambiguously resolve
+    // this call to the CPO, as opposed to resolving to the thrust:: algorithm
+    // via ADL. This is verified by checking that an event is returned.
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    using namespace thrust::async;
+    thrust::device_event e = inclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+struct using_cpo
+{
+  template <typename PrefixArgTuple,
+            std::size_t... PrefixArgIndices,
+            typename InputType,
+            typename OutputType,
+            typename PostfixArgTuple,
+            std::size_t... PostfixArgIndices>
+  static auto invoke_async(
+    PrefixArgTuple&& prefix_tuple,
+    std::index_sequence<PrefixArgIndices...>,
+    InputType const& input,
+    OutputType& output,
+    PostfixArgTuple&& postfix_tuple,
+    std::index_sequence<PostfixArgIndices...>)
+  {
+    // Importing the CPO into the current namespace should unambiguously resolve
+    // this call to the CPO, as opposed to resolving to the thrust:: algorithm
+    // via ADL. This is verified by checking that an event is returned.
+    using thrust::async::inclusive_scan;
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    thrust::device_event e = inclusive_scan(
+      std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+      input.cbegin(),
+      input.cend(),
+      output.begin(),
+      std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return e;
+  }
+};
+
+} // namespace invoke_async
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct using_namespace_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , invoke_reference::adl_host_synchronous<input_value_type, output_value_type>
+    , invoke_async::using_namespace
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "importing async CPO with `using namespace thrust::async`";
+  }
+};
+
+void test_using_namespace()
+{
+  using invoker = using_namespace_invoker<int>;
+  testing::async::test_policy_overloads<invoker>::run(128);
+}
+DECLARE_UNITTEST(test_using_namespace);
+
+template <typename input_value_type,
+          typename output_value_type   = input_value_type,
+          typename alternate_binary_op = thrust::maximum<>>
+struct using_cpo_invoker
+    : testing::async::mixin::input::device_vector<input_value_type>
+    , testing::async::mixin::output::device_vector<output_value_type>
+    , testing::async::inclusive_scan::mixin::postfix_args::all_overloads<alternate_binary_op>
+    , invoke_reference::adl_host_synchronous<input_value_type, output_value_type>
+    , invoke_async::using_cpo
+    , testing::async::mixin::compare_outputs::assert_almost_equal_if_fp_quiet
+{
+  static std::string description()
+  {
+    return "importing async CPO with "
+           "`using namespace thrust::async::inclusive_scan`";
+  }
+};
+
+void test_using_cpo()
+{
+  using invoker = using_cpo_invoker<int>;
+  testing::async::test_policy_overloads<invoker>::run(128);
+}
+DECLARE_UNITTEST(test_using_cpo);
+
+#endif // C++17
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async/mixin.h b/projects/rocthrust/testing/async/mixin.h
new file mode 100644
index 000000000000..5269240a0ad3
--- /dev/null
+++ b/projects/rocthrust/testing/async/mixin.h
@@ -0,0 +1,699 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+#  include <thrust/iterator/constant_iterator.h>
+#  include <thrust/iterator/counting_iterator.h>
+#  include <thrust/iterator/discard_iterator.h>
+#  include <thrust/sequence.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+
+#  include <tuple>
+#  include <type_traits>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+// clang-format off
+
+// This file contains a set of mix-in classes that define an algorithm
+// definition for use with test_policy_overloads<algo_def>. The algorithm
+// definition describes the details of a thrust::async algorithm invocation:
+//
+// - Input type and initialization
+// - Output type and initialization (supports in-place, too)
+// - Postfix arguments that define the algorithm's overload set
+// - Abstracted invocation of the async algorithm
+// - Abstracted invocation of a reference algorithm
+// - Validation of async vs. reference output
+// - A description string.
+//
+// This definition is used by test_policy_overloads to test each overload
+// against a reference while injecting a variety of execution policies. This
+// validates that each overload behaves correctly according to some reference.
+//
+// Since much of the algorithm definition is generic and may be reused in
+// multiple tests with slight changes, a mix-in system is used to simplify
+// the creation of algorithm definitions. The following namespace hierarchy is
+// used to organize these generic components:
+//
+// * testing::async::mixin::
+// ** ::input - Input types/values (device vectors, counting iterators, etc)
+// ** ::output - Output types/values (device vectors, inplace device vectors,
+//                                    discard iterators, etc)
+// ** ::postfix_args - Algorithm specific overload sets
+// ** ::invoke_reference - Algorithm specific reference invocation
+// ** ::invoke_async - Algorithm specific async algo invocation
+// ** ::compare_outputs - Compare output values.
+//
+// Each algorithm should define its own `mixins.h` header to declare algorithm
+// specific mixins (e.g. postfix_args, invoke_reference, and invoke_async)
+// in a testing::async::<algorithm_name>::mixins namespace structure.
+//
+// For example, the test.async.exclusive_scan.basic test uses the following
+// algorithm definition from mix-ins:
+//
+// ```
+//   #include <async/test_policy_overloads.h>
+//   #include <async/mixin.h>
+//   #include <async/exclusive_scan/mixin.h>
+//   template <typename input_value_type,
+//            typename output_value_type   = input_value_type,
+//            typename initial_value_type  = input_value_type,
+//            typename alternate_binary_op = thrust::maximum<>>
+//   struct basic_invoker
+//      : testing::async::mixin::input::device_vector<input_value_type>
+//      , testing::async::mixin::output::device_vector<output_value_type>
+//      , testing::async::exclusive_scan::mixin::postfix_args::
+//          all_overloads<initial_value_type, alternate_binary_op>
+//      , testing::async::exclusive_scan::mixin::invoke_reference::
+//          host_synchronous<input_value_type, output_value_type>
+//      , testing::async::exclusive_scan::mixin::invoke_async::basic
+//      , testing::async::mixin::compare_outputs::assert_equal_quiet
+//   {
+//     static std::string description()
+//     {
+//       return "basic invocation with device vectors";
+//     }
+//   };
+//
+//   ...
+//
+//   testing::async::test_policy_overloads<basic_invoker<T>>::run(num_values);
+// ```
+//
+// The basic_invoker class expands to something similar to the following:
+//
+// ```
+//  template <typename input_value_type,
+//            typename output_value_type   = input_value_type,
+//            typename initial_value_type  = input_value_type,
+//            typename alternate_binary_op = thrust::maximum<>>
+//  struct basic_invoker
+//  {
+//  public:
+//
+//    static std::string description()
+//    {
+//      return "basic invocation with device vectors";
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    // testing::async::mixin::input::device_vector
+//    //
+//    // input_type must provide idiomatic definitions of:
+//    // - `using iterator = ...;`
+//    // - `iterator begin() const { ... }`
+//    // - `iterator end() const { ... }`
+//    // - `size_t size() const { ... }`
+//    using input_type = thrust::device_vector<input_value_type>;
+//
+//    // Generate an instance of the input:
+//    static input_type generate_input(std::size_t num_values)
+//    {
+//      input_type input(num_values);
+//      thrust::sequence(input.begin(), input.end(), 25, 3);
+//      return input;
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    // testing::async::mixin::output::device_vector
+//    //
+//    // output_type must provide idiomatic definitions of:
+//    // - `using iterator = ...;`
+//    // - `iterator begin() { ... }`
+//    using output_type = thrust::device_vector<output_value_type>;
+//
+//    // Generate an instance of the output:
+//    // Might be more complicated, eg. fancy iterators, etc
+//    static output_type generate_output(std::size_t num_values)
+//    {
+//      return output_type(num_values);
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    // testing::async::exclusive_scan::mixin::postfix_args::all_overloads
+//    using postfix_args_type = std::tuple<   // List any extra arg overloads:
+//      std::tuple<>,                                       // - no extra args
+//      std::tuple<initial_value_type>,                     // - initial_value
+//      std::tuple<initial_value_type, alternate_binary_op> // - initial_value, binary_op
+//      >;
+//
+//    // Create instances of the extra arguments to use when invoking the
+//    // algorithm:
+//    static postfix_args_type generate_postfix_args()
+//    {
+//      return postfix_args_type{
+//        std::tuple<>{},                            // no extra args
+//        std::make_tuple(initial_value_type{42}),   // initial_value
+//        // initial_value, binary_op:
+//        std::make_tuple(initial_value_Type{57}, alternate_binary_op{})
+//      };
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    //
+//    testing::async::exclusive_scan::mixin::invoke_reference::host_synchronous
+//    //
+//    // Invoke a reference implementation for a single overload as described by
+//    // postfix_tuple. This tuple contains instances of any trailing arguments
+//    // to pass to the algorithm. The tuple/index_sequence pattern is used to
+//    // support a "no extra args" overload, since the parameter pack expansion
+//    // will do exactly what we want in all cases.
+//    template <typename PostfixArgTuple, std::size_t... PostfixArgIndices>
+//    static void invoke_reference(input_type const &input,
+//                                 output_type &output,
+//                                 PostfixArgTuple &&postfix_tuple,
+//                                 std::index_sequence<PostfixArgIndices...>)
+//    {
+//      // Create host versions of the input/output:
+//      thrust::host_vector<input_value_type> host_input(input.cbegin(),
+//                                                       input.cend());
+//      thrust::host_vector<output_value_type> host_output(host_input.size());
+//
+//      // Run host synchronous algorithm to generate reference.
+//      thrust::exclusive_scan(host_input.cbegin(),
+//                             host_input.cend(),
+//                             host_output.begin(),
+//                             std::get<PostfixArgIndices>(
+//                               THRUST_FWD(postfix_tuple))...);
+//
+//      // Copy back to device.
+//      output = host_output;
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    // testing::async::mixin::exclusive_scan::mixin::invoke_async::basic
+//    //
+//    // Invoke the async algorithm for a single overload as described by
+//    // the prefix and postfix tuples. These tuples contains instances of any
+//    // additional arguments to pass to the algorithm. The tuple/index_sequence
+//    // pattern is used to support the "no extra args" overload, since the
+//    // parameter pack expansion will do exactly what we want in all cases.
+//    // Prefix args are included here (but not for invoke_reference) to allow
+//    // the test framework to change the execution policy.
+//    // This method must return an event or future.
+//    template <typename PrefixArgTuple,
+//              std::size_t... PrefixArgIndices,
+//              typename PostfixArgTuple,
+//              std::size_t... PostfixArgIndices>
+//    static auto invoke_async(PrefixArgTuple &&prefix_tuple,
+//                             std::index_sequence<PrefixArgIndices...>,
+//                             input_type const &input,
+//                             output_type &output,
+//                             PostfixArgTuple &&postfix_tuple,
+//                             std::index_sequence<PostfixArgIndices...>)
+//    {
+//      output.resize(input.size());
+//      auto e = thrust::async::exclusive_scan(
+//        std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+//        input.cbegin(),
+//        input.cend(),
+//        output.begin(),
+//        std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+//      return e;
+//    }
+//
+//    //-------------------------------------------------------------------------
+//    // testing::async::mixin::compare_outputs::assert_equal_quiet
+//    //
+//    // Wait on and validate the event/future (usually with TEST_EVENT_WAIT /
+//    // TEST_FUTURE_VALUE_RETRIEVAL), then check that the reference output
+//    // matches the testing output.
+//    template <typename EventType>
+//    static void compare_outputs(EventType &e,
+//                                output_type const &ref,
+//                                output_type const &test)
+//    {
+//      TEST_EVENT_WAIT(e);
+//      ASSERT_EQUAL_QUIET(ref, test);
+//    }
+// };
+// ```
+//
+// Similar invokers with slight tweaks are used in other
+// async/exclusive_scan/*.cu tests.
+
+// clang-format on
+
+namespace testing
+{
+namespace async
+{
+namespace mixin
+{
+
+//------------------------------------------------------------------------------
+namespace input
+{
+
+template <typename value_type>
+struct device_vector
+{
+  using input_type = thrust::device_vector<value_type>;
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    input_type input(num_values);
+    thrust::sequence(input.begin(), input.end(), static_cast<value_type>(1), static_cast<value_type>(1));
+    return input;
+  }
+};
+
+template <typename value_type>
+struct counting_iterator_from_0
+{
+  struct input_type
+  {
+    using iterator = thrust::counting_iterator<value_type>;
+
+    std::size_t num_values;
+
+    iterator begin() const
+    {
+      return iterator{static_cast<value_type>(0)};
+    }
+    iterator cbegin() const
+    {
+      return iterator{static_cast<value_type>(0)};
+    }
+
+    iterator end() const
+    {
+      return iterator{static_cast<value_type>(num_values)};
+    }
+    iterator cend() const
+    {
+      return iterator{static_cast<value_type>(num_values)};
+    }
+
+    std::size_t size() const
+    {
+      return num_values;
+    }
+  };
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    return {num_values};
+  }
+};
+
+template <typename value_type>
+struct counting_iterator_from_1
+{
+  struct input_type
+  {
+    using iterator = thrust::counting_iterator<value_type>;
+
+    std::size_t num_values;
+
+    iterator begin() const
+    {
+      return iterator{static_cast<value_type>(1)};
+    }
+    iterator cbegin() const
+    {
+      return iterator{static_cast<value_type>(1)};
+    }
+
+    iterator end() const
+    {
+      return iterator{static_cast<value_type>(1 + num_values)};
+    }
+    iterator cend() const
+    {
+      return iterator{static_cast<value_type>(1 + num_values)};
+    }
+
+    std::size_t size() const
+    {
+      return num_values;
+    }
+  };
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    return {num_values};
+  }
+};
+
+template <typename value_type>
+struct constant_iterator_1
+{
+  struct input_type
+  {
+    using iterator = thrust::constant_iterator<value_type>;
+
+    std::size_t num_values;
+
+    iterator begin() const
+    {
+      return iterator{static_cast<value_type>(1)};
+    }
+    iterator cbegin() const
+    {
+      return iterator{static_cast<value_type>(1)};
+    }
+
+    iterator end() const
+    {
+      return iterator{static_cast<value_type>(1)} + num_values;
+    }
+    iterator cend() const
+    {
+      return iterator{static_cast<value_type>(1)} + num_values;
+    }
+
+    std::size_t size() const
+    {
+      return num_values;
+    }
+  };
+
+  static input_type generate_input(std::size_t num_values)
+  {
+    return {num_values};
+  }
+};
+
+} // namespace input
+
+//------------------------------------------------------------------------------
+namespace output
+{
+
+template <typename value_type>
+struct device_vector
+{
+  using output_type = thrust::device_vector<value_type>;
+
+  template <typename InputType>
+  static output_type generate_output(std::size_t num_values, InputType& /* unused */)
+  {
+    return output_type(num_values);
+  }
+};
+
+template <typename value_type>
+struct device_vector_reuse_input
+{
+  using output_type = thrust::device_vector<value_type>&;
+
+  template <typename InputType>
+  static output_type generate_output(std::size_t /*num_values*/, InputType& input)
+  {
+    return input;
+  }
+};
+
+struct discard_iterator
+{
+  struct output_type
+  {
+    using iterator = thrust::discard_iterator<>;
+
+    iterator begin() const
+    {
+      return thrust::make_discard_iterator();
+    }
+    iterator cbegin() const
+    {
+      return thrust::make_discard_iterator();
+    }
+  };
+
+  template <typename InputType>
+  static output_type generate_output(std::size_t /* num_values */, InputType& /* input */)
+  {
+    return output_type{};
+  }
+};
+
+} // namespace output
+
+//------------------------------------------------------------------------------
+namespace postfix_args
+{
+/* Defined per algorithm. Example:
+ *
+ * // Defines several overloads:
+ * // algorithm([policy,] input, output) // no postfix args
+ * // algorithm([policy,] input, output, initial_value)
+ * // algorithm([policy,] input, output, initial_value, binary_op)
+ * template <typename value_type,
+ *           typename alternate_binary_op = thrust::maximum<>>
+ * struct all_overloads
+ * {
+ *   using postfix_args_type = std::tuple<     // List any extra arg overloads:
+ *     std::tuple<>,                               // - no extra args
+ *     std::tuple<value_type>,                     // - initial_value
+ *     std::tuple<value_type, alternate_binary_op> // - initial_value, binary_op
+ *     >;
+ *
+ *   static postfix_args_type generate_postfix_args()
+ *   {
+ *     return postfix_args_type{
+ *       std::tuple<>{},                            // no extra args
+ *       std::make_tuple(initial_value_type{42}),   // initial_value
+ *       // initial_value, binary_op:
+ *       std::make_tuple(initial_value_Type{57}, alternate_binary_op{})
+ *   }
+ * };
+ *
+ */
+}
+
+//------------------------------------------------------------------------------
+namespace invoke_reference
+{
+
+/* Defined per algorithm. Example:
+ *
+ * template <typename input_value_type,
+ *           typename output_value_type = input_value_type>
+ * struct host_synchronous
+ * {
+ *   template <typename InputType,
+ *             typename OutputType,
+ *             typename PostfixArgTuple,
+ *             std::size_t... PostfixArgIndices>
+ *   static void invoke_reference(InputType const& input,
+ *                                OutputType& output,
+ *                                PostfixArgTuple&& postfix_tuple,
+ *                                std::index_sequence<PostfixArgIndices...>)
+ *   {
+ *     // Create host versions of the input/output:
+ *     thrust::host_vector<input_value_type> host_input(input.cbegin(),
+ *                                                      input.cend());
+ *     thrust::host_vector<output_value_type> host_output(host_input.size());
+ *
+ *     // Run host synchronous algorithm to generate reference.
+ *     // Be sure to call a backend that doesn't use the same underlying
+ *     // implementation.
+ *     thrust::exclusive_scan(host_input.cbegin(),
+ *                            host_input.cend(),
+ *                            host_output.begin(),
+ *                            std::get<PostfixArgIndices>(
+ *                              THRUST_FWD(postfix_tuple))...);
+ *
+ *     // Copy back to device.
+ *     output = host_output;
+ *   }
+ * };
+ *
+ */
+
+// Used to save time when testing unverifiable invocations (discard_iterators)
+struct noop
+{
+  template <typename... Ts>
+  static void invoke_reference(Ts&&...)
+  {}
+};
+
+} // namespace invoke_reference
+
+//------------------------------------------------------------------------------
+namespace invoke_async
+{
+
+/* Defined per algorithm. Example:
+ *
+ * struct basic
+ * {
+ *   template <typename PrefixArgTuple,
+ *             std::size_t... PrefixArgIndices,
+ *             typename InputType,
+ *             typename OutputType,
+ *             typename PostfixArgTuple,
+ *             std::size_t... PostfixArgIndices>
+ *   static auto invoke_async(PrefixArgTuple&& prefix_tuple,
+ *                            std::index_sequence<PrefixArgIndices...>,
+ *                            InputType const& input,
+ *                            OutputType& output,
+ *                            PostfixArgTuple&& postfix_tuple,
+ *                            std::index_sequence<PostfixArgIndices...>)
+ *   {
+ *     auto e = thrust::async::exclusive_scan(
+ *       std::get<PrefixArgIndices>(THRUST_FWD(prefix_tuple))...,
+ *       input.cbegin(),
+ *       input.cend(),
+ *       output.begin(),
+ *       std::get<PostfixArgIndices>(THRUST_FWD(postfix_tuple))...);
+ *     return e;
+ *   }
+ * };
+ */
+
+} // namespace invoke_async
+
+//------------------------------------------------------------------------------
+namespace compare_outputs
+{
+
+namespace detail
+{
+
+void basic_event_validation(thrust::device_event& e)
+{
+  TEST_EVENT_WAIT(e);
+}
+
+template <typename T>
+void basic_event_validation(thrust::device_future<T>& f)
+{
+  TEST_FUTURE_VALUE_RETRIEVAL(f);
+}
+
+} // namespace detail
+
+struct assert_equal
+{
+  template <typename EventType, typename OutputType>
+  static void compare_outputs(EventType& e, OutputType const& ref, OutputType const& test)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_EQUAL(ref, test);
+  }
+};
+
+struct assert_almost_equal
+{
+  template <typename EventType, typename OutputType>
+  static void compare_outputs(EventType& e, OutputType const& ref, OutputType const& test)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_ALMOST_EQUAL(ref, test);
+  }
+};
+
+// Does an 'almost_equal' comparison for floating point types. Since fp
+// addition is non-associative, this is sometimes necessary.
+struct assert_almost_equal_if_fp
+{
+private:
+  template <typename EventType, typename OutputType>
+  static void compare_outputs_impl(
+    EventType& e, OutputType const& ref, OutputType const& test, std::false_type /* is_floating_point */)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_EQUAL(ref, test);
+  }
+
+  template <typename EventType, typename OutputType>
+  static void compare_outputs_impl(
+    EventType& e, OutputType const& ref, OutputType const& test, std::true_type /* is_floating_point */)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_ALMOST_EQUAL(ref, test);
+  }
+
+public:
+  template <typename EventType, typename OutputType>
+  static void compare_outputs(EventType& e, OutputType const& ref, OutputType const& test)
+  {
+    using value_type = typename OutputType::value_type;
+    compare_outputs_impl(e, ref, test, std::is_floating_point<value_type>{});
+  }
+};
+
+struct assert_equal_quiet
+{
+  template <typename EventType, typename OutputType>
+  static void compare_outputs(EventType& e, OutputType const& ref, OutputType const& test)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_EQUAL_QUIET(ref, test);
+  }
+};
+
+// Does an 'almost_equal' comparison for floating point types, since fp
+// addition is non-associative
+struct assert_almost_equal_if_fp_quiet
+{
+private:
+  template <typename EventType, typename OutputType>
+  static void compare_outputs_impl(
+    EventType& e, OutputType const& ref, OutputType const& test, std::false_type /* is_floating_point */)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_EQUAL_QUIET(ref, test);
+  }
+
+  template <typename EventType, typename OutputType>
+  static void compare_outputs_impl(
+    EventType& e, OutputType const& ref, OutputType const& test, std::true_type /* is_floating_point */)
+  {
+    detail::basic_event_validation(e);
+    ASSERT_ALMOST_EQUAL(ref, test);
+  }
+
+public:
+  template <typename EventType, typename OutputType>
+  static void compare_outputs(EventType& e, OutputType const& ref, OutputType const& test)
+  {
+    using value_type = typename OutputType::value_type;
+    compare_outputs_impl(e, ref, test, std::is_floating_point<value_type>{});
+  }
+};
+
+// Used to save time when testing unverifiable invocations (discard_iterators).
+// Just does basic validation of the future/event.
+struct noop
+{
+  template <typename EventType, typename... Ts>
+  static void compare_outputs(EventType& e, Ts&&...)
+  {
+    detail::basic_event_validation(e);
+  }
+};
+
+} // namespace compare_outputs
+
+} // namespace mixin
+} // namespace async
+} // namespace testing
+
+#endif // C++14
diff --git a/projects/rocthrust/testing/async/test_policy_overloads.h b/projects/rocthrust/testing/async/test_policy_overloads.h
new file mode 100644
index 000000000000..826e78e3d5cf
--- /dev/null
+++ b/projects/rocthrust/testing/async/test_policy_overloads.h
@@ -0,0 +1,371 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/device_allocator.h>
+#  include <thrust/future.h>
+
+#  include <string>
+
+#  include <unittest/unittest.h>
+
+// TODO Cover these cases from testing/async_reduce.cu:
+//   - [x] test_async_reduce_after ("after_future" in test_policy_overloads)
+//   - [ ] test_async_reduce_on_then_after (KNOWN_FAILURE, see #1195)
+//     - [ ] all the child variants (e.g. with allocator) too
+//   - [ ] test_async_copy_then_reduce (Need to figure out how to fit this in)
+//   - [ ] test_async_reduce_caching (only useful when returning future)
+
+namespace testing
+{
+
+namespace async
+{
+
+// Tests that policies are handled correctly for all overloads of an async
+// algorithm.
+//
+// The AlgoDef parameter type defines an async algorithm, its overloads, and
+// abstracts its invocation. See the async/mixins.h for a documented example of
+// this interface and some convenience mixins that can be used to construct a
+// definition quickly.
+//
+// The AlgoDef interface is used to run several tests of the algorithm,
+// exhaustively testing all overloads for algorithm correctness and proper
+// policy handling.
+//
+// ## Basic tests
+//
+// In the basic tests, each overload is called repeatedly with:
+// 1) No policy
+// 2) thrust::device
+// 3) thrust::device(thrust::device_allocator<void>)
+// 4) thrust::device.on(stream)
+// 5) thrust::device(thrust::device_allocator<void>).on(stream)
+//
+// The output of the async algorithm is compared against a reference output,
+// and the returned event/future is tested to make sure it holds a reference to
+// the expected stream.
+//
+// ## After Future tests
+//
+// The after_future tests check that the future/event returned from an algorithm
+// behaves properly when consumed by a policy's `.after` method.
+template <typename AlgoDef>
+struct test_policy_overloads
+{
+  using algo_def          = AlgoDef;
+  using input_type        = typename algo_def::input_type;
+  using output_type       = typename algo_def::output_type;
+  using postfix_args_type = typename algo_def::postfix_args_type;
+
+  static constexpr std::size_t num_postfix_arg_sets = std::tuple_size<postfix_args_type>::value;
+
+  // Main entry point; call this from a unit test function.
+  static void run(std::size_t num_values)
+  {
+    test_postfix_overloads(num_values);
+  }
+
+private:
+  template <std::size_t Size>
+  using size_const = std::integral_constant<std::size_t, Size>;
+
+  //----------------------------------------------------------------------------
+  // Recursively call sub tests for each overload set in postfix_args:
+  template <std::size_t PostfixIdx = 0>
+  static void test_postfix_overloads(std::size_t const num_values, size_const<PostfixIdx> = {})
+  {
+    static_assert(PostfixIdx < num_postfix_arg_sets, "Internal error.");
+
+    run_basic_policy_tests<PostfixIdx>(num_values);
+    run_after_future_tests<PostfixIdx>(num_values);
+
+    // Recurse to test next round of overloads:
+    test_postfix_overloads(num_values, size_const<PostfixIdx + 1>{});
+  }
+
+  static void test_postfix_overloads(std::size_t const, size_const<num_postfix_arg_sets>)
+  {
+    // terminal case, no-op
+  }
+
+  //----------------------------------------------------------------------------
+  // For the specified postfix overload set, test the algorithm with several
+  // different policy configurations.
+  template <std::size_t PostfixIdx>
+  static void run_basic_policy_tests(std::size_t const num_values)
+  {
+    // When a policy uses the default stream, the algorithm implementation
+    // should spawn a new stream in the returned event:
+    auto using_default_stream = [](auto& e) {
+      ASSERT_NOT_EQUAL(thrust::hip_rocprim::default_stream(), e.stream().native_handle());
+    };
+
+    // When a policy uses a non-default stream, the implementation should pass
+    // the stream through to the output:
+    thrust::system::hip::detail::unique_stream test_stream{};
+    auto using_test_stream = [&test_stream](auto& e) {
+      ASSERT_EQUAL(test_stream.native_handle(), e.stream().native_handle());
+    };
+
+    // Test the different types of policies:
+    basic_policy_test<PostfixIdx>("(no policy)", std::make_tuple(), using_default_stream, num_values);
+
+    basic_policy_test<PostfixIdx>("thrust::device", std::make_tuple(thrust::device), using_default_stream, num_values);
+
+    basic_policy_test<PostfixIdx>(
+      "thrust::device(thrust::device_allocator<void>{})",
+      std::make_tuple(thrust::device(thrust::device_allocator<void>{})),
+      using_default_stream,
+      num_values);
+
+    basic_policy_test<PostfixIdx>(
+      "thrust::device.on(test_stream.get())",
+      std::make_tuple(thrust::device.on(test_stream.get())),
+      using_test_stream,
+      num_values);
+
+    basic_policy_test<PostfixIdx>(
+      "thrust::device(thrust::device_allocator<void>{}).on(test_stream.get())",
+      std::make_tuple(thrust::device(thrust::device_allocator<void>{}).on(test_stream.get())),
+      using_test_stream,
+      num_values);
+  }
+
+  // Invoke the algorithm multiple times with the provided policy and validate
+  // the results.
+  template <std::size_t PostfixIdx, typename PrefixArgTuple, typename ValidateEvent>
+  static void basic_policy_test(
+    std::string const& policy_desc,
+    PrefixArgTuple&& prefix_tuple_ref,
+    ValidateEvent const& validate,
+    std::size_t num_values)
+  try
+  {
+    // Sink the prefix tuple into a const local so it can be safely passed to
+    // multiple invocations without worrying about potential modifications.
+    using prefix_tuple_type              = ::internal::remove_cvref_t<PrefixArgTuple>;
+    prefix_tuple_type const prefix_tuple = THRUST_FWD(prefix_tuple_ref);
+
+    using postfix_tuple_type               = std::tuple_element_t<PostfixIdx, postfix_args_type>;
+    postfix_tuple_type const postfix_tuple = get_postfix_tuple<PostfixIdx>();
+
+    // Generate index sequences for the tuples:
+    constexpr auto prefix_tuple_size  = std::tuple_size<prefix_tuple_type>{};
+    constexpr auto postfix_tuple_size = std::tuple_size<postfix_tuple_type>{};
+    using prefix_index_seq            = std::make_index_sequence<prefix_tuple_size>;
+    using postfix_index_seq           = std::make_index_sequence<postfix_tuple_size>;
+
+    // Use unique, non-const inputs for each invocation to support in-place
+    // algo_def configurations.
+    input_type input_a   = algo_def::generate_input(num_values);
+    input_type input_b   = algo_def::generate_input(num_values);
+    input_type input_c   = algo_def::generate_input(num_values);
+    input_type input_d   = algo_def::generate_input(num_values);
+    input_type input_ref = algo_def::generate_input(num_values);
+
+    output_type output_a   = algo_def::generate_output(num_values, input_a);
+    output_type output_b   = algo_def::generate_output(num_values, input_b);
+    output_type output_c   = algo_def::generate_output(num_values, input_c);
+    output_type output_d   = algo_def::generate_output(num_values, input_d);
+    output_type output_ref = algo_def::generate_output(num_values, input_ref);
+
+    // Invoke multiple overlapping async algorithms, capturing their outputs
+    // and events/futures:
+    auto e_a =
+      algo_def::invoke_async(prefix_tuple, prefix_index_seq{}, input_a, output_a, postfix_tuple, postfix_index_seq{});
+    auto e_b =
+      algo_def::invoke_async(prefix_tuple, prefix_index_seq{}, input_b, output_b, postfix_tuple, postfix_index_seq{});
+    auto e_c =
+      algo_def::invoke_async(prefix_tuple, prefix_index_seq{}, input_c, output_c, postfix_tuple, postfix_index_seq{});
+    auto e_d =
+      algo_def::invoke_async(prefix_tuple, prefix_index_seq{}, input_d, output_d, postfix_tuple, postfix_index_seq{});
+
+    // Let reference calc overlap with async testing:
+    algo_def::invoke_reference(input_ref, output_ref, postfix_tuple, postfix_index_seq{});
+
+    // These wait on the e_X events:
+    algo_def::compare_outputs(e_a, output_ref, output_a);
+    algo_def::compare_outputs(e_b, output_ref, output_b);
+    algo_def::compare_outputs(e_c, output_ref, output_c);
+    algo_def::compare_outputs(e_d, output_ref, output_d);
+
+    validate(e_a);
+    validate(e_b);
+    validate(e_c);
+    validate(e_d);
+  }
+  catch (unittest::UnitTestException& exc)
+  {
+    // Append some identifying information to the exception to help with
+    // debugging:
+    using overload_t = std::tuple_element_t<PostfixIdx, postfix_args_type>;
+
+    std::string const overload_desc = unittest::type_name<overload_t>();
+    std::string const input_desc    = unittest::type_name<input_type>();
+    std::string const output_desc   = unittest::type_name<output_type>();
+
+    exc
+      << "\n"
+      << " - algo_def::description = " << algo_def::description() << "\n"
+      << " - test = basic_policy\n"
+      << " - policy = " << policy_desc << "\n"
+      << " - input_type = " << input_desc << "\n"
+      << " - output_type = " << output_desc << "\n"
+      << " - tuple of trailing arguments = " << overload_desc << "\n"
+      << " - num_values = " << num_values;
+    throw;
+  }
+
+  //----------------------------------------------------------------------------
+  // Test .after(event/future) handling:
+  template <std::size_t PostfixIdx>
+  static void run_after_future_tests(std::size_t const num_values)
+  try
+  {
+    using postfix_tuple_type               = std::tuple_element_t<PostfixIdx, postfix_args_type>;
+    postfix_tuple_type const postfix_tuple = get_postfix_tuple<PostfixIdx>();
+
+    // Generate index sequences for the tuples. Prefix size always = 1 here,
+    // since the async algorithms are always invoked with a single prefix
+    // arg (the execution policy) here.
+    constexpr auto postfix_tuple_size = std::tuple_size<postfix_tuple_type>{};
+    using prefix_index_seq            = std::make_index_sequence<1>;
+    using postfix_index_seq           = std::make_index_sequence<postfix_tuple_size>;
+
+    // Use unique, non-const inputs for each invocation to support in-place
+    // algo_def configurations.
+    input_type input_a   = algo_def::generate_input(num_values);
+    input_type input_b   = algo_def::generate_input(num_values);
+    input_type input_c   = algo_def::generate_input(num_values);
+    input_type input_tmp = algo_def::generate_input(num_values);
+    input_type input_ref = algo_def::generate_input(num_values);
+
+    output_type output_a   = algo_def::generate_output(num_values, input_a);
+    output_type output_b   = algo_def::generate_output(num_values, input_b);
+    output_type output_c   = algo_def::generate_output(num_values, input_c);
+    output_type output_tmp = algo_def::generate_output(num_values, input_tmp);
+    output_type output_ref = algo_def::generate_output(num_values, input_ref);
+
+    auto e_a = algo_def::invoke_async(
+      std::make_tuple(thrust::device), prefix_index_seq{}, input_a, output_a, postfix_tuple, postfix_index_seq{});
+    ASSERT_EQUAL(true, e_a.valid_stream());
+    auto const stream_a = e_a.stream().native_handle();
+
+    // Execution on default stream should create a new stream in the result:
+    ASSERT_NOT_EQUAL_QUIET(thrust::hip_rocprim::default_stream(), stream_a);
+
+    //--------------------------------------------------------------------------
+    // Test event consumption when the event is an rvalue.
+    //--------------------------------------------------------------------------
+    // Using `forward_as_tuple` instead of `make_tuple` to explicitly control
+    // value categories.
+    // Explicitly order this invocation after e_a:
+    auto e_b = algo_def::invoke_async(
+      std::forward_as_tuple(thrust::device.after(e_a)),
+      prefix_index_seq{},
+      input_b,
+      output_b,
+      postfix_tuple,
+      postfix_index_seq{});
+    ASSERT_EQUAL(true, e_b.valid_stream());
+    auto const stream_b = e_b.stream().native_handle();
+
+    // Second invocation should use same stream as before:
+    ASSERT_EQUAL_QUIET(stream_a, stream_b);
+
+    // Verify that double consumption of e_a produces an exception:
+    ASSERT_THROWS_EQUAL(
+      auto x = algo_def::invoke_async(
+        std::forward_as_tuple(thrust::device.after(e_a)),
+        prefix_index_seq{},
+        input_tmp,
+        output_tmp,
+        postfix_tuple,
+        postfix_index_seq{});
+      THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    //--------------------------------------------------------------------------
+    // Test event consumption when the event is an lvalue
+    //--------------------------------------------------------------------------
+    // Explicitly order this invocation after e_b:
+    auto policy_after_e_b       = thrust::device.after(e_b);
+    auto policy_after_e_b_tuple = std::forward_as_tuple(policy_after_e_b);
+    auto e_c                    = algo_def::invoke_async(
+      policy_after_e_b_tuple, prefix_index_seq{}, input_c, output_c, postfix_tuple, postfix_index_seq{});
+    ASSERT_EQUAL(true, e_c.valid_stream());
+    auto const stream_c = e_c.stream().native_handle();
+
+    // Should use same stream as e_b:
+    ASSERT_EQUAL_QUIET(stream_b, stream_c);
+
+    // Verify that double consumption of e_b produces an exception:
+    ASSERT_THROWS_EQUAL(
+      auto x = algo_def::invoke_async(
+        policy_after_e_b_tuple, prefix_index_seq{}, input_tmp, output_tmp, postfix_tuple, postfix_index_seq{});
+      THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    // Let reference calc overlap with async testing:
+    algo_def::invoke_reference(input_ref, output_ref, postfix_tuple, postfix_index_seq{});
+
+    // Validate results
+    // Use e_c for all three checks -- e_a and e_b will not pass the event
+    // checks since their streams were stolen by dependencies.
+    algo_def::compare_outputs(e_c, output_ref, output_a);
+    algo_def::compare_outputs(e_c, output_ref, output_b);
+    algo_def::compare_outputs(e_c, output_ref, output_c);
+  }
+  catch (unittest::UnitTestException& exc)
+  {
+    // Append some identifying information to the exception to help with
+    // debugging:
+    using postfix_t = std::tuple_element_t<PostfixIdx, postfix_args_type>;
+
+    std::string const postfix_desc = unittest::demangle(typeid(postfix_t).name());
+    std::string const input_desc   = unittest::demangle(typeid(input_type).name());
+    std::string const output_desc  = unittest::demangle(typeid(output_type).name());
+
+    exc << "\n"
+        << " - algo_def::description = " << algo_def::description() << "\n"
+        << " - test = after_future\n"
+        << " - input_type = " << input_desc << "\n"
+        << " - output_type = " << output_desc << "\n"
+        << " - tuple of trailing arguments = " << postfix_desc << "\n"
+        << " - num_values = " << num_values;
+    throw;
+  }
+
+  //----------------------------------------------------------------------------
+  // Various helper functions:
+  template <std::size_t PostfixIdx>
+  static auto get_postfix_tuple()
+  {
+    return std::get<PostfixIdx>(algo_def::generate_postfix_args());
+  }
+};
+
+} // namespace async
+} // namespace testing
+
+#endif // C++14
diff --git a/projects/rocthrust/testing/async_copy.cu b/projects/rocthrust/testing/async_copy.cu
new file mode 100644
index 000000000000..c94b1a269426
--- /dev/null
+++ b/projects/rocthrust/testing/async_copy.cu
@@ -0,0 +1,346 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2014
+
+#  include <thrust/async/copy.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+#  include <thrust/limits.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+#  define DEFINE_ASYNC_COPY_CALLABLE(name, ...)                                                \
+    struct THRUST_PP_CAT2(name, _fn)                                                           \
+    {                                                                                          \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt>                      \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output) const \
+        THRUST_RETURNS(::thrust::async::copy(                                                  \
+          __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first),      \
+          THRUST_FWD(last),                                                                    \
+          THRUST_FWD(output)))                                                                 \
+    };                                                                                         \
+    /**/
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy);
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device, thrust::device);
+
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host_to_device, thrust::host, thrust::device);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device_to_host, thrust::device, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_host_to_host, thrust::host, thrust::host);
+DEFINE_ASYNC_COPY_CALLABLE(invoke_async_copy_device_to_device, thrust::device, thrust::device);
+
+#  undef DEFINE_ASYNC_COPY_CALLABLE
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename AsyncCopyCallable>
+struct test_async_copy_host_to_device
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+      thrust::device_vector<T> d0(n);
+
+      auto f0 = AsyncCopyCallable{}(h0.begin(), h0.end(), d0.begin());
+
+      f0.wait();
+
+      ASSERT_EQUAL(h0, d0);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_host_to_device<invoke_async_copy_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_trivially_relocatable_elements_host_to_device);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_host_to_device<invoke_async_copy_host_to_device_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_trivially_relocatable_elements_host_to_device_policies);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename AsyncCopyCallable>
+struct test_async_copy_device_to_host
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+      thrust::host_vector<T> h1(n);
+      thrust::device_vector<T> d0(n);
+
+      thrust::copy(h0.begin(), h0.end(), d0.begin());
+
+      ASSERT_EQUAL(h0, d0);
+
+      auto f0 = AsyncCopyCallable{}(d0.begin(), d0.end(), h1.begin());
+
+      f0.wait();
+
+      ASSERT_EQUAL(h0, d0);
+      ASSERT_EQUAL(d0, h1);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_device_to_host<invoke_async_copy_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_trivially_relocatable_elements_device_to_host);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_device_to_host<invoke_async_copy_device_to_host_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_trivially_relocatable_elements_device_to_host_policies);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename AsyncCopyCallable>
+struct test_async_copy_device_to_device
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+      thrust::device_vector<T> d0(n);
+      thrust::device_vector<T> d1(n);
+
+      thrust::copy(h0.begin(), h0.end(), d0.begin());
+
+      ASSERT_EQUAL(h0, d0);
+
+      auto f0 = AsyncCopyCallable{}(d0.begin(), d0.end(), d1.begin());
+
+      f0.wait();
+
+      ASSERT_EQUAL(h0, d0);
+      ASSERT_EQUAL(d0, d1);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_device_to_device<invoke_async_copy_fn>::tester, NumericTypes, test_async_copy_device_to_device);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_device_to_device<invoke_async_copy_device_fn>::tester,
+  NumericTypes,
+  test_async_copy_device_to_device_policy);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_device_to_device<invoke_async_copy_device_to_device_fn>::tester,
+  NumericTypes,
+  test_async_copy_device_to_device_policies);
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Non ContiguousIterator input.
+template <typename AsyncCopyCallable>
+struct test_async_copy_counting_iterator_input_to_device_vector
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::counting_iterator<T> first(0);
+      thrust::counting_iterator<T> last(unittest::truncate_to_max_representable<T>(n));
+
+      thrust::device_vector<T> d0(n);
+      thrust::device_vector<T> d1(n);
+
+      thrust::copy(first, last, d0.begin());
+
+      auto f0 = AsyncCopyCallable{}(first, last, d1.begin());
+
+      f0.wait();
+
+      ASSERT_EQUAL(d0, d1);
+    }
+  };
+};
+// TODO: Re-add custom_numeric when it supports counting iterators.
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_device_vector<invoke_async_copy_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_device_vector<invoke_async_copy_device_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device_policy);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_device_vector<invoke_async_copy_device_to_device_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_device_policies);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_device_vector<invoke_async_copy_host_to_device_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_host_to_device_policies);
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Non ContiguousIterator input.
+template <typename AsyncCopyCallable>
+struct test_async_copy_counting_iterator_input_to_host_vector
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::counting_iterator<T> first(0);
+      thrust::counting_iterator<T> last(unittest::truncate_to_max_representable<T>(n));
+
+      thrust::host_vector<T> d0(n);
+      thrust::host_vector<T> d1(n);
+
+      thrust::copy(first, last, d0.begin());
+
+      auto f0 = AsyncCopyCallable{}(first, last, d1.begin());
+
+      f0.wait();
+
+      ASSERT_EQUAL(d0, d1);
+
+#  if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
+      // ICC fails this for some unknown reason - see #1468.
+      KNOWN_FAILURE;
+#  endif
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_host_vector<invoke_async_copy_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_host);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_counting_iterator_input_to_host_vector<invoke_async_copy_device_to_host_fn>::tester,
+  BuiltinNumericTypes,
+  test_async_copy_counting_iterator_input_trivially_relocatable_elements_device_to_host_policies);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_copy_roundtrip
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0(n);
+
+    auto e0 = thrust::async::copy(thrust::host, thrust::device, h0.begin(), h0.end(), d0.begin());
+
+    auto e1 = thrust::async::copy(thrust::device.after(e0), thrust::host, d0.begin(), d0.end(), h0.begin());
+
+    TEST_EVENT_WAIT(e1);
+
+    ASSERT_EQUAL(h0, d0);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  test_async_copy_roundtrip, BuiltinNumericTypes, test_async_copy_trivially_relocatable_elements_roundtrip);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_copy_after
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::host_vector<T> h1(n);
+    thrust::device_vector<T> d0(n);
+    thrust::device_vector<T> d1(n);
+    thrust::device_vector<T> d2(n);
+
+    auto e0 = thrust::async::copy(h0.begin(), h0.end(), d0.begin());
+
+    ASSERT_EQUAL(true, e0.valid_stream());
+
+    auto const e0_stream = e0.stream().native_handle();
+
+    auto e1 = thrust::async::copy(thrust::device.after(e0), d0.begin(), d0.end(), d1.begin());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::copy(thrust::device.after(e0), d0.begin(), d0.end(), d1.begin());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(e0_stream, e1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(e1);
+
+    auto e2 = thrust::async::copy(thrust::host, after_policy2, h0.begin(), h0.end(), d2.begin());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::copy(thrust::host, after_policy2, h0.begin(), h0.end(), d2.begin());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(e0_stream, e2.stream().native_handle());
+
+    auto e3 = thrust::async::copy(thrust::device.after(e2), thrust::host, d1.begin(), d1.end(), h1.begin());
+
+    ASSERT_EQUAL_QUIET(e0_stream, e3.stream().native_handle());
+
+    TEST_EVENT_WAIT(e3);
+
+    ASSERT_EQUAL(h0, h1);
+    ASSERT_EQUAL(h0, d0);
+    ASSERT_EQUAL(h0, d1);
+    ASSERT_EQUAL(h0, d2);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_copy_after, BuiltinNumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: device_to_device NonContiguousIterator output (discard_iterator).
+
+// TODO: host_to_device non trivially relocatable.
+
+// TODO: device_to_host non trivially relocatable.
+
+// TODO: host_to_device NonContiguousIterator input (counting_iterator).
+
+// TODO: host_to_device NonContiguousIterator output (discard_iterator).
+
+// TODO: device_to_host NonContiguousIterator input (counting_iterator).
+
+// TODO: device_to_host NonContiguousIterator output (discard_iterator).
+
+// TODO: Mixed types, needs loosening of `is_trivially_relocatable_to` logic.
+
+// TODO: H->D copy, then dependent D->H copy (round trip).
+// Can't do this today because we can't do cross-system with explicit policies.
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async_for_each.cu b/projects/rocthrust/testing/async_for_each.cu
new file mode 100644
index 000000000000..e8a50b493140
--- /dev/null
+++ b/projects/rocthrust/testing/async_for_each.cu
@@ -0,0 +1,90 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/for_each.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include <unittest/unittest.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#  define DEFINE_ASYNC_FOR_EACH_CALLABLE(name, ...)                                            \
+    struct THRUST_PP_CAT2(name, _fn)                                                           \
+    {                                                                                          \
+      template <typename ForwardIt, typename Sentinel, typename UnaryFunction>                 \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, UnaryFunction&& f) const \
+        THRUST_RETURNS(::thrust::async::for_each(                                              \
+          __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first),      \
+          THRUST_FWD(last),                                                                    \
+          THRUST_FWD(f)))                                                                      \
+    };                                                                                         \
+    /**/
+
+DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each);
+DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each_device, thrust::device);
+
+#  undef DEFINE_ASYNC_FOR_EACH_CALLABLE
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct inplace_divide_by_2
+{
+  template <typename T>
+  THRUST_HOST_DEVICE void operator()(T& x) const
+  {
+    x /= 2;
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename AsyncForEachCallable, typename UnaryFunction>
+struct test_async_for_each
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::host_vector<T> h0_data(unittest::random_integers<T>(n));
+      thrust::device_vector<T> d0_data(h0_data);
+
+      thrust::for_each(h0_data.begin(), h0_data.end(), UnaryFunction{});
+
+      auto f0 = AsyncForEachCallable{}(d0_data.begin(), d0_data.end(), UnaryFunction{});
+
+      f0.wait();
+
+      ASSERT_EQUAL(h0_data, d0_data);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_for_each<invoke_async_for_each_fn, inplace_divide_by_2>::tester),
+  NumericTypes,
+  test_async_for_each);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_for_each<invoke_async_for_each_device_fn, inplace_divide_by_2>::tester),
+  NumericTypes,
+  test_async_for_each_policy);
+
+#endif
diff --git a/projects/rocthrust/testing/async_reduce.cu b/projects/rocthrust/testing/async_reduce.cu
new file mode 100644
index 000000000000..c57ad756671d
--- /dev/null
+++ b/projects/rocthrust/testing/async_reduce.cu
@@ -0,0 +1,928 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#define THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside several thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/reduce.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+template <typename T>
+struct custom_plus
+{
+  THRUST_HOST_DEVICE T operator()(T lhs, T rhs) const
+  {
+    return lhs + rhs;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...) \
+    template <typename T>                                                                \
+    struct NAME                                                                          \
+    {                                                                                    \
+      MEMBERS                                                                            \
+                                                                                         \
+      NAME()                                                                             \
+      {                                                                                  \
+        CTOR                                                                             \
+      }                                                                                  \
+                                                                                         \
+      ~NAME()                                                                            \
+      {                                                                                  \
+        DTOR                                                                             \
+      }                                                                                  \
+                                                                                         \
+      template <typename Event>                                                          \
+      void validate_event(Event& e)                                                      \
+      {                                                                                  \
+        THRUST_UNUSED_VAR(e);                                                            \
+        VALIDATE                                                                         \
+      }                                                                                  \
+                                                                                         \
+      template <typename ForwardIt, typename Sentinel>                                   \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last)                    \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::reduce(__VA_ARGS__))                    \
+    };                                                                                   \
+    /**/
+
+#  define DEFINE_ASYNC_REDUCE_INVOKER(NAME, ...)                                                     \
+    DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(                                                            \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_REDUCE_INVOKER(NAME, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct NAME                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::reduce(__VA_ARGS__)) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker, THRUST_FWD(first), THRUST_FWD(last));
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker_device, thrust::device, THRUST_FWD(first), THRUST_FWD(last));
+DEFINE_ASYNC_REDUCE_INVOKER(reduce_async_invoker_device_allocator,
+                            thrust::device(thrust::device_allocator<void>{}),
+                            THRUST_FWD(first),
+                            THRUST_FWD(last));
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last));
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last));
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker, THRUST_FWD(first), THRUST_FWD(last));
+
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_init, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init, thrust::device, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker_init, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>());
+
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>(), thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>(), thrust::plus<T>());
+
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_init_custom_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_init_custom_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_init_custom_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INVOKER(
+  reduce_async_invoker_device_allocator_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_custom_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncReduceInvoker, template <typename> class SyncReduceInvoker>
+struct test_async_reduce
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      CHECK_ASAN_ENABLEMENT();
+	  
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+      thrust::device_vector<T> d0a(h0);
+      thrust::device_vector<T> d0b(h0);
+      thrust::device_vector<T> d0c(h0);
+      thrust::device_vector<T> d0d(h0);
+
+      AsyncReduceInvoker<T> invoke_async;
+      SyncReduceInvoker<T> invoke_sync;
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+
+      auto f0a = invoke_async(d0a.begin(), d0a.end());
+      auto f0b = invoke_async(d0b.begin(), d0b.end());
+      auto f0c = invoke_async(d0c.begin(), d0c.end());
+      auto f0d = invoke_async(d0d.begin(), d0d.end());
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      auto const r0 = invoke_sync(h0.begin(), h0.end());
+
+      auto const r1a = TEST_FUTURE_VALUE_RETRIEVAL(f0a);
+      auto const r1b = TEST_FUTURE_VALUE_RETRIEVAL(f0b);
+      auto const r1c = TEST_FUTURE_VALUE_RETRIEVAL(f0c);
+      auto const r1d = TEST_FUTURE_VALUE_RETRIEVAL(f0d);
+
+      ASSERT_EQUAL(r0, r1a);
+      ASSERT_EQUAL(r0, r1b);
+      ASSERT_EQUAL(r0, r1c);
+      ASSERT_EQUAL(r0, r1d);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_policy);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_allocator, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_on, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_policy_on);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_allocator_on, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_on);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_policy_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_allocator_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_on_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_policy_on_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_allocator_on_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_on_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_allocator_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_on_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_on_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_allocator_on_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_on_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_init_custom_plus, reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_init_custom_plus, reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_allocator_init_custom_plus,
+                                          reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce<reduce_async_invoker_device_on_init_custom_plus, reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_on_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce<reduce_async_invoker_device_allocator_on_init_custom_plus,
+                                          reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_policy_allocator_on_init_custom_plus);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncReduceInvoker, template <typename> class SyncReduceInvoker>
+struct test_async_reduce_counting_iterator
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()()
+    {
+      constexpr std::size_t n = 15 * sizeof(T);
+
+      ASSERT_LEQUAL(T(n), unittest::truncate_to_max_representable<T>(n));
+
+      thrust::counting_iterator<T> first(0);
+      thrust::counting_iterator<T> last(n);
+
+      AsyncReduceInvoker<T> invoke_async;
+      SyncReduceInvoker<T> invoke_sync;
+
+      auto f0a = invoke_async(first, last);
+      auto f0b = invoke_async(first, last);
+      auto f0c = invoke_async(first, last);
+      auto f0d = invoke_async(first, last);
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      auto const r0 = invoke_sync(first, last);
+
+      auto const r1a = TEST_FUTURE_VALUE_RETRIEVAL(f0a);
+      auto const r1b = TEST_FUTURE_VALUE_RETRIEVAL(f0b);
+      auto const r1c = TEST_FUTURE_VALUE_RETRIEVAL(f0c);
+      auto const r1d = TEST_FUTURE_VALUE_RETRIEVAL(f0d);
+
+      ASSERT_EQUAL(r0, r1a);
+      ASSERT_EQUAL(r0, r1b);
+      ASSERT_EQUAL(r0, r1c);
+      ASSERT_EQUAL(r0, r1d);
+    }
+  };
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_counting_iterator<reduce_async_invoker, reduce_sync_invoker>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_counting_iterator);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_counting_iterator<reduce_async_invoker_device, reduce_sync_invoker>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_policy_counting_iterator);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_counting_iterator<reduce_async_invoker_init, reduce_sync_invoker_init>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_counting_iterator_init);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_counting_iterator<reduce_async_invoker_device_init, reduce_sync_invoker_init>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_policy_counting_iterator_init);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_counting_iterator<reduce_async_invoker_init_plus, reduce_sync_invoker_init_plus>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_counting_iterator_init_plus);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_counting_iterator<reduce_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_policy_counting_iterator_init_plus);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_counting_iterator<reduce_async_invoker_init_custom_plus,
+                                                            reduce_sync_invoker_init_custom_plus>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_counting_iterator_init_custom_plus);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_counting_iterator<reduce_async_invoker_device_init_custom_plus,
+                                                            reduce_sync_invoker_init_custom_plus>::tester),
+  BuiltinNumericTypes,
+  test_async_reduce_policy_counting_iterator_init_custom_plus);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_reduce_using
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+	CHECK_ASAN_ENABLEMENT();
+	
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0a(h0);
+    thrust::device_vector<T> d0b(h0);
+
+    ASSERT_EQUAL(h0, d0a);
+    ASSERT_EQUAL(h0, d0b);
+
+    thrust::device_future<T> f0a;
+    thrust::device_future<T> f0b;
+
+    // When you import the customization points into the global namespace,
+    // they should be selected instead of the synchronous algorithms.
+    {
+      using namespace thrust::async;
+      f0a = reduce(d0a.begin(), d0a.end());
+    }
+    {
+      using thrust::async::reduce;
+      f0b = reduce(d0b.begin(), d0b.end());
+    }
+
+    // ADL should find the synchronous algorithms.
+    // This potentially runs concurrently with the copies.
+    T const r0 = reduce(h0.begin(), h0.end());
+
+    T const r1a = TEST_FUTURE_VALUE_RETRIEVAL(f0a);
+    T const r1b = TEST_FUTURE_VALUE_RETRIEVAL(f0b);
+
+    ASSERT_EQUAL(r0, r1a);
+    ASSERT_EQUAL(r0, r1b);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_reduce_using, NumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_reduce_after
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    CHECK_ASAN_ENABLEMENT();
+  
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQUAL(h0, d0);
+
+    auto f0 = thrust::async::reduce(d0.begin(), d0.end());
+
+    ASSERT_EQUAL(true, f0.valid_stream());
+
+    auto const f0_stream = f0.stream().native_handle();
+
+    auto f1 = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(f0_stream, f1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(f1);
+
+    auto f2 = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(f0_stream, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T const r1 = TEST_FUTURE_VALUE_RETRIEVAL(f2);
+
+    ASSERT_EQUAL(r0, r1);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_reduce_after, NumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_reduce_on_then_after
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+	CHECK_ASAN_ENABLEMENT();
+	
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQUAL(h0, d0);
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    auto f0 = thrust::async::reduce(thrust::device.on(stream), d0.begin(), d0.end());
+
+    ASSERT_EQUAL_QUIET(stream, f0.stream().native_handle());
+
+    auto f1 = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+
+    // Verify that double consumption of a future produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::reduce(thrust::device.after(f0), d0.begin(), d0.end());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(stream, f1.stream().native_handle());
+
+    auto after_policy2 = thrust::device.after(f1);
+
+    auto f2 = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+
+    // Verify that double consumption of a policy produces an exception.
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::reduce(after_policy2, d0.begin(), d0.end());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(stream, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T const r1 = TEST_FUTURE_VALUE_RETRIEVAL(f2);
+
+    ASSERT_EQUAL(r0, r1);
+
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream));
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_reduce_on_then_after, NumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_reduce_allocator_on_then_after
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQUAL(h0, d0);
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream0;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream0, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream1;
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(
+      StreamCreateWithFlags)(&stream1, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+
+    auto f0 = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).on(stream0), d0.begin(), d0.end());
+
+    ASSERT_EQUAL_QUIET(stream0, f0.stream().native_handle());
+
+    auto f1 = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).after(f0), d0.begin(), d0.end());
+
+    ASSERT_THROWS_EQUAL(
+      auto x = thrust::async::reduce(thrust::device(thrust::device_allocator<void>{}).after(f0), d0.begin(), d0.end());
+      THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_EQUAL_QUIET(stream0, f1.stream().native_handle());
+
+    auto f2 = thrust::async::reduce(
+      thrust::device(thrust::device_allocator<void>{}).on(stream1).after(f1), d0.begin(), d0.end());
+
+    ASSERT_THROWS_EQUAL(auto x = thrust::async::reduce(
+                          thrust::device(thrust::device_allocator<void>{}).on(stream1).after(f1), d0.begin(), d0.end());
+                        THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    KNOWN_FAILURE;
+    // FIXME: The below fails because you can't combine allocator attachment,
+    // `.on`, and `.after`.
+    // The `#if 0` can be removed once the KNOWN_FAILURE is resolved.
+#  if 0
+    ASSERT_EQUAL_QUIET(stream1, f2.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+    T const r1 = TEST_FUTURE_VALUE_RETRIEVAL(f2);
+
+    ASSERT_EQUAL(r0, r1);
+
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream0));
+    thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream1));
+#  endif
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_reduce_allocator_on_then_after, NumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_reduce_caching
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    CHECK_ASAN_ENABLEMENT();
+  
+    constexpr std::int64_t m = 32;
+
+    thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+    thrust::device_vector<T> d0(h0);
+
+    ASSERT_EQUAL(h0, d0);
+
+    T const* f0_raw_data;
+
+    {
+      // Perform one reduction to ensure there's an entry in the caching
+      // allocator.
+      auto f0 = thrust::async::reduce(d0.begin(), d0.end());
+
+      TEST_EVENT_WAIT(f0);
+
+      f0_raw_data = f0.raw_data();
+    }
+
+    for (std::int64_t i = 0; i < m; ++i)
+    {
+      auto f1 = thrust::async::reduce(d0.begin(), d0.end());
+
+      ASSERT_EQUAL(true, f1.valid_stream());
+      ASSERT_EQUAL(true, f1.valid_content());
+
+      ASSERT_EQUAL_QUIET(f0_raw_data, f1.raw_data());
+
+      // This potentially runs concurrently with the copies.
+      T const r0 = thrust::reduce(h0.begin(), h0.end());
+
+      T const r1 = TEST_FUTURE_VALUE_RETRIEVAL(f1);
+
+      ASSERT_EQUAL(r0, r1);
+    }
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_reduce_caching, NumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_async_copy_then_reduce
+{
+  THRUST_HOST void operator()(std::size_t n)
+  {
+    CHECK_ASAN_ENABLEMENT();
+	
+    thrust::host_vector<T> h0a(unittest::random_integers<T>(n));
+    thrust::host_vector<T> h0b(unittest::random_integers<T>(n));
+    thrust::host_vector<T> h0c(unittest::random_integers<T>(n));
+    thrust::host_vector<T> h0d(unittest::random_integers<T>(n));
+
+    thrust::device_vector<T> d0a(n);
+    thrust::device_vector<T> d0b(n);
+    thrust::device_vector<T> d0c(n);
+    thrust::device_vector<T> d0d(n);
+
+    auto f0a = thrust::async::copy(h0a.begin(), h0a.end(), d0a.begin());
+    auto f0b = thrust::async::copy(h0b.begin(), h0b.end(), d0b.begin());
+    auto f0c = thrust::async::copy(h0c.begin(), h0c.end(), d0c.begin());
+    auto f0d = thrust::async::copy(h0d.begin(), h0d.end(), d0d.begin());
+
+    ASSERT_EQUAL(true, f0a.valid_stream());
+    ASSERT_EQUAL(true, f0b.valid_stream());
+    ASSERT_EQUAL(true, f0c.valid_stream());
+    ASSERT_EQUAL(true, f0d.valid_stream());
+
+    auto const f0a_stream = f0a.stream().native_handle();
+    auto const f0b_stream = f0b.stream().native_handle();
+    auto const f0c_stream = f0c.stream().native_handle();
+    auto const f0d_stream = f0d.stream().native_handle();
+
+    auto f1a = thrust::async::reduce(thrust::device.after(f0a), d0a.begin(), d0a.end());
+    auto f1b = thrust::async::reduce(thrust::device.after(f0b), d0b.begin(), d0b.end());
+    auto f1c = thrust::async::reduce(thrust::device.after(f0c), d0c.begin(), d0c.end());
+    auto f1d = thrust::async::reduce(thrust::device.after(f0d), d0d.begin(), d0d.end());
+
+    ASSERT_EQUAL(false, f0a.valid_stream());
+    ASSERT_EQUAL(false, f0b.valid_stream());
+    ASSERT_EQUAL(false, f0c.valid_stream());
+    ASSERT_EQUAL(false, f0d.valid_stream());
+
+    ASSERT_EQUAL(true, f1a.valid_stream());
+    ASSERT_EQUAL(true, f1a.valid_content());
+    ASSERT_EQUAL(true, f1b.valid_stream());
+    ASSERT_EQUAL(true, f1b.valid_content());
+    ASSERT_EQUAL(true, f1c.valid_stream());
+    ASSERT_EQUAL(true, f1c.valid_content());
+    ASSERT_EQUAL(true, f1d.valid_stream());
+    ASSERT_EQUAL(true, f1d.valid_content());
+
+    // Verify that streams were stolen.
+    ASSERT_EQUAL_QUIET(f0a_stream, f1a.stream().native_handle());
+    ASSERT_EQUAL_QUIET(f0b_stream, f1b.stream().native_handle());
+    ASSERT_EQUAL_QUIET(f0c_stream, f1c.stream().native_handle());
+    ASSERT_EQUAL_QUIET(f0d_stream, f1d.stream().native_handle());
+
+    // This potentially runs concurrently with the copies.
+    T const r0 = thrust::reduce(h0a.begin(), h0a.end());
+
+    T const r1a = TEST_FUTURE_VALUE_RETRIEVAL(f1a);
+    T const r1b = TEST_FUTURE_VALUE_RETRIEVAL(f1b);
+    T const r1c = TEST_FUTURE_VALUE_RETRIEVAL(f1c);
+    T const r1d = TEST_FUTURE_VALUE_RETRIEVAL(f1d);
+
+    ASSERT_EQUAL(r0, r1a);
+    ASSERT_EQUAL(r0, r1b);
+    ASSERT_EQUAL(r0, r1c);
+    ASSERT_EQUAL(r0, r1d);
+  }
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES(test_async_copy_then_reduce, BuiltinNumericTypes);
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: when_all from reductions.
+
+// See also issue: https://github.com/NVIDIA/cccl/issues/1886
+struct test_async_reduce_bug1886
+{
+  struct tuple_sum
+  {
+    __device__ thrust::tuple<int, int>
+    operator()(const thrust::tuple<int, int>& t1, const thrust::tuple<int, int>& t2) const
+    {
+      return thrust::make_tuple(thrust::get<0>(t1) + thrust::get<0>(t2), thrust::get<1>(t1) + thrust::get<1>(t2));
+    }
+  };
+
+  void operator()() const
+  {
+    // Initialize input data
+    thrust::device_vector<int> d_data1{1, 2, 3, 4, 5};
+    thrust::device_vector<int> d_data2{10, 20, 30, 40, 50};
+
+    using TupleType = thrust::tuple<int, int>;
+    using IteratorType =
+      thrust::zip_iterator<thrust::tuple<thrust::device_vector<int>::iterator, thrust::device_vector<int>::iterator>>;
+
+    // Create zip_begin and zip_end iterators
+    IteratorType zip_begin = thrust::make_zip_iterator(thrust::make_tuple(d_data1.begin(), d_data2.begin()));
+    IteratorType zip_end   = thrust::make_zip_iterator(thrust::make_tuple(d_data2.end(), d_data2.end()));
+
+    // Initialize the starting tuple
+    TupleType init = thrust::make_tuple(0, 0);
+
+    // Perform async reduce using zip_begin and zip_end
+    auto future = thrust::async::reduce(thrust::device, zip_begin, zip_end, init, tuple_sum());
+
+    // Get the result
+    TupleType result = future.get();
+
+    // Print the result
+    std::cout << "Sum: (" << thrust::get<0>(result) << ", " << thrust::get<1>(result) << ")" << std::endl;
+  }
+};
+DECLARE_UNITTEST(test_async_reduce_bug1886);
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async_reduce_into.cu b/projects/rocthrust/testing/async_reduce_into.cu
new file mode 100644
index 000000000000..6ae3b9376780
--- /dev/null
+++ b/projects/rocthrust/testing/async_reduce_into.cu
@@ -0,0 +1,512 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#define THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/reduce.h>
+#  include <thrust/device_make_unique.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+template <typename T>
+struct custom_plus
+{
+  THRUST_HOST_DEVICE T operator()(T lhs, T rhs) const
+  {
+    return lhs + rhs;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...) \
+    template <typename T>                                                                     \
+    struct NAME                                                                               \
+    {                                                                                         \
+      MEMBERS                                                                                 \
+                                                                                              \
+      NAME()                                                                                  \
+      {                                                                                       \
+        CTOR                                                                                  \
+      }                                                                                       \
+                                                                                              \
+      ~NAME()                                                                                 \
+      {                                                                                       \
+        DTOR                                                                                  \
+      }                                                                                       \
+                                                                                              \
+      template <typename Event>                                                               \
+      void validate_event(Event& e)                                                           \
+      {                                                                                       \
+        THRUST_UNUSED_VAR(e);                                                                 \
+        VALIDATE                                                                              \
+      }                                                                                       \
+                                                                                              \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt>                     \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output)      \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::reduce_into(__VA_ARGS__))                    \
+    };                                                                                        \
+    /**/
+
+#  define DEFINE_ASYNC_REDUCE_INTO_INVOKER(NAME, ...)                                                \
+    DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(                                                       \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_REDUCE_INVOKER(NAME, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct NAME                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::reduce(__VA_ARGS__)) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(reduce_into_async_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output));
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device, thrust::device, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output));
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output));
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker, THRUST_FWD(first), THRUST_FWD(last));
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(reduce_sync_invoker_init, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>());
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  thrust::plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_plus, THRUST_FWD(first), THRUST_FWD(last), unittest::random_integer<T>(), thrust::plus<T>());
+
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_init_custom_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_init_custom_plus,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_init_custom_plus,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+DEFINE_STATEFUL_ASYNC_REDUCE_INTO_INVOKER(
+  reduce_into_async_invoker_device_allocator_on_init_custom_plus
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::reduce_into`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+
+DEFINE_SYNC_REDUCE_INVOKER(
+  reduce_sync_invoker_init_custom_plus,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  unittest::random_integer<T>(),
+  custom_plus<T>());
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncReduceIntoInvoker, template <typename> class SyncReduceIntoInvoker>
+struct test_async_reduce_into
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      CHECK_ASAN_ENABLEMENT();
+		
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+
+      thrust::device_vector<T> d0a(h0);
+      thrust::device_vector<T> d0b(h0);
+      thrust::device_vector<T> d0c(h0);
+      thrust::device_vector<T> d0d(h0);
+
+      auto s0a = thrust::device_make_unique<T>();
+      auto s0b = thrust::device_make_unique<T>();
+      auto s0c = thrust::device_make_unique<T>();
+      auto s0d = thrust::device_make_unique<T>();
+
+      auto const s0a_ptr = s0a.get();
+      auto const s0b_ptr = s0b.get();
+      auto const s0c_ptr = s0c.get();
+      auto const s0d_ptr = s0d.get();
+
+      AsyncReduceIntoInvoker<T> invoke_async;
+      SyncReduceIntoInvoker<T> invoke_sync;
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+
+      auto f0a = invoke_async(d0a.begin(), d0a.end(), s0a_ptr);
+      auto f0b = invoke_async(d0b.begin(), d0b.end(), s0b_ptr);
+      auto f0c = invoke_async(d0c.begin(), d0c.end(), s0c_ptr);
+      auto f0d = invoke_async(d0d.begin(), d0d.end(), s0d_ptr);
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      auto const r0 = invoke_sync(h0.begin(), h0.end());
+
+      TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+      ASSERT_EQUAL(r0, *s0a_ptr);
+      ASSERT_EQUAL(r0, *s0b_ptr);
+      ASSERT_EQUAL(r0, *s0c_ptr);
+      ASSERT_EQUAL(r0, *s0d_ptr);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_into);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_allocator, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_on, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_on);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_allocator_on, reduce_sync_invoker>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_on);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_into_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_allocator_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_on_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_on_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_allocator_on_init, reduce_sync_invoker_init>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_on_init);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_allocator_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_device_on_init_plus, reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_on_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_allocator_on_init_plus,
+                                               reduce_sync_invoker_init_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_on_init_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_reduce_into<reduce_into_async_invoker_init_custom_plus, reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_init_custom_plus,
+                                               reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_allocator_init_custom_plus,
+                                               reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_on_init_custom_plus,
+                                               reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_on_init_custom_plus);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_reduce_into<reduce_into_async_invoker_device_allocator_on_init_custom_plus,
+                                               reduce_sync_invoker_init_custom_plus>::tester),
+  NumericTypes,
+  test_async_reduce_into_policy_allocator_on_init_custom_plus);
+
+#endif
diff --git a/projects/rocthrust/testing/async_sort.cu b/projects/rocthrust/testing/async_sort.cu
new file mode 100644
index 000000000000..198fe4783f1b
--- /dev/null
+++ b/projects/rocthrust/testing/async_sort.cu
@@ -0,0 +1,202 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings inside a lot of thrust headers
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+// Disabled on MSVC && NVCC < 11.1 for GH issue #1098.
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && defined(__CUDACC__)
+#  if (__CUDACC_VER_MAJOR__ < 11) || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 1)
+#    define THRUST_BUG_1098_ACTIVE
+#  endif // NVCC version check
+#endif // MSVC + NVCC check
+
+#if THRUST_CPP_DIALECT >= 2017 && !defined(THRUST_BUG_1098_ACTIVE)
+
+#  include <thrust/async/sort.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include <unittest/unittest.h>
+
+enum wait_policy
+{
+  wait_for_futures,
+  do_not_wait_for_futures
+};
+
+template <typename T>
+struct custom_greater
+{
+  THRUST_HOST_DEVICE bool operator()(T rhs, T lhs) const
+  {
+    return lhs > rhs;
+  }
+};
+
+#  define DEFINE_SORT_INVOKER(name, ...)                                                                      \
+    template <typename T>                                                                                     \
+    struct name                                                                                               \
+    {                                                                                                         \
+      template <typename ForwardIt, typename Sentinel>                                                        \
+      THRUST_HOST static void sync(ForwardIt&& first, Sentinel&& last)                                        \
+      {                                                                                                       \
+        ::thrust::sort(THRUST_FWD(first), THRUST_FWD(last));                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename ForwardIt, typename Sentinel>                                                        \
+      THRUST_HOST static auto async(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::async::sort( \
+        __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first), THRUST_FWD(last)))    \
+    };                                                                                                        \
+    /**/
+
+DEFINE_SORT_INVOKER(sort_invoker);
+DEFINE_SORT_INVOKER(sort_invoker_device, thrust::device);
+
+#  define DEFINE_SORT_OP_INVOKER(name, op, ...)                                                                     \
+    template <typename T>                                                                                           \
+    struct name                                                                                                     \
+    {                                                                                                               \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST static void sync(ForwardIt&& first, Sentinel&& last)                                              \
+      {                                                                                                             \
+        ::thrust::sort(THRUST_FWD(first), THRUST_FWD(last), op<T>{});                                               \
+      }                                                                                                             \
+                                                                                                                    \
+      template <typename ForwardIt, typename Sentinel>                                                              \
+      THRUST_HOST static auto async(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(::thrust::async::sort(       \
+        __VA_ARGS__ THRUST_PP_COMMA_IF(THRUST_PP_ARITY(__VA_ARGS__)) THRUST_FWD(first), THRUST_FWD(last), op<T>{})) \
+    };                                                                                                              \
+    /**/
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_less, thrust::less);
+DEFINE_SORT_OP_INVOKER(sort_invoker_less_device, thrust::less, thrust::device);
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_greater, thrust::greater);
+DEFINE_SORT_OP_INVOKER(sort_invoker_greater_device, thrust::greater, thrust::device);
+
+DEFINE_SORT_OP_INVOKER(sort_invoker_custom_greater, custom_greater);
+DEFINE_SORT_OP_INVOKER(sort_invoker_custom_greater_device, custom_greater, thrust::device);
+
+#  undef DEFINE_SORT_INVOKER
+#  undef DEFINE_SORT_OP_INVOKER
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class SortInvoker, wait_policy WaitPolicy>
+struct test_async_sort
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      thrust::host_vector<T> h0_data(unittest::random_integers<T>(n));
+      thrust::device_vector<T> d0_data(h0_data);
+
+      ASSERT_EQUAL(h0_data, d0_data);
+
+      SortInvoker<T>::sync(h0_data.begin(), h0_data.end());
+
+      auto f0 = SortInvoker<T>::async(d0_data.begin(), d0_data.end());
+
+      THRUST_IF_CONSTEXPR (wait_for_futures == WaitPolicy)
+      {
+        f0.wait();
+
+        ASSERT_EQUAL(h0_data, d0_data);
+      }
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker, wait_for_futures>::tester), NumericTypes, test_async_sort);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_device, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_device, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_less, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_less);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_less, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_less_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_less_device, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_less);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_less_device, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_less_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_greater, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_greater);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_greater, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_greater_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_greater_device, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_greater);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_greater_device, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_greater_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_custom_greater, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_custom_greater);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_custom_greater, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_custom_greater_no_wait);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_custom_greater_device, wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_custom_greater);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_sort<sort_invoker_custom_greater_device, do_not_wait_for_futures>::tester),
+  NumericTypes,
+  test_async_sort_policy_custom_greater_no_wait);
+
+///////////////////////////////////////////////////////////////////////////////
+
+// TODO: Async copy then sort.
+
+// TODO: Test future return type.
+
+#endif
+
+// we need to leak the suppression on clang/MSVC to suppresses warnings from the cudafe1.stub.c file
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_CLANG && THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
diff --git a/projects/rocthrust/testing/async_transform.cu b/projects/rocthrust/testing/async_transform.cu
new file mode 100644
index 000000000000..6b5fe54bda18
--- /dev/null
+++ b/projects/rocthrust/testing/async_transform.cu
@@ -0,0 +1,466 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/async/copy.h>
+#  include <thrust/async/transform.h>
+#  include <thrust/device_vector.h>
+#  include <thrust/host_vector.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+template <typename T>
+struct divide_by_2
+{
+  THRUST_HOST_DEVICE T operator()(T x) const
+  {
+    return x / 2;
+  }
+};
+
+#  define DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(NAME, MEMBERS, CTOR, DTOR, VALIDATE, ...)             \
+    template <typename T>                                                                                     \
+    struct NAME                                                                                               \
+    {                                                                                                         \
+      MEMBERS                                                                                                 \
+                                                                                                              \
+      NAME()                                                                                                  \
+      {                                                                                                       \
+        CTOR                                                                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      ~NAME()                                                                                                 \
+      {                                                                                                       \
+        DTOR                                                                                                  \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename Event>                                                                               \
+      void validate_event(Event& e)                                                                           \
+      {                                                                                                       \
+        THRUST_UNUSED_VAR(e);                                                                                 \
+        VALIDATE                                                                                              \
+      }                                                                                                       \
+                                                                                                              \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>            \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output, UnaryOperation&& op) \
+        THRUST_DECLTYPE_RETURNS(::thrust::async::transform(__VA_ARGS__))                                      \
+    };                                                                                                        \
+    /**/
+
+#  define DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(NAME, ...)                                            \
+    DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(                                                   \
+      NAME, THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), THRUST_PP_EMPTY(), __VA_ARGS__) \
+    /**/
+
+#  define DEFINE_SYNC_TRANSFORM_UNARY_INVOKER(NAME, ...)                                                      \
+    template <typename T>                                                                                     \
+    struct NAME                                                                                               \
+    {                                                                                                         \
+      template <typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>            \
+      THRUST_HOST auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& output, UnaryOperation&& op) \
+        THRUST_RETURNS(::thrust::transform(__VA_ARGS__))                                                      \
+    };                                                                                                        \
+    /**/
+
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output), THRUST_FWD(op));
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device,
+  thrust::device,
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_allocator,
+  thrust::device(thrust::device_allocator<void>{}),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::transform`.
+  ,
+  thrust::device.on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+DEFINE_STATEFUL_ASYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_async_invoker_device_allocator_on
+  // Members.
+  ,
+  SPECIALIZE_DEVICE_RESOURCE_NAME(Stream_t) stream_;
+  // Constructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamCreateWithFlags)(
+    &stream_, SPECIALIZE_DEVICE_RESOURCE_NAME(StreamNonBlocking)));
+  // Destructor.
+  ,
+  thrust::THRUST_DEVICE_BACKEND_DETAIL::throw_on_error(SPECIALIZE_DEVICE_RESOURCE_NAME(StreamDestroy)(stream_));
+  // `validate_event` member.
+  ,
+  ASSERT_EQUAL_QUIET(stream_, e.stream().native_handle());
+  // Arguments to `thrust::async::transform`.
+  ,
+  thrust::device(thrust::device_allocator<void>{}).on(stream_),
+  THRUST_FWD(first),
+  THRUST_FWD(last),
+  THRUST_FWD(output),
+  THRUST_FWD(op));
+
+DEFINE_SYNC_TRANSFORM_UNARY_INVOKER(
+  transform_unary_sync_invoker, THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(output), THRUST_FWD(op));
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+struct test_async_transform_unary
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      CHECK_ASAN_ENABLEMENT();
+      
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+
+      thrust::device_vector<T> d0a(h0);
+      thrust::device_vector<T> d0b(h0);
+      thrust::device_vector<T> d0c(h0);
+      thrust::device_vector<T> d0d(h0);
+
+      thrust::host_vector<T> h1(n);
+
+      thrust::device_vector<T> d1a(n);
+      thrust::device_vector<T> d1b(n);
+      thrust::device_vector<T> d1c(n);
+      thrust::device_vector<T> d1d(n);
+
+      AsyncTransformUnaryInvoker<T> invoke_async;
+      SyncTransformUnaryInvoker<T> invoke_sync;
+
+      UnaryOperation<T> op;
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+
+      auto f0a = invoke_async(d0a.begin(), d0a.end(), d1a.begin(), op);
+      auto f0b = invoke_async(d0b.begin(), d0b.end(), d1b.begin(), op);
+      auto f0c = invoke_async(d0c.begin(), d0c.end(), d1c.begin(), op);
+      auto f0d = invoke_async(d0d.begin(), d0d.end(), d1d.begin(), op);
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      invoke_sync(h0.begin(), h0.end(), h1.begin(), op);
+
+      TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+
+      ASSERT_EQUAL(h1, d1a);
+      ASSERT_EQUAL(h1, d1b);
+      ASSERT_EQUAL(h1, d1c);
+      ASSERT_EQUAL(h1, d1d);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_transform_unary<transform_unary_async_invoker, transform_unary_sync_invoker, divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_transform_unary<transform_unary_async_invoker_device, transform_unary_sync_invoker, divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_policy_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary<transform_unary_async_invoker_device_allocator,
+                                                   transform_unary_sync_invoker,
+                                                   divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_policy_allocator_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_transform_unary<transform_unary_async_invoker_device_on, transform_unary_sync_invoker, divide_by_2>::
+      tester),
+  NumericTypes,
+  test_async_transform_unary_policy_on_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary<transform_unary_async_invoker_device_allocator_on,
+                                                   transform_unary_sync_invoker,
+                                                   divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_policy_allocator_on_divide_by_2);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+struct test_async_transform_unary_inplace
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      CHECK_ASAN_ENABLEMENT();
+      
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+
+      thrust::device_vector<T> d0a(h0);
+      thrust::device_vector<T> d0b(h0);
+      thrust::device_vector<T> d0c(h0);
+      thrust::device_vector<T> d0d(h0);
+
+      AsyncTransformUnaryInvoker<T> invoke_async;
+      SyncTransformUnaryInvoker<T> invoke_sync;
+
+      UnaryOperation<T> op;
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+
+      auto f0a = invoke_async(d0a.begin(), d0a.end(), d0a.begin(), op);
+      auto f0b = invoke_async(d0b.begin(), d0b.end(), d0b.begin(), op);
+      auto f0c = invoke_async(d0c.begin(), d0c.end(), d0c.begin(), op);
+      auto f0d = invoke_async(d0d.begin(), d0d.end(), d0d.begin(), op);
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      invoke_sync(h0.begin(), h0.end(), h0.begin(), op);
+
+      TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(
+    test_async_transform_unary_inplace<transform_unary_async_invoker, transform_unary_sync_invoker, divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_inplace_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_inplace<transform_unary_async_invoker_device,
+                                                           transform_unary_sync_invoker,
+                                                           divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_inplace_policy_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_inplace<transform_unary_async_invoker_device_allocator,
+                                                           transform_unary_sync_invoker,
+                                                           divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_inplace_policy_allocator_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_inplace<transform_unary_async_invoker_device_on,
+                                                           transform_unary_sync_invoker,
+                                                           divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_inplace_policy_on_divide_by_2);
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_inplace<transform_unary_async_invoker_device_allocator_on,
+                                                           transform_unary_sync_invoker,
+                                                           divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_unary_inplace_policy_allocator_on_divide_by_2);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class AsyncTransformUnaryInvoker,
+          template <typename>
+          class SyncTransformUnaryInvoker,
+          template <typename>
+          class UnaryOperation>
+struct test_async_transform_unary_counting_iterator
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()()
+    {
+      CHECK_ASAN_ENABLEMENT();
+		
+      constexpr std::size_t n = 15 * sizeof(T);
+
+      ASSERT_LEQUAL(T(n), unittest::truncate_to_max_representable<T>(n));
+
+      thrust::counting_iterator<T> first(0);
+      thrust::counting_iterator<T> last(n);
+
+      thrust::host_vector<T> h0(n);
+
+      thrust::device_vector<T> d0a(n);
+      thrust::device_vector<T> d0b(n);
+      thrust::device_vector<T> d0c(n);
+      thrust::device_vector<T> d0d(n);
+
+      AsyncTransformUnaryInvoker<T> invoke_async;
+      SyncTransformUnaryInvoker<T> invoke_sync;
+
+      UnaryOperation<T> op;
+
+      auto f0a = invoke_async(first, last, d0a.begin(), op);
+      auto f0b = invoke_async(first, last, d0b.begin(), op);
+      auto f0c = invoke_async(first, last, d0c.begin(), op);
+      auto f0d = invoke_async(first, last, d0d.begin(), op);
+
+      invoke_async.validate_event(f0a);
+      invoke_async.validate_event(f0b);
+      invoke_async.validate_event(f0c);
+      invoke_async.validate_event(f0d);
+
+      // This potentially runs concurrently with the copies.
+      invoke_sync(first, last, h0.begin(), op);
+
+      TEST_EVENT_WAIT(thrust::when_all(f0a, f0b, f0c, f0d));
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+      ASSERT_EQUAL(h0, d0c);
+      ASSERT_EQUAL(h0, d0d);
+    }
+  };
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_counting_iterator<transform_unary_async_invoker,
+                                                                     transform_unary_sync_invoker,
+                                                                     divide_by_2>::tester),
+  BuiltinNumericTypes,
+  test_async_transform_unary_counting_iterator_divide_by_2);
+DECLARE_GENERIC_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND_ARGS(test_async_transform_unary_counting_iterator<transform_unary_async_invoker_device,
+                                                                     transform_unary_sync_invoker,
+                                                                     divide_by_2>::tester),
+  BuiltinNumericTypes,
+  test_async_transform_unary_counting_iterator_policy_divide_by_2);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <template <typename> class UnaryOperation>
+struct test_async_transform_using
+{
+  template <typename T>
+  struct tester
+  {
+    THRUST_HOST void operator()(std::size_t n)
+    {
+      CHECK_ASAN_ENABLEMENT();
+	  
+      thrust::host_vector<T> h0(unittest::random_integers<T>(n));
+
+      thrust::device_vector<T> d0a(h0);
+      thrust::device_vector<T> d0b(h0);
+
+      thrust::host_vector<T> h1(n);
+
+      thrust::device_vector<T> d1a(n);
+      thrust::device_vector<T> d1b(n);
+
+      UnaryOperation<T> op;
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+
+      thrust::device_event f0a;
+      thrust::device_event f0b;
+
+      // When you import the customization points into the global namespace,
+      // they should be selected instead of the synchronous algorithms.
+      {
+        THRUST_SUPPRESS_DEPRECATED_PUSH
+        using namespace thrust::async;
+        f0a = transform(d0a.begin(), d0a.end(), d1a.begin(), op);
+        THRUST_SUPPRESS_DEPRECATED_POP
+      }
+      {
+        THRUST_SUPPRESS_DEPRECATED_PUSH
+        using thrust::async::transform;
+        f0b = transform(d0b.begin(), d0b.end(), d1b.begin(), op);
+        THRUST_SUPPRESS_DEPRECATED_POP
+      }
+
+      // ADL should find the synchronous algorithms.
+      // This potentially runs concurrently with the copies.
+      transform(h0.begin(), h0.end(), h1.begin(), op);
+
+      TEST_EVENT_WAIT(thrust::when_all(f0a, f0b));
+
+      ASSERT_EQUAL(h0, d0a);
+      ASSERT_EQUAL(h0, d0b);
+
+      ASSERT_EQUAL(h1, d1a);
+      ASSERT_EQUAL(h1, d1b);
+    }
+  };
+};
+DECLARE_GENERIC_SIZED_UNITTEST_WITH_TYPES_AND_NAME(
+  THRUST_PP_EXPAND(test_async_transform_using<divide_by_2>::tester),
+  NumericTypes,
+  test_async_transform_using_divide_by_2);
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/testing/binary_search.cu b/projects/rocthrust/testing/binary_search.cu
index 30a296695731..919233902512 100644
--- a/projects/rocthrust/testing/binary_search.cu
+++ b/projects/rocthrust/testing/binary_search.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@
 
 #include <unittest/unittest.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 THRUST_DIAG_PUSH
 THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
@@ -267,10 +265,10 @@ void TestBoundsWithBigIndexesHelper(int magnitude)
   thrust::counting_iterator<long long> end = begin + (1ll << magnitude);
   ASSERT_EQUAL(thrust::distance(begin, end), 1ll << magnitude);
 
-  _THRUST_STD::intmax_t distance_low_value =
+  thrust::detail::intmax_t distance_low_value =
     thrust::distance(begin, thrust::lower_bound(thrust::device, begin, end, 17));
 
-  _THRUST_STD::intmax_t distance_high_value =
+  thrust::detail::intmax_t distance_high_value =
     thrust::distance(begin, thrust::lower_bound(thrust::device, begin, end, (1ll << magnitude) - 17));
 
   ASSERT_EQUAL(distance_low_value, 16);
diff --git a/projects/rocthrust/testing/complex.cu b/projects/rocthrust/testing/complex.cu
index bc0214ce91cc..a916fcc621cf 100644
--- a/projects/rocthrust/testing/complex.cu
+++ b/projects/rocthrust/testing/complex.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2024 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -68,11 +68,11 @@ struct TestComplexSizeAndAlignment
 {
   void operator()()
   {
-    static_assert(sizeof(thrust::complex<T>) == sizeof(T) * 2);
-    static_assert(alignof(thrust::complex<T>) == alignof(T) * 2);
+    THRUST_STATIC_ASSERT(sizeof(thrust::complex<T>) == sizeof(T) * 2);
+    THRUST_STATIC_ASSERT(alignof(thrust::complex<T>) == alignof(T) * 2);
 
-    static_assert(sizeof(thrust::complex<T const>) == sizeof(T) * 2);
-    static_assert(alignof(thrust::complex<T const>) == alignof(T) * 2);
+    THRUST_STATIC_ASSERT(sizeof(thrust::complex<T const>) == sizeof(T) * 2);
+    THRUST_STATIC_ASSERT(alignof(thrust::complex<T const>) == alignof(T) * 2);
   }
 };
 SimpleUnitTest<TestComplexSizeAndAlignment, FloatingPointTypes> TestComplexSizeAndAlignmentInstance;
diff --git a/projects/rocthrust/testing/constant_iterator.cu b/projects/rocthrust/testing/constant_iterator.cu
index 35e3083e4ba0..a487a0cb75d4 100644
--- a/projects/rocthrust/testing/constant_iterator.cu
+++ b/projects/rocthrust/testing/constant_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,50 +16,14 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/reduce.h>
 #include <thrust/transform.h>
 
 #include <unittest/unittest.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// ensure that we properly support thrust::constant_iterator from _THRUST_STD
-void TestConstantIteratorTraits()
-{
-  using it       = thrust::constant_iterator<int>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, signed int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestConstantIteratorTraits);
-
 void TestConstantIteratorConstructFromConvertibleSystem()
 {
   using namespace thrust;
@@ -153,7 +117,7 @@ void TestMakeConstantIterator()
   ASSERT_EQUAL(13, *iter0);
 
   // test two argument version
-  constant_iterator<int, _THRUST_STD::intmax_t> iter1 = make_constant_iterator<int, _THRUST_STD::intmax_t>(13, 7);
+  constant_iterator<int, thrust::detail::intmax_t> iter1 = make_constant_iterator<int, thrust::detail::intmax_t>(13, 7);
 
   ASSERT_EQUAL(13, *iter1);
   ASSERT_EQUAL(7, iter1 - iter0);
diff --git a/projects/rocthrust/testing/copy.cu b/projects/rocthrust/testing/copy.cu
index 157246fa16e6..da96a38869c2 100644
--- a/projects/rocthrust/testing/copy.cu
+++ b/projects/rocthrust/testing/copy.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -34,10 +34,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
 void TestCopyFromConstIterator()
 {
   using T = int;
@@ -738,32 +734,15 @@ template <>
 struct is_non_const_reference<only_set_when_expected_it> : thrust::true_type
 {};
 } // end namespace detail
-THRUST_NAMESPACE_END
 
-namespace std
-{
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
   using value_type        = long long;
   using reference         = only_set_when_expected_it;
   using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
 };
-} // namespace std
-
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-_THRUST_STD_NAMESPACE_BEGIN
-template <>
-struct iterator_traits<only_set_when_expected_it>
-{
-  using value_type        = long long;
-  using reference         = only_set_when_expected_it;
-  using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
-};
-_THRUST_STD_NAMESPACE_END
-#  endif
+THRUST_NAMESPACE_END
 
 void TestCopyWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/rocthrust/testing/counting_iterator.cu b/projects/rocthrust/testing/counting_iterator.cu
index 6b3d545d45b9..f4a01cdfe28f 100644
--- a/projects/rocthrust/testing/counting_iterator.cu
+++ b/projects/rocthrust/testing/counting_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 #include <thrust/binary_search.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/detail/iterator_traits.h>
 #include <thrust/sort.h>
 
 #include <cstdint>
@@ -28,67 +28,25 @@
 #include _THRUST_STD_INCLUDE(iterator)
 #include _THRUST_STD_INCLUDE(type_traits)
 
-template <typename ValueType, typename DifferenceType>
-inline constexpr bool diff_type_is =
-  _THRUST_STD::is_same_v<typename thrust::counting_iterator<ValueType>::difference_type, DifferenceType>;
-
-static_assert(diff_type_is<int8_t, int>);
-static_assert(diff_type_is<uint8_t, int>);
-static_assert(diff_type_is<int16_t, int>);
-static_assert(diff_type_is<uint16_t, int>);
-static_assert(diff_type_is<int32_t, ptrdiff_t>);
-static_assert(diff_type_is<uint32_t, ptrdiff_t>);
-static_assert(diff_type_is<int64_t, ptrdiff_t>);
-static_assert(diff_type_is<uint64_t, ptrdiff_t>);
-#if !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__)) \
-  && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
-static_assert(diff_type_is<__int128_t, ptrdiff_t>);
-static_assert(diff_type_is<__uint128_t, ptrdiff_t>);
-#endif
-static_assert(diff_type_is<float, ptrdiff_t>);
-static_assert(diff_type_is<double, ptrdiff_t>);
-
-struct custom_int
-{
-  THRUST_HOST_DEVICE custom_int(int) {}
-  THRUST_HOST_DEVICE operator int() const;
-};
-static_assert(thrust::detail::is_numeric<custom_int>::value);
-
-static_assert(diff_type_is<custom_int, ptrdiff_t>);
-
 THRUST_DIAG_PUSH
 THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 // ensure that we properly support thrust::counting_iterator from _THRUST_STD
-void TestCountingIteratorTraits()
+void test_iterator_traits()
 {
-  using it       = thrust::counting_iterator<int>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
+  using It       = _THRUST_STD::iterator_traits<thrust::counting_iterator<int>>;
+  using category = thrust::detail::iterator_category_with_system_and_traversal<::std::random_access_iterator_tag,
                                                                                thrust::any_system_tag,
                                                                                thrust::random_access_traversal_tag>;
 
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, signed int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
+  static_assert(_THRUST_STD::is_same<It::difference_type, ptrdiff_t>::value, "");
+  static_assert(_THRUST_STD::is_same<It::value_type, int>::value, "");
+  static_assert(_THRUST_STD::is_same<It::pointer, void>::value, "");
+  static_assert(_THRUST_STD::is_same<It::reference, signed int>::value, "");
+  static_assert(_THRUST_STD::is_same<It::iterator_category, category>::value, "");
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
+  static_assert(::thrust::detail::is_cpp17_random_access_iterator<thrust::counting_iterator<int>>::value, "");
 }
-DECLARE_UNITTEST(TestCountingIteratorTraits);
 
 template <typename T>
 void TestCountingDefaultConstructor()
@@ -295,7 +253,7 @@ DECLARE_UNITTEST(TestCountingIteratorLowerBound);
 void TestCountingIteratorDifference()
 {
   using Iterator   = thrust::counting_iterator<std::uint64_t>;
-  using Difference = thrust::detail::it_difference_t<Iterator>;
+  using Difference = thrust::iterator_difference<Iterator>::type;
 
   Difference diff = std::numeric_limits<std::uint32_t>::max() + 1;
 
diff --git a/projects/rocthrust/testing/cuda/adjacent_difference.cu b/projects/rocthrust/testing/cuda/adjacent_difference.cu
index 2f982421cfd4..842c82ef276a 100644
--- a/projects/rocthrust/testing/cuda/adjacent_difference.cu
+++ b/projects/rocthrust/testing/cuda/adjacent_difference.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -113,9 +113,9 @@ DECLARE_UNITTEST(TestAdjacentDifferenceCudaStreams);
 struct detect_wrong_difference
 {
   using difference_type   = void;
-  using value_type        = long long;
+  using value_type        = void;
   using pointer           = void;
-  using reference         = detect_wrong_difference;
+  using reference         = void;
   using iterator_category = ::cuda::std::output_iterator_tag;
 
   bool* flag;
diff --git a/projects/rocthrust/testing/cuda/complex.cu b/projects/rocthrust/testing/cuda/complex.cu
index be4a77941f5a..bdbaf063f13c 100644
--- a/projects/rocthrust/testing/cuda/complex.cu
+++ b/projects/rocthrust/testing/cuda/complex.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
 template <typename T, typename VectorT>
 void TestComplexAlignment()
 {
-  static_assert(sizeof(thrust::complex<T>) == sizeof(VectorT));
-  static_assert(alignof(thrust::complex<T>) == alignof(VectorT));
+  THRUST_STATIC_ASSERT(sizeof(thrust::complex<T>) == sizeof(VectorT));
+  THRUST_STATIC_ASSERT(alignof(thrust::complex<T>) == alignof(VectorT));
 
-  static_assert(sizeof(thrust::complex<T const>) == sizeof(VectorT));
-  static_assert(alignof(thrust::complex<T const>) == alignof(VectorT));
+  THRUST_STATIC_ASSERT(sizeof(thrust::complex<T const>) == sizeof(VectorT));
+  THRUST_STATIC_ASSERT(alignof(thrust::complex<T const>) == alignof(VectorT));
 }
 DECLARE_UNITTEST_WITH_NAME(THRUST_PP_EXPAND_ARGS(TestComplexAlignment<char, char2>), TestComplexCharAlignment);
 DECLARE_UNITTEST_WITH_NAME(THRUST_PP_EXPAND_ARGS(TestComplexAlignment<short, short2>), TestComplexShortAlignment);
diff --git a/projects/rocthrust/testing/cuda/is_partitioned.cu b/projects/rocthrust/testing/cuda/is_partitioned.cu
index a98ba8bac7f4..9b1c6d837c5e 100644
--- a/projects/rocthrust/testing/cuda/is_partitioned.cu
+++ b/projects/rocthrust/testing/cuda/is_partitioned.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ void TestIsPartitionedDevice(ExecutionPolicy exec)
 {
   size_t n = 1000;
 
-  n = ::cuda::std::max<size_t>(n, 2);
+  n = thrust::max<size_t>(n, 2);
 
   thrust::device_vector<int> v = unittest::random_integers<int>(n);
 
diff --git a/projects/rocthrust/testing/cuda/offset_iterator.cu b/projects/rocthrust/testing/cuda/offset_iterator.cu
deleted file mode 100644
index 1a154b4b93a1..000000000000
--- a/projects/rocthrust/testing/cuda/offset_iterator.cu
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/distance.h>
-#include <thrust/functional.h>
-#include <thrust/iterator/offset_iterator.h>
-#include <thrust/iterator/transform_iterator.h>
-
-#include <cuda/std/iterator>
-
-#include <unittest/unittest.h>
-
-struct device_only_iterator
-{
-  using iterator_category = cuda::std::random_access_iterator_tag;
-  using difference_type   = cuda::std::ptrdiff_t;
-  using value_type        = int;
-  using pointer           = int*;
-  using reference         = int&;
-
-  _CCCL_HOST_DEVICE device_only_iterator(pointer ptr)
-      : m_ptr(ptr)
-  {}
-
-  _CCCL_DEVICE reference operator*() const
-  {
-    return *m_ptr;
-  }
-
-  _CCCL_DEVICE device_only_iterator& operator++()
-  {
-    ++m_ptr;
-    return *this;
-  }
-
-  _CCCL_DEVICE device_only_iterator operator++(int)
-  {
-    device_only_iterator tmp = *this;
-    ++*this;
-    return tmp;
-  }
-
-  _CCCL_DEVICE device_only_iterator& operator--()
-  {
-    --m_ptr;
-    return *this;
-  }
-
-  _CCCL_DEVICE device_only_iterator operator--(int)
-  {
-    device_only_iterator tmp = *this;
-    --*this;
-    return tmp;
-  }
-
-  _CCCL_DEVICE device_only_iterator& operator+=(difference_type n)
-  {
-    m_ptr += n;
-    return *this;
-  }
-
-  _CCCL_DEVICE friend bool operator-(const device_only_iterator& a, const device_only_iterator& b)
-  {
-    return a.m_ptr - b.m_ptr;
-  }
-
-  _CCCL_DEVICE friend bool operator==(const device_only_iterator& a, const device_only_iterator& b)
-  {
-    return a.m_ptr == b.m_ptr;
-  }
-
-  _CCCL_DEVICE friend bool operator!=(const device_only_iterator& a, const device_only_iterator& b)
-  {
-    return a.m_ptr != b.m_ptr;
-  }
-
-private:
-  pointer m_ptr;
-};
-
-_CCCL_HOST_DEVICE void TestOffsetIteratorBoth(thrust::offset_iterator<device_only_iterator> iter)
-{
-  assert(iter.offset() == 0);
-  ++iter;
-  assert(iter.offset() == 1);
-  iter++;
-  assert(iter.offset() == 2);
-  --iter;
-  assert(iter.offset() == 1);
-  iter--;
-  assert(iter.offset() == 0);
-  iter += 100;
-  assert(iter.offset() == 100);
-}
-
-__global__ void TestOffsetIteratorDevice(thrust::offset_iterator<device_only_iterator> iter)
-{
-  TestOffsetIteratorBoth(iter);
-
-  // access
-  assert(*iter == 1);
-
-  auto iter2 = iter;
-  iter2 += 3;
-  assert(*iter2 == 1);
-
-  // difference
-  assert(iter2 - iter == 3);
-
-  // comparison
-  assert(!(iter2 == iter));
-  assert(iter2 != iter);
-}
-
-void TestOffsetIteratorWithDeviceOnlyIterator()
-{
-  thrust::device_vector<int> v{1, 2, 3, 4, 5};
-  device_only_iterator base(thrust::raw_pointer_cast(v.data()));
-  thrust::offset_iterator iter(base);
-  TestOffsetIteratorBoth(iter);
-  TestOffsetIteratorDevice<<<1, 1>>>(iter);
-}
-DECLARE_UNITTEST(TestOffsetIteratorWithDeviceOnlyIterator);
diff --git a/projects/rocthrust/testing/cuda/sort.cu b/projects/rocthrust/testing/cuda/sort.cu
index 80b556a01af5..570ec02a709a 100644
--- a/projects/rocthrust/testing/cuda/sort.cu
+++ b/projects/rocthrust/testing/cuda/sort.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -163,18 +163,18 @@ struct TestRadixSortDispatch
 SimpleUnitTest<TestRadixSortDispatch,
                unittest::concat<IntegralTypes,
                                 FloatingPointTypes
-#if _CCCL_HAS_INT128()
+#ifndef _LIBCUDACXX_HAS_NO_INT128
                                 ,
                                 unittest::type_list<__int128_t, __uint128_t>
-#endif // _CCCL_HAS_INT128()
-#if _CCCL_HAS_NVFP16()
+#endif // _LIBCUDACXX_HAS_NO_INT128
+#ifdef _CCCL_HAS_NVFP16
                                 ,
                                 unittest::type_list<__half>
-#endif // _CCCL_HAS_NVFP16()
-#if _CCCL_HAS_NVBF16()
+#endif // _CCCL_HAS_NVFP16
+#ifdef _CCCL_HAS_NVBF16
                                 ,
                                 unittest::type_list<__nv_bfloat16>
-#endif // _CCCL_HAS_NVBF16()
+#endif // _CCCL_HAS_NVBF16
                                 >>
   TestRadixSortDispatchInstance;
 
@@ -298,20 +298,21 @@ struct TestSortAscendingKey
 
 SimpleUnitTest<TestSortAscendingKey,
                unittest::concat<unittest::type_list<>
-#if _CCCL_HAS_INT128()
+#ifndef _LIBCUDACXX_HAS_NO_INT128
                                 ,
                                 unittest::type_list<__int128_t, __uint128_t>
-#endif // _CCCL_HAS_INT128()
+#endif
 // CTK 12.2 offers __host__ __device__ operators for __half and __nv_bfloat16, so we can use std::sort
-#if _CCCL_CTK_AT_LEAST(12, 2)
-#  if _CCCL_HAS_NVFP16() || !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
+#if _CCCL_CUDACC_AT_LEAST(12, 2)
+#  if defined(_CCCL_HAS_NVFP16) || !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
                                 ,
                                 unittest::type_list<__half>
 #  endif
-#  if _CCCL_HAS_NVBF16() || !defined(__CUDA_NO_BFLOAT16_OPERATORS__) && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__)
+#  if defined(_CCCL_HAS_NVBF16) \
+    || !defined(__CUDA_NO_BFLOAT16_OPERATORS__) && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__)
                                 ,
                                 unittest::type_list<__nv_bfloat16>
 #  endif
-#endif // _CCCL_CTK_AT_LEAST(12, 2)
+#endif // _CCCL_CUDACC_AT_LEAST(12, 2)
                                 >>
   TestSortAscendingKeyMoreTypes;
diff --git a/projects/rocthrust/testing/cuda/stream_wrapper.cu b/projects/rocthrust/testing/cuda/stream_wrapper.cu
deleted file mode 100644
index 536169fbb426..000000000000
--- a/projects/rocthrust/testing/cuda/stream_wrapper.cu
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/execution_policy.h>
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/reduce.h>
-
-#include <cuda/stream_ref>
-
-#include <unittest/unittest.h>
-
-// Simple non-owning stream wrapper that allows implicit conversion to cudaStream_t.
-struct stream_wrapper
-{
-  stream_wrapper(cudaStream_t s)
-      : stream(s)
-  {}
-
-  operator cudaStream_t() const
-  {
-    return stream;
-  }
-
-  cudaStream_t stream;
-};
-
-// Simple non-owning stream wrapper that allows implicit conversion to cudaStream_t and cuda::stream_ref.
-struct stream_wrapper_ref
-{
-  stream_wrapper_ref(cudaStream_t s)
-      : stream(s)
-  {}
-
-  operator cudaStream_t() const
-  {
-    return stream;
-  }
-  operator cuda::stream_ref() const
-  {
-    return cuda::stream_ref(stream);
-  }
-
-  cudaStream_t stream;
-};
-
-template <typename Wrapper, typename ExecutionPolicy>
-void TestOnStream(ExecutionPolicy policy)
-{
-  using Vector = thrust::device_vector<int>;
-
-  Vector v(3);
-  v[0] = 1;
-  v[1] = -2;
-  v[2] = 3;
-
-  cudaStream_t s;
-  cudaStreamCreate(&s);
-
-  Wrapper wrapper(s);
-
-  auto streampolicy = policy.on(wrapper);
-
-  ASSERT_EQUAL(thrust::reduce(streampolicy, v.begin(), v.end()), 2);
-
-  cudaStreamDestroy(s);
-}
-
-void TestCudartStreamSync()
-{
-  TestOnStream<stream_wrapper>(thrust::cuda::par);
-}
-DECLARE_UNITTEST(TestCudartStreamSync);
-
-void TestCudartStreamNoSync()
-{
-  TestOnStream<stream_wrapper>(thrust::cuda::par_nosync);
-}
-DECLARE_UNITTEST(TestCudartStreamNoSync);
-
-void TestCudaStreamRefSync()
-{
-  TestOnStream<stream_wrapper_ref>(thrust::cuda::par);
-}
-DECLARE_UNITTEST(TestCudaStreamRefSync);
-
-void TestCudaStreamRefNoSync()
-{
-  TestOnStream<stream_wrapper_ref>(thrust::cuda::par_nosync);
-}
-DECLARE_UNITTEST(TestCudaStreamRefNoSync);
diff --git a/projects/rocthrust/testing/cuda/transform.cu b/projects/rocthrust/testing/cuda/transform.cu
index 854fe32c9b92..63d9bf81b324 100644
--- a/projects/rocthrust/testing/cuda/transform.cu
+++ b/projects/rocthrust/testing/cuda/transform.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -371,6 +371,8 @@ struct sum_five
   }
 };
 
+// The following test cannot be compiled because of a bug in the conversion of thrust::tuple on MSVC 2017
+#if !_CCCL_COMPILER(MSVC2017)
 // we specialize zip_function for sum_five, but do nothing in the call operator so the test below would fail if the
 // zip_function is actually called (and not unwrapped)
 THRUST_NAMESPACE_BEGIN
@@ -435,3 +437,4 @@ void TestTransformZipIteratorUnwrapping()
   }
 }
 DECLARE_UNITTEST(TestTransformZipIteratorUnwrapping);
+#endif // !_CCCL_COMPILER(MSVC2017)
diff --git a/projects/rocthrust/testing/cuda/transform_iterator.cmake b/projects/rocthrust/testing/cuda/transform_iterator.cmake
deleted file mode 100644
index e02e34f5870c..000000000000
--- a/projects/rocthrust/testing/cuda/transform_iterator.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-target_compile_options(${test_target} PRIVATE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>: --extended-lambda>)
-
-# this check is actually not correct, because we must check the host compiler, not the CXX compiler.
-# We rely on that those are usually the same ;)
-if ("Clang" STREQUAL "${CMAKE_CXX_COMPILER_ID}" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
-    # When clang >= 13 is used as host compiler, we get the following warning:
-    #   nvcc_internal_extended_lambda_implementation:312:22: error: definition of implicit copy constructor for '__nv_hdl_wrapper_t<false, true, false, __nv_dl_tag<void (*)(), &TestAddressStabilityLambda, 2>, int (const int &)>' is deprecated because it has a user-declared copy assignment operator [-Werror,-Wdeprecated-copy]
-    #   312 | __nv_hdl_wrapper_t & operator=(const __nv_hdl_wrapper_t &in) = delete;
-    #   |                      ^
-    # Let's suppress it until NVBug 4980157 is resolved.
-    target_compile_options(${test_target} PRIVATE $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>: -Wno-deprecated-copy>)
-endif ()
diff --git a/projects/rocthrust/testing/cuda/transform_iterator.cu b/projects/rocthrust/testing/cuda/transform_iterator.cu
deleted file mode 100644
index 42b71ef04633..000000000000
--- a/projects/rocthrust/testing/cuda/transform_iterator.cu
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/device_vector.h>
-#include <thrust/host_vector.h>
-#include <thrust/iterator/transform_iterator.h>
-#include <thrust/logical.h>
-
-#include <unittest/unittest.h>
-
-// see also: https://github.com/NVIDIA/cccl/issues/3541
-void TestTransformWithLambda()
-{
-  auto l = [] __host__ __device__(int v) { return v < 4; };
-  thrust::host_vector<int> A{1, 2, 3, 4, 5, 6, 7};
-  ASSERT_EQUAL(thrust::any_of(A.begin(), A.end(), l), true);
-
-  thrust::device_vector<int> B{1, 2, 3, 4, 5, 6, 7};
-  ASSERT_EQUAL(thrust::any_of(B.begin(), B.end(), l), true);
-}
-
-DECLARE_UNITTEST(TestTransformWithLambda);
diff --git a/projects/rocthrust/testing/dependencies_aware_policies.cu b/projects/rocthrust/testing/dependencies_aware_policies.cu
new file mode 100644
index 000000000000..3153ef825aa2
--- /dev/null
+++ b/projects/rocthrust/testing/dependencies_aware_policies.cu
@@ -0,0 +1,133 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+// need to suppress deprecation warnings for execute_with_allocator_and_dependencies inside type traits
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#include <thrust/detail/seq.h>
+#include <thrust/system/cpp/detail/par.h>
+#include <thrust/system/hip/detail/par.h>
+#include <thrust/system/omp/detail/par.h>
+#include <thrust/system/tbb/detail/par.h>
+
+#include <unittest/unittest.h>
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+template <typename T>
+struct test_allocator_t
+{};
+
+test_allocator_t<int> test_allocator = test_allocator_t<int>();
+
+template <int I>
+struct test_dependency_t
+{};
+
+template <int I>
+test_dependency_t<I> test_dependency()
+{
+  return {};
+}
+
+template <typename Policy, template <typename> class CRTPBase>
+struct policy_info
+{
+  using policy = Policy;
+
+  template <template <template <typename> class, typename...> class Template, typename... Arguments>
+  using apply_base_first = Template<CRTPBase, Arguments...>;
+
+  template <template <typename, template <typename> class, typename...> class Template,
+            typename First,
+            typename... Arguments>
+  using apply_base_second = Template<First, CRTPBase, Arguments...>;
+};
+
+template <typename PolicyInfo>
+struct TestDependencyAttachment
+{
+  template <typename... Expected, typename T>
+  static void assert_correct(T)
+  {
+    ASSERT_EQUAL(
+      (_THRUST_STD::is_same<
+        T,
+        typename PolicyInfo::template apply_base_first<thrust::detail::execute_with_dependencies, Expected...>>::value),
+      true);
+  }
+
+  template <typename Allocator, typename... Expected, typename T>
+  static void assert_correct_with_allocator(T)
+  {
+    ASSERT_EQUAL(
+      (_THRUST_STD::is_same<
+        T,
+        typename PolicyInfo::template apply_base_second<thrust::detail::execute_with_allocator_and_dependencies,
+                                                        Allocator,
+                                                        Expected...>>::value),
+      true);
+  }
+
+  void operator()()
+  {
+    typename PolicyInfo::policy policy;
+
+    assert_correct<test_dependency_t<1>>(policy.after(test_dependency<1>()));
+
+    assert_correct<test_dependency_t<1>, test_dependency_t<2>>(
+      policy.after(test_dependency<1>(), test_dependency<2>()));
+
+    assert_correct<test_dependency_t<1>, test_dependency_t<2>, test_dependency_t<3>>(
+      policy.after(test_dependency<1>(), test_dependency<2>(), test_dependency<3>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&, test_dependency_t<1>>(
+      policy(test_allocator).after(test_dependency<1>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&, test_dependency_t<1>, test_dependency_t<2>>(
+      policy(test_allocator).after(test_dependency<1>(), test_dependency<2>()));
+
+    assert_correct_with_allocator<test_allocator_t<int>&,
+                                  test_dependency_t<1>,
+                                  test_dependency_t<2>,
+                                  test_dependency_t<3>>(
+      policy(test_allocator).after(test_dependency<1>(), test_dependency<2>(), test_dependency<3>()));
+  }
+};
+
+using sequential_info = policy_info<thrust::detail::seq_t, thrust::system::detail::sequential::execution_policy>;
+using cpp_par_info    = policy_info<thrust::system::cpp::detail::par_t, thrust::system::cpp::detail::execution_policy>;
+using omp_par_info    = policy_info<thrust::system::omp::detail::par_t, thrust::system::omp::detail::execution_policy>;
+using tbb_par_info    = policy_info<thrust::system::tbb::detail::par_t, thrust::system::tbb::detail::execution_policy>;
+
+using hip_par_info = policy_info<thrust::system::hip::detail::par_t, thrust::hip_rocprim::execute_on_stream_base>;
+
+SimpleUnitTest<TestDependencyAttachment,
+               unittest::type_list<
+                 // TODO: uncomment when dependencies are generalized to all backends
+                 // sequential_info,
+                 // cpp_par_info,
+                 // omp_par_info,
+                 // tbb_par_info,
+                 hip_par_info>>
+  TestDependencyAttachmentInstance;
+
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/testing/dereference.cu b/projects/rocthrust/testing/dereference.cu
index a2fe897e2a1f..a3c5d7430839 100644
--- a/projects/rocthrust/testing/dereference.cu
+++ b/projects/rocthrust/testing/dereference.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/device_ptr.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
diff --git a/projects/rocthrust/testing/device_delete.cu b/projects/rocthrust/testing/device_delete.cu
index f04b00981273..af976e7b5110 100644
--- a/projects/rocthrust/testing/device_delete.cu
+++ b/projects/rocthrust/testing/device_delete.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_delete.h>
 #include <thrust/device_new.h>
 #include <thrust/device_ptr.h>
@@ -30,8 +31,7 @@ struct Foo
 
   THRUST_HOST_DEVICE ~Foo()
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (if (set_me_upon_destruction != nullptr) { *set_me_upon_destruction = true; }));
+    NV_IF_TARGET(NV_IS_DEVICE, (if (set_me_upon_destruction != nullptr) { *set_me_upon_destruction = true; }));
   }
 
   bool* set_me_upon_destruction;
diff --git a/projects/rocthrust/testing/discard_iterator.cu b/projects/rocthrust/testing/discard_iterator.cu
index 3d401a8b385f..14d59e135606 100644
--- a/projects/rocthrust/testing/discard_iterator.cu
+++ b/projects/rocthrust/testing/discard_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,48 +15,11 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/discard_iterator.h>
 
 #include <unittest/unittest.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// ensure that we properly support thrust::discard_iterator from _THRUST_STD
-void TestDiscardIteratorTraits()
-{
-  using it       = thrust::discard_iterator<>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, thrust::detail::any_assign>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, thrust::detail::any_assign&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestDiscardIteratorTraits);
-
-void TestDiscardIteratorIncrement()
+void TestDiscardIteratorIncrement(void)
 {
   thrust::discard_iterator<> lhs(0);
   thrust::discard_iterator<> rhs(0);
@@ -81,10 +44,10 @@ void TestDiscardIteratorIncrement()
   ASSERT_EQUAL(-2, lhs - rhs);
 }
 DECLARE_UNITTEST(TestDiscardIteratorIncrement);
-static_assert(_THRUST_STD::is_trivially_copy_constructible<thrust::discard_iterator<>>::value, "");
-static_assert(_THRUST_STD::is_trivially_copyable<thrust::discard_iterator<>>::value, "");
+static_assert(std::is_trivially_copy_constructible<thrust::discard_iterator<>>::value, "");
+static_assert(std::is_trivially_copyable<thrust::discard_iterator<>>::value, "");
 
-void TestDiscardIteratorComparison()
+void TestDiscardIteratorComparison(void)
 {
   thrust::discard_iterator<> iter1(0);
   thrust::discard_iterator<> iter2(0);
@@ -110,7 +73,7 @@ void TestDiscardIteratorComparison()
 }
 DECLARE_UNITTEST(TestDiscardIteratorComparison);
 
-void TestMakeDiscardIterator()
+void TestMakeDiscardIterator(void)
 {
   thrust::discard_iterator<> iter0 = thrust::make_discard_iterator(13);
 
@@ -124,7 +87,7 @@ void TestMakeDiscardIterator()
 }
 DECLARE_UNITTEST(TestMakeDiscardIterator);
 
-void TestZippedDiscardIterator()
+void TestZippedDiscardIterator(void)
 {
   using namespace thrust;
 
diff --git a/projects/rocthrust/testing/event.cu b/projects/rocthrust/testing/event.cu
new file mode 100644
index 000000000000..1beaa60cedd2
--- /dev/null
+++ b/projects/rocthrust/testing/event.cu
@@ -0,0 +1,174 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/event.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+// note: there is no matching THRUST_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+///////////////////////////////////////////////////////////////////////////////
+
+THRUST_HOST void test_event_default_constructed()
+{
+  THRUST_STATIC_ASSERT((
+    std::is_same<thrust::event<decltype(thrust::device)>, thrust::unique_eager_event<decltype(thrust::device)>>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::event<decltype(thrust::device)>, thrust::device_event>::value));
+
+  THRUST_STATIC_ASSERT((std::is_same<thrust::device_event, thrust::device_unique_eager_event>::value));
+
+  thrust::device_event e0;
+
+  ASSERT_EQUAL(false, e0.valid_stream());
+
+  ASSERT_THROWS_EQUAL(e0.wait(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+  ASSERT_THROWS_EQUAL(e0.stream(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+}
+DECLARE_UNITTEST(test_event_default_constructed);
+
+///////////////////////////////////////////////////////////////////////////////
+
+THRUST_HOST void test_event_new_stream()
+{
+  auto e0 = thrust::device_event(thrust::new_stream);
+
+  ASSERT_EQUAL(true, e0.valid_stream());
+
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e0.stream().native_handle());
+
+  e0.wait();
+
+  ASSERT_EQUAL(true, e0.ready());
+}
+DECLARE_UNITTEST(test_event_new_stream);
+
+///////////////////////////////////////////////////////////////////////////////
+
+THRUST_HOST void test_event_linear_chaining()
+{
+  constexpr std::int64_t n = 1024;
+
+  // Create a new stream.
+  auto e0 = thrust::when_all();
+
+  auto const e0_stream = e0.stream().native_handle();
+
+  ASSERT_EQUAL(true, e0.valid_stream());
+
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e0_stream);
+
+  thrust::device_event e1;
+
+  for (std::int64_t i = 0; i < n; ++i)
+  {
+    ASSERT_EQUAL(true, e0.valid_stream());
+
+    ASSERT_EQUAL(false, e1.valid_stream());
+    ASSERT_EQUAL(false, e1.ready());
+
+    ASSERT_EQUAL_QUIET(e0_stream, e0.stream().native_handle());
+
+    e1 = thrust::when_all(e0);
+
+    ASSERT_EQUAL(false, e0.valid_stream());
+    ASSERT_EQUAL(false, e0.ready());
+
+    ASSERT_EQUAL(true, e1.valid_stream());
+
+    ASSERT_EQUAL(e0_stream, e1.stream().native_handle());
+
+    std::swap(e0, e1);
+  }
+}
+DECLARE_UNITTEST(test_event_linear_chaining);
+
+///////////////////////////////////////////////////////////////////////////////
+
+THRUST_HOST void test_event_when_all()
+{
+  // Create events with new streams.
+  auto e0 = thrust::when_all();
+  auto e1 = thrust::when_all();
+  auto e2 = thrust::when_all();
+  auto e3 = thrust::when_all();
+  auto e4 = thrust::when_all();
+  auto e5 = thrust::when_all();
+  auto e6 = thrust::when_all();
+  auto e7 = thrust::when_all();
+
+  auto const e0_stream = e0.stream().native_handle();
+
+  ASSERT_EQUAL(true, e0.valid_stream());
+  ASSERT_EQUAL(true, e1.valid_stream());
+  ASSERT_EQUAL(true, e2.valid_stream());
+  ASSERT_EQUAL(true, e3.valid_stream());
+  ASSERT_EQUAL(true, e4.valid_stream());
+  ASSERT_EQUAL(true, e5.valid_stream());
+  ASSERT_EQUAL(true, e6.valid_stream());
+  ASSERT_EQUAL(true, e7.valid_stream());
+
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e0_stream);
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e1.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e2.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e3.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e4.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e5.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e6.stream().native_handle());
+  ASSERT_NOT_EQUAL_QUIET(nullptr, e7.stream().native_handle());
+
+  auto e8 = thrust::when_all(e0, e1, e2, e3, e4, e5, e6, e7);
+
+  ASSERT_EQUAL(false, e0.valid_stream());
+  ASSERT_EQUAL(false, e1.valid_stream());
+  ASSERT_EQUAL(false, e2.valid_stream());
+  ASSERT_EQUAL(false, e3.valid_stream());
+  ASSERT_EQUAL(false, e4.valid_stream());
+  ASSERT_EQUAL(false, e5.valid_stream());
+  ASSERT_EQUAL(false, e6.valid_stream());
+  ASSERT_EQUAL(false, e7.valid_stream());
+
+  ASSERT_EQUAL(true, e8.valid_stream());
+
+  ASSERT_EQUAL(e0_stream, e8.stream().native_handle());
+
+  TEST_EVENT_WAIT(e8);
+
+  ASSERT_EQUAL(false, e0.ready());
+  ASSERT_EQUAL(false, e1.ready());
+  ASSERT_EQUAL(false, e2.ready());
+  ASSERT_EQUAL(false, e3.ready());
+  ASSERT_EQUAL(false, e4.ready());
+  ASSERT_EQUAL(false, e5.ready());
+  ASSERT_EQUAL(false, e6.ready());
+  ASSERT_EQUAL(false, e7.ready());
+
+  ASSERT_EQUAL(true, e8.ready());
+}
+DECLARE_UNITTEST(test_event_when_all);
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/testing/find.cu b/projects/rocthrust/testing/find.cu
index 7ee13ba5d27d..7e13062522e4 100644
--- a/projects/rocthrust/testing/find.cu
+++ b/projects/rocthrust/testing/find.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/find.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
@@ -23,8 +22,6 @@
 
 #include <unittest/unittest.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 template <typename T>
 struct equal_to_value_pred
 {
@@ -305,9 +302,9 @@ void TestFindWithBigIndexesHelper(int magnitude)
   thrust::counting_iterator<long long> end = begin + (1ll << magnitude);
   ASSERT_EQUAL(thrust::distance(begin, end), 1ll << magnitude);
 
-  _THRUST_STD::intmax_t distance_low_value = thrust::distance(begin, thrust::find(thrust::device, begin, end, 17));
+  thrust::detail::intmax_t distance_low_value = thrust::distance(begin, thrust::find(thrust::device, begin, end, 17));
 
-  _THRUST_STD::intmax_t distance_high_value =
+  thrust::detail::intmax_t distance_high_value =
     thrust::distance(begin, thrust::find(thrust::device, begin, end, (1ll << magnitude) - 17));
 
   ASSERT_EQUAL(distance_low_value, 16);
diff --git a/projects/rocthrust/testing/functional.cu b/projects/rocthrust/testing/functional.cu
index 83844563c6a9..d0cb6b41a25b 100644
--- a/projects/rocthrust/testing/functional.cu
+++ b/projects/rocthrust/testing/functional.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/transform.h>
 
@@ -26,6 +25,7 @@
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
+#  include <utility>
 #endif
 
 THRUST_DIAG_PUSH
@@ -33,7 +33,7 @@ THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
@@ -209,6 +209,43 @@ typename _THRUST_STD::add_const<_Tp>::type& as_const(_Tp& __t) noexcept
   return __t;
 }
 
+// Ad-hoc testing for other functionals
+THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestIdentityFunctional()
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  int i    = 42;
+  double d = 3.14;
+
+  // pass through
+  ASSERT_EQUAL(thrust::identity<int>{}(i), 42);
+  ASSERT_EQUAL(thrust::identity<int>{}(d), 3);
+
+  // modification through
+  thrust::identity<int>{}(i) = 1337;
+  ASSERT_EQUAL(i, 1337);
+
+  // value categories and const
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(42)), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(i)), int&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(as_const(i))), const int&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(_THRUST_STD::move(i))), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(static_cast<const int&&>(i))), const int&>::value,
+                "");
+
+  // value categories when casting to different type
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(3.14)), int&&>::value, "");
+  // unfortunately, old versions of MSVC pick the `const int&` overload instead of `int&&`
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && THRUST_MSVC_VERSION >= 1929
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(d)), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(as_const(d))), int&&>::value, "");
+#endif
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(_THRUST_STD::move(d))), int&&>::value, "");
+  static_assert(_THRUST_STD::is_same<decltype(thrust::identity<int>{}(static_cast<const double&&>(d))), int&&>::value,
+                "");
+  THRUST_SUPPRESS_DEPRECATED_POP
+}
+DECLARE_UNITTEST(TestIdentityFunctional);
+
 template <class Vector>
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestIdentityFunctionalVector()
 {
@@ -299,6 +336,15 @@ THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestNot1()
 }
 DECLARE_INTEGRAL_VECTOR_UNITTEST(TestNot1);
 
+// GCC 11 fails to build this test case with a spurious error in a
+// very specific scenario:
+// - GCC 11
+// - CPP system for both host and device
+// - C++11 dialect
+#if !(defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 110000 && THRUST_GCC_VERSION < 120000          \
+      && THRUST_HOST_SYSTEM == THRUST_HOST_SYSTEM_CPP && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CPP \
+      && THRUST_CPP_DIALECT == 2011)
+
 template <class Vector>
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestNot2()
 {
@@ -316,4 +362,6 @@ THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestNot2()
 }
 DECLARE_VECTOR_UNITTEST(TestNot2);
 
+#endif // Weird GCC11 failure case
+
 THRUST_DIAG_POP
diff --git a/projects/rocthrust/testing/future.cu b/projects/rocthrust/testing/future.cu
new file mode 100644
index 000000000000..5b24debcaebf
--- /dev/null
+++ b/projects/rocthrust/testing/future.cu
@@ -0,0 +1,223 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/future.h>
+
+#  include <unittest/unittest.h>
+#  include <unittest/util_async.h>
+
+// note: there is no matching THRUST_SUPPRESS_DEPRECATED_POP, so the warning suppression leaks into more content of the
+// generated cudafe1.stub.c file.
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+struct mock
+{};
+
+using future_value_types = unittest::type_list<
+  char,
+  signed char,
+  unsigned char,
+  short,
+  unsigned short,
+  int,
+  unsigned int,
+  long,
+  unsigned long,
+  long long,
+  unsigned long long,
+  float,
+  double,
+  custom_numeric,
+  float2,
+  mock>;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_future_default_constructed
+{
+  THRUST_HOST void operator()()
+  {
+    THRUST_STATIC_ASSERT((std::is_same<thrust::future<decltype(thrust::device), T>,
+                                       thrust::unique_eager_future<decltype(thrust::device), T>>::value));
+
+    THRUST_STATIC_ASSERT((std::is_same<thrust::future<decltype(thrust::device), T>, thrust::device_future<T>>::value));
+
+    THRUST_STATIC_ASSERT((std::is_same<thrust::device_future<T>, thrust::device_unique_eager_future<T>>::value));
+
+    thrust::device_future<T> f0;
+
+    ASSERT_EQUAL(false, f0.valid_stream());
+    ASSERT_EQUAL(false, f0.valid_content());
+
+    ASSERT_THROWS_EQUAL(f0.wait(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_THROWS_EQUAL(f0.stream(), thrust::event_error, thrust::event_error(thrust::event_errc::no_state));
+
+    ASSERT_THROWS_EQUAL(f0.get(), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+
+    ASSERT_THROWS_EQUAL(
+      THRUST_UNUSED_VAR(f0.extract()), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+  }
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES(test_future_default_constructed, future_value_types);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_future_new_stream
+{
+  THRUST_HOST void operator()()
+  {
+    auto f0 = thrust::device_future<T>(thrust::new_stream);
+
+    ASSERT_EQUAL(true, f0.valid_stream());
+    ASSERT_EQUAL(false, f0.valid_content());
+
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f0.stream().native_handle());
+
+    TEST_EVENT_WAIT(f0);
+
+    ASSERT_EQUAL(true, f0.ready());
+
+    ASSERT_THROWS_EQUAL(f0.get(), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+
+    ASSERT_THROWS_EQUAL(
+      THRUST_UNUSED_VAR(f0.extract()), thrust::event_error, thrust::event_error(thrust::event_errc::no_content));
+  }
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES(test_future_new_stream, future_value_types);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_future_convert_to_event
+{
+  THRUST_HOST void operator()()
+  {
+    auto f0 = thrust::device_future<T>(thrust::new_stream);
+
+    auto const f0_stream = f0.stream().native_handle();
+
+    ASSERT_EQUAL(true, f0.valid_stream());
+    ASSERT_EQUAL(false, f0.valid_content());
+
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f0_stream);
+
+    auto f1 = thrust::device_event(std::move(f0));
+
+    ASSERT_EQUAL(false, f0.valid_stream());
+    ASSERT_EQUAL(true, f1.valid_stream());
+
+    ASSERT_EQUAL(f0_stream, f1.stream().native_handle());
+  }
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES(test_future_convert_to_event, future_value_types);
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+struct test_future_when_all
+{
+  THRUST_HOST void operator()()
+  {
+    // Create futures with new streams.
+    auto f0 = thrust::device_future<T>(thrust::new_stream);
+    auto f1 = thrust::device_future<T>(thrust::new_stream);
+    auto f2 = thrust::device_future<T>(thrust::new_stream);
+    auto f3 = thrust::device_future<T>(thrust::new_stream);
+    auto f4 = thrust::device_future<T>(thrust::new_stream);
+    auto f5 = thrust::device_future<T>(thrust::new_stream);
+    auto f6 = thrust::device_future<T>(thrust::new_stream);
+    auto f7 = thrust::device_future<T>(thrust::new_stream);
+
+    auto const f0_stream = f0.stream().native_handle();
+
+    ASSERT_EQUAL(true, f0.valid_stream());
+    ASSERT_EQUAL(true, f1.valid_stream());
+    ASSERT_EQUAL(true, f2.valid_stream());
+    ASSERT_EQUAL(true, f3.valid_stream());
+    ASSERT_EQUAL(true, f4.valid_stream());
+    ASSERT_EQUAL(true, f5.valid_stream());
+    ASSERT_EQUAL(true, f6.valid_stream());
+    ASSERT_EQUAL(true, f7.valid_stream());
+
+    ASSERT_EQUAL(false, f0.valid_content());
+    ASSERT_EQUAL(false, f1.valid_content());
+    ASSERT_EQUAL(false, f2.valid_content());
+    ASSERT_EQUAL(false, f3.valid_content());
+    ASSERT_EQUAL(false, f4.valid_content());
+    ASSERT_EQUAL(false, f5.valid_content());
+    ASSERT_EQUAL(false, f6.valid_content());
+    ASSERT_EQUAL(false, f7.valid_content());
+
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f0_stream);
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f1.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f2.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f3.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f4.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f5.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f6.stream().native_handle());
+    ASSERT_NOT_EQUAL_QUIET(nullptr, f7.stream().native_handle());
+
+    auto e0 = thrust::when_all(f0, f1, f2, f3, f4, f5, f6, f7);
+
+    ASSERT_EQUAL(false, f0.valid_stream());
+    ASSERT_EQUAL(false, f1.valid_stream());
+    ASSERT_EQUAL(false, f2.valid_stream());
+    ASSERT_EQUAL(false, f3.valid_stream());
+    ASSERT_EQUAL(false, f4.valid_stream());
+    ASSERT_EQUAL(false, f5.valid_stream());
+    ASSERT_EQUAL(false, f6.valid_stream());
+    ASSERT_EQUAL(false, f7.valid_stream());
+
+    ASSERT_EQUAL(false, f0.valid_content());
+    ASSERT_EQUAL(false, f1.valid_content());
+    ASSERT_EQUAL(false, f2.valid_content());
+    ASSERT_EQUAL(false, f3.valid_content());
+    ASSERT_EQUAL(false, f4.valid_content());
+    ASSERT_EQUAL(false, f5.valid_content());
+    ASSERT_EQUAL(false, f6.valid_content());
+    ASSERT_EQUAL(false, f7.valid_content());
+
+    ASSERT_EQUAL(true, e0.valid_stream());
+
+    ASSERT_EQUAL(f0_stream, e0.stream().native_handle());
+
+    TEST_EVENT_WAIT(e0);
+
+    ASSERT_EQUAL(false, f0.ready());
+    ASSERT_EQUAL(false, f1.ready());
+    ASSERT_EQUAL(false, f2.ready());
+    ASSERT_EQUAL(false, f3.ready());
+    ASSERT_EQUAL(false, f4.ready());
+    ASSERT_EQUAL(false, f5.ready());
+    ASSERT_EQUAL(false, f6.ready());
+    ASSERT_EQUAL(false, f7.ready());
+
+    ASSERT_EQUAL(true, e0.ready());
+  }
+};
+DECLARE_GENERIC_UNITTEST_WITH_TYPES(test_future_when_all, future_value_types);
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
diff --git a/projects/rocthrust/testing/generate_const_iterators.cu b/projects/rocthrust/testing/generate_const_iterators.cu
new file mode 100644
index 000000000000..06c63fdf21f4
--- /dev/null
+++ b/projects/rocthrust/testing/generate_const_iterators.cu
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <unittest/runtime_static_assert.h>
+#include <unittest/unittest.h>
+
+// The runtime_static_assert header needs to come first as we are overwriting thrusts internal static assert
+#include <thrust/generate.h>
+
+struct generator
+{
+  THRUST_HOST_DEVICE int operator()() const
+  {
+    return 1;
+  }
+};
+
+void TestGenerateConstIteratorCompilationError()
+{
+  thrust::host_vector<int> test1(10);
+
+  ASSERT_STATIC_ASSERT(thrust::generate(test1.cbegin(), test1.cend(), generator()));
+  ASSERT_STATIC_ASSERT(thrust::generate_n(test1.cbegin(), 10, generator()));
+}
+DECLARE_UNITTEST(TestGenerateConstIteratorCompilationError);
+
+void TestFillConstIteratorCompilationError()
+{
+  thrust::host_vector<int> test1(10);
+  ASSERT_STATIC_ASSERT(thrust::fill(test1.cbegin(), test1.cend(), 1));
+}
+DECLARE_UNITTEST(TestFillConstIteratorCompilationError);
diff --git a/projects/rocthrust/testing/is_contiguous_iterator.cu b/projects/rocthrust/testing/is_contiguous_iterator.cu
index 2e551bbe4bd5..321334e0a820 100644
--- a/projects/rocthrust/testing/is_contiguous_iterator.cu
+++ b/projects/rocthrust/testing/is_contiguous_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
-#include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
 #include <array>
 #include <deque>
@@ -41,40 +40,61 @@
 #  include <utility>
 #endif
 
-static_assert(thrust::is_contiguous_iterator<std::string::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::wstring::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::string_view::iterator>::value);
-static_assert(thrust::is_contiguous_iterator<std::wstring_view::iterator>::value);
-static_assert(!thrust::is_contiguous_iterator<std::vector<bool>::iterator>::value);
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::string::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::wstring::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::string_view::iterator>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<std::wstring_view::iterator>::value));
+
+THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::vector<bool>::iterator>::value));
 
 template <typename T>
 THRUST_HOST void test_is_contiguous_iterator()
 {
-  static_assert(thrust::is_contiguous_iterator<T*>::value);
-  static_assert(thrust::is_contiguous_iterator<T const*>::value);
-  static_assert(thrust::is_contiguous_iterator<thrust::device_ptr<T>>::value);
-  static_assert(thrust::is_contiguous_iterator<typename std::vector<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::vector<T>::reverse_iterator>::value);
-  static_assert(thrust::is_contiguous_iterator<typename std::array<T, 1>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::list<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::deque<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::set<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::multiset<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::map<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::multimap<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_set<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_multiset<T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_map<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<typename std::unordered_multimap<T, T>::iterator>::value);
-  static_assert(!thrust::is_contiguous_iterator<std::istream_iterator<T>>::value);
-  static_assert(!thrust::is_contiguous_iterator<std::ostream_iterator<T>>::value);
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<T*>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<T const*>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<thrust::device_ptr<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename std::vector<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::vector<T>::reverse_iterator>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename std::array<T, 1>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::list<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::deque<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::set<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::multiset<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::map<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::multimap<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_set<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_multiset<T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_map<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<typename std::unordered_multimap<T, T>::iterator>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::istream_iterator<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_contiguous_iterator<std::ostream_iterator<T>>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_is_contiguous_iterator);
 
 template <typename Vector>
 THRUST_HOST void test_is_contiguous_iterator_vectors()
 {
-  static_assert(thrust::is_contiguous_iterator<typename Vector::iterator>::value);
+  THRUST_STATIC_ASSERT((thrust::is_contiguous_iterator<typename Vector::iterator>::value));
 }
 DECLARE_VECTOR_UNITTEST(test_is_contiguous_iterator_vectors);
 
@@ -99,34 +119,38 @@ template <typename T>
 void test_try_unwrap_contiguous_iterator()
 {
   // Raw pointers should pass whether expecting pointers or passthrough.
-  static_assert(check_unwrapped_iterator<T*, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<T*, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<T const*, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<T const*, T const*, expect_passthrough>::value);
-
-  static_assert(check_unwrapped_iterator<thrust::device_ptr<T>, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<thrust::device_ptr<T const>, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::vector<T>::iterator, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::vector<T>::reverse_iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::array<T, 1>::iterator, T*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::array<T const, 1>::iterator, T const*, expect_pointer>::value);
-  static_assert(check_unwrapped_iterator<typename std::list<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::deque<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::set<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::multiset<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::multimap<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_set<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_multiset<T>::iterator, T*, expect_passthrough>::value);
-  static_assert(
-    check_unwrapped_iterator<typename std::unordered_map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::
-      value);
-  static_assert(check_unwrapped_iterator<typename std::unordered_multimap<T, T>::iterator,
-                                         std::pair<T const, T>*,
-                                         expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<std::istream_iterator<T>, T*, expect_passthrough>::value);
-  static_assert(check_unwrapped_iterator<std::ostream_iterator<T>, void, expect_passthrough>::value);
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T*, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T*, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T const*, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<T const*, T const*, expect_passthrough>::value));
+
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<thrust::device_ptr<T>, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<thrust::device_ptr<T const>, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::vector<T>::iterator, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::vector<T>::reverse_iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::array<T, 1>::iterator, T*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::array<T const, 1>::iterator, T const*, expect_pointer>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::list<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::deque<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::set<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::multiset<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((
+    check_unwrapped_iterator<typename std::multimap<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_set<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_multiset<T>::iterator, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT(
+    (check_unwrapped_iterator<typename std::unordered_map<T, T>::iterator, std::pair<T const, T>*, expect_passthrough>::
+       value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<typename std::unordered_multimap<T, T>::iterator,
+                                                 std::pair<T const, T>*,
+                                                 expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<std::istream_iterator<T>, T*, expect_passthrough>::value));
+  THRUST_STATIC_ASSERT((check_unwrapped_iterator<std::ostream_iterator<T>, void, expect_passthrough>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_try_unwrap_contiguous_iterator);
diff --git a/projects/rocthrust/testing/is_operator_function_object.cu b/projects/rocthrust/testing/is_operator_function_object.cu
index 20a7bddb7e99..a23e47d34c55 100644
--- a/projects/rocthrust/testing/is_operator_function_object.cu
+++ b/projects/rocthrust/testing/is_operator_function_object.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,68 +21,106 @@
 
 #include <unittest/unittest.h>
 
-static_assert(thrust::is_operator_less_function_object<std::less<>>::value);
-static_assert(thrust::is_operator_greater_function_object<std::greater<>>::value);
-static_assert(thrust::is_operator_less_or_greater_function_object<std::less<>>::value);
-static_assert(thrust::is_operator_less_or_greater_function_object<std::greater<>>::value);
-static_assert(thrust::is_operator_plus_function_object<std::plus<>>::value);
+#if THRUST_CPP_DIALECT >= 2017
+THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<std::less<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<std::greater<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::less<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::greater<>>::value));
+
+THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<std::plus<>>::value));
+#endif
 
 template <typename T>
 THRUST_HOST void test_is_operator_less_function_object()
 {
-  static_assert(thrust::is_operator_less_function_object<thrust::less<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<thrust::greater_equal<T>>::value);
-  static_assert(thrust::is_operator_less_function_object<std::less<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_function_object<T>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_is_operator_less_function_object);
 
 template <typename T>
 THRUST_HOST void test_is_operator_greater_function_object()
 {
-  static_assert(!thrust::is_operator_greater_function_object<thrust::less<T>>::value);
-  static_assert(thrust::is_operator_greater_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<thrust::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::less<T>>::value);
-  static_assert(thrust::is_operator_greater_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_greater_function_object<T>::value);
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_greater_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_greater_function_object<T>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_is_operator_greater_function_object);
 
 template <typename T>
 THRUST_HOST void test_is_operator_less_or_greater_function_object()
 {
-  static_assert(thrust::is_operator_less_or_greater_function_object<thrust::less<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<thrust::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<thrust::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<thrust::greater_equal<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<std::less<T>>::value);
-  static_assert(thrust::is_operator_less_or_greater_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<std::less_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<std::greater_equal<T>>::value);
-  static_assert(!thrust::is_operator_less_or_greater_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<thrust::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<thrust::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_less_or_greater_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<std::less_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<std::greater_equal<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_less_or_greater_function_object<T>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_is_operator_less_or_greater_function_object);
 
 template <typename T>
 THRUST_HOST void test_is_operator_plus_function_object()
 {
-  static_assert(thrust::is_operator_plus_function_object<thrust::plus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::minus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::less<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<thrust::greater<T>>::value);
-  static_assert(thrust::is_operator_plus_function_object<std::plus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::minus<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::less<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<std::greater<T>>::value);
-  static_assert(!thrust::is_operator_plus_function_object<T>::value);
+  THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<thrust::plus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::minus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<thrust::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((thrust::is_operator_plus_function_object<std::plus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::minus<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::less<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<std::greater<T>>::value));
+
+  THRUST_STATIC_ASSERT((!thrust::is_operator_plus_function_object<T>::value));
 }
 DECLARE_GENERIC_UNITTEST(test_is_operator_plus_function_object);
diff --git a/projects/rocthrust/testing/is_partitioned.cu b/projects/rocthrust/testing/is_partitioned.cu
index 45af14753574..0a92b45ea108 100644
--- a/projects/rocthrust/testing/is_partitioned.cu
+++ b/projects/rocthrust/testing/is_partitioned.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/partition.h>
diff --git a/projects/rocthrust/testing/logical.cu b/projects/rocthrust/testing/logical.cu
index b613e1ab5efe..f644cae9e922 100644
--- a/projects/rocthrust/testing/logical.cu
+++ b/projects/rocthrust/testing/logical.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/logical.h>
diff --git a/projects/rocthrust/testing/memory.cu b/projects/rocthrust/testing/memory.cu
index 395337d8222b..e45ec7a3c148 100644
--- a/projects/rocthrust/testing/memory.cu
+++ b/projects/rocthrust/testing/memory.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,17 +27,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// WAR NVIDIA/cccl#1731
-// Some tests miscompile for non-CUDA backends on MSVC 2017 and 2019 (though 2022 is fine).
-// This is due to a bug in the compiler that breaks __THRUST_DEFINE_HAS_MEMBER_FUNCTION.
-#if defined(_MSC_VER) && _MSC_VER <= 1929 && THRUST_DEVICE_SYSTEM != THRUST_DEVICE_SYSTEM_CUDA
-#  define WAR_BUG_1731
-#endif
-
 // Define a new system class, as the my_system one is already used with a thrust::sort template definition
 // that calls back into sort.cu
 class my_memory_system : public thrust::device_execution_policy<my_memory_system>
@@ -269,18 +258,16 @@ get_temporary_buffer(my_memory_system& system, std::ptrdiff_t n)
   return thrust::make_pair(thrust::pointer<T, my_memory_system>(result.first.get()), result.second);
 }
 
-// [NON-CCCL PARITY BEGIN]
 template <typename Pointer>
 void return_temporary_buffer(my_memory_system& system, Pointer p, std::ptrdiff_t n)
 {
   system.validate_dispatch();
 
   thrust::device_system_tag device_sys;
-  thrust::pointer<typename _THRUST_STD::iterator_traits<Pointer>::value_type, thrust::device_system_tag> device_ptr(
-    p.get());
+  thrust::pointer<typename thrust::iterator_traits<Pointer>::value_type, 
+                           thrust::device_system_tag> device_ptr(p.get());
   thrust::return_temporary_buffer(device_sys, device_ptr, n);
 }
-// [NON-CCCL PARITY END]
 
 void TestGetTemporaryBufferDispatchExplicit()
 {
@@ -304,8 +291,6 @@ void TestGetTemporaryBufferDispatchExplicit()
 }
 DECLARE_UNITTEST(TestGetTemporaryBufferDispatchExplicit);
 
-#ifndef WAR_BUG_1731
-
 void TestGetTemporaryBufferDispatchImplicit()
 {
   if (are_same(thrust::device_system_tag(), thrust::system::cpp::tag()))
@@ -322,7 +307,6 @@ void TestGetTemporaryBufferDispatchImplicit()
 
     // call something we know will invoke get_temporary_buffer
     my_memory_system sys(0);
-
     thrust::sort(sys, vec.begin(), vec.end());
 
     ASSERT_EQUAL(true, thrust::is_sorted(vec.begin(), vec.end()));
@@ -331,8 +315,6 @@ void TestGetTemporaryBufferDispatchImplicit()
 }
 DECLARE_UNITTEST(TestGetTemporaryBufferDispatchImplicit);
 
-#endif
-
 void TestTemporaryBufferOldCustomization()
 {
   using system           = my_old_namespace::my_old_temporary_allocation_system;
diff --git a/projects/rocthrust/testing/merge_by_key.cu b/projects/rocthrust/testing/merge_by_key.cu
index 93d582a62533..641bc404560c 100644
--- a/projects/rocthrust/testing/merge_by_key.cu
+++ b/projects/rocthrust/testing/merge_by_key.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ void TestMergeByKeyDispatchImplicit()
 template <typename T, typename CompareOp, typename... Args>
 auto call_merge_by_key(Args&&... args) -> decltype(thrust::merge_by_key(std::forward<Args>(args)...))
 {
-  if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+  THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
   {
     return thrust::merge_by_key(std::forward<Args>(args)...);
   }
@@ -161,7 +161,7 @@ void TestMergeByKey(size_t n)
     const thrust::host_vector<T> h_a_vals(random_vals.begin(), random_vals.begin() + size_a);
     const thrust::host_vector<T> h_b_vals(random_vals.begin() + size_a, random_vals.end());
 
-    if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+    THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
     {
       thrust::stable_sort(h_a_keys.begin(), h_a_keys.end());
       thrust::stable_sort(h_b_keys.begin(), h_b_keys.end());
diff --git a/projects/rocthrust/testing/merge_key_value.cu b/projects/rocthrust/testing/merge_key_value.cu
index 96576951e5ee..1f1a2f42f28f 100644
--- a/projects/rocthrust/testing/merge_key_value.cu
+++ b/projects/rocthrust/testing/merge_key_value.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 template <typename T, typename CompareOp, typename... Args>
 auto call_merge(Args&&... args) -> decltype(thrust::merge(std::forward<Args>(args)...))
 {
-  if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+  THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
   {
     return thrust::merge(std::forward<Args>(args)...);
   }
@@ -60,7 +60,7 @@ void TestMergeKeyValue(size_t n)
     h_b[i] = T(h_keys_b[i], h_values_b[i]);
   }
 
-  if constexpr (_THRUST_STD::is_void<CompareOp>::value)
+  THRUST_IF_CONSTEXPR (_THRUST_STD::is_void<CompareOp>::value)
   {
     thrust::stable_sort(h_a.begin(), h_a.end());
     thrust::stable_sort(h_b.begin(), h_b.end());
diff --git a/projects/rocthrust/testing/min_and_max.cu b/projects/rocthrust/testing/min_and_max.cu
index 248af89e4717..26b35817e020 100644
--- a/projects/rocthrust/testing/min_and_max.cu
+++ b/projects/rocthrust/testing/min_and_max.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,28 +26,32 @@ struct TestMin
   {
     // 2 < 3
     T two(2), three(3);
-    ASSERT_EQUAL(two, _THRUST_STD::min(two, three));
-    ASSERT_EQUAL(two, _THRUST_STD::min(two, three, thrust::less<T>()));
+    ASSERT_EQUAL(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three));
+    ASSERT_EQUAL(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::less<T>()));
 
-    ASSERT_EQUAL(two, _THRUST_STD::min(three, two));
-    ASSERT_EQUAL(two, _THRUST_STD::min(three, two, thrust::less<T>()));
+    ASSERT_EQUAL(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two));
+    ASSERT_EQUAL(two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::less<T>()));
 
-    ASSERT_EQUAL(three, _THRUST_STD::min(two, three, thrust::greater<T>()));
-    ASSERT_EQUAL(three, _THRUST_STD::min(three, two, thrust::greater<T>()));
+    ASSERT_EQUAL(three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::greater<T>()));
+    ASSERT_EQUAL(three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::greater<T>()));
 
     using KV = key_value<T, T>;
     KV two_and_two(two, two);
     KV two_and_three(two, three);
 
     // the first element breaks ties
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two));
-
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three, thrust::less<KV>()));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two, thrust::less<KV>()));
-
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::min(two_and_two, two_and_three, thrust::greater<KV>()));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::min(two_and_three, two_and_two, thrust::greater<KV>()));
+    ASSERT_EQUAL_QUIET(two_and_two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three));
+    ASSERT_EQUAL_QUIET(two_and_three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two));
+
+    ASSERT_EQUAL_QUIET(two_and_two,
+                       thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::less<KV>()));
+    ASSERT_EQUAL_QUIET(two_and_three,
+                       thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::less<KV>()));
+
+    ASSERT_EQUAL_QUIET(
+      two_and_two, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::greater<KV>()));
+    ASSERT_EQUAL_QUIET(
+      two_and_three, thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::greater<KV>()));
   }
 };
 SimpleUnitTest<TestMin, NumericTypes> TestMinInstance;
@@ -59,28 +63,32 @@ struct TestMax
   {
     // 2 < 3
     T two(2), three(3);
-    ASSERT_EQUAL(three, _THRUST_STD::max(two, three));
-    ASSERT_EQUAL(three, _THRUST_STD::max(two, three, thrust::less<T>()));
+    ASSERT_EQUAL(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three));
+    ASSERT_EQUAL(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::less<T>()));
 
-    ASSERT_EQUAL(three, _THRUST_STD::max(three, two));
-    ASSERT_EQUAL(three, _THRUST_STD::max(three, two, thrust::less<T>()));
+    ASSERT_EQUAL(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two));
+    ASSERT_EQUAL(three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::less<T>()));
 
-    ASSERT_EQUAL(two, _THRUST_STD::max(two, three, thrust::greater<T>()));
-    ASSERT_EQUAL(two, _THRUST_STD::max(three, two, thrust::greater<T>()));
+    ASSERT_EQUAL(two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two, three, thrust::greater<T>()));
+    ASSERT_EQUAL(two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(three, two, thrust::greater<T>()));
 
     using KV = key_value<T, T>;
     KV two_and_two(two, two);
     KV two_and_three(two, three);
 
     // the first element breaks ties
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two));
-
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three, thrust::less<KV>()));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two, thrust::less<KV>()));
-
-    ASSERT_EQUAL_QUIET(two_and_two, _THRUST_STD::max(two_and_two, two_and_three, thrust::greater<KV>()));
-    ASSERT_EQUAL_QUIET(two_and_three, _THRUST_STD::max(two_and_three, two_and_two, thrust::greater<KV>()));
+    ASSERT_EQUAL_QUIET(two_and_two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three));
+    ASSERT_EQUAL_QUIET(two_and_three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two));
+
+    ASSERT_EQUAL_QUIET(two_and_two,
+                       thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::less<KV>()));
+    ASSERT_EQUAL_QUIET(two_and_three,
+                       thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::less<KV>()));
+
+    ASSERT_EQUAL_QUIET(
+      two_and_two, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_two, two_and_three, thrust::greater<KV>()));
+    ASSERT_EQUAL_QUIET(
+      two_and_three, thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(two_and_three, two_and_two, thrust::greater<KV>()));
   }
 };
 SimpleUnitTest<TestMax, NumericTypes> TestMaxInstance;
diff --git a/projects/rocthrust/testing/offset_iterator.cu b/projects/rocthrust/testing/offset_iterator.cu
deleted file mode 100644
index 8514cb30bf0d..000000000000
--- a/projects/rocthrust/testing/offset_iterator.cu
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
-#include <thrust/distance.h>
-#include <thrust/iterator/offset_iterator.h>
-
-#include <unittest/unittest.h>
-
-#include _THRUST_STD_INCLUDE(iterator)
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-// ensure that we properly support thrust::counting_iterator from _THRUST_STD
-void TestOffsetIteratorTraits()
-{
-  using base_it    = thrust::host_vector<int>::iterator;
-  using it         = thrust::offset_iterator<base_it>;
-  using traits     = _THRUST_STD::iterator_traits<it>;
-  using vec_traits = _THRUST_STD::iterator_traits<base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, vec_traits::difference_type>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, vec_traits::value_type>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, vec_traits::pointer>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, vec_traits::reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, vec_traits::iterator_category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestOffsetIteratorTraits);
-
-template <typename Vector>
-void TestOffsetConstructor()
-{
-  thrust::offset_iterator<int*> iter0;
-  ASSERT_EQUAL(iter0.base(), static_cast<int*>(nullptr));
-  ASSERT_EQUAL(iter0.offset(), 0);
-
-  Vector v{42, 43};
-  thrust::offset_iterator iter1(v.begin());
-  ASSERT_EQUAL_QUIET(iter1.base(), v.begin());
-  ASSERT_EQUAL(iter1.offset(), 0);
-  ASSERT_EQUAL(*iter1, 42);
-
-  thrust::offset_iterator iter2(v.begin(), 1);
-  ASSERT_EQUAL_QUIET(iter2.base(), v.begin());
-  ASSERT_EQUAL(iter2.offset(), 1);
-  ASSERT_EQUAL(*iter2, 43);
-
-  ptrdiff_t offset = 1;
-  thrust::offset_iterator iter3(v.begin(), &offset);
-  ASSERT_EQUAL_QUIET(iter3.base(), v.begin());
-  ASSERT_EQUAL(iter3.offset(), &offset);
-  ASSERT_EQUAL(*iter3.offset(), 1);
-  ASSERT_EQUAL(*iter3, 43);
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetConstructor);
-
-template <typename Vector>
-void TestOffsetIteratorCopyConstructorAndAssignment()
-{
-  Vector v{42, 43};
-
-  // value offset
-  {
-    thrust::offset_iterator iter0(v.begin());
-#if THRUST_COMPILER(MSVC) // MSVC cannot deduce the template arguments from the copy ctor
-    decltype(iter0) iter1(iter0);
-#else // THRUST_COMPILER(MSVC)
-    thrust::offset_iterator iter1(iter0);
-#endif // THRUST_COMPILER(MSVC)
-    ASSERT_EQUAL(iter0 == iter1, true);
-    ASSERT_EQUAL(*iter0 == *iter1, true);
-
-    thrust::offset_iterator iter2(v.begin() + 1);
-    ASSERT_EQUAL(iter0 != iter2, true);
-    ASSERT_EQUAL(*iter0 != *iter2, true);
-
-    iter2 = iter0;
-    ASSERT_EQUAL(iter0 == iter2, true);
-    ASSERT_EQUAL(*iter0 == *iter2, true);
-  }
-
-  // indirect offset
-  {
-    const typename Vector::iterator::difference_type offset = 0;
-    thrust::offset_iterator iter0(v.begin(), &offset);
-
-#if THRUST_COMPILER(MSVC) // MSVC cannot deduce the template arguments from the copy ctor
-    decltype(iter0) iter1(iter0);
-#else // THRUST_COMPILER(MSVC)
-    thrust::offset_iterator iter1(iter0);
-#endif // THRUST_COMPILER(MSVC)
-    ASSERT_EQUAL(iter0 == iter1, true);
-    ASSERT_EQUAL(*iter0 == *iter1, true);
-
-    thrust::offset_iterator iter2(v.begin() + 1, &offset);
-    ASSERT_EQUAL(iter0 != iter2, true);
-    ASSERT_EQUAL(*iter0 != *iter2, true);
-
-    iter2 = iter0;
-    ASSERT_EQUAL(iter0 == iter2, true);
-    ASSERT_EQUAL(*iter0 == *iter2, true);
-  }
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorCopyConstructorAndAssignment);
-
-template <typename Vector>
-void TestOffsetIteratorIncrement()
-{
-  auto test = [](auto iter) {
-    ASSERT_EQUAL(*iter, 0);
-    iter++;
-    ASSERT_EQUAL(*iter, 1);
-    iter++;
-    iter++;
-    ASSERT_EQUAL(*iter, 3);
-    iter += 5;
-    ASSERT_EQUAL(*iter, 8);
-    iter -= 10;
-    ASSERT_EQUAL(*iter, -2);
-  };
-
-  const Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-  test(thrust::offset_iterator(v.begin() + 1, 1));
-  const typename Vector::iterator::difference_type offset = 1;
-  test(thrust::offset_iterator(v.begin() + 1, &offset));
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorIncrement);
-
-template <typename Vector>
-void TestOffsetIteratorMutation()
-{
-  {
-    Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-    thrust::offset_iterator it(v.begin() + 1, 1);
-    *it = 42;
-    ++it;
-    *it = 43;
-    ++it.offset();
-    *it = 44;
-    ASSERT_EQUAL(v, (Vector{-2, -1, 42, 43, 44, 3, 4, 5, 6, 7, 8}));
-  }
-  {
-    Vector v{-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-    typename Vector::iterator::difference_type offset = 1;
-    thrust::offset_iterator it(v.begin() + 1, &offset);
-    *it = 42;
-    ++it;
-    *it    = 43;
-    offset = 2;
-    *it    = 44;
-    ASSERT_EQUAL(v, (Vector{-2, -1, 42, 43, 44, 3, 4, 5, 6, 7, 8}));
-  }
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorMutation);
-
-template <typename Vector>
-void TestOffsetIteratorComparisonAndDistance()
-{
-  auto test = [](auto iter1, auto iter2) {
-    ASSERT_EQUAL(iter1 == iter2, true);
-    ASSERT_EQUAL(iter1 - iter2, 0);
-    ASSERT_EQUAL(thrust::distance(iter1, iter2), 0);
-
-    iter1++;
-    ASSERT_EQUAL(iter1 == iter2, false);
-    ASSERT_EQUAL(iter1 - iter2, 1);
-    ASSERT_EQUAL(thrust::distance(iter1, iter2), -1);
-
-    iter2++;
-    ASSERT_EQUAL(iter1 == iter2, true);
-    ASSERT_EQUAL(iter1 - iter2, 0);
-    ASSERT_EQUAL(thrust::distance(iter1, iter2), 0);
-
-    iter1 += 100;
-    iter2 += 100;
-    ASSERT_EQUAL(iter1 == iter2, true);
-    ASSERT_EQUAL(iter1 - iter2, 0);
-    ASSERT_EQUAL(thrust::distance(iter1, iter2), 0);
-
-    iter1 -= 5;
-    ASSERT_EQUAL(iter1 == iter2, false);
-    ASSERT_EQUAL(iter1 - iter2, -5);
-    ASSERT_EQUAL(thrust::distance(iter1, iter2), 5);
-  };
-
-  Vector v(101);
-  test(thrust::offset_iterator(v.begin()), thrust::offset_iterator(v.begin()));
-  const typename Vector::iterator::difference_type offset = 0;
-  test(thrust::offset_iterator(v.begin(), &offset), thrust::offset_iterator(v.begin(), &offset));
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorComparisonAndDistance);
-
-template <typename Vector>
-void TestOffsetIteratorLateValue()
-{
-  typename Vector::difference_type offset;
-  Vector v{0, 1, 2, 3, 4, 5, 6, 7, 8};
-  thrust::offset_iterator iter(v.begin(), &offset);
-  offset = 2; // we provide the offset value **after** constructing the iterator
-  ASSERT_EQUAL(*iter, 2);
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorLateValue);
-
-template <typename Vector>
-void TestOffsetIteratorIndirectValueFancyIterator()
-{
-  using thrust::placeholders::_1;
-
-  Vector v{0, 1, 2, 3, 4, 5, 6, 7, 8};
-  thrust::device_vector<typename Vector::difference_type> offsets{2};
-  auto it = thrust::make_transform_iterator(offsets.begin(), _1 * 3);
-  thrust::offset_iterator iter(v.begin(), it);
-  ASSERT_EQUAL(*iter, 6);
-}
-DECLARE_VECTOR_UNITTEST(TestOffsetIteratorIndirectValueFancyIterator);
diff --git a/projects/rocthrust/testing/omp/reduce_intervals.cu b/projects/rocthrust/testing/omp/reduce_intervals.cu
index df563e84d555..9ee0b56372c3 100644
--- a/projects/rocthrust/testing/omp/reduce_intervals.cu
+++ b/projects/rocthrust/testing/omp/reduce_intervals.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 template <typename InputIterator, typename OutputIterator, typename BinaryFunction, typename Decomposition>
 void reduce_intervals(InputIterator input, OutputIterator output, BinaryFunction binary_op, Decomposition decomp)
 {
-  using OutputType = thrust::detail::it_value_t<OutputIterator>;
+  using OutputType = typename thrust::iterator_value<OutputIterator>::type;
   using index_type = typename Decomposition::index_type;
 
   // wrap binary_op
@@ -53,7 +53,7 @@ void reduce_intervals(InputIterator input, OutputIterator output, BinaryFunction
   }
 }
 
-void TestOmpReduceIntervalsSimple()
+void TestOmpReduceIntervalsSimple(void)
 {
   using T      = int;
   using Vector = thrust::device_vector<T>;
diff --git a/projects/rocthrust/testing/pair.cu b/projects/rocthrust/testing/pair.cu
index 4ea29e37a083..5f2010b2c041 100644
--- a/projects/rocthrust/testing/pair.cu
+++ b/projects/rocthrust/testing/pair.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -332,6 +332,7 @@ void TestPairSwap()
 }
 DECLARE_UNITTEST(TestPairSwap);
 
+#if THRUST_CPP_DIALECT >= 2017
 void TestPairStructuredBindings()
 {
   const int a = 42;
@@ -355,3 +356,4 @@ void TestPairCTAD(void)
   ASSERT_EQUAL(b, b2);
 }
 DECLARE_UNITTEST(TestPairCTAD);
+#endif // THRUST_CPP_DIALECT >= 2017
diff --git a/projects/rocthrust/testing/partition.cu b/projects/rocthrust/testing/partition.cu
index 163d64a49ee4..5c81a0e84854 100644
--- a/projects/rocthrust/testing/partition.cu
+++ b/projects/rocthrust/testing/partition.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 #include <thrust/count.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/iterator/zip_iterator.h>
@@ -25,7 +25,7 @@
 
 #include <unittest/unittest.h>
 
-#if THRUST_COMPILER(GCC, >=, 11) && THRUST_COMPILER(GCC, <, 12)
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 110000 && THRUST_GCC_VERSION < 120000
 #  define WAIVE_GCC11_FAILURES
 #endif
 
diff --git a/projects/rocthrust/testing/partition_point.cu b/projects/rocthrust/testing/partition_point.cu
index cae7105f3a86..1610d2a5d8c7 100644
--- a/projects/rocthrust/testing/partition_point.cu
+++ b/projects/rocthrust/testing/partition_point.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/partition.h>
diff --git a/projects/rocthrust/testing/permutation_iterator.cu b/projects/rocthrust/testing/permutation_iterator.cu
index 76c2ddd46e67..2b5f26e72a83 100644
--- a/projects/rocthrust/testing/permutation_iterator.cu
+++ b/projects/rocthrust/testing/permutation_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/permutation_iterator.h>
 #include <thrust/reduce.h>
@@ -27,40 +26,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// ensure that we properly support thrust::permutation_iterator from _THRUST_STD
-void TestPermutationIteratorTraits()
-{
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it       = thrust::permutation_iterator<base_it, base_it>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = _THRUST_STD::random_access_iterator_tag;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestPermutationIteratorTraits);
-
 template <class Vector>
 void TestPermutationIteratorSimple()
 {
diff --git a/projects/rocthrust/testing/raw_reference_cast.cu b/projects/rocthrust/testing/raw_reference_cast.cu
deleted file mode 100644
index 17c5c8d3fbcf..000000000000
--- a/projects/rocthrust/testing/raw_reference_cast.cu
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <thrust/detail/raw_reference_cast.h>
-#include <thrust/device_vector.h>
-#include <thrust/iterator/discard_iterator.h>
-#include <thrust/iterator/zip_iterator.h>
-
-#include <vector>
-
-#include <unittest/unittest.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-template <>
-struct thrust::detail::is_proxy_reference<std::vector<bool>::reference> : true_type
-{};
-
-void TestRawReferenceCast()
-{
-  using _THRUST_STD::is_same_v;
-
-  {
-    [[maybe_unused]] int i        = 42;
-    [[maybe_unused]] const int ci = 42;
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(i)), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(ci)), const int&>);
-  }
-  {
-    [[maybe_unused]] thrust::host_vector<int> vec(1);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.begin())), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.cbegin())), const int&>);
-
-    [[maybe_unused]] auto zip = thrust::make_zip_iterator(vec.begin(), vec.begin());
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip)), thrust::detail::tuple_of_iterator_references<int&, int&>>);
-
-    [[maybe_unused]] auto zip2 = thrust::make_zip_iterator(zip, zip);
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip2)),
-                thrust::detail::tuple_of_iterator_references<thrust::detail::tuple_of_iterator_references<int&, int&>,
-                                                             thrust::detail::tuple_of_iterator_references<int&, int&>>>);
-  }
-  {
-    [[maybe_unused]] thrust::device_vector<int> vec(1);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.begin())), int&>);
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(*vec.cbegin())), const int&>);
-
-    [[maybe_unused]] auto zip = thrust::make_zip_iterator(vec.begin(), vec.begin());
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip)), thrust::detail::tuple_of_iterator_references<int&, int&>>);
-
-    [[maybe_unused]] auto zip2 = thrust::make_zip_iterator(zip, zip);
-    static_assert(
-      is_same_v<decltype(thrust::raw_reference_cast(*zip2)),
-                thrust::detail::tuple_of_iterator_references<thrust::detail::tuple_of_iterator_references<int&, int&>,
-                                                             thrust::detail::tuple_of_iterator_references<int&, int&>>>);
-  }
-
-  // proxy references
-  {
-    [[maybe_unused]] std::vector<bool> vb;
-    static_assert(is_same_v<decltype(thrust::raw_reference_cast(vb[0])), std::vector<bool>::reference>);
-  }
-}
-DECLARE_UNITTEST(TestRawReferenceCast);
diff --git a/projects/rocthrust/testing/remove.cu b/projects/rocthrust/testing/remove.cu
index f8605fa79661..a9ac6ddb8fae 100644
--- a/projects/rocthrust/testing/remove.cu
+++ b/projects/rocthrust/testing/remove.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/count.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
diff --git a/projects/rocthrust/testing/replace.cu b/projects/rocthrust/testing/replace.cu
index 0aed0805e7c4..e314a55fecbf 100644
--- a/projects/rocthrust/testing/replace.cu
+++ b/projects/rocthrust/testing/replace.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,14 +23,20 @@
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 #endif
 
+// GCC 12 + omp + c++11 miscompiles some test cases and emits spurious warnings.
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ == 12 && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_OMP \
+  && THRUST_CPP_DIALECT == 2011
+#  define THRUST_GCC12_OMP_MISCOMPILE
+#endif
+
 // New GCC, new miscompile. 13 + TBB this time.
-#if THRUST_COMPILER(GCC, ==, 13) && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_TBB
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ == 13 && THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_TBB
 #  define THRUST_GCC13_TBB_MISCOMPILE
 #endif
 
@@ -100,6 +106,7 @@ void TestReplace(const size_t n)
 DECLARE_VARIABLE_UNITTEST(TestReplace);
 
 #ifndef THRUST_GCC13_TBB_MISCOMPILE
+#  ifndef THRUST_GCC12_OMP_MISCOMPILE
 template <class Vector>
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestReplaceCopySimple()
 {
@@ -116,6 +123,7 @@ THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestReplaceCopySimple()
   ASSERT_EQUAL(dest, result);
 }
 DECLARE_VECTOR_UNITTEST(TestReplaceCopySimple);
+#  endif
 #endif
 
 template <typename InputIterator, typename OutputIterator, typename T>
diff --git a/projects/rocthrust/testing/reverse.cu b/projects/rocthrust/testing/reverse.cu
index 6b9db59f56cc..b26998e02045 100644
--- a/projects/rocthrust/testing/reverse.cu
+++ b/projects/rocthrust/testing/reverse.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -72,13 +72,13 @@ DECLARE_UNITTEST(TestReverseDispatchImplicit);
 template <typename Vector>
 void TestReverseCopySimple()
 {
-#if THRUST_COMPILER(GCC, >=, 8) && THRUST_COMPILER(GCC, <, 10)
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC && THRUST_GCC_VERSION >= 80000 && THRUST_GCC_VERSION < 100000
 
   if (typeid(Vector) == typeid(thrust::host_vector<custom_numeric>))
   {
     KNOWN_FAILURE // WAR NVBug 2481122
   }
-#endif // THRUST_COMPILER(GCC, >=, 8) && THRUST_COMPILER(GCC, <, 10)
+#endif
 
   using Iterator = typename Vector::iterator;
 
diff --git a/projects/rocthrust/testing/reverse_iterator.cu b/projects/rocthrust/testing/reverse_iterator.cu
index e61828318f85..1d438e13609a 100644
--- a/projects/rocthrust/testing/reverse_iterator.cu
+++ b/projects/rocthrust/testing/reverse_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/reverse_iterator.h>
 #include <thrust/scan.h>
 #include <thrust/sequence.h>
@@ -24,40 +23,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestReverseIteratorTraits()
-{
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it       = thrust::reverse_iterator<base_it>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = _THRUST_STD::random_access_iterator_tag;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int&>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestReverseIteratorTraits);
-
 void TestReverseIteratorCopyConstructor()
 {
   thrust::host_vector<int> h_v(1, 13);
diff --git a/projects/rocthrust/testing/scan.cu b/projects/rocthrust/testing/scan.cu
index 4caeb9f2e224..729a564c594a 100644
--- a/projects/rocthrust/testing/scan.cu
+++ b/projects/rocthrust/testing/scan.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 #include <thrust/detail/config.h>
 
-#include <thrust/detail/libcxx_wrapper/__functional/maximum.h>
 #include <thrust/device_free.h>
 #include <thrust/device_malloc.h>
 #include <thrust/functional.h>
@@ -28,19 +27,33 @@
 
 #include <unittest/unittest.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(functional)
-#endif
 #include _THRUST_STD_INCLUDE(array)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
+template <typename T>
+struct max_functor
+{
+  THRUST_HOST_DEVICE T operator()(T rhs, T lhs) const
+  {
+    return thrust::max(rhs, lhs);
+  }
+};
 
 template <class Vector>
 void TestScanSimple()
 {
   using T = typename Vector::value_type;
+
+  // icc miscompiles the intermediate sum updates for custom_numeric.
+  // The issue doesn't happen with opts disabled, or on other compilers.
+  // Printing the intermediate sum each iteration "fixes" the issue,
+  // so likely a bad optimization.
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL
+  if (std::is_same<T, custom_numeric>::value)
+  {
+    return;
+  }
+#endif
+
   typename Vector::iterator iter;
 
   Vector input(5);
@@ -305,12 +318,12 @@ struct TestScanWithOperator
     thrust::host_vector<T> h_output(n);
     thrust::device_vector<T> d_output(n);
 
-    thrust::inclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), ::internal::maximum<T>{});
-    thrust::inclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), ::internal::maximum<T>{});
+    thrust::inclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), max_functor<T>());
+    thrust::inclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), max_functor<T>());
     ASSERT_EQUAL(d_output, h_output);
 
-    thrust::exclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), T(13), ::internal::maximum<T>{});
-    thrust::exclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), T(13), ::internal::maximum<T>{});
+    thrust::exclusive_scan(h_input.begin(), h_input.end(), h_output.begin(), T(13), max_functor<T>());
+    thrust::exclusive_scan(d_input.begin(), d_input.end(), d_output.begin(), T(13), max_functor<T>());
     ASSERT_EQUAL(d_output, h_output);
   }
 };
@@ -327,19 +340,19 @@ struct TestScanWithOperatorToDiscardIterator
     thrust::discard_iterator<> reference(n);
 
     thrust::discard_iterator<> h_result =
-      thrust::inclusive_scan(h_input.begin(), h_input.end(), thrust::make_discard_iterator(), ::internal::maximum<T>{});
+      thrust::inclusive_scan(h_input.begin(), h_input.end(), thrust::make_discard_iterator(), max_functor<T>());
 
     thrust::discard_iterator<> d_result =
-      thrust::inclusive_scan(d_input.begin(), d_input.end(), thrust::make_discard_iterator(), ::internal::maximum<T>{});
+      thrust::inclusive_scan(d_input.begin(), d_input.end(), thrust::make_discard_iterator(), max_functor<T>());
 
     ASSERT_EQUAL_QUIET(reference, h_result);
     ASSERT_EQUAL_QUIET(reference, d_result);
 
-    h_result = thrust::exclusive_scan(
-      h_input.begin(), h_input.end(), thrust::make_discard_iterator(), T(13), ::internal::maximum<T>{});
+    h_result =
+      thrust::exclusive_scan(h_input.begin(), h_input.end(), thrust::make_discard_iterator(), T(13), max_functor<T>());
 
-    d_result = thrust::exclusive_scan(
-      d_input.begin(), d_input.end(), thrust::make_discard_iterator(), T(13), ::internal::maximum<T>{});
+    d_result =
+      thrust::exclusive_scan(d_input.begin(), d_input.end(), thrust::make_discard_iterator(), T(13), max_functor<T>());
 
     ASSERT_EQUAL_QUIET(reference, h_result);
     ASSERT_EQUAL_QUIET(reference, d_result);
@@ -591,29 +604,24 @@ struct only_set_when_expected_it
   }
 };
 
-namespace std
-{
+THRUST_NAMESPACE_BEGIN
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
-  using value_type      = long long;
-  using reference       = only_set_when_expected_it;
-  using difference_type = _THRUST_STD::ptrdiff_t;
+  using value_type = long long;
+  using reference  = only_set_when_expected_it;
 };
-} // namespace std
+THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-_THRUST_STD_NAMESPACE_BEGIN
+namespace std
+{
 template <>
 struct iterator_traits<only_set_when_expected_it>
 {
-  using value_type        = long long;
-  using reference         = only_set_when_expected_it;
-  using iterator_category = thrust::random_access_device_iterator_tag;
-  using difference_type   = _THRUST_STD::ptrdiff_t;
+  using value_type = long long;
+  using reference  = only_set_when_expected_it;
 };
-_THRUST_STD_NAMESPACE_END
-#endif
+} // namespace std
 
 void TestInclusiveScanWithBigIndexesHelper(int magnitude)
 {
diff --git a/projects/rocthrust/testing/set_difference.cu b/projects/rocthrust/testing/set_difference.cu
index 6ef81c39b856..46ba7f74f7de 100644
--- a/projects/rocthrust/testing/set_difference.cu
+++ b/projects/rocthrust/testing/set_difference.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -195,7 +195,7 @@ DECLARE_VARIABLE_UNITTEST(TestSetDifferenceMultiset);
 
 // FIXME: disabled on Windows, because it causes a failure on the internal CI system in one specific configuration.
 // That failure will be tracked in a new NVBug, this is disabled to unblock submitting all the other changes.
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 void TestSetDifferenceWithBigIndexesHelper(int magnitude)
 {
   thrust::counting_iterator<long long> begin(0);
diff --git a/projects/rocthrust/testing/set_intersection.cu b/projects/rocthrust/testing/set_intersection.cu
index 4810cba2dfa8..b997c3c69f45 100644
--- a/projects/rocthrust/testing/set_intersection.cu
+++ b/projects/rocthrust/testing/set_intersection.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -229,7 +229,7 @@ DECLARE_VARIABLE_UNITTEST(TestSetIntersectionMultiset);
 
 // FIXME: disabled on Windows, because it causes a failure on the internal CI system in one specific configuration.
 // That failure will be tracked in a new NVBug, this is disabled to unblock submitting all the other changes.
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 void TestSetDifferenceWithBigIndexesHelper(int magnitude)
 {
   thrust::counting_iterator<long long> begin1(0);
diff --git a/projects/rocthrust/testing/sort_permutation_iterator.cu b/projects/rocthrust/testing/sort_permutation_iterator.cu
index 7e0584eba59a..e3d83889bf9c 100644
--- a/projects/rocthrust/testing/sort_permutation_iterator.cu
+++ b/projects/rocthrust/testing/sort_permutation_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ template <typename Iterator>
 class strided_range
 {
 public:
-  using difference_type = thrust::detail::it_difference_t<Iterator>;
+  using difference_type = typename thrust::iterator_difference<Iterator>::type;
 
   struct stride_functor
   {
diff --git a/projects/rocthrust/testing/tabulate.cu b/projects/rocthrust/testing/tabulate.cu
index 647b5336a3bc..34f8e4185349 100644
--- a/projects/rocthrust/testing/tabulate.cu
+++ b/projects/rocthrust/testing/tabulate.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
diff --git a/projects/rocthrust/testing/tabulate_output_iterator.cu b/projects/rocthrust/testing/tabulate_output_iterator.cu
index 0d31e7060254..b0e885ac7fc7 100644
--- a/projects/rocthrust/testing/tabulate_output_iterator.cu
+++ b/projects/rocthrust/testing/tabulate_output_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2024 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
 #include <thrust/gather.h>
@@ -32,10 +31,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 template <typename OutItT>
 struct host_write_op
 {
@@ -98,41 +93,6 @@ struct index_to_gather_index_op
   }
 };
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestTabulateOutputIteratorTraits()
-{
-  using base_it = thrust::host_vector<int>::iterator;
-  using Op      = host_write_op<base_it>;
-
-  using it       = thrust::tabulate_output_iterator<Op>;
-  using traits   = _THRUST_STD::iterator_traits<it>;
-  using category = thrust::detail::iterator_category_with_system_and_traversal<_THRUST_STD::random_access_iterator_tag,
-                                                                               thrust::any_system_tag,
-                                                                               thrust::random_access_traversal_tag>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(
-    _THRUST_STD::is_same_v<traits::reference, thrust::detail::tabulate_output_iterator_proxy<Op, ptrdiff_t>>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, category>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-  // FIXME(bgruber): all up to and including random access should be true
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(!_THRUST_STD::input_iterator<it>);
-  static_assert(!_THRUST_STD::forward_iterator<it>);
-  static_assert(!_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(!_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestTabulateOutputIteratorTraits);
-
 template <class Vector>
 void TestTabulateOutputIterator()
 {
diff --git a/projects/rocthrust/testing/transform.cu b/projects/rocthrust/testing/transform.cu
index 5a8c9a9cafa7..d3dfbc93585c 100644
--- a/projects/rocthrust/testing/transform.cu
+++ b/projects/rocthrust/testing/transform.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/retag.h>
@@ -28,7 +28,7 @@
 
 // There is a unfortunate miscompilation of the gcc-11 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 11)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 11
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
 #else
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
@@ -666,7 +666,7 @@ THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestTransformIfBinaryToDiscardIterator
 }
 DECLARE_VARIABLE_UNITTEST(TestTransformIfBinaryToDiscardIterator);
 
-#if ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) == 40400) || defined(__INTEL_COMPILER)
+#if ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) == 40400) || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
 template <typename T>
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestTransformUnaryCountingIterator()
 {
diff --git a/projects/rocthrust/testing/transform_input_output_iterator.cu b/projects/rocthrust/testing/transform_input_output_iterator.cu
index 83e4be0f8a9d..5d537b9c81e1 100644
--- a/projects/rocthrust/testing/transform_input_output_iterator.cu
+++ b/projects/rocthrust/testing/transform_input_output_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_input_output_iterator.h>
@@ -26,51 +24,14 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
 // There is an unfortunate miscompilation of the gcc-13 vectorizer leading to OOB writes
 // Adding this attribute suffices that this miscompilation does not appear anymore
-#if THRUST_COMPILER(GCC, >=, 13)
+#if defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ >= 13
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER __attribute__((optimize("no-tree-vectorize")))
-#else // THRUST_COMPILER(GCC, <, 13)
+#else // defined(THRUST_HOST_COMPILER_GCC) && __GNUC__ < 13
 #  define THRUST_DISABLE_BROKEN_GCC_VECTORIZER
 #endif
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestTransformInputOutputIteratorTraits()
-{
-  using input_func  = thrust::negate<int>;
-  using output_func = thrust::square<int>;
-  using base_it     = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::transform_input_output_iterator<input_func, output_func, base_it>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::transform_input_output_iterator_proxy<input_func, output_func, base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestTransformInputOutputIteratorTraits);
-
 template <class Vector>
 THRUST_DISABLE_BROKEN_GCC_VECTORIZER void TestTransformInputOutputIterator()
 {
diff --git a/projects/rocthrust/testing/transform_iterator.cu b/projects/rocthrust/testing/transform_iterator.cu
index d01fc3fb2938..e01e276f6efb 100644
--- a/projects/rocthrust/testing/transform_iterator.cu
+++ b/projects/rocthrust/testing/transform_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,56 +15,33 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/config.h>
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+// suppress warnings on thrust::identity
+THRUST_SUPPRESS_DEPRECATED_PUSH
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
-#include <thrust/logical.h>
 #include <thrust/reduce.h>
 #include <thrust/sequence.h>
 
 #include <memory>
 #include <vector>
-
-#include <unittest/unittest.h>
-
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <functional>
-#  include <iterator>
 #  include <type_traits>
+#  include <utility>
 #endif
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestTransformIteratorTraits()
-{
-  using func    = thrust::negate<int>;
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it     = thrust::transform_iterator<func, base_it>;
-  using traits = _THRUST_STD::iterator_traits<it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
+#include <unittest/unittest.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestTransformIteratorTraits);
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
 
 template <class Vector>
 void TestTransformIterator()
@@ -190,6 +167,7 @@ struct forward
 
 void TestTransformIteratorReferenceAndValueType()
 {
+  THRUST_SUPPRESS_DEPRECATED_PUSH
   using _THRUST_STD::is_same;
   using _THRUST_STD::negate;
   {
@@ -214,6 +192,11 @@ void TestTransformIteratorReferenceAndValueType()
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
@@ -243,6 +226,11 @@ void TestTransformIteratorReferenceAndValueType()
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
@@ -272,22 +260,37 @@ void TestTransformIteratorReferenceAndValueType()
     static_assert(is_same<decltype(it_tr_fwd)::value_type, bool>::value, "");
     (void) it_tr_fwd;
 
+    auto it_tr_ide = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_ide)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_ide)::value_type, bool>::value, "");
+    (void) it_tr_ide;
+
+    auto it_tr_tid = thrust::make_transform_iterator(it, thrust::identity<bool>{});
+    static_assert(is_same<decltype(it_tr_tid)::reference, bool>::value, ""); // identity<bool>::value_type
+    static_assert(is_same<decltype(it_tr_tid)::value_type, bool>::value, "");
+    (void) it_tr_tid;
+
     auto it_tr_cid = thrust::make_transform_iterator(it, ::internal::identity{});
     static_assert(is_same<decltype(it_tr_cid)::reference, bool>::value, ""); // special handling by
                                                                              // transform_iterator_reference
     static_assert(is_same<decltype(it_tr_cid)::value_type, bool>::value, "");
     (void) it_tr_cid;
   }
+  THRUST_SUPPRESS_DEPRECATED_POP
 }
 DECLARE_UNITTEST(TestTransformIteratorReferenceAndValueType);
 
 void TestTransformIteratorIdentity()
 {
+  THRUST_SUPPRESS_DEPRECATED_PUSH
   thrust::device_vector<int> v(3, 42);
 
+  ASSERT_EQUAL(*thrust::make_transform_iterator(v.begin(), thrust::identity<int>{}), 42);
+  ASSERT_EQUAL(*thrust::make_transform_iterator(v.begin(), thrust::identity<>{}), 42);
   ASSERT_EQUAL(*thrust::make_transform_iterator(v.begin(), ::internal::identity{}), 42);
   using namespace thrust::placeholders;
   ASSERT_EQUAL(*thrust::make_transform_iterator(v.begin(), _1), 42);
+  THRUST_SUPPRESS_DEPRECATED_POP
 }
 
 DECLARE_UNITTEST(TestTransformIteratorIdentity);
diff --git a/projects/rocthrust/testing/transform_output_iterator.cu b/projects/rocthrust/testing/transform_output_iterator.cu
index db75890bf46d..82757a5e4731 100644
--- a/projects/rocthrust/testing/transform_output_iterator.cu
+++ b/projects/rocthrust/testing/transform_output_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/device_vector.h>
 #include <thrust/functional.h>
 #include <thrust/host_vector.h>
@@ -27,43 +26,6 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <type_traits>
-#endif
-
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestTransformOutputIteratorTraits()
-{
-  using func    = thrust::negate<int>;
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::transform_output_iterator<func, base_it>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::transform_output_iterator_proxy<func, base_it>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, int>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-  // FIXME(bgruber): all up to and including random access should be true
-  static_assert(!_THRUST_STD::input_iterator<it>);
-  static_assert(!_THRUST_STD::forward_iterator<it>);
-  static_assert(!_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(!_THRUST_STD::random_access_iterator<it>);
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestTransformOutputIteratorTraits);
-
 template <class Vector>
 void TestTransformOutputIterator()
 {
diff --git a/projects/rocthrust/testing/transform_scan.cu b/projects/rocthrust/testing/transform_scan.cu
index 2b4269775a1c..bc473cc2b876 100644
--- a/projects/rocthrust/testing/transform_scan.cu
+++ b/projects/rocthrust/testing/transform_scan.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
diff --git a/projects/rocthrust/testing/trivial_sequence.cu b/projects/rocthrust/testing/trivial_sequence.cu
index c0fe19ed3081..59a9bc84de53 100644
--- a/projects/rocthrust/testing/trivial_sequence.cu
+++ b/projects/rocthrust/testing/trivial_sequence.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,17 +21,13 @@
 
 #include <unittest/unittest.h>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 template <typename Iterator>
 void test(Iterator first, Iterator last)
 {
   using System = typename thrust::iterator_system<Iterator>::type;
   System system;
   thrust::detail::trivial_sequence<Iterator, System> ts(system, first, last);
-  using ValueType = typename _THRUST_STD::iterator_traits<Iterator>::value_type;
+  using ValueType = typename thrust::iterator_traits<Iterator>::value_type;
 
   ASSERT_EQUAL_QUIET((ValueType) ts.begin()[0], ValueType(0, 11));
   ASSERT_EQUAL_QUIET((ValueType) ts.begin()[1], ValueType(2, 11));
diff --git a/projects/rocthrust/testing/tuple.cu b/projects/rocthrust/testing/tuple.cu
index 538fb1424b43..1c5a1465739a 100644
--- a/projects/rocthrust/testing/tuple.cu
+++ b/projects/rocthrust/testing/tuple.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2024 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/config/namespace.h>
 #include <thrust/generate.h>
 #include <thrust/swap.h>
 #include <thrust/tuple.h>
@@ -28,6 +27,11 @@
 
 using namespace unittest;
 
+// Yes we're using 'thrust::null_type', I don't care >:(
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+THRUST_SUPPRESS_DEPRECATED_PUSH
+#endif
+
 template <typename T>
 struct TestTupleConstructor
 {
@@ -493,11 +497,7 @@ void TestTupleSwap()
   thrust::tuple<int, int, int> t1(a, b, c);
   thrust::tuple<int, int, int> t2(x, y, z);
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
   using _THRUST_STD::swap;
-#else
-  using THRUST_NS_QUALIFIER::swap;
-#endif
   swap(t1, t2);
 
   ASSERT_EQUAL(x, thrust::get<0>(t1));
@@ -524,6 +524,7 @@ void TestTupleSwap()
 }
 DECLARE_UNITTEST(TestTupleSwap);
 
+#if THRUST_CPP_DIALECT >= 2017
 void TestTupleStructuredBindings()
 {
   const int a = 0;
@@ -551,20 +552,108 @@ void TestTupleCTAD(void)
   ASSERT_EQUAL(c, c2);
 }
 DECLARE_UNITTEST(TestTupleCTAD);
+#endif // THRUST_CPP_DIALECT >= 2017
 
-void TestTupleOfIteratorReferenceAssignsFromConst()
-{
-  // tuple of mutable references
-  thrust::device_vector<int> v(10);
-  using devref = decltype(v[0]);
-  auto refs    = thrust::detail::tuple_of_iterator_references<devref>{thrust::tuple<devref>(v[0])};
-
-  // tuple of const references
-  const thrust::device_vector<int> cv(10);
-  using devcref = decltype(cv[0]);
-  auto crefs    = thrust::detail::tuple_of_iterator_references<devcref>{thrust::tuple<devcref>(cv[0])};
-
-  // should compile:
-  refs = crefs;
-}
-DECLARE_UNITTEST(TestTupleOfIteratorReferenceAssignsFromConst);
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+THRUST_SUPPRESS_DEPRECATED_POP
+#endif
+
+// Ensure that we are backwards compatible with the old thrust::tuple implementation
+THRUST_SUPPRESS_DEPRECATED_PUSH
+static_assert(
+  thrust::tuple_size<thrust::tuple<thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 0,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 1,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 2,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 3,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 4,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int,
+                                   int,
+                                   int,
+                                   int,
+                                   int,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type,
+                                   thrust::null_type>>::value
+    == 5,
+  "");
+static_assert(
+  thrust::tuple_size<
+    thrust::
+      tuple<int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type, thrust::null_type>>::value
+    == 6,
+  "");
+static_assert(
+  thrust::tuple_size<
+    thrust::tuple<int, int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type>>::value
+    == 7,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, thrust::null_type, thrust::null_type>>::value
+    == 8,
+  "");
+static_assert(
+  thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, thrust::null_type>>::value == 9, "");
+static_assert(thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, int>>::value == 10, "");
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/testing/tuple_algorithms.cu b/projects/rocthrust/testing/tuple_algorithms.cu
new file mode 100644
index 000000000000..cf33f21899c7
--- /dev/null
+++ b/projects/rocthrust/testing/tuple_algorithms.cu
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/tuple_algorithms.h>
+#include <thrust/type_traits/integer_sequence.h>
+
+#include <unittest/unittest.h>
+
+// FIXME: Replace with C++14 style `thrust::square<>` when we have it.
+struct custom_square
+{
+  template <typename T>
+  THRUST_HOST_DEVICE T operator()(T v) const
+  {
+    return v * v;
+  }
+};
+
+struct custom_square_inplace
+{
+  template <typename T>
+  THRUST_HOST_DEVICE void operator()(T& v) const
+  {
+    v *= v;
+  }
+};
+
+void test_tuple_subset()
+{
+  auto t0 = std::make_tuple(0, 2, 3.14);
+
+  auto t1 = thrust::tuple_subset(t0, thrust::index_sequence<2, 0>{});
+
+  ASSERT_EQUAL_QUIET(t1, std::make_tuple(3.14, 0));
+}
+DECLARE_UNITTEST(test_tuple_subset);
+
+void test_tuple_transform()
+{
+  auto t0 = std::make_tuple(0, 2, 3.14);
+
+  auto t1 = thrust::tuple_transform(t0, custom_square{});
+
+  ASSERT_EQUAL_QUIET(t1, std::make_tuple(0, 4, 9.8596));
+}
+DECLARE_UNITTEST(test_tuple_transform);
+
+void test_tuple_for_each()
+{
+  auto t = std::make_tuple(0, 2, 3.14);
+
+  thrust::tuple_for_each(t, custom_square_inplace{});
+
+  ASSERT_EQUAL_QUIET(t, std::make_tuple(0, 4, 9.8596));
+}
+DECLARE_UNITTEST(test_tuple_for_each);
diff --git a/projects/rocthrust/testing/tuple_reduce.cu b/projects/rocthrust/testing/tuple_reduce.cu
index e34765032f37..6c221725004e 100644
--- a/projects/rocthrust/testing/tuple_reduce.cu
+++ b/projects/rocthrust/testing/tuple_reduce.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ struct TestTupleReduce
 
     // zip up the data
     host_vector<tuple<T, T>> h_tuples(n);
-    thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
+    transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
 
     // copy to device
     device_vector<tuple<T, T>> d_tuples = h_tuples;
diff --git a/projects/rocthrust/testing/tuple_scan.cu b/projects/rocthrust/testing/tuple_scan.cu
index af1afd41549f..8b9032c186b4 100644
--- a/projects/rocthrust/testing/tuple_scan.cu
+++ b/projects/rocthrust/testing/tuple_scan.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ struct TestTupleScan
 
     // initialize input
     host_vector<tuple<T, T>> h_input(n);
-    thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_input.begin(), MakeTupleFunctor());
+    transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_input.begin(), MakeTupleFunctor());
     device_vector<tuple<T, T>> d_input = h_input;
 
     // allocate output
diff --git a/projects/rocthrust/testing/tuple_sort.cu b/projects/rocthrust/testing/tuple_sort.cu
index 77bed6f9bdd1..389b11ca9247 100644
--- a/projects/rocthrust/testing/tuple_sort.cu
+++ b/projects/rocthrust/testing/tuple_sort.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -54,30 +54,30 @@ struct TestTupleStableSort
 
     // zip up the data
     host_vector<tuple<T, T>> h_tuples(n);
-    thrust::transform(h_keys.begin(), h_keys.end(), h_values.begin(), h_tuples.begin(), MakeTupleFunctor());
+    transform(h_keys.begin(), h_keys.end(), h_values.begin(), h_tuples.begin(), MakeTupleFunctor());
 
     // copy to device
     device_vector<tuple<T, T>> d_tuples = h_tuples;
 
     // sort on host
-    thrust::stable_sort(h_tuples.begin(), h_tuples.end());
+    stable_sort(h_tuples.begin(), h_tuples.end());
 
     // sort on device
-    thrust::stable_sort(d_tuples.begin(), d_tuples.end());
+    stable_sort(d_tuples.begin(), d_tuples.end());
 
-    ASSERT_EQUAL(true, thrust::is_sorted(d_tuples.begin(), d_tuples.end()));
+    ASSERT_EQUAL(true, is_sorted(d_tuples.begin(), d_tuples.end()));
 
     // select keys
-    thrust::transform(h_tuples.begin(), h_tuples.end(), h_keys.begin(), GetFunctor<0>());
+    transform(h_tuples.begin(), h_tuples.end(), h_keys.begin(), GetFunctor<0>());
 
     device_vector<T> d_keys(h_keys.size());
-    thrust::transform(d_tuples.begin(), d_tuples.end(), d_keys.begin(), GetFunctor<0>());
+    transform(d_tuples.begin(), d_tuples.end(), d_keys.begin(), GetFunctor<0>());
 
     // select values
-    thrust::transform(h_tuples.begin(), h_tuples.end(), h_values.begin(), GetFunctor<1>());
+    transform(h_tuples.begin(), h_tuples.end(), h_values.begin(), GetFunctor<1>());
 
     device_vector<T> d_values(h_values.size());
-    thrust::transform(d_tuples.begin(), d_tuples.end(), d_values.begin(), GetFunctor<1>());
+    transform(d_tuples.begin(), d_tuples.end(), d_values.begin(), GetFunctor<1>());
 
     ASSERT_ALMOST_EQUAL(h_keys, d_keys);
     ASSERT_ALMOST_EQUAL(h_values, d_values);
diff --git a/projects/rocthrust/testing/tuple_transform.cu b/projects/rocthrust/testing/tuple_transform.cu
index e893189cf437..7cbc5723da6f 100644
--- a/projects/rocthrust/testing/tuple_transform.cu
+++ b/projects/rocthrust/testing/tuple_transform.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ struct TestTupleTransform
 
     // zip up the data
     host_vector<tuple<T, T>> h_tuples(n);
-    thrust::transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
+    transform(h_t1.begin(), h_t1.end(), h_t2.begin(), h_tuples.begin(), MakeTupleFunctor());
 
     // copy to device
     device_vector<tuple<T, T>> d_tuples = h_tuples;
@@ -61,10 +61,10 @@ struct TestTupleTransform
     device_vector<T> d_t1(n), d_t2(n);
 
     // select 0th
-    thrust::transform(d_tuples.begin(), d_tuples.end(), d_t1.begin(), GetFunctor<0>());
+    transform(d_tuples.begin(), d_tuples.end(), d_t1.begin(), GetFunctor<0>());
 
     // select 1st
-    thrust::transform(d_tuples.begin(), d_tuples.end(), d_t2.begin(), GetFunctor<1>());
+    transform(d_tuples.begin(), d_tuples.end(), d_t2.begin(), GetFunctor<1>());
 
     ASSERT_ALMOST_EQUAL(h_t1, d_t1);
     ASSERT_ALMOST_EQUAL(h_t2, d_t2);
diff --git a/projects/rocthrust/testing/type_traits.cu b/projects/rocthrust/testing/type_traits.cu
index 2c5aedbd3471..5283c93a1413 100644
--- a/projects/rocthrust/testing/type_traits.cu
+++ b/projects/rocthrust/testing/type_traits.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  *  limitations under the License.
  */
 
-#include <thrust/detail/libcxx_wrapper/__cccl_config.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#include <thrust/detail/config.h>
+
 #include <thrust/detail/type_traits.h>
 #include <thrust/device_ptr.h>
+#include <thrust/functional.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
@@ -30,10 +31,10 @@
 
 #include <unittest/unittest.h>
 
-#if THRUST_COMPILER(GCC, >=, 7)
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 // This header pulls in an unsuppressable warning on GCC 6
 #  include _THRUST_STD_INCLUDE(complex)
-#endif // THRUST_COMPILER(GCC, >=, 7)
+#endif // defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 #include _THRUST_STD_INCLUDE(tuple)
 #include _THRUST_STD_INCLUDE(utility)
 
@@ -59,14 +60,23 @@ void TestIsContiguousIterator()
 
   using HostIteratorTuple = thrust::tuple<HostVector::iterator, HostVector::iterator>;
 
-  using ConstantIterator  = thrust::constant_iterator<int>;
-  using CountingIterator  = thrust::counting_iterator<int>;
-  using TransformIterator = thrust::transform_iterator<::internal::identity, HostVector::iterator>;
-  using ZipIterator       = thrust::zip_iterator<HostIteratorTuple>;
+  using ConstantIterator = thrust::constant_iterator<int>;
+  using CountingIterator = thrust::counting_iterator<int>;
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  using TransformIterator1 = thrust::transform_iterator<thrust::identity<int>, HostVector::iterator>;
+  THRUST_SUPPRESS_DEPRECATED_POP
+  using TransformIterator2 = thrust::transform_iterator<::internal::identity, HostVector::iterator>;
+  using ZipIterator        = thrust::zip_iterator<HostIteratorTuple>;
 
   ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<ConstantIterator>::value, false);
   ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<CountingIterator>::value, false);
-  ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<TransformIterator>::value, false);
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVHPC
+  // thrust::identity creates a deprecated warning that could not be worked around
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<TransformIterator1>::value, false);
+  THRUST_SUPPRESS_DEPRECATED_POP
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVHPC
+  ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<TransformIterator2>::value, false);
   ASSERT_EQUAL((bool) thrust::is_contiguous_iterator<ZipIterator>::value, false);
 }
 DECLARE_UNITTEST(TestIsContiguousIterator);
@@ -191,19 +201,20 @@ static_assert(thrust::is_trivially_relocatable<NonTriviallyCopyable>::value, "")
 void TestTriviallyRelocatable()
 {
   static_assert(thrust::is_trivially_relocatable<int>::value, "");
-#if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
   static_assert(thrust::is_trivially_relocatable<__half>::value, "");
   static_assert(thrust::is_trivially_relocatable<int1>::value, "");
   static_assert(thrust::is_trivially_relocatable<int2>::value, "");
   static_assert(thrust::is_trivially_relocatable<int3>::value, "");
   static_assert(thrust::is_trivially_relocatable<int4>::value, "");
-#  if !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__)) \
-    && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
+#if !(THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC                                          \
+      || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC && !defined(__CUDACC_RTC_INT128__)) \
+      || (defined(__NVCC__) && __CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__ < 1105)         \
+      || !defined(__SIZEOF_INT128__))
   static_assert(thrust::is_trivially_relocatable<__int128>::value, "");
-#  endif // !defined(THRUST_DISABLE_INT128_SUPPORT) && (defined(__linux__) || defined(__LP64__))
-         // && ((THRUST_COMPILER(NVRTC) && defined(__CUDACC_RTC_INT128__)) || defined(__SIZEOF_INT128__))
-#endif // THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
-#if THRUST_COMPILER(GCC, >=, 7)
+#endif // (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC &&
+       // !defined(__CUDACC_RTC_INT128__)) || (defined(__NVCC__) && __CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__ <
+       // 1105) || !defined(__SIZEOF_INT128__))
+#if defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
   static_assert(thrust::is_trivially_relocatable<thrust::complex<float>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::complex<float>>::value, "");
   static_assert(thrust::is_trivially_relocatable<thrust::pair<int, thrust::complex<float>>>::value, "");
@@ -211,7 +222,7 @@ void TestTriviallyRelocatable()
   static_assert(thrust::is_trivially_relocatable<thrust::tuple<int, thrust::complex<float>, char>>::value, "");
   static_assert(thrust::is_trivially_relocatable<_THRUST_STD::tuple<int, _THRUST_STD::complex<float>, char>>::value,
                 "");
-#endif // THRUST_COMPILER(GCC, >=, 7)
+#endif // defined(THRUST_GCC_VERSION) && THRUST_GCC_VERSION >= 70000
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
   static_assert(thrust::is_trivially_relocatable<
                   _THRUST_STD::tuple<thrust::pair<int, thrust::tuple<int, _THRUST_STD::tuple<>>>,
diff --git a/projects/rocthrust/testing/uninitialized_copy.cu b/projects/rocthrust/testing/uninitialized_copy.cu
index 6e68329e625d..c42355a62437 100644
--- a/projects/rocthrust/testing/uninitialized_copy.cu
+++ b/projects/rocthrust/testing/uninitialized_copy.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/uninitialized_copy.h>
@@ -127,9 +128,9 @@ struct CopyConstructTest
 
   THRUST_HOST_DEVICE CopyConstructTest(const CopyConstructTest&)
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (copy_constructed_on_device = true; copy_constructed_on_host = false;),
-                      (copy_constructed_on_device = false; copy_constructed_on_host = true;));
+    NV_IF_TARGET(NV_IS_DEVICE,
+                 (copy_constructed_on_device = true; copy_constructed_on_host = false;),
+                 (copy_constructed_on_device = false; copy_constructed_on_host = true;));
   }
 
   THRUST_HOST_DEVICE CopyConstructTest& operator=(const CopyConstructTest& x)
diff --git a/projects/rocthrust/testing/uninitialized_fill.cu b/projects/rocthrust/testing/uninitialized_fill.cu
index 4640998f9d15..03e9e4dbc0ba 100644
--- a/projects/rocthrust/testing/uninitialized_fill.cu
+++ b/projects/rocthrust/testing/uninitialized_fill.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 
+#include <thrust/detail/nv_target.h>
 #include <thrust/device_malloc_allocator.h>
 #include <thrust/iterator/retag.h>
 #include <thrust/uninitialized_fill.h>
@@ -136,9 +137,9 @@ struct CopyConstructTest
 
   THRUST_HOST_DEVICE CopyConstructTest(const CopyConstructTest&)
   {
-    _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                      (copy_constructed_on_device = true; copy_constructed_on_host = false;),
-                      (copy_constructed_on_device = false; copy_constructed_on_host = true;));
+    NV_IF_TARGET(NV_IS_DEVICE,
+                 (copy_constructed_on_device = true; copy_constructed_on_host = false;),
+                 (copy_constructed_on_device = false; copy_constructed_on_host = true;));
   }
 
   THRUST_HOST_DEVICE CopyConstructTest& operator=(const CopyConstructTest& x)
diff --git a/projects/rocthrust/testing/unique.cu b/projects/rocthrust/testing/unique.cu
index f786e2f4520e..3bba7e92cfbf 100644
--- a/projects/rocthrust/testing/unique.cu
+++ b/projects/rocthrust/testing/unique.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 #  include _THRUST_STD_INCLUDE(array)
-#else
-#  include <iterator>
 #endif
 
 template <typename ForwardIterator>
@@ -100,7 +98,7 @@ void TestUniqueCopyDispatchImplicit()
 DECLARE_UNITTEST(TestUniqueCopyDispatchImplicit);
 
 template <typename ForwardIterator>
-typename _THRUST_STD::iterator_traits<ForwardIterator>::difference_type
+typename thrust::iterator_traits<ForwardIterator>::difference_type
 unique_count(my_system& system, ForwardIterator, ForwardIterator)
 {
   system.validate_dispatch();
@@ -119,8 +117,7 @@ void TestUniqueCountDispatchExplicit()
 DECLARE_UNITTEST(TestUniqueCountDispatchExplicit);
 
 template <typename ForwardIterator>
-typename _THRUST_STD::iterator_traits<ForwardIterator>::difference_type
-unique_count(my_tag, ForwardIterator, ForwardIterator)
+typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(my_tag, ForwardIterator, ForwardIterator)
 {
   return 13;
 }
diff --git a/projects/rocthrust/testing/unittest/assertions.h b/projects/rocthrust/testing/unittest/assertions.h
index 9ee3bed874ac..cdcbe1a3c8cb 100644
--- a/projects/rocthrust/testing/unittest/assertions.h
+++ b/projects/rocthrust/testing/unittest/assertions.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 #include <unittest/util.h>
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
 #  include <type_traits>
 #endif
 
@@ -431,8 +430,8 @@ void assert_equal(
   const std::string& filename = "unknown",
   int lineno                  = -1)
 {
-  using difference_type = THRUST_NS_QUALIFIER::detail::it_difference_t<ForwardIterator1>;
-  using InputType       = THRUST_NS_QUALIFIER::detail::it_value_t<ForwardIterator1>;
+  using difference_type = typename THRUST_NS_QUALIFIER::iterator_difference<ForwardIterator1>::type;
+  using InputType       = typename THRUST_NS_QUALIFIER::iterator_value<ForwardIterator1>::type;
 
   bool failure = false;
 
@@ -508,7 +507,7 @@ void assert_equal(
   const std::string& filename = "unknown",
   int lineno                  = -1)
 {
-  using InputType = typename _THRUST_STD::iterator_traits<ForwardIterator1>::value_type;
+  using InputType = typename THRUST_NS_QUALIFIER::iterator_traits<ForwardIterator1>::value_type;
   assert_equal(first1, last1, first2, last2, THRUST_NS_QUALIFIER::equal_to<InputType>(), filename, lineno);
 }
 
@@ -523,7 +522,7 @@ void assert_almost_equal(
   const double a_tol          = DEFAULT_ABSOLUTE_TOL,
   const double r_tol          = DEFAULT_RELATIVE_TOL)
 {
-  using InputType = typename _THRUST_STD::iterator_traits<ForwardIterator1>::value_type;
+  using InputType = typename THRUST_NS_QUALIFIER::iterator_traits<ForwardIterator1>::value_type;
   assert_equal(first1, last1, first2, last2, almost_equal_to<InputType>(a_tol, r_tol), filename, lineno);
 }
 
diff --git a/projects/rocthrust/testing/unittest/meta.h b/projects/rocthrust/testing/unittest/meta.h
index ad331a0dba8d..71cc4d47a856 100644
--- a/projects/rocthrust/testing/unittest/meta.h
+++ b/projects/rocthrust/testing/unittest/meta.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,6 +23,11 @@
 
 #pragma once
 
+// This header `<thrust/detail/config/diagnostic.h>` is added only for suppressing the
+// warning generated by deprecated API `thrust::device_malloc_allocator`. Once the
+// API is removed, this header should also be removed.
+#include <thrust/detail/config/diagnostic.h>
+
 namespace unittest
 {
 
@@ -117,7 +122,12 @@ struct for_each_type<TypeList, Function, null_type, i>
 template <template <typename> class Template, typename T>
 struct ApplyTemplate1
 {
+  // The `thrust::device_malloc_allocator` is deprecated, considered removed and is only
+  // here for compatibility, once it is removed, the `THRUST_SUPPRESS_DEPRECATED_PUSH`
+  // and `THRUST_SUPPRESS_DEPRECATED_POP` should also be removed.
+  THRUST_SUPPRESS_DEPRECATED_PUSH
   using type = Template<T>;
+  THRUST_SUPPRESS_DEPRECATED_POP
 };
 
 template <template <typename> class Template>
diff --git a/projects/rocthrust/testing/unittest/runtime_static_assert.h b/projects/rocthrust/testing/unittest/runtime_static_assert.h
new file mode 100644
index 000000000000..487caf3ddf2b
--- /dev/null
+++ b/projects/rocthrust/testing/unittest/runtime_static_assert.h
@@ -0,0 +1,119 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/static_assert.h>
+
+#include <string>
+#undef THRUST_STATIC_ASSERT
+#undef THRUST_STATIC_ASSERT_MSG
+
+#define THRUST_STATIC_ASSERT(B)          unittest::assert_static((B), __FILE__, __LINE__);
+#define THRUST_STATIC_ASSERT_MSG(B, msg) unittest::assert_static((B), __FILE__, __LINE__);
+
+namespace unittest
+{
+THRUST_HOST_DEVICE void assert_static(bool condition, const char* filename, int lineno);
+}
+
+#include <thrust/detail/nv_target.h>
+#include <thrust/device_delete.h>
+#include <thrust/device_new.h>
+
+#define ASSERT_STATIC_ASSERT(X)                                                                        \
+  {                                                                                                    \
+    bool triggered                      = false;                                                       \
+    using ex_t                          = unittest::static_assert_exception;                           \
+    thrust::device_ptr<ex_t> device_ptr = thrust::device_new<ex_t>();                                  \
+    ex_t* raw_ptr                       = thrust::raw_pointer_cast(device_ptr);                        \
+    hipError_t err = ::hipMemcpyToSymbol(unittest::detail::device_exception, &raw_ptr, sizeof(ex_t*)); \
+    if (err != hipSuccess)                                                                             \
+    {                                                                                                  \
+      thrust::device_free(device_ptr);                                                                 \
+      raw_ptr = nullptr;                                                                               \
+      unittest::UnitTestFailure f;                                                                     \
+      f << "[" << __FILE__ << ":" << __LINE__ << "] hipMemcpyToSymbol failed";                         \
+      throw f;                                                                                         \
+    }                                                                                                  \
+    try                                                                                                \
+    {                                                                                                  \
+      X;                                                                                               \
+    }                                                                                                  \
+    catch (ex_t)                                                                                       \
+    {                                                                                                  \
+      triggered = true;                                                                                \
+    }                                                                                                  \
+    if (!triggered)                                                                                    \
+    {                                                                                                  \
+      triggered = static_cast<ex_t>(*device_ptr).triggered;                                            \
+    }                                                                                                  \
+    thrust::device_free(device_ptr);                                                                   \
+    raw_ptr = nullptr;                                                                                 \
+    err     = ::hipMemcpyToSymbol(unittest::detail::device_exception, &raw_ptr, sizeof(ex_t*));        \
+    if (err != hipSuccess)                                                                             \
+    {                                                                                                  \
+      unittest::UnitTestFailure f;                                                                     \
+      f << "[" << __FILE__ << ":" << __LINE__ << "] hipMemcpyToSymbol failed";                         \
+      throw f;                                                                                         \
+    }                                                                                                  \
+    if (!triggered)                                                                                    \
+    {                                                                                                  \
+      unittest::UnitTestFailure f;                                                                     \
+      f << "[" << __FILE__ << ":" << __LINE__ << "] did not trigger a THRUST_STATIC_ASSERT";           \
+      throw f;                                                                                         \
+    }                                                                                                  \
+  }
+
+namespace unittest
+{
+class static_assert_exception
+{
+public:
+  THRUST_HOST_DEVICE static_assert_exception()
+      : triggered(false)
+  {}
+
+  THRUST_HOST_DEVICE static_assert_exception(const char* filename, int lineno)
+      : triggered(true)
+      , filename(filename)
+      , lineno(lineno)
+  {}
+
+  bool triggered;
+  const char* filename;
+  int lineno;
+};
+
+namespace detail
+{
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+__attribute__((used))
+#endif
+THRUST_DEVICE static static_assert_exception* device_exception = nullptr;
+} // namespace detail
+
+THRUST_HOST_DEVICE void assert_static(bool condition, const char* filename, int lineno)
+{
+  if (!condition)
+  {
+    static_assert_exception ex(filename, lineno);
+
+    NV_IF_TARGET(NV_IS_DEVICE, (*detail::device_exception = ex;), (throw ex;));
+  }
+}
+} // namespace unittest
diff --git a/projects/rocthrust/testing/unittest/testframework.h b/projects/rocthrust/testing/unittest/testframework.h
index 588f4aa443be..e251e20cf8b4 100644
--- a/projects/rocthrust/testing/unittest/testframework.h
+++ b/projects/rocthrust/testing/unittest/testframework.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,23 +19,25 @@
 
 #include <thrust/detail/config.h>
 
+#include <thrust/detail/integer_traits.h>
+#include <thrust/limits.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/mr/device_memory_resource.h>
 #include <thrust/mr/host_memory_resource.h>
 #include <thrust/mr/universal_memory_resource.h>
 
-#include _THRUST_STD_INCLUDE(limits)
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  include _THRUST_STD_INCLUDE(limits)
+#endif
 
 #include <cstdio>
 #include <iostream>
+#include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <type_traits>
 #include <vector>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <limits>
-#endif
 
 #include "meta.h"
 #include "util.h"
@@ -234,6 +236,17 @@ struct numeric_limits<custom_numeric> : numeric_limits<int>
 _THRUST_STD_NAMESPACE_END
 #endif
 
+THRUST_NAMESPACE_BEGIN
+namespace detail
+{
+// For random number generation
+template <>
+class integer_traits<custom_numeric> : public integer_traits_base<int, INT_MIN, INT_MAX>
+{};
+
+} // namespace detail
+THRUST_NAMESPACE_END
+
 using NumericTypes = unittest::type_list<
   char,
   signed char,
diff --git a/projects/rocthrust/testing/unittest/unittest.h b/projects/rocthrust/testing/unittest/unittest.h
index ba0673e452c6..0c34762e8b83 100644
--- a/projects/rocthrust/testing/unittest/unittest.h
+++ b/projects/rocthrust/testing/unittest/unittest.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -41,11 +41,13 @@
 #define CHECK_ASAN_ENABLEMENT()
 #endif
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  define THRUST_DEVICE_BACKEND                 hip
 #  define THRUST_DEVICE_BACKEND_DETAIL          hip_rocprim
 #  define SPECIALIZE_DEVICE_RESOURCE_NAME(name) hip##name
-#elif THRUST_HAS_CUDA_COMPILER()
+#elif defined(__NVCC__) || defined(_NVHPC_CUDA)                                \
+  || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+  || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
 #  define THRUST_DEVICE_BACKEND                 cuda
 #  define THRUST_DEVICE_BACKEND_DETAIL          cuda_cub
 #  define SPECIALIZE_DEVICE_RESOURCE_NAME(name) cuda##name
diff --git a/projects/rocthrust/testing/unittest/util.h b/projects/rocthrust/testing/unittest/util.h
index 4258d3216451..b3811263054b 100644
--- a/projects/rocthrust/testing/unittest/util.h
+++ b/projects/rocthrust/testing/unittest/util.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,11 +19,13 @@
 
 #include <thrust/detail/type_traits.h>
 #include <thrust/extrema.h>
+#include <thrust/limits.h>
 
 #include <iostream>
 #include <string>
 #include <typeinfo>
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
+// Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
 #  include <limits>
 #  include <type_traits>
 #endif
@@ -45,6 +47,7 @@ template <typename T>
 typename THRUST_NS_QUALIFIER::detail::disable_if<_THRUST_STD::is_floating_point<T>::value, T>::type
 truncate_to_max_representable(std::size_t n)
 {
+  // Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
   return static_cast<T>(
     THRUST_NS_QUALIFIER::min<std::size_t>(n, static_cast<std::size_t>(_THRUST_STD::numeric_limits<T>::max())));
 }
@@ -54,6 +57,7 @@ template <typename T>
 typename _THRUST_STD::enable_if_t<_THRUST_STD::is_floating_point<T>::value, T>
 truncate_to_max_representable(std::size_t n)
 {
+  // Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
   return THRUST_NS_QUALIFIER::min<T>(static_cast<T>(n), _THRUST_STD::numeric_limits<T>::max());
 }
 
diff --git a/projects/rocthrust/testing/unittest/util_async.h b/projects/rocthrust/testing/unittest/util_async.h
new file mode 100644
index 000000000000..cd49f7ea45bb
--- /dev/null
+++ b/projects/rocthrust/testing/unittest/util_async.h
@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/future.h>
+
+#  include <unittest/unittest.h>
+
+#  define TEST_EVENT_WAIT(e) ::unittest::test_event_wait(e, __FILE__, __LINE__) /**/
+
+#  define TEST_FUTURE_VALUE_RETRIEVAL(f) ::unittest::test_future_value_retrieval(f, __FILE__, __LINE__) /**/
+
+namespace unittest
+{
+
+template <typename Event>
+THRUST_HOST void test_event_wait(Event&& e, std::string const& filename = "unknown", int lineno = -1)
+{
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.valid_stream(), filename, lineno);
+
+  e.wait();
+  while (!e.ready())
+  {
+    e.wait();
+  }
+
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.valid_stream(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, e.ready(), filename, lineno);
+}
+
+template <typename Future>
+THRUST_HOST auto test_future_value_retrieval(Future&& f, std::string const& filename = "unknown", int lineno = -1)
+  -> decltype(f.extract())
+{
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, f.valid_stream(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, f.valid_content(), filename, lineno);
+
+  auto const r0 = f.get();
+  auto const r1 = f.get();
+
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, f.ready(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, f.valid_stream(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(true, f.valid_content(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(r0, r1, filename, lineno);
+
+  auto const r2 = f.extract();
+
+  ASSERT_THROWS_EQUAL_WITH_FILE_AND_LINE(
+    auto x = f.extract();
+    THRUST_UNUSED_VAR(x), thrust::event_error, thrust::event_error(thrust::event_errc::no_content), filename, lineno);
+
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(false, f.ready(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(false, f.valid_stream(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(false, f.valid_content(), filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(r2, r1, filename, lineno);
+  ASSERT_EQUAL_WITH_FILE_AND_LINE(r2, r0, filename, lineno);
+
+  return r2;
+}
+
+} // namespace unittest
+
+#endif // THRUST_CPP_DIALECT >= 2017
diff --git a/projects/rocthrust/testing/unittest_static_assert.cmake b/projects/rocthrust/testing/unittest_static_assert.cmake
new file mode 100644
index 000000000000..cd526b982e76
--- /dev/null
+++ b/projects/rocthrust/testing/unittest_static_assert.cmake
@@ -0,0 +1,15 @@
+# Disable unreachable code warnings.
+# This test unconditionally throws in some places, the compiler will detect that
+# control flow will never reach some instructions. This is intentional.
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  target_compile_options(${TEST_TARGET} PRIVATE
+    $<$<COMPILE_LANGUAGE:CXX>:/wd4702>
+    $<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-Xcompiler=/wd4702>
+  )
+endif()
+
+# The machinery behind this test is not compatible with NVC++.
+# See https://github.com/NVIDIA/thrust/issues/1397
+if ("NVHPC" STREQUAL "${CMAKE_CUDA_COMPILER_ID}")
+  set_tests_properties(${TEST_TARGET} PROPERTIES DISABLED True)
+endif()
diff --git a/projects/rocthrust/testing/unittest_static_assert.cu b/projects/rocthrust/testing/unittest_static_assert.cu
new file mode 100644
index 000000000000..b3e3dde22203
--- /dev/null
+++ b/projects/rocthrust/testing/unittest_static_assert.cu
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include <unittest/runtime_static_assert.h>
+#include <unittest/unittest.h>
+
+// The runtime_static_assert header needs to come first as we are overwriting thrusts internal static assert
+#include <thrust/generate.h>
+
+template <typename T>
+struct dependent_false
+{
+  enum
+  {
+    value = false
+  };
+};
+
+template <typename T>
+struct static_assertion
+{
+  THRUST_HOST_DEVICE T operator()() const
+  {
+    THRUST_STATIC_ASSERT(dependent_false<T>::value);
+    return 0;
+  }
+};
+
+template <typename V>
+void TestStaticAssertAssert()
+{
+  using value_type = typename V::value_type;
+  V test(10);
+  ASSERT_STATIC_ASSERT(thrust::generate(test.begin(), test.end(), static_assertion<value_type>()));
+}
+DECLARE_VECTOR_UNITTEST(TestStaticAssertAssert);
diff --git a/projects/rocthrust/testing/universal_memory.cu b/projects/rocthrust/testing/universal_memory.cu
index 9483d3025200..2bd34e10fbec 100644
--- a/projects/rocthrust/testing/universal_memory.cu
+++ b/projects/rocthrust/testing/universal_memory.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ namespace
 
 // The managed_memory_pointer class should be identified as a
 // contiguous_iterator
-static_assert(thrust::is_contiguous_iterator<thrust::universal_allocator<int>::pointer>::value);
+THRUST_STATIC_ASSERT(thrust::is_contiguous_iterator<thrust::universal_allocator<int>::pointer>::value);
 
 template <typename T>
 struct some_object
@@ -138,11 +138,12 @@ void TestUniversalThrustVector(std::size_t const n)
   thrust::host_vector<T> host(n);
   thrust::universal_vector<T> universal(n);
 
-  static_assert(std::is_same_v<typename std::decay_t<decltype(universal)>::pointer, thrust::universal_ptr<T>>,
+  static_assert(std::is_same<typename std::decay<decltype(universal)>::type::pointer, thrust::universal_ptr<T>>::value,
                 "Unexpected thrust::universal_vector pointer type.");
 
   thrust::sequence(host.begin(), host.end(), 0);
   thrust::sequence(universal.begin(), universal.end(), 0);
+
   ASSERT_EQUAL(host.size(), n);
   ASSERT_EQUAL(universal.size(), n);
   ASSERT_EQUAL(host, universal);
@@ -156,8 +157,10 @@ void TestUniversalHostPinnedThrustVector(std::size_t const n)
   thrust::host_vector<T> host(n);
   thrust::universal_host_pinned_vector<T> universal(n);
 
-  static_assert(std::is_same_v<typename std::decay_t<decltype(universal)>::pointer, thrust::universal_ptr<T>>,
-                "Unexpected thrust::universal_vector pointer type.");
+  // FIXME(bgruber): only the CUDA system uses a universal_ptr here. Other systems have a native pointer.
+  // static_assert(std::is_same<typename std::decay<decltype(universal)>::type::pointer,
+  // thrust::universal_ptr<T>>::value,
+  //              "Unexpected thrust::universal_vector pointer type.");
 
   thrust::sequence(host.begin(), host.end(), 0);
   thrust::sequence(universal.begin(), universal.end(), 0);
diff --git a/projects/rocthrust/testing/vector_manipulation.cu b/projects/rocthrust/testing/vector_manipulation.cu
index 6b6ce6a1498d..b57847fe49f7 100644
--- a/projects/rocthrust/testing/vector_manipulation.cu
+++ b/projects/rocthrust/testing/vector_manipulation.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ void TestVectorManipulation(size_t n)
   ASSERT_EQUAL(test1.size(), n);
   ASSERT_EQUAL((test1 == std::vector<T>(n, T(3))), true);
 
-#if THRUST_COMPILER(MSVC, <=, 14)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (_MSC_VER <= 1400)
   // XXX MSVC 2005's STL unintentionally uses adl to dispatch advance which
   //     produces an ambiguity between std::advance & thrust::advance
   //     don't produce a KNOWN_FAILURE, just ignore the issue
diff --git a/projects/rocthrust/testing/zip_function.cu b/projects/rocthrust/testing/zip_function.cu
index ec2f54ad729d..704643cb6336 100644
--- a/projects/rocthrust/testing/zip_function.cu
+++ b/projects/rocthrust/testing/zip_function.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,20 +17,22 @@
 
 #include <thrust/detail/config.h>
 
-#include <thrust/device_vector.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/remove.h>
-#include <thrust/sort.h>
-#include <thrust/transform.h>
-#include <thrust/zip_function.h>
+#if !defined(THRUST_LEGACY_GCC)
 
-#include <iostream>
+#  include <thrust/device_vector.h>
+#  include <thrust/iterator/zip_iterator.h>
+#  include <thrust/remove.h>
+#  include <thrust/sort.h>
+#  include <thrust/transform.h>
+#  include <thrust/zip_function.h>
 
-#include <unittest/unittest.h>
+#  include <iostream>
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
+#  include <unittest/unittest.h>
+
+#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#    include <iterator>
+#  endif
 
 using namespace unittest;
 
@@ -54,9 +56,9 @@ struct TestZipFunctionCtor
   {
     ASSERT_EQUAL(thrust::zip_function<SumThree>()(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
     ASSERT_EQUAL(thrust::zip_function<SumThree>(SumThree{})(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
-#ifdef __cpp_deduction_guides
+#  ifdef __cpp_deduction_guides
     ASSERT_EQUAL(thrust::zip_function(SumThree{})(thrust::make_tuple(1, 2, 3)), SumThree{}(1, 2, 3));
-#endif // __cpp_deduction_guides
+#  endif // __cpp_deduction_guides
   }
 };
 SimpleUnitTest<TestZipFunctionCtor, type_list<int>> TestZipFunctionCtorInstance;
@@ -81,20 +83,19 @@ struct TestZipFunctionTransform
     device_vector<T> d_result_zip(n);
 
     // Tuple base case
-
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result_tuple.begin(),
-                      SumThreeTuple{});
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result_tuple.begin(),
+              SumThreeTuple{});
     // Zip Function
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result_zip.begin(),
-                      make_zip_function(SumThree{}));
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
-                      d_result_zip.begin(),
-                      make_zip_function(SumThree{}));
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result_zip.begin(),
+              make_zip_function(SumThree{}));
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
+              d_result_zip.begin(),
+              make_zip_function(SumThree{}));
 
     ASSERT_EQUAL(h_result_tuple, h_result_zip);
     ASSERT_EQUAL(h_result_tuple, d_result_zip);
@@ -196,3 +197,4 @@ struct TestNestedZipFunction2
   }
 };
 SimpleUnitTest<TestNestedZipFunction2, type_list<int, float>> TestNestedZipFunctionInstance2;
+#endif // !THRUST_LEGACY_GCC
diff --git a/projects/rocthrust/testing/zip_iterator.cu b/projects/rocthrust/testing/zip_iterator.cu
index 0df58ce1d784..2ecb935af81b 100644
--- a/projects/rocthrust/testing/zip_iterator.cu
+++ b/projects/rocthrust/testing/zip_iterator.cu
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,57 +16,17 @@
  */
 
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/sequence.h>
 #include <thrust/transform.h>
 
-#include <unittest/unittest.h>
-
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
+#include <unittest/unittest.h>
 
 using namespace unittest;
 
-// ensure that we properly support thrust::reverse_iterator from _THRUST_STD
-void TestZipIteratorTraits()
-{
-  using base_it = thrust::host_vector<int>::iterator;
-
-  using it        = thrust::zip_iterator<thrust::tuple<base_it, base_it>>;
-  using traits    = _THRUST_STD::iterator_traits<it>;
-  using reference = thrust::detail::tuple_of_iterator_references<int&, int&>;
-
-  static_assert(_THRUST_STD::is_same_v<traits::difference_type, ptrdiff_t>);
-  static_assert(_THRUST_STD::is_same_v<traits::value_type, thrust::tuple<int, int>>);
-  static_assert(_THRUST_STD::is_same_v<traits::pointer, void>);
-
-  static_assert(_THRUST_STD::is_same_v<traits::reference, reference>);
-  static_assert(_THRUST_STD::is_same_v<traits::iterator_category, _THRUST_STD::random_access_iterator_tag>);
-
-  static_assert(_THRUST_STD::is_same_v<thrust::iterator_traversal_t<it>, thrust::random_access_traversal_tag>);
-
-  static_assert(::internal::is_cpp17_random_access_iterator<it>::value);
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::output_iterator<it, int>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD // The fallback version of zip_iterator lacks these iterator concepts.
-  static_assert(_THRUST_STD::input_iterator<it>);
-  static_assert(_THRUST_STD::forward_iterator<it>);
-  static_assert(_THRUST_STD::bidirectional_iterator<it>);
-  static_assert(_THRUST_STD::random_access_iterator<it>);
-#endif
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-  static_assert(!_THRUST_STD::contiguous_iterator<it>);
-#endif
-}
-DECLARE_UNITTEST(TestZipIteratorTraits);
-
 template <typename T>
 struct TestZipIteratorManipulation
 {
@@ -166,7 +126,7 @@ struct TestZipIteratorReference
     using IteratorTuple1 = tuple<Iterator1, Iterator2>;
     using ZipIterator1   = zip_iterator<IteratorTuple1>;
 
-    using zip_iterator_reference_type1 = thrust::detail::it_reference_t<ZipIterator1>;
+    using zip_iterator_reference_type1 = typename iterator_reference<ZipIterator1>::type;
 
     host_vector<T> h_variable(1);
 
@@ -185,7 +145,7 @@ struct TestZipIteratorReference
     using IteratorTuple2 = tuple<Iterator3, Iterator4>;
     using ZipIterator2   = zip_iterator<IteratorTuple2>;
 
-    using zip_iterator_reference_type2 = thrust::detail::it_reference_t<ZipIterator2>;
+    using zip_iterator_reference_type2 = typename iterator_reference<ZipIterator2>::type;
 
     device_vector<T> d_variable(1);
 
@@ -389,25 +349,25 @@ struct TestZipIteratorTransform
     device_vector<T> d_result(n);
 
     // Tuples with 2 elements
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end()),
-                      h_result.begin(),
-                      SumTwoTuple());
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end()),
-                      d_result.begin(),
-                      SumTwoTuple());
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end()),
+              h_result.begin(),
+              SumTwoTuple());
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end()),
+              d_result.begin(),
+              SumTwoTuple());
     ASSERT_EQUAL(h_result, d_result);
 
     // Tuples with 3 elements
-    thrust::transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
-                      make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
-                      h_result.begin(),
-                      SumThreeTuple());
-    thrust::transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
-                      make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
-                      d_result.begin(),
-                      SumThreeTuple());
+    transform(make_zip_iterator(h_data0.begin(), h_data1.begin(), h_data2.begin()),
+              make_zip_iterator(h_data0.end(), h_data1.end(), h_data2.end()),
+              h_result.begin(),
+              SumThreeTuple());
+    transform(make_zip_iterator(d_data0.begin(), d_data1.begin(), d_data2.begin()),
+              make_zip_iterator(d_data0.end(), d_data1.end(), d_data2.end()),
+              d_result.begin(),
+              SumThreeTuple());
     ASSERT_EQUAL(h_result, d_result);
   }
 };
diff --git a/projects/rocthrust/thrust/addressof.h b/projects/rocthrust/thrust/addressof.h
index cf3e948596a4..3217fa8f34b1 100644
--- a/projects/rocthrust/thrust/addressof.h
+++ b/projects/rocthrust/thrust/addressof.h
@@ -7,20 +7,20 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__memory/addressof.h)
-#else
-#  include <thrust/detail/memory_wrapper.h>
-#endif
+#include <thrust/detail/memory_wrapper.h>
 
 THRUST_NAMESPACE_BEGIN
-using _THRUST_STD::addressof;
+
+///////////////////////////////////////////////////////////////////////////////
+
+/*! Obtains the actual address of the object or function arg, even in presence of overloaded operator&.
+ */
+template <typename T>
+THRUST_HOST_DEVICE T* addressof(T& arg)
+{
+  return reinterpret_cast<T*>(&const_cast<char&>(reinterpret_cast<const volatile char&>(arg)));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/adjacent_difference.h b/projects/rocthrust/thrust/adjacent_difference.h
index 93768deb308a..ed8f842d06b5 100644
--- a/projects/rocthrust/thrust/adjacent_difference.h
+++ b/projects/rocthrust/thrust/adjacent_difference.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -111,12 +104,11 @@ THRUST_HOST_DEVICE OutputIterator adjacent_difference(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p BinaryFunction's first and second argument
- * type, and \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p BinaryFunction's \c first_argument_type and
+ * \c second_argument_type, and \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of
  * \c value_types. \tparam OutputIterator is a model of <a
- * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>.
- *  \tparam BinaryFunction The functions's return type convertible to a type in \p OutputIterator's set of \c
- * value_types.
+ * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam BinaryFunction's \c
+ * result_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *
  *  \remark Note that \p result is permitted to be the same iterator as \p first. This is
  *          useful for computing differences "in place".
@@ -211,12 +203,11 @@ OutputIterator adjacent_difference(InputIterator first, InputIterator last, Outp
  *  \return The iterator <tt>result + (last - first)</tt>
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p BinaryFunction's first and second argument
- * type, and \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
- *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
- * Iterator</a>.
- *  \tparam BinaryFunction The function's return type must be convertible to a type in \p OutputIterator's
- * set of \c value_types.
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p BinaryFunction's \c first_argument_type and
+ * \c second_argument_type, and \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of
+ * \c value_types. \tparam OutputIterator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam BinaryFunction's \c
+ * result_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *
  *  \remark Note that \p result is permitted to be the same iterator as \p first. This is
  *          useful for computing differences "in place".
diff --git a/projects/rocthrust/thrust/advance.h b/projects/rocthrust/thrust/advance.h
index 7ada5ffe914e..13641be27fc1 100644
--- a/projects/rocthrust/thrust/advance.h
+++ b/projects/rocthrust/thrust/advance.h
@@ -22,18 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup iterators
@@ -105,7 +93,7 @@ template <typename InputIterator, typename Distance>
 THRUST_HOST_DEVICE
 InputIterator next(
   InputIterator i
-, typename _THRUST_STD::iterator_traits<InputIterator>::difference_type n = 1
+, typename iterator_traits<InputIterator>::difference_type n = 1
 );
 #endif
 
@@ -139,7 +127,7 @@ template <typename BidirectionalIterator, typename Distance>
 THRUST_HOST_DEVICE
 BidirectionalIterator prev(
   BidirectionalIterator i
-, typename _THRUST_STD::iterator_traits<BidirectionalIterator>::difference_type n = 1
+, typename iterator_traits<BidirectionalIterator>::difference_type n = 1
 );
 #endif
 
diff --git a/projects/rocthrust/thrust/allocate_unique.h b/projects/rocthrust/thrust/allocate_unique.h
index 049ea54eb939..25f9a85781bf 100644
--- a/projects/rocthrust/thrust/allocate_unique.h
+++ b/projects/rocthrust/thrust/allocate_unique.h
@@ -19,7 +19,6 @@
 #include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/type_deduction.h>
-#include <thrust/detail/type_traits.h> // for internal::remove_cvref_t
 
 #include _THRUST_STD_INCLUDE(utility)
 
@@ -29,6 +28,40 @@ THRUST_NAMESPACE_BEGIN
 
 ///////////////////////////////////////////////////////////////////////////////
 
+namespace detail
+{
+
+template <typename Allocator, typename Pointer>
+void allocator_delete_impl(Allocator const& alloc, Pointer p, std::false_type)
+{
+  using traits =
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>;
+
+  typename traits::allocator_type alloc_T(alloc);
+
+  if (nullptr != pointer_traits<Pointer>::get(p))
+  {
+    traits::destroy(alloc_T, thrust::raw_pointer_cast(p));
+    traits::deallocate(alloc_T, p, 1);
+  }
+}
+
+template <typename Allocator, typename Pointer>
+void allocator_delete_impl(Allocator const& alloc, Pointer p, std::true_type)
+{
+  using traits =
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>;
+
+  typename traits::allocator_type alloc_T(alloc);
+
+  if (nullptr != pointer_traits<Pointer>::get(p))
+  {
+    traits::deallocate(alloc_T, p, 1);
+  }
+}
+
+} // namespace detail
+
 template <typename T, typename Allocator, bool Uninitialized = false>
 struct allocator_delete final
 {
@@ -65,17 +98,9 @@ struct allocator_delete final
 
   void operator()(pointer p)
   {
-    using traits = detail::allocator_traits<::internal::remove_cvref_t<Allocator>>;
-    typename traits::allocator_type alloc_T(alloc_);
-
-    if (nullptr != detail::pointer_traits<pointer>::get(p))
-    {
-      if constexpr (!Uninitialized)
-      {
-        traits::destroy(alloc_T, thrust::raw_pointer_cast(p));
-      }
-      traits::deallocate(alloc_T, p, 1);
-    }
+    std::integral_constant<bool, Uninitialized> ic;
+
+    detail::allocator_delete_impl(get_allocator(), p, ic);
   }
 
   allocator_type& get_allocator() noexcept
@@ -100,6 +125,40 @@ struct allocator_delete final
 template <typename T, typename Allocator>
 using uninitialized_allocator_delete = allocator_delete<T, Allocator, true>;
 
+namespace detail
+{
+
+template <typename Allocator, typename Pointer, typename Size>
+void array_allocator_delete_impl(Allocator const& alloc, Pointer p, Size count, std::false_type)
+{
+  using traits =
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>;
+
+  typename traits::allocator_type alloc_T(alloc);
+
+  if (nullptr != pointer_traits<Pointer>::get(p))
+  {
+    destroy_n(alloc_T, p, count);
+    traits::deallocate(alloc_T, p, count);
+  }
+}
+
+template <typename Allocator, typename Pointer, typename Size>
+void array_allocator_delete_impl(Allocator const& alloc, Pointer p, Size count, std::true_type)
+{
+  using traits =
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>;
+
+  typename traits::allocator_type alloc_T(alloc);
+
+  if (nullptr != pointer_traits<Pointer>::get(p))
+  {
+    traits::deallocate(alloc_T, p, count);
+  }
+}
+
+} // namespace detail
+
 template <typename T, typename Allocator, bool Uninitialized = false>
 struct array_allocator_delete final
 {
@@ -141,16 +200,9 @@ struct array_allocator_delete final
 
   void operator()(pointer p)
   {
-    using traits = detail::allocator_traits<::internal::remove_cvref_t<Allocator>>;
-    typename traits::allocator_type alloc_T(get_allocator());
-    if (nullptr != detail::pointer_traits<pointer>::get(p))
-    {
-      if constexpr (!Uninitialized)
-      {
-        destroy_n(alloc_T, p, count_);
-      }
-      traits::deallocate(alloc_T, p, count_);
-    }
+    std::integral_constant<bool, Uninitialized> ic;
+
+    detail::array_allocator_delete_impl(get_allocator(), p, count_, ic);
   }
 
   allocator_type& get_allocator() noexcept
@@ -197,17 +249,16 @@ THRUST_HOST_DEVICE tagged_deleter<Pointer, Lambda> make_tagged_deleter(Lambda&&
 
 ///////////////////////////////////////////////////////////////////////////////
 
-//! Creates a \p std::unique_ptr holding a new object of type \p T, constructed with \p args, using \p alloc as the
-//! allocator.
 template <typename T, typename Allocator, typename... Args>
 THRUST_HOST std::unique_ptr<
   T,
-  allocator_delete<
-    T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+  allocator_delete<T,
+                   typename detail::allocator_traits<typename std::remove_cv<
+                     typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>::allocator_type>>
 allocate_unique(Allocator const& alloc, Args&&... args)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<
+    typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -222,17 +273,17 @@ allocate_unique(Allocator const& alloc, Args&&... args)
   return std::unique_ptr<T, decltype(deleter)>(hold.release(), std::move(deleter));
 }
 
-//! Creates a \p std::unique_ptr holding storage for a new object of type \p T without constructing it, using \p alloc
-//! as the allocator.
 template <typename T, typename Allocator>
 THRUST_HOST std::unique_ptr<
   T,
   uninitialized_allocator_delete<
     T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::
+      template rebind_traits<T>::allocator_type>>
 uninitialized_allocate_unique(Allocator const& alloc)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<
+    typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -246,8 +297,6 @@ uninitialized_allocate_unique(Allocator const& alloc)
   return std::unique_ptr<T, decltype(deleter)>(hold.release(), std::move(deleter));
 }
 
-//! Creates a \p std::unique_ptr holding an array of objects of type \p T, each one constructed with \p args, using \p
-//! alloc as the allocator.
 template <typename T, typename Allocator, typename Size, typename... Args>
 THRUST_HOST std::unique_ptr<
   T[],
@@ -256,7 +305,8 @@ THRUST_HOST std::unique_ptr<
                            Allocator>::type>::type>::template rebind_traits<T>::allocator_type>>
 allocate_unique_n(Allocator const& alloc, Size n, Args&&... args)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<
+    typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
@@ -271,17 +321,17 @@ allocate_unique_n(Allocator const& alloc, Size n, Args&&... args)
   return std::unique_ptr<T[], decltype(deleter)>(hold.release(), std::move(deleter));
 }
 
-//! Creates a \p std::unique_ptr holding storage for an array of objects of type \p T without constructing them, using
-//! \p alloc as the allocator.
 template <typename T, typename Allocator, typename Size>
 THRUST_HOST std::unique_ptr<
   T[],
   uninitialized_array_allocator_delete<
     T,
-    typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>::allocator_type>>
+    typename detail::allocator_traits<typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::
+      template rebind_traits<T>::allocator_type>>
 uninitialized_allocate_unique_n(Allocator const& alloc, Size n)
 {
-  using traits = typename detail::allocator_traits<::internal::remove_cvref_t<Allocator>>::template rebind_traits<T>;
+  using traits = typename detail::allocator_traits<
+    typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
   typename traits::allocator_type alloc_T(alloc);
 
diff --git a/projects/rocthrust/thrust/async/copy.h b/projects/rocthrust/thrust/async/copy.h
new file mode 100644
index 000000000000..dfde676ca8e3
--- /dev/null
+++ b/projects/rocthrust/thrust/async/copy.h
@@ -0,0 +1,136 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief Algorithms for asynchronously copying a range.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/event.h>
+#  include <thrust/system/detail/adl/async/copy.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+/*! \cond
+ */
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+THRUST_DEPRECATED THRUST_HOST event<FromPolicy> async_copy(
+  thrust::execution_policy<FromPolicy>& /*from_exec*/,
+  thrust::execution_policy<ToPolicy>& /*to_exec*/,
+  ForwardIt /*first*/,
+  Sentinel /*last*/,
+  OutputIt /*output*/)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace copy_detail
+{
+
+using thrust::async::unimplemented::async_copy;
+
+struct copy_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+  THRUST_HOST static auto
+  call(thrust::detail::execution_policy_base<FromPolicy> const& from_exec,
+       thrust::detail::execution_policy_base<ToPolicy> const& to_exec,
+       ForwardIt&& first,
+       Sentinel&& last,
+       OutputIt&& output)
+    // ADL dispatch.
+    THRUST_RETURNS(async_copy(
+      thrust::detail::derived_cast(thrust::detail::strip_const(from_exec)),
+      thrust::detail::derived_cast(thrust::detail::strip_const(to_exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(output))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_HOST static auto call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+                                 ForwardIt&& first,
+                                 Sentinel&& last,
+                                 OutputIt&& output)
+      THRUST_RETURNS(copy_fn::call(
+        thrust::detail::derived_cast(thrust::detail::strip_const(exec))
+        // Synthesize a suitable new execution policy, because we don't want to
+        // try and extract twice from the one we were passed.
+        ,
+        typename ::internal::remove_cvref_t<
+          decltype(thrust::detail::derived_cast(thrust::detail::strip_const(exec)))>::tag_type{},
+        THRUST_FWD(first),
+        THRUST_FWD(last),
+        THRUST_FWD(output)))
+
+        template <typename ForwardIt, typename Sentinel, typename OutputIt>
+        THRUST_HOST static auto call(ForwardIt&& first, Sentinel&& last, OutputIt&& output) THRUST_RETURNS(copy_fn::call(
+          thrust::detail::select_system(typename thrust::iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}),
+          thrust::detail::select_system(typename thrust::iterator_system<::internal::remove_cvref_t<OutputIt>>::type{}),
+          THRUST_FWD(first),
+          THRUST_FWD(last),
+          THRUST_FWD(output)))
+
+          template <typename... Args>
+          THRUST_DEPRECATED THRUST_NODISCARD THRUST_HOST auto operator()(Args&&... args) const
+    THRUST_RETURNS(call(THRUST_FWD(args)...))
+};
+
+} // namespace copy_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT copy_detail::copy_fn copy{};
+
+/*! \endcond
+ */
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/async/for_each.h b/projects/rocthrust/thrust/async/for_each.h
new file mode 100644
index 000000000000..559482994ba5
--- /dev/null
+++ b/projects/rocthrust/thrust/async/for_each.h
@@ -0,0 +1,113 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief Algorithms for asynchronously iterating over the elements of a range.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/event.h>
+#  include <thrust/system/detail/adl/async/for_each.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+/*! \cond
+ */
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
+THRUST_DEPRECATED THRUST_HOST event<DerivedPolicy>
+async_for_each(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, UnaryFunction)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace for_each_detail
+{
+
+using thrust::async::unimplemented::async_for_each;
+
+struct for_each_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
+  THRUST_HOST static auto
+  call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+       ForwardIt&& first,
+       Sentinel&& last,
+       UnaryFunction&& f)
+    // ADL dispatch.
+    THRUST_RETURNS(async_for_each(thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+                                  THRUST_FWD(first),
+                                  THRUST_FWD(last),
+                                  THRUST_FWD(f))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    template <typename ForwardIt, typename Sentinel, typename UnaryFunction>
+    THRUST_HOST static auto call(ForwardIt&& first, Sentinel&& last, UnaryFunction&& f)
+      THRUST_RETURNS(for_each_fn::call(
+        thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}),
+        THRUST_FWD(first),
+        THRUST_FWD(last),
+        THRUST_FWD(f)))
+
+        template <typename... Args>
+        THRUST_DEPRECATED THRUST_NODISCARD THRUST_HOST auto operator()(Args&&... args) const
+    THRUST_RETURNS(call(THRUST_FWD(args)...))
+};
+
+} // namespace for_each_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT for_each_detail::for_each_fn for_each{};
+
+/*! \endcond
+ */
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/async/reduce.h b/projects/rocthrust/thrust/async/reduce.h
new file mode 100644
index 000000000000..dd81505ea3a6
--- /dev/null
+++ b/projects/rocthrust/thrust/async/reduce.h
@@ -0,0 +1,331 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief Algorithms for asynchronously reducing a range to a single value.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/future.h>
+#  include <thrust/system/detail/adl/async/reduce.h>
+#  include <thrust/type_traits/is_execution_policy.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+/*! \cond
+ */
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
+THRUST_DEPRECATED THRUST_HOST future<DerivedPolicy, T>
+async_reduce(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, T, BinaryOp)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace reduce_detail
+{
+
+using thrust::async::unimplemented::async_reduce;
+
+struct reduce_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
+  THRUST_HOST static auto
+  call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+       ForwardIt&& first,
+       Sentinel&& last,
+       T&& init,
+       BinaryOp&& op)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T>
+    THRUST_HOST static auto call4(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      T&& init,
+      thrust::true_type)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(init),
+      thrust::plus<::internal::remove_cvref_t<T>>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH template <typename DerivedPolicy, typename ForwardIt, typename Sentinel>
+    THRUST_HOST static auto call3(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      thrust::true_type)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type{},
+      thrust::plus<
+        ::internal::remove_cvref_t<typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type>>{}))
+      THRUST_SUPPRESS_DEPRECATED_POP
+
+    template <typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
+    THRUST_HOST static auto call4(ForwardIt&& first, Sentinel&& last, T&& init, BinaryOp&& op, thrust::false_type)
+      THRUST_RETURNS(reduce_fn::call(
+        thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}),
+        THRUST_FWD(first),
+        THRUST_FWD(last),
+        THRUST_FWD(init),
+        THRUST_FWD(op)))
+
+        template <typename ForwardIt, typename Sentinel, typename T>
+        THRUST_HOST static auto call3(ForwardIt&& first, Sentinel&& last, T&& init, thrust::false_type)
+          THRUST_RETURNS(reduce_fn::call(
+            thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}),
+            THRUST_FWD(first),
+            THRUST_FWD(last),
+            THRUST_FWD(init),
+            thrust::plus<::internal::remove_cvref_t<T>>{}))
+
+    // MSVC WAR: MSVC gets angsty and eats all available RAM when we try to detect
+    // if T1 is an execution_policy by using SFINAE. Switching to a static
+    // dispatch pattern to prevent this.
+    template <typename T1, typename T2, typename T3>
+    THRUST_HOST static auto call(T1&& t1, T2&& t2, T3&& t3) THRUST_RETURNS(reduce_fn::call3(
+      THRUST_FWD(t1), THRUST_FWD(t2), THRUST_FWD(t3), thrust::is_execution_policy<::internal::remove_cvref_t<T1>>{}))
+
+      template <typename T1, typename T2, typename T3, typename T4>
+      THRUST_HOST static auto call(T1&& t1, T2&& t2, T3&& t3, T4&& t4) THRUST_RETURNS(reduce_fn::call4(
+        THRUST_FWD(t1),
+        THRUST_FWD(t2),
+        THRUST_FWD(t3),
+        THRUST_FWD(t4),
+        thrust::is_execution_policy<::internal::remove_cvref_t<T1>>{}))
+
+        template <typename ForwardIt, typename Sentinel>
+        THRUST_HOST static auto call(ForwardIt&& first, Sentinel&& last) THRUST_RETURNS(reduce_fn::call(
+          thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}),
+          THRUST_FWD(first),
+          THRUST_FWD(last),
+          typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type{},
+          thrust::plus<
+            ::internal::remove_cvref_t<typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type>>{}))
+
+          template <typename... Args>
+          THRUST_DEPRECATED THRUST_NODISCARD THRUST_HOST auto operator()(Args&&... args) const
+    THRUST_RETURNS(call(THRUST_FWD(args)...))
+};
+
+} // namespace reduce_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT reduce_detail::reduce_fn reduce{};
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
+THRUST_DEPRECATED THRUST_HOST event<DerivedPolicy>
+async_reduce_into(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, T, BinaryOp)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace reduce_into_detail
+{
+
+using thrust::async::unimplemented::async_reduce_into;
+
+struct reduce_into_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
+  THRUST_HOST static auto
+  call(thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+       ForwardIt&& first,
+       Sentinel&& last,
+       OutputIt&& output,
+       T&& init,
+       BinaryOp&& op)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce_into(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(output),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T>
+    THRUST_HOST static auto call5(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& output,
+      T&& init,
+      thrust::true_type)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce_into(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(output),
+      THRUST_FWD(init),
+      thrust::plus<::internal::remove_cvref_t<T>>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_HOST static auto call4(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& output,
+      thrust::true_type)
+    // ADL dispatch.
+    THRUST_RETURNS(async_reduce_into(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(output),
+      typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type{},
+      thrust::plus<
+        ::internal::remove_cvref_t<typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type>>{}))
+      THRUST_SUPPRESS_DEPRECATED_POP
+
+    template <typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
+    THRUST_HOST static auto call5(
+      ForwardIt&& first, Sentinel&& last, OutputIt&& output, T&& init, BinaryOp&& op, thrust::false_type)
+      THRUST_RETURNS(reduce_into_fn::call(
+        thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{},
+                                      typename iterator_system<::internal::remove_cvref_t<OutputIt>>::type{}),
+        THRUST_FWD(first),
+        THRUST_FWD(last),
+        THRUST_FWD(output),
+        THRUST_FWD(init),
+        THRUST_FWD(op)))
+
+        template <typename ForwardIt, typename Sentinel, typename OutputIt, typename T>
+        THRUST_HOST static auto call4(
+          ForwardIt&& first, Sentinel&& last, OutputIt&& output, T&& init, thrust::false_type)
+          THRUST_RETURNS(reduce_into_fn::call(
+            thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{},
+                                          typename iterator_system<::internal::remove_cvref_t<OutputIt>>::type{}),
+            THRUST_FWD(first),
+            THRUST_FWD(last),
+            THRUST_FWD(output),
+            THRUST_FWD(init),
+            thrust::plus<::internal::remove_cvref_t<T>>{}))
+
+            template <typename ForwardIt, typename Sentinel, typename OutputIt>
+            THRUST_HOST static auto call(ForwardIt&& first, Sentinel&& last, OutputIt&& output)
+              THRUST_RETURNS(reduce_into_fn::call(
+                thrust::detail::select_system(typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{},
+                                              typename iterator_system<::internal::remove_cvref_t<OutputIt>>::type{}),
+                THRUST_FWD(first),
+                THRUST_FWD(last),
+                THRUST_FWD(output),
+                typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type{},
+                thrust::plus<::internal::remove_cvref_t<
+                  typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type>>{}))
+
+    // MSVC WAR: MSVC gets angsty and eats all available RAM when we try to detect
+    // if T1 is an execution_policy by using SFINAE. Switching to a static
+    // dispatch pattern to prevent this.
+    template <typename T1, typename T2, typename T3, typename T4>
+    THRUST_HOST static auto call(T1&& t1, T2&& t2, T3&& t3, T4&& t4) THRUST_RETURNS(reduce_into_fn::call4(
+      THRUST_FWD(t1),
+      THRUST_FWD(t2),
+      THRUST_FWD(t3),
+      THRUST_FWD(t4),
+      thrust::is_execution_policy<::internal::remove_cvref_t<T1>>{}))
+
+      template <typename T1, typename T2, typename T3, typename T4, typename T5>
+      THRUST_HOST static auto call(T1&& t1, T2&& t2, T3&& t3, T4&& t4, T5&& t5) THRUST_RETURNS(reduce_into_fn::call5(
+        THRUST_FWD(t1),
+        THRUST_FWD(t2),
+        THRUST_FWD(t3),
+        THRUST_FWD(t4),
+        THRUST_FWD(t5),
+        thrust::is_execution_policy<::internal::remove_cvref_t<T1>>{}))
+
+        template <typename... Args>
+        THRUST_DEPRECATED THRUST_NODISCARD THRUST_HOST auto operator()(Args&&... args) const
+    THRUST_RETURNS(call(THRUST_FWD(args)...))
+};
+
+} // namespace reduce_into_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT reduce_into_detail::reduce_into_fn reduce_into{};
+
+/*! \endcond
+ */
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/async/scan.h b/projects/rocthrust/thrust/async/scan.h
new file mode 100644
index 000000000000..e964cd7043f2
--- /dev/null
+++ b/projects/rocthrust/thrust/async/scan.h
@@ -0,0 +1,323 @@
+/*
+ *  Copyright 2008-2020 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file async/scan.h
+ *  \brief Functions for asynchronously computing prefix scans.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/execution_policy.h>
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/future.h>
+#  include <thrust/system/detail/adl/async/scan.h>
+#  include <thrust/type_traits/is_execution_policy.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+// Fallback implementations used when no overloads are found via ADL:
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
+THRUST_DEPRECATED event<DerivedPolicy>
+async_inclusive_scan(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, BinaryOp)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Sentinel,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+THRUST_DEPRECATED event<DerivedPolicy> async_exclusive_scan(
+  thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, InitialValueType, BinaryOp)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace inclusive_scan_detail
+{
+
+// Include fallback implementation for ADL failures
+using thrust::async::unimplemented::async_inclusive_scan;
+
+// Implementation of the thrust::async::inclusive_scan CPO.
+struct inclusive_scan_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
+  THRUST_DEPRECATED auto operator()(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+    ForwardIt&& first,
+    Sentinel&& last,
+    OutputIt&& out,
+    BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_DEPRECATED auto operator()(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& out) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy,
+              typename ForwardIt,
+              typename Sentinel,
+              typename OutputIt,
+              typename InitialValueType,
+              typename BinaryOp>
+    THRUST_DEPRECATED auto operator()(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& out,
+      InitialValueType&& init,
+      BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename ForwardIt,
+              typename Sentinel,
+              typename OutputIt,
+              typename BinaryOp,
+              typename = std::enable_if_t<!is_execution_policy_v<::internal::remove_cvref_t<ForwardIt>>>>
+    THRUST_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH template <typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename ForwardIt,
+              typename Sentinel,
+              typename OutputIt,
+              typename InitialValueType,
+              typename BinaryOp,
+              typename = std::enable_if_t<!is_execution_policy_v<::internal::remove_cvref_t<ForwardIt>>>>
+    THRUST_DEPRECATED auto
+    operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init, BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_inclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+};
+
+} // namespace inclusive_scan_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT inclusive_scan_detail::inclusive_scan_fn inclusive_scan{};
+
+namespace exclusive_scan_detail
+{
+
+// Include fallback implementation for ADL failures
+using thrust::async::unimplemented::async_exclusive_scan;
+
+// Implementation of the thrust::async::exclusive_scan CPO.
+struct exclusive_scan_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename DerivedPolicy,
+            typename ForwardIt,
+            typename Sentinel,
+            typename OutputIt,
+            typename InitialValueType,
+            typename BinaryOp>
+  THRUST_DEPRECATED auto operator()(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+    ForwardIt&& first,
+    Sentinel&& last,
+    OutputIt&& out,
+    InitialValueType&& init,
+    BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename InitialValueType>
+    THRUST_DEPRECATED auto operator()(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& out,
+      InitialValueType&& init) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_DEPRECATED auto operator()(
+      thrust::detail::execution_policy_base<DerivedPolicy> const& exec,
+      ForwardIt&& first,
+      Sentinel&& last,
+      OutputIt&& out) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      iterator_value_t<::internal::remove_cvref_t<ForwardIt>>{},
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename ForwardIt,
+              typename Sentinel,
+              typename OutputIt,
+              typename InitialValueType,
+              typename BinaryOp,
+              typename = std::enable_if_t<!is_execution_policy_v<::internal::remove_cvref_t<ForwardIt>>>>
+    THRUST_DEPRECATED auto
+    operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init, BinaryOp&& op) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      THRUST_FWD(op))) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    template <typename ForwardIt,
+              typename Sentinel,
+              typename OutputIt,
+              typename InitialValueType,
+              typename = std::enable_if_t<!is_execution_policy_v<::internal::remove_cvref_t<ForwardIt>>>>
+    THRUST_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out, InitialValueType&& init) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      THRUST_FWD(init),
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+
+    THRUST_SUPPRESS_DEPRECATED_PUSH template <typename ForwardIt, typename Sentinel, typename OutputIt>
+    THRUST_DEPRECATED auto operator()(ForwardIt&& first, Sentinel&& last, OutputIt&& out) const
+    // ADL dispatch.
+    THRUST_RETURNS(async_exclusive_scan(
+      thrust::detail::select_system(iterator_system_t<::internal::remove_cvref_t<ForwardIt>>{},
+                                    iterator_system_t<::internal::remove_cvref_t<OutputIt>>{}),
+      THRUST_FWD(first),
+      THRUST_FWD(last),
+      THRUST_FWD(out),
+      iterator_value_t<::internal::remove_cvref_t<ForwardIt>>{},
+      thrust::plus<>{})) THRUST_SUPPRESS_DEPRECATED_POP
+};
+
+} // namespace exclusive_scan_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT exclusive_scan_detail::exclusive_scan_fn exclusive_scan{};
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/async/sort.h b/projects/rocthrust/thrust/async/sort.h
new file mode 100644
index 000000000000..8a155069c03d
--- /dev/null
+++ b/projects/rocthrust/thrust/async/sort.h
@@ -0,0 +1,297 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief Algorithms for asynchronously sorting a range.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/event.h>
+#  include <thrust/system/detail/adl/async/sort.h>
+#  include <thrust/type_traits/is_execution_policy.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+/*! \cond
+ */
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+THRUST_DEPRECATED THRUST_HOST event<DerivedPolicy>
+async_stable_sort(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, StrictWeakOrdering)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace stable_sort_detail
+{
+
+using thrust::async::unimplemented::async_stable_sort;
+
+// clang-format off
+struct stable_sort_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <
+    typename DerivedPolicy
+  , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
+  >
+  THRUST_HOST
+
+  static auto call(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec
+  , ForwardIt&& first, Sentinel&& last
+  , StrictWeakOrdering&& comp
+  )
+  // ADL dispatch.
+  THRUST_RETURNS(
+    async_stable_sort(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec))
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(comp)
+    )
+  )
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <
+    typename DerivedPolicy
+  , typename ForwardIt, typename Sentinel
+  >
+  THRUST_HOST
+
+  static auto call(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec
+  , ForwardIt&& first, Sentinel&& last
+  )
+  // ADL dispatch.
+  THRUST_RETURNS(
+    async_stable_sort(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec))
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , thrust::less<
+        typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type
+      >{}
+    )
+  )
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+  THRUST_HOST
+  static auto call(ForwardIt&& first, Sentinel&& last, StrictWeakOrdering&& comp)
+  THRUST_RETURNS(
+    stable_sort_fn::call(
+      thrust::detail::select_system(
+        typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}
+      )
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(comp)
+    )
+  )
+
+  template <typename ForwardIt, typename Sentinel>
+  THRUST_HOST
+  static auto call(ForwardIt&& first, Sentinel&& last)
+  THRUST_RETURNS(
+    stable_sort_fn::call(
+      THRUST_FWD(first), THRUST_FWD(last)
+    , thrust::less<
+        typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type
+      >{}
+    )
+  )
+
+  template <typename... Args>
+  THRUST_DEPRECATED
+  #if !(defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG)
+  // clang in CUDA mode can only handle one attribute
+  THRUST_NODISCARD THRUST_HOST
+  #endif
+  auto operator()(Args&&... args) const
+  THRUST_RETURNS(
+    call(THRUST_FWD(args)...)
+  )
+};
+// clang-format on
+
+} // namespace stable_sort_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT stable_sort_detail::stable_sort_fn stable_sort{};
+
+namespace fallback
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+THRUST_DEPRECATED THRUST_HOST event<DerivedPolicy>
+async_sort(thrust::execution_policy<DerivedPolicy>& exec, ForwardIt&& first, Sentinel&& last, StrictWeakOrdering&& comp)
+{
+  return async_stable_sort(thrust::detail::derived_cast(exec), THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(comp));
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace fallback
+
+namespace sort_detail
+{
+
+using thrust::async::fallback::async_sort;
+
+// clang-format off
+struct sort_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <
+    typename DerivedPolicy
+  , typename ForwardIt, typename Sentinel, typename StrictWeakOrdering
+  >
+  THRUST_HOST
+  static auto call(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec
+  , ForwardIt&& first, Sentinel&& last
+  , StrictWeakOrdering&& comp
+  )
+  // ADL dispatch.
+  THRUST_RETURNS(
+    async_sort(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec))
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(comp)
+    )
+  )
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <
+    typename DerivedPolicy
+  , typename ForwardIt, typename Sentinel
+  >
+  THRUST_HOST
+  static auto call3(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec
+  , ForwardIt&& first, Sentinel&& last
+  , thrust::true_type
+  )
+  THRUST_RETURNS(
+    sort_fn::call(
+      exec
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , thrust::less<
+        typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type
+      >{}
+    )
+  )
+
+  template <typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+  THRUST_HOST
+  static auto call3(ForwardIt&& first, Sentinel&& last,
+                    StrictWeakOrdering&& comp,
+                    thrust::false_type)
+  THRUST_RETURNS(
+    sort_fn::call(
+      thrust::detail::select_system(
+        typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}
+      )
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(comp)
+    )
+  )
+
+  // MSVC WAR: MSVC gets angsty and eats all available RAM when we try to detect
+  // if T1 is an execution_policy by using SFINAE. Switching to a static
+  // dispatch pattern to prevent this.
+  template <typename T1, typename T2, typename T3>
+  THRUST_HOST
+  static auto call(T1&& t1, T2&& t2, T3&& t3)
+  THRUST_RETURNS(
+    sort_fn::call3(THRUST_FWD(t1), THRUST_FWD(t2), THRUST_FWD(t3),
+                   thrust::is_execution_policy<::internal::remove_cvref_t<T1>>{})
+  )
+
+  template <typename ForwardIt, typename Sentinel>
+  THRUST_HOST
+  static auto call(ForwardIt&& first, Sentinel&& last)
+  THRUST_RETURNS(
+    sort_fn::call(
+      thrust::detail::select_system(
+        typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}
+      )
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , thrust::less<
+        typename iterator_traits<::internal::remove_cvref_t<ForwardIt>>::value_type
+      >{}
+    )
+  )
+
+  template <typename... Args>
+  THRUST_DEPRECATED
+  #if !(defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG)
+  // clang in CUDA mode can only handle one attribute
+  THRUST_NODISCARD THRUST_HOST
+  #endif
+  auto operator()(Args&&... args) const
+  THRUST_RETURNS(
+    call(THRUST_FWD(args)...)
+  )
+};
+// clang-format on
+
+} // namespace sort_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT sort_detail::sort_fn sort{};
+
+/*! \endcond
+ */
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/async/transform.h b/projects/rocthrust/thrust/async/transform.h
new file mode 100644
index 000000000000..e75013a2d0a1
--- /dev/null
+++ b/projects/rocthrust/thrust/async/transform.h
@@ -0,0 +1,148 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief Algorithms for asynchronously transforming a range.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/select_system.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/event.h>
+#  include <thrust/system/detail/adl/async/transform.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace async
+{
+
+/*! \cond
+ */
+
+namespace unimplemented
+{
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>
+THRUST_DEPRECATED THRUST_HOST event<DerivedPolicy> async_transform(
+  thrust::execution_policy<DerivedPolicy>& /*exec*/,
+  ForwardIt /*first*/,
+  Sentinel /*last*/,
+  OutputIt /*output*/,
+  UnaryOperation /*op*/)
+{
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
+                           "this algorithm is not implemented for the specified system");
+  return {};
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
+} // namespace unimplemented
+
+namespace transform_detail
+{
+
+using thrust::async::unimplemented::async_transform;
+
+// clang-format off
+struct transform_fn final
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <
+    typename DerivedPolicy
+  , typename ForwardIt, typename Sentinel, typename OutputIt
+  , typename UnaryOperation
+  >
+  THRUST_HOST
+  static auto
+  call(
+    thrust::detail::execution_policy_base<DerivedPolicy> const& exec
+  , ForwardIt&& first, Sentinel&& last
+  , OutputIt&& output
+  , UnaryOperation&& op
+  )
+  // ADL dispatch.
+  THRUST_RETURNS(
+    async_transform(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec))
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(output)
+    , THRUST_FWD(op)
+    )
+  )
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <
+    typename ForwardIt, typename Sentinel, typename OutputIt
+  , typename UnaryOperation
+  >
+  THRUST_HOST
+  static auto call(
+    ForwardIt&& first, Sentinel&& last
+  , OutputIt&& output
+  , UnaryOperation&& op
+  )
+  THRUST_RETURNS(
+    transform_fn::call(
+      thrust::detail::select_system(
+        typename iterator_system<::internal::remove_cvref_t<ForwardIt>>::type{}
+      , typename iterator_system<::internal::remove_cvref_t<OutputIt>>::type{}
+      )
+    , THRUST_FWD(first), THRUST_FWD(last)
+    , THRUST_FWD(output)
+    , THRUST_FWD(op)
+    )
+  )
+
+  template <typename... Args>
+  THRUST_DEPRECATED THRUST_NODISCARD THRUST_HOST
+ auto operator()(Args&&... args) const
+  THRUST_RETURNS(
+    call(THRUST_FWD(args)...)
+  )
+};
+// clang-format on
+
+} // namespace transform_detail
+
+// note: cannot add a THRUST_DEPRECATED here because the global variable is emitted into cudafe1.stub.c and we cannot
+// suppress the warning there
+//! deprecated [Since 2.8.0]
+THRUST_INLINE_CONSTANT transform_detail::transform_fn transform{};
+
+/*! \endcond
+ */
+
+} // namespace async
+
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/complex.h b/projects/rocthrust/thrust/complex.h
index cee2c715dfb2..fd2216a9b200 100644
--- a/projects/rocthrust/thrust/complex.h
+++ b/projects/rocthrust/thrust/complex.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2019 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -343,11 +343,23 @@ struct complex
   }
 
 private:
+#if defined(__CUDACC__) && ((__CUDACC_VER_MAJOR__ < 11) || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 7))
+  struct __align__(sizeof(T) * 2) storage
+#elif (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
+  struct storage
+#else // !((THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL) || (defined(__CUDACC__) && ((__CUDACC_VER_MAJOR__ < 11)
+      // || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 7))))
   struct alignas(sizeof(T) * 2) storage
+#endif // !((THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL) || (defined(__CUDACC__) && ((__CUDACC_VER_MAJOR__ < 11)
+       // || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 7))))
   {
     T x; /**< @brief The first \p complex. */
     T y; /**< @brief The second \p complex. */
-  };
+  }
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
+  __attribute__((aligned(sizeof(T) * 2)))
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL
+  ;
   storage data;
 };
 
@@ -387,7 +399,8 @@ THRUST_HOST_DEVICE complex<T> conj(const complex<T>& z);
  *  \param theta The phase of the returned \p complex in radians.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> polar(const T0& m, const T1& theta = T1());
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+polar(const T0& m, const T1& theta = T1());
 
 /*! Returns the projection of a \p complex on the Riemann sphere.
  *  For all finite \p complex it returns the argument. For \p complexs
@@ -410,7 +423,8 @@ THRUST_HOST_DEVICE complex<T> proj(const T& z);
  *  \param y The second \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const complex<T0>& x, const complex<T1>& y);
 
 /*! Adds a scalar to a \p complex number.
  *
@@ -421,7 +435,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const co
  *  \param y The scalar.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const complex<T0>& x, const T1& y);
 
 /*! Adds a \p complex number to a scalar.
  *
@@ -432,7 +447,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const co
  *  \param y The \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const T0& x, const complex<T1>& y);
 
 /*! Subtracts two \p complex numbers.
  *
@@ -443,7 +459,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0
  *  \param y The second \p complex (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const complex<T0>& x, const complex<T1>& y);
 
 /*! Subtracts a scalar from a \p complex number.
  *
@@ -454,7 +471,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const co
  *  \param y The scalar (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const complex<T0>& x, const T1& y);
 
 /*! Subtracts a \p complex number from a scalar.
  *
@@ -465,7 +483,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const co
  *  \param y The \p complex (subtrahend).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const T0& x, const complex<T1>& y);
 
 /*! Multiplies two \p complex numbers.
  *
@@ -476,7 +495,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0
  *  \param y The second \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const complex<T0>& x, const complex<T1>& y);
 
 /*! Multiplies a \p complex number by a scalar.
  *
@@ -484,7 +504,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const co
  *  \param y The scalar.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const complex<T0>& x, const T1& y);
 
 /*! Multiplies a scalar by a \p complex number.
  *
@@ -495,7 +516,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const co
  *  \param y The \p complex.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const T0& x, const complex<T1>& y);
 
 /*! Divides two \p complex numbers.
  *
@@ -506,7 +528,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0
  *  \param y The denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const complex<T0>& x, const complex<T1>& y);
 
 /*! Divides a \p complex number by a scalar.
  *
@@ -517,7 +540,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
  *  \param y The scalar denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const complex<T0>& x, const T1& y);
 
 /*! Divides a scalar by a \p complex number.
  *
@@ -528,7 +552,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
  *  \param y The complex denomimator (divisor).
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const T0& x, const complex<T1>& y);
 
 /* --- Unary Arithmetic operators --- */
 
@@ -581,7 +606,8 @@ THRUST_HOST_DEVICE complex<T> log10(const complex<T>& z);
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const complex<T0>& x, const complex<T1>& y);
 
 /*! Returns a \p complex number raised to a scalar.
  *
@@ -592,7 +618,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const complex<T0>& x, const T1& y);
 
 /*! Returns a scalar raised to a \p complex number.
  *
@@ -603,7 +630,8 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<
  *  \param y The exponent.
  */
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y);
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const T0& x, const complex<T1>& y);
 
 /*! Returns the complex square root of a \p complex number.
  *
diff --git a/projects/rocthrust/thrust/copy.h b/projects/rocthrust/thrust/copy.h
index 0fe234889ca9..c0835c441ade 100644
--- a/projects/rocthrust/thrust/copy.h
+++ b/projects/rocthrust/thrust/copy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,13 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -261,7 +254,7 @@ OutputIterator copy_n(InputIterator first, Size n, OutputIterator result);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -277,7 +270,7 @@ OutputIterator copy_n(InputIterator first, Size n, OutputIterator result);
  *  ...
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
@@ -322,7 +315,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
  *          evaluated to \c true in the range <tt>[first, last)</tt>.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -337,7 +330,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
  *  ...
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
@@ -384,7 +377,7 @@ OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator r
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/OutputIterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -402,7 +395,7 @@ OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator r
  *  ...
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
@@ -457,7 +450,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/OutputIterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -473,7 +466,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
  *  ...
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
diff --git a/projects/rocthrust/thrust/count.h b/projects/rocthrust/thrust/count.h
index 9efe9fa16e7c..1d6c518e66f0 100644
--- a/projects/rocthrust/thrust/count.h
+++ b/projects/rocthrust/thrust/count.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/iterator_traits.h>
 
@@ -89,7 +82,7 @@ THRUST_NAMESPACE_BEGIN
  *  \see https://en.cppreference.com/w/cpp/algorithm/count
  */
 template <typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
       InputIterator first,
       InputIterator last,
@@ -131,7 +124,7 @@ count(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \see https://en.cppreference.com/w/cpp/algorithm/count
  */
 template <typename InputIterator, typename EqualityComparable>
-thrust::detail::it_difference_t<InputIterator>
+typename thrust::iterator_traits<InputIterator>::difference_type
 count(InputIterator first, InputIterator last, const EqualityComparable& value);
 
 /*! \p count_if finds the number of elements in <tt>[first,last)</tt> for which
@@ -148,7 +141,7 @@ count(InputIterator first, InputIterator last, const EqualityComparable& value);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator must be a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator's \c value_type must be convertible to \c Predicate's argument type. \tparam
+ * Iterator</a> and \c InputIterator's \c value_type must be convertible to \c Predicate's \c argument_type. \tparam
  * Predicate must be a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p count to
@@ -161,7 +154,7 @@ count(InputIterator first, InputIterator last, const EqualityComparable& value);
  *  ...
  *  struct is_odd
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int &x)
  *    {
  *      return x & 1;
@@ -184,7 +177,7 @@ count(InputIterator first, InputIterator last, const EqualityComparable& value);
  *  \see https://en.cppreference.com/w/cpp/algorithm/count
  */
 template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
          InputIterator first,
          InputIterator last,
@@ -200,7 +193,7 @@ count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \return The number of elements where \p pred is \c true.
  *
  *  \tparam InputIterator must be a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator's \c value_type must be convertible to \c Predicate's argument type. \tparam
+ * Iterator</a> and \c InputIterator's \c value_type must be convertible to \c Predicate's \c argument_type. \tparam
  * Predicate must be a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p count to
@@ -211,7 +204,7 @@ count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  ...
  *  struct is_odd
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int &x)
  *    {
  *      return x & 1;
@@ -234,7 +227,8 @@ count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \see https://en.cppreference.com/w/cpp/algorithm/count
  */
 template <typename InputIterator, typename Predicate>
-thrust::detail::it_difference_t<InputIterator> count_if(InputIterator first, InputIterator last, Predicate pred);
+typename thrust::iterator_traits<InputIterator>::difference_type
+count_if(InputIterator first, InputIterator last, Predicate pred);
 
 /*! \} // end counting
  *  \} // end reductions
diff --git a/projects/rocthrust/thrust/detail/adjacent_difference.inl b/projects/rocthrust/thrust/detail/adjacent_difference.inl
index dd3d4d323b91..0602746b533d 100644
--- a/projects/rocthrust/thrust/detail/adjacent_difference.inl
+++ b/projects/rocthrust/thrust/detail/adjacent_difference.inl
@@ -17,50 +17,42 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/adl/adjacent_difference.h>
-#include <thrust/system/detail/generic/adjacent_difference.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/adjacent_difference.h>
+#include <thrust/system/detail/adl/adjacent_difference.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator adjacent_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result)
+THRUST_HOST_DEVICE
+OutputIterator adjacent_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                   InputIterator first, InputIterator last,
+                                   OutputIterator result)
 {
   using thrust::system::detail::generic::adjacent_difference;
 
   return adjacent_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end adjacent_difference()
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator adjacent_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  BinaryFunction binary_op)
+THRUST_HOST_DEVICE
+OutputIterator adjacent_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                   InputIterator first, InputIterator last,
+                                   OutputIterator result,
+                                   BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::adjacent_difference;
 
-  return adjacent_difference(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, binary_op);
+  return adjacent_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, binary_op);
 } // end adjacent_difference()
 
+
 template <typename InputIterator, typename OutputIterator>
-OutputIterator adjacent_difference(InputIterator first, InputIterator last, OutputIterator result)
+OutputIterator adjacent_difference(InputIterator first, InputIterator last,
+                                   OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -73,9 +65,11 @@ OutputIterator adjacent_difference(InputIterator first, InputIterator last, Outp
   return thrust::adjacent_difference(select_system(system1, system2), first, last, result);
 } // end adjacent_difference()
 
+
 template <typename InputIterator, typename OutputIterator, typename BinaryFunction>
-OutputIterator
-adjacent_difference(InputIterator first, InputIterator last, OutputIterator result, BinaryFunction binary_op)
+OutputIterator adjacent_difference(InputIterator first, InputIterator last,
+                                   OutputIterator result,
+                                   BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -88,4 +82,5 @@ adjacent_difference(InputIterator first, InputIterator last, OutputIterator resu
   return thrust::adjacent_difference(select_system(system1, system2), first, last, result, binary_op);
 } // end adjacent_difference()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/advance.inl b/projects/rocthrust/thrust/detail/advance.inl
index 5751c56f545b..7fd9a143e0d0 100644
--- a/projects/rocthrust/thrust/detail/advance.inl
+++ b/projects/rocthrust/thrust/detail/advance.inl
@@ -17,56 +17,55 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/advance.h>
+#include <thrust/system/detail/generic/advance.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_nested_type.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/generic/advance.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
 
 THRUST_NAMESPACE_BEGIN
 
 __THRUST_DEFINE_HAS_NESTED_TYPE(has_difference_type, difference_type)
 
 template <typename InputIterator, typename Distance>
-THRUST_HOST_DEVICE void advance(InputIterator& i, Distance n)
+THRUST_HOST_DEVICE
+void advance(InputIterator& i, Distance n)
 {
   thrust::system::detail::generic::advance(i, n);
 }
 
 template <typename InputIterator>
-THRUST_HOST_DEVICE InputIterator next(InputIterator i, thrust::detail::it_difference_t<InputIterator> n = 1)
+THRUST_HOST_DEVICE
+InputIterator next(
+  InputIterator i
+, typename iterator_traits<InputIterator>::difference_type n = 1
+)
 {
   thrust::system::detail::generic::advance(i, n);
   return i;
 }
 
 template <typename BidirectionalIterator>
-THRUST_HOST_DEVICE BidirectionalIterator
-prev(BidirectionalIterator i, thrust::detail::it_difference_t<BidirectionalIterator> n = 1)
+THRUST_HOST_DEVICE
+BidirectionalIterator prev(
+  BidirectionalIterator i
+, typename iterator_traits<BidirectionalIterator>::difference_type n = 1
+)
 {
   thrust::system::detail::generic::advance(i, -n);
   return i;
 }
 
-// FIXME(bgruber): what does this prevent against?
 template <typename BidirectionalIterator>
 THRUST_HOST_DEVICE
-typename detail::disable_if<has_difference_type<_THRUST_STD::iterator_traits<BidirectionalIterator>>::value,
-                            BidirectionalIterator>::type
-prev(BidirectionalIterator i, typename detail::pointer_traits<BidirectionalIterator>::difference_type n = 1)
+typename detail::disable_if<
+  has_difference_type<iterator_traits<BidirectionalIterator> >::value
+, BidirectionalIterator
+>::type prev(
+  BidirectionalIterator i
+, typename detail::pointer_traits<BidirectionalIterator>::difference_type n = 1
+)
 {
   thrust::system::detail::generic::advance(i, -n);
   return i;
diff --git a/projects/rocthrust/thrust/detail/algorithm_wrapper.h b/projects/rocthrust/thrust/detail/algorithm_wrapper.h
index c732e106c1df..b6a97a52d209 100644
--- a/projects/rocthrust/thrust/detail/algorithm_wrapper.h
+++ b/projects/rocthrust/thrust/detail/algorithm_wrapper.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // When a compiler uses Thrust as part of its implementation of Standard C++
 // algorithms, a cycle of included files may result when Thrust code tries to
 // use a standard algorithm.  Having a macro that is defined only when Thrust
diff --git a/projects/rocthrust/thrust/detail/allocator/allocator_traits.h b/projects/rocthrust/thrust/detail/allocator/allocator_traits.h
index 03ec80efe013..ac7d0d53b77e 100644
--- a/projects/rocthrust/thrust/detail/allocator/allocator_traits.h
+++ b/projects/rocthrust/thrust/detail/allocator/allocator_traits.h
@@ -87,10 +87,11 @@ THRUST_SUPPRESS_DEPRECATED_PUSH
 
 // The following fields of std::allocator have been deprecated (since C++17).
 // There's no way to detect it other than explicit specialization.
-#define THRUST_SPECIALIZE_DEPRECATED(trait_name)    \
-  template <typename T>                             \
-  struct trait_name<std::allocator<T>> : false_type \
-  {};
+#if THRUST_CPP_DIALECT >= 2017
+#  define THRUST_SPECIALIZE_DEPRECATED(trait_name)    \
+    template <typename T>                             \
+    struct trait_name<std::allocator<T>> : false_type \
+    {};
 
 THRUST_SPECIALIZE_DEPRECATED(has_is_always_equal)
 THRUST_SPECIALIZE_DEPRECATED(has_pointer)
@@ -98,11 +99,12 @@ THRUST_SPECIALIZE_DEPRECATED(has_const_pointer)
 THRUST_SPECIALIZE_DEPRECATED(has_reference)
 THRUST_SPECIALIZE_DEPRECATED(has_const_reference)
 
-#undef THRUST_SPECIALIZE_DEPRECATED
+#  undef THRUST_SPECIALIZE_DEPRECATED
 
 template <typename T, typename U>
 struct has_rebind<std::allocator<T>, U> : false_type
 {};
+#endif
 
 template <typename T>
 struct nested_pointer
diff --git a/projects/rocthrust/thrust/detail/allocator/allocator_traits.inl b/projects/rocthrust/thrust/detail/allocator/allocator_traits.inl
index 20f0c3be00ed..49a81b6ddaff 100644
--- a/projects/rocthrust/thrust/detail/allocator/allocator_traits.inl
+++ b/projects/rocthrust/thrust/detail/allocator/allocator_traits.inl
@@ -26,12 +26,11 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/allocator/allocator_traits.h>
+#include <thrust/detail/integer_traits.h>
 #include <thrust/detail/memory_wrapper.h>
 #include <thrust/detail/type_deduction.h>
 #include <thrust/detail/type_traits/is_call_possible.h>
 
-#include _THRUST_STD_INCLUDE(limits)
-
 #include <new>
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
@@ -268,7 +267,7 @@ THRUST_HOST_DEVICE _THRUST_STD::enable_if_t<!has_member_max_size<Alloc>::value,
 max_size(const Alloc&)
 {
   using size_type = typename allocator_traits<Alloc>::size_type;
-  return _THRUST_STD::numeric_limits<size_type>::max();
+  return thrust::detail::integer_traits<size_type>::const_max;
 }
 
 template <typename Alloc>
diff --git a/projects/rocthrust/thrust/detail/allocator/copy_construct_range.h b/projects/rocthrust/thrust/detail/allocator/copy_construct_range.h
index 630d2769cc36..dbcddad8d6ec 100644
--- a/projects/rocthrust/thrust/detail/allocator/copy_construct_range.h
+++ b/projects/rocthrust/thrust/detail/allocator/copy_construct_range.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/allocator/copy_construct_range.inl b/projects/rocthrust/thrust/detail/allocator/copy_construct_range.inl
index 2de2a8bc859f..ec67562a20bb 100644
--- a/projects/rocthrust/thrust/detail/allocator/copy_construct_range.inl
+++ b/projects/rocthrust/thrust/detail/allocator/copy_construct_range.inl
@@ -104,12 +104,12 @@ THRUST_HOST_DEVICE enable_if_convertible_t<FromSystem, ToSystem, Pointer> uninit
   ZipIterator end   = begin;
 
   // get a zip_iterator pointing to the end
-  const thrust::detail::it_difference_t<InputIterator> n = thrust::distance(first, last);
+  const typename thrust::iterator_difference<InputIterator>::type n = thrust::distance(first, last);
   thrust::advance(end, n);
 
   // create a functor
-  using InputType  = it_value_t<InputIterator>;
-  using OutputType = it_value_t<Pointer>;
+  using InputType  = typename iterator_traits<InputIterator>::value_type;
+  using OutputType = typename iterator_traits<Pointer>::value_type;
 
   // do the for_each
   // note we use to_system to dispatch the for_each
@@ -139,8 +139,8 @@ THRUST_HOST_DEVICE enable_if_convertible_t<FromSystem, ToSystem, Pointer> uninit
   ZipIterator begin = thrust::make_zip_iterator(thrust::make_tuple(first, result));
 
   // create a functor
-  using InputType  = it_value_t<InputIterator>;
-  using OutputType = it_value_t<Pointer>;
+  using InputType  = typename iterator_traits<InputIterator>::value_type;
+  using OutputType = typename iterator_traits<Pointer>::value_type;
 
   // do the for_each_n
   // note we use to_system to dispatch the for_each_n
@@ -206,8 +206,8 @@ copy_construct_range_n(
 }
 
 template <typename FromSystem, typename Allocator, typename InputIterator, typename Pointer>
-THRUST_HOST_DEVICE _THRUST_STD::
-  enable_if_t<needs_copy_construct_via_allocator<Allocator, typename pointer_element<Pointer>::type>::value, Pointer>
+THRUST_HOST_DEVICE
+  _THRUST_STD::enable_if_t<needs_copy_construct_via_allocator<Allocator, typename pointer_element<Pointer>::type>::value, Pointer>
   copy_construct_range(thrust::execution_policy<FromSystem>& from_system,
                        Allocator& a,
                        InputIterator first,
@@ -218,8 +218,8 @@ THRUST_HOST_DEVICE _THRUST_STD::
 }
 
 template <typename FromSystem, typename Allocator, typename InputIterator, typename Size, typename Pointer>
-THRUST_HOST_DEVICE _THRUST_STD::
-  enable_if_t<needs_copy_construct_via_allocator<Allocator, typename pointer_element<Pointer>::type>::value, Pointer>
+THRUST_HOST_DEVICE
+  _THRUST_STD::enable_if_t<needs_copy_construct_via_allocator<Allocator, typename pointer_element<Pointer>::type>::value, Pointer>
   copy_construct_range_n(
     thrust::execution_policy<FromSystem>& from_system, Allocator& a, InputIterator first, Size n, Pointer result)
 {
diff --git a/projects/rocthrust/thrust/detail/allocator/destroy_range.h b/projects/rocthrust/thrust/detail/allocator/destroy_range.h
index 9679455e899f..5b23625cb6f1 100644
--- a/projects/rocthrust/thrust/detail/allocator/destroy_range.h
+++ b/projects/rocthrust/thrust/detail/allocator/destroy_range.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/rocthrust/thrust/detail/allocator/destroy_range.inl b/projects/rocthrust/thrust/detail/allocator/destroy_range.inl
index 0111b997fce5..9743911f3b82 100644
--- a/projects/rocthrust/thrust/detail/allocator/destroy_range.inl
+++ b/projects/rocthrust/thrust/detail/allocator/destroy_range.inl
@@ -68,14 +68,14 @@ struct enable_if_destroy_range_case1
 template <typename Allocator, typename Pointer>
 struct enable_if_destroy_range_case2
     : _THRUST_STD::enable_if<!has_effectful_member_destroy<Allocator, typename pointer_element<Pointer>::type>::value
-                             && !_THRUST_STD::is_trivially_destructible<typename pointer_element<Pointer>::type>::value>
+                            && !_THRUST_STD::is_trivially_destructible<typename pointer_element<Pointer>::type>::value>
 {};
 
 // case 3: Allocator has no member function "destroy", and T has a trivial destructor
 template <typename Allocator, typename Pointer>
 struct enable_if_destroy_range_case3
     : _THRUST_STD::enable_if<!has_effectful_member_destroy<Allocator, typename pointer_element<Pointer>::type>::value
-                             && _THRUST_STD::is_trivially_destructible<typename pointer_element<Pointer>::type>::value>
+                            && _THRUST_STD::is_trivially_destructible<typename pointer_element<Pointer>::type>::value>
 {};
 
 template <typename Allocator>
diff --git a/projects/rocthrust/thrust/detail/allocator/fill_construct_range.h b/projects/rocthrust/thrust/detail/allocator/fill_construct_range.h
index 3bb84f765598..e78426136779 100644
--- a/projects/rocthrust/thrust/detail/allocator/fill_construct_range.h
+++ b/projects/rocthrust/thrust/detail/allocator/fill_construct_range.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/rocthrust/thrust/detail/allocator/malloc_allocator.h b/projects/rocthrust/thrust/detail/allocator/malloc_allocator.h
index d0896c18dd4f..35f1912024e6 100644
--- a/projects/rocthrust/thrust/detail/allocator/malloc_allocator.h
+++ b/projects/rocthrust/thrust/detail/allocator/malloc_allocator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator/tagged_allocator.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 
diff --git a/projects/rocthrust/thrust/detail/allocator/malloc_allocator.inl b/projects/rocthrust/thrust/detail/allocator/malloc_allocator.inl
index 91eda7b4cc79..cc6237d0fa64 100644
--- a/projects/rocthrust/thrust/detail/allocator/malloc_allocator.inl
+++ b/projects/rocthrust/thrust/detail/allocator/malloc_allocator.inl
@@ -17,27 +17,21 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator/malloc_allocator.h>
-#include <thrust/detail/malloc_and_free.h>
-#include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/system/detail/bad_alloc.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/bad_alloc.h>
+#include <thrust/detail/raw_pointer_cast.h>
+#include <thrust/detail/malloc_and_free.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
-template <typename T, typename System, typename Pointer>
-typename malloc_allocator<T, System, Pointer>::pointer
-malloc_allocator<T, System, Pointer>::allocate(typename malloc_allocator<T, System, Pointer>::size_type cnt)
+
+template<typename T, typename System, typename Pointer>
+  typename malloc_allocator<T,System,Pointer>::pointer
+    malloc_allocator<T,System,Pointer>
+      ::allocate(typename malloc_allocator<T,System,Pointer>::size_type cnt)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -46,7 +40,7 @@ malloc_allocator<T, System, Pointer>::allocate(typename malloc_allocator<T, Syst
 
   pointer result = thrust::malloc<T>(select_system(system), cnt);
 
-  if (result.get() == 0)
+  if(result.get() == 0)
   {
     throw thrust::system::detail::bad_alloc("malloc_allocator::allocate: malloc failed");
   } // end if
@@ -54,9 +48,10 @@ malloc_allocator<T, System, Pointer>::allocate(typename malloc_allocator<T, Syst
   return result;
 } // end malloc_allocator::allocate()
 
-template <typename T, typename System, typename Pointer>
-void malloc_allocator<T, System, Pointer>::deallocate(typename malloc_allocator<T, System, Pointer>::pointer p,
-                                                      typename malloc_allocator<T, System, Pointer>::size_type) noexcept
+
+template<typename T, typename System, typename Pointer>
+  void malloc_allocator<T,System,Pointer>
+    ::deallocate(typename malloc_allocator<T,System,Pointer>::pointer p, typename malloc_allocator<T,System,Pointer>::size_type) noexcept
 {
   using thrust::system::detail::generic::select_system;
 
@@ -64,5 +59,6 @@ void malloc_allocator<T, System, Pointer>::deallocate(typename malloc_allocator<
   thrust::free(select_system(system), p);
 } // end malloc_allocator
 
-} // namespace detail
+
+} // end detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/allocator/no_throw_allocator.h b/projects/rocthrust/thrust/detail/allocator/no_throw_allocator.h
index fbc8a27796f7..9733a0580980 100644
--- a/projects/rocthrust/thrust/detail/allocator/no_throw_allocator.h
+++ b/projects/rocthrust/thrust/detail/allocator/no_throw_allocator.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,13 +19,7 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/nv_target.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -50,8 +44,8 @@ struct no_throw_allocator : BaseAllocator
 
   THRUST_HOST_DEVICE void deallocate(typename super_t::pointer p, typename super_t::size_type n) noexcept
   {
-    _THRUST_IF_TARGET(
-      _THRUST_IS_HOST,
+    NV_IF_TARGET(
+      NV_IS_HOST,
       (try { super_t::deallocate(p, n); } // end try
        catch (...){
          // catch anything
diff --git a/projects/rocthrust/thrust/detail/allocator/tagged_allocator.h b/projects/rocthrust/thrust/detail/allocator/tagged_allocator.h
index 37825b603d74..95ced3dd532c 100644
--- a/projects/rocthrust/thrust/detail/allocator/tagged_allocator.h
+++ b/projects/rocthrust/thrust/detail/allocator/tagged_allocator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 
@@ -60,8 +53,8 @@ class tagged_allocator
   using value_type      = T;
   using pointer         = typename thrust::detail::pointer_traits<Pointer>::template rebind<T>::other;
   using const_pointer   = typename thrust::detail::pointer_traits<Pointer>::template rebind<const T>::other;
-  using reference       = thrust::detail::it_reference_t<pointer>;
-  using const_reference = thrust::detail::it_reference_t<const_pointer>;
+  using reference       = typename thrust::iterator_reference<pointer>::type;
+  using const_reference = typename thrust::iterator_reference<const_pointer>::type;
   using size_type       = std::size_t;
   using difference_type = typename thrust::detail::pointer_traits<pointer>::difference_type;
   using system_type     = Tag;
diff --git a/projects/rocthrust/thrust/detail/allocator/tagged_allocator.inl b/projects/rocthrust/thrust/detail/allocator/tagged_allocator.inl
index 601be80aa2cb..bb4b8c42fa20 100644
--- a/projects/rocthrust/thrust/detail/allocator/tagged_allocator.inl
+++ b/projects/rocthrust/thrust/detail/allocator/tagged_allocator.inl
@@ -17,70 +17,87 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator/tagged_allocator.h>
-
 #include <limits>
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
-template <typename T, typename Tag, typename Pointer>
-THRUST_HOST_DEVICE tagged_allocator<T, Tag, Pointer>::tagged_allocator()
+
+template<typename T, typename Tag, typename Pointer>
+  THRUST_HOST_DEVICE
+  tagged_allocator<T,Tag,Pointer>
+    ::tagged_allocator()
 {}
 
-template <typename T, typename Tag, typename Pointer>
-THRUST_HOST_DEVICE tagged_allocator<T, Tag, Pointer>::tagged_allocator(const tagged_allocator<T, Tag, Pointer>&)
+
+template<typename T, typename Tag, typename Pointer>
+  THRUST_HOST_DEVICE
+  tagged_allocator<T,Tag,Pointer>
+    ::tagged_allocator(const tagged_allocator<T,Tag,Pointer> &)
 {}
 
-template <typename T, typename Tag, typename Pointer>
-template <typename U, typename OtherPointer>
-THRUST_HOST_DEVICE tagged_allocator<T, Tag, Pointer>::tagged_allocator(const tagged_allocator<U, Tag, OtherPointer>&)
+
+template<typename T, typename Tag, typename Pointer>
+  template<typename U, typename OtherPointer>
+    THRUST_HOST_DEVICE
+    tagged_allocator<T,Tag,Pointer>
+      ::tagged_allocator(const tagged_allocator<U,Tag,OtherPointer> &)
 {}
 
-template <typename T, typename Tag, typename Pointer>
-THRUST_HOST_DEVICE tagged_allocator<T, Tag, Pointer>::~tagged_allocator()
+
+template<typename T, typename Tag, typename Pointer>
+  THRUST_HOST_DEVICE
+  tagged_allocator<T,Tag,Pointer>
+    ::~tagged_allocator()
 {}
 
-template <typename T, typename Tag, typename Pointer>
-THRUST_HOST_DEVICE typename tagged_allocator<T, Tag, Pointer>::pointer
-tagged_allocator<T, Tag, Pointer>::address(reference x) const
+
+template<typename T, typename Tag, typename Pointer>
+  THRUST_HOST_DEVICE
+  typename tagged_allocator<T,Tag,Pointer>::pointer
+    tagged_allocator<T,Tag,Pointer>
+      ::address(reference x) const
 {
   return &x;
 }
 
-template <typename T, typename Tag, typename Pointer>
-THRUST_HOST_DEVICE typename tagged_allocator<T, Tag, Pointer>::const_pointer
-tagged_allocator<T, Tag, Pointer>::address(const_reference x) const
+
+template<typename T, typename Tag, typename Pointer>
+  THRUST_HOST_DEVICE
+  typename tagged_allocator<T,Tag,Pointer>::const_pointer
+    tagged_allocator<T,Tag,Pointer>
+      ::address(const_reference x) const
 {
   return &x;
 }
 
-template <typename T, typename Tag, typename Pointer>
-typename tagged_allocator<T, Tag, Pointer>::size_type tagged_allocator<T, Tag, Pointer>::max_size() const
+
+template<typename T, typename Tag, typename Pointer>
+  typename tagged_allocator<T,Tag,Pointer>::size_type
+    tagged_allocator<T,Tag,Pointer>
+      ::max_size() const
 {
   return (std::numeric_limits<size_type>::max)() / sizeof(T);
 }
 
-template <typename T1, typename Pointer1, typename T2, typename Pointer2, typename Tag>
-THRUST_HOST_DEVICE bool operator==(const tagged_allocator<T1, Pointer1, Tag>&, const tagged_allocator<T2, Pointer2, Tag>&)
+
+template<typename T1, typename Pointer1, typename T2, typename Pointer2, typename Tag>
+THRUST_HOST_DEVICE
+bool operator==(const tagged_allocator<T1,Pointer1,Tag> &, const tagged_allocator<T2,Pointer2,Tag> &)
 {
   return true;
 }
 
-template <typename T1, typename Pointer1, typename T2, typename Pointer2, typename Tag>
-THRUST_HOST_DEVICE bool operator!=(const tagged_allocator<T1, Pointer1, Tag>&, const tagged_allocator<T2, Pointer2, Tag>&)
+
+template<typename T1, typename Pointer1, typename T2, typename Pointer2, typename Tag>
+THRUST_HOST_DEVICE
+bool operator!=(const tagged_allocator<T1,Pointer1,Tag> &, const tagged_allocator<T2,Pointer2,Tag> &)
 {
   return false;
 }
 
-} // namespace detail
+
+} // end detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/allocator/temporary_allocator.h b/projects/rocthrust/thrust/detail/allocator/temporary_allocator.h
index 3feb8842d606..94c0f22c0738 100644
--- a/projects/rocthrust/thrust/detail/allocator/temporary_allocator.h
+++ b/projects/rocthrust/thrust/detail/allocator/temporary_allocator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/allocator/tagged_allocator.h>
 #include <thrust/detail/execution_policy.h>
diff --git a/projects/rocthrust/thrust/detail/allocator/temporary_allocator.inl b/projects/rocthrust/thrust/detail/allocator/temporary_allocator.inl
index a53704fa37e0..6f408b3f74ac 100644
--- a/projects/rocthrust/thrust/detail/allocator/temporary_allocator.inl
+++ b/projects/rocthrust/thrust/detail/allocator/temporary_allocator.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,57 +18,54 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator/temporary_allocator.h>
 #include <thrust/detail/temporary_buffer.h>
 #include <thrust/system/detail/bad_alloc.h>
-
 #include <cassert>
 
+#include <thrust/detail/nv_target.h>
+
 #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
-#  if (defined(_NVHPC_CUDA) || defined(__CUDA_ARCH__))
-#    include <thrust/system/cuda/detail/terminate.h>
-#  endif // NVCC device pass or NVC++
-#elif THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
-#  include <thrust/system/hip/detail/terminate.h>
+#if (defined(_NVHPC_CUDA) || defined(__CUDA_ARCH__))
+#include <thrust/system/cuda/detail/terminate.h>
+#endif // NVCC device pass or NVC++
 #endif // CUDA
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#include <thrust/system/hip/detail/terminate.h>
+#endif // HIP
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
-template <typename T, typename System>
-THRUST_HOST_DEVICE typename temporary_allocator<T, System>::pointer
-temporary_allocator<T, System>::allocate(typename temporary_allocator<T, System>::size_type cnt)
+
+template<typename T, typename System>
+THRUST_HOST_DEVICE
+  typename temporary_allocator<T,System>::pointer
+    temporary_allocator<T,System>
+      ::allocate(typename temporary_allocator<T,System>::size_type cnt)
 {
   pointer_and_size result = thrust::get_temporary_buffer<T>(system(), cnt);
 
   // handle failure
-  if (result.second < cnt)
+  if(result.second < cnt)
   {
     // deallocate and throw
     // note that we pass cnt to deallocate, not a value derived from result.second
     deallocate(result.first, cnt);
 
 #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                 (throw thrust::system::detail::bad_alloc("temporary_buffer::allocate: get_temporary_buffer failed");),
-                 ( // _THRUST_IS_DEVICE
-                   thrust::system::cuda::detail::terminate_with_message("temporary_buffer::allocate: "
-                                                                        "get_temporary_buffer failed");));
+    NV_IF_TARGET(NV_IS_HOST, (
+      throw thrust::system::detail::bad_alloc("temporary_buffer::allocate: get_temporary_buffer failed");
+    ), ( // NV_IS_DEVICE
+      thrust::system::cuda::detail::terminate_with_message("temporary_buffer::allocate: get_temporary_buffer failed");
+    ));
 #elif THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                 (throw thrust::system::detail::bad_alloc("temporary_buffer::allocate: get_temporary_buffer failed");),
-                 ( // _THRUST_IS_DEVICE
-                   thrust::system::hip::detail::terminate_with_message("temporary_buffer::allocate: "
-                                                                       "get_temporary_buffer failed");));
+    NV_IF_TARGET(NV_IS_HOST, (
+      throw thrust::system::detail::bad_alloc("temporary_buffer::allocate: get_temporary_buffer failed");
+    ), ( // NV_IS_DEVICE
+      thrust::system::hip::detail::terminate_with_message("temporary_buffer::allocate: get_temporary_buffer failed");
+    ));
 #else
     throw thrust::system::detail::bad_alloc("temporary_buffer::allocate: get_temporary_buffer failed");
 #endif
@@ -77,12 +74,15 @@ temporary_allocator<T, System>::allocate(typename temporary_allocator<T, System>
   return result.first;
 } // end temporary_allocator::allocate()
 
-template <typename T, typename System>
-THRUST_HOST_DEVICE void temporary_allocator<T, System>::deallocate(
-  typename temporary_allocator<T, System>::pointer p, typename temporary_allocator<T, System>::size_type n) noexcept
+
+template<typename T, typename System>
+THRUST_HOST_DEVICE
+  void temporary_allocator<T,System>
+    ::deallocate(typename temporary_allocator<T,System>::pointer p, typename temporary_allocator<T,System>::size_type n) noexcept
 {
   return thrust::return_temporary_buffer(system(), p, n);
 } // end temporary_allocator
 
-} // namespace detail
+
+} // end detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/allocator/value_initialize_range.h b/projects/rocthrust/thrust/detail/allocator/value_initialize_range.h
index eaf7d385674e..b6fef9f63602 100644
--- a/projects/rocthrust/thrust/detail/allocator/value_initialize_range.h
+++ b/projects/rocthrust/thrust/detail/allocator/value_initialize_range.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/rocthrust/thrust/detail/allocator/value_initialize_range.inl b/projects/rocthrust/thrust/detail/allocator/value_initialize_range.inl
index 21954b16ea53..e7b07f40c4a1 100644
--- a/projects/rocthrust/thrust/detail/allocator/value_initialize_range.inl
+++ b/projects/rocthrust/thrust/detail/allocator/value_initialize_range.inl
@@ -61,9 +61,9 @@ struct construct1_via_allocator
 template <typename Allocator, typename T>
 struct needs_default_construct_via_allocator
     : _THRUST_STD::disjunction<has_member_construct1<Allocator, T>, // if the Allocator does something interesting
-                                                                    // or if T's default constructor does something
-                                                                    // interesting
-                               thrust::detail::not_<_THRUST_STD::is_trivially_default_constructible<T>>>
+                                                                   // or if T's default constructor does something
+                                                                   // interesting
+                              thrust::detail::not_<_THRUST_STD::is_trivially_default_constructible<T>>>
 {};
 
 // we know that std::allocator::construct's only effect is to call T's
diff --git a/projects/rocthrust/thrust/detail/allocator_aware_execution_policy.h b/projects/rocthrust/thrust/detail/allocator_aware_execution_policy.h
index c6e35d7156ed..ee1c25a6c6bf 100644
--- a/projects/rocthrust/thrust/detail/allocator_aware_execution_policy.h
+++ b/projects/rocthrust/thrust/detail/allocator_aware_execution_policy.h
@@ -30,10 +30,6 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <utility>
-#endif
-
 THRUST_NAMESPACE_BEGIN
 
 namespace mr
diff --git a/projects/rocthrust/thrust/detail/attributes.h b/projects/rocthrust/thrust/detail/attributes.h
new file mode 100644
index 000000000000..48bb610f6c2c
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/attributes.h
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DETAIL_ATTRIBUTES_H
+#define DETAIL_ATTRIBUTES_H
+
+#include <thrust/detail/config.h>
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__cccl/attributes.h)
+// clang-format on
+
+#  define THRUST_DECLSPEC_EMPTY_BASES _CCCL_DECLSPEC_EMPTY_BASES
+
+#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
+
+#  ifdef __has_declspec_attribute
+#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) __has_declspec_attribute(__x)
+#  else // ^^^ __has_declspec_attribute ^^^ / vvv !__has_declspec_attribute vvv
+#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) 0
+#  endif // !__has_declspec_attribute
+
+// MSVC needs extra help with empty base classes
+#  if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC || THRUST_HAS_DECLSPEC_ATTRIBUTE(empty_bases)
+#    define THRUST_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
+#  else // !THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#    define THRUST_DECLSPEC_EMPTY_BASES
+#  endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+
+#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
+
+#endif // DETAIL_ATTRIBUTES_H
diff --git a/projects/rocthrust/thrust/detail/binary_search.inl b/projects/rocthrust/thrust/detail/binary_search.inl
index 021e3338b539..31810045d87d 100644
--- a/projects/rocthrust/thrust/detail/binary_search.inl
+++ b/projects/rocthrust/thrust/detail/binary_search.inl
@@ -17,345 +17,337 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/binary_search.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/binary_search.h>
-#include <thrust/system/detail/generic/binary_search.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/binary_search.h>
+#include <thrust/system/detail/adl/binary_search.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE ForwardIterator lower_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const LessThanComparable& value)
+THRUST_HOST_DEVICE
+ForwardIterator lower_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            const LessThanComparable &value)
 {
-  using thrust::system::detail::generic::lower_bound;
-  return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
+    using thrust::system::detail::generic::lower_bound;
+    return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE ForwardIterator lower_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+ForwardIterator lower_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            const T &value,
+                            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::lower_bound;
-  return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
+    using thrust::system::detail::generic::lower_bound;
+    return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE ForwardIterator upper_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const LessThanComparable& value)
+template<typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
+THRUST_HOST_DEVICE
+ForwardIterator upper_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            const LessThanComparable &value)
 {
-  using thrust::system::detail::generic::upper_bound;
-  return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
+    using thrust::system::detail::generic::upper_bound;
+    return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE ForwardIterator upper_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+ForwardIterator upper_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            const T &value,
+                            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::upper_bound;
-  return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
+    using thrust::system::detail::generic::upper_bound;
+    return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE bool binary_search(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const LessThanComparable& value)
+THRUST_HOST_DEVICE
+bool binary_search(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   ForwardIterator first,
+                   ForwardIterator last,
+                   const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::binary_search;
-  return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
+    using thrust::system::detail::generic::binary_search;
+    return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE bool binary_search(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value,
-  StrictWeakOrdering comp)
+THRUST_HOST_DEVICE
+bool binary_search(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   ForwardIterator first,
+                   ForwardIterator last,
+                   const T& value,
+                   StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::binary_search;
-  return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
+    using thrust::system::detail::generic::binary_search;
+    return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value,
-  StrictWeakOrdering comp)
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator, ForwardIterator>
+equal_range(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+            ForwardIterator first,
+            ForwardIterator last,
+            const T& value,
+            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::equal_range;
-  return equal_range(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
+    using thrust::system::detail::generic::equal_range;
+    return equal_range(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const LessThanComparable& value)
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator, ForwardIterator>
+equal_range(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+            ForwardIterator first,
+            ForwardIterator last,
+            const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::equal_range;
-  return equal_range(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
+    using thrust::system::detail::generic::equal_range;
+    return equal_range(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator lower_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+THRUST_HOST_DEVICE
+OutputIterator lower_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output)
 {
-  using thrust::system::detail::generic::lower_bound;
-  return lower_bound(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
+    using thrust::system::detail::generic::lower_bound;
+    return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator lower_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator lower_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::lower_bound;
-  return lower_bound(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first,
-    last,
-    values_first,
-    values_last,
-    output,
-    comp);
+    using thrust::system::detail::generic::lower_bound;
+    return lower_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator upper_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+THRUST_HOST_DEVICE
+OutputIterator upper_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output)
 {
-  using thrust::system::detail::generic::upper_bound;
-  return upper_bound(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
+    using thrust::system::detail::generic::upper_bound;
+    return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator upper_bound(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator upper_bound(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::upper_bound;
-  return upper_bound(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first,
-    last,
-    values_first,
-    values_last,
-    output,
-    comp);
+    using thrust::system::detail::generic::upper_bound;
+    return upper_bound(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output, comp);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator binary_search(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+THRUST_HOST_DEVICE
+OutputIterator binary_search(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                             ForwardIterator first,
+                             ForwardIterator last,
+                             InputIterator values_first,
+                             InputIterator values_last,
+                             OutputIterator output)
 {
-  using thrust::system::detail::generic::binary_search;
-  return binary_search(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
+    using thrust::system::detail::generic::binary_search;
+    return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator binary_search(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator binary_search(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                             ForwardIterator first,
+                             ForwardIterator last,
+                             InputIterator values_first,
+                             InputIterator values_last,
+                             OutputIterator output,
+                             StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::binary_search;
-  return binary_search(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first,
-    last,
-    values_first,
-    values_last,
-    output,
-    comp);
+    using thrust::system::detail::generic::binary_search;
+    return binary_search(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, values_first, values_last, output, comp);
 }
 
+
 //////////////////////
 // Scalar Functions //
 //////////////////////
 
 template <typename ForwardIterator, typename LessThanComparable>
-ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const LessThanComparable& value)
+ForwardIterator lower_bound(ForwardIterator first,
+                            ForwardIterator last,
+                            const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::lower_bound(select_system(system), first, last, value);
+    return thrust::lower_bound(select_system(system), first, last, value);
 }
 
 template <typename ForwardIterator, typename T, typename StrictWeakOrdering>
-ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp)
+ForwardIterator lower_bound(ForwardIterator first,
+                            ForwardIterator last,
+                            const T& value,
+                            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::lower_bound(select_system(system), first, last, value, comp);
+    return thrust::lower_bound(select_system(system), first, last, value, comp);
 }
 
 template <typename ForwardIterator, typename LessThanComparable>
-ForwardIterator upper_bound(ForwardIterator first, ForwardIterator last, const LessThanComparable& value)
+ForwardIterator upper_bound(ForwardIterator first,
+                            ForwardIterator last,
+                            const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::upper_bound(select_system(system), first, last, value);
+    return thrust::upper_bound(select_system(system), first, last, value);
 }
 
 template <typename ForwardIterator, typename T, typename StrictWeakOrdering>
-ForwardIterator upper_bound(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp)
+ForwardIterator upper_bound(ForwardIterator first,
+                            ForwardIterator last,
+                            const T& value,
+                            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::upper_bound(select_system(system), first, last, value, comp);
+    return thrust::upper_bound(select_system(system), first, last, value, comp);
 }
 
 template <typename ForwardIterator, typename LessThanComparable>
-bool binary_search(ForwardIterator first, ForwardIterator last, const LessThanComparable& value)
+bool binary_search(ForwardIterator first,
+                   ForwardIterator last,
+                   const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::binary_search(select_system(system), first, last, value);
+    return thrust::binary_search(select_system(system), first, last, value);
 }
 
 template <typename ForwardIterator, typename T, typename StrictWeakOrdering>
-bool binary_search(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp)
+bool binary_search(ForwardIterator first,
+                   ForwardIterator last,
+                   const T& value,
+                   StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::binary_search(select_system(system), first, last, value, comp);
+    return thrust::binary_search(select_system(system), first, last, value, comp);
 }
 
 template <typename ForwardIterator, typename LessThanComparable>
 thrust::pair<ForwardIterator, ForwardIterator>
-equal_range(ForwardIterator first, ForwardIterator last, const LessThanComparable& value)
+equal_range(ForwardIterator first,
+            ForwardIterator last,
+            const LessThanComparable& value)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::equal_range(select_system(system), first, last, value);
+    return thrust::equal_range(select_system(system), first, last, value);
 }
 
 template <typename ForwardIterator, typename T, typename StrictWeakOrdering>
 thrust::pair<ForwardIterator, ForwardIterator>
-equal_range(ForwardIterator first, ForwardIterator last, const T& value, StrictWeakOrdering comp)
+equal_range(ForwardIterator first,
+            ForwardIterator last,
+            const T& value,
+            StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System = typename thrust::iterator_system<ForwardIterator>::type;
+    using System = typename thrust::iterator_system<ForwardIterator>::type;
 
-  System system;
+    System system;
 
-  return thrust::equal_range(select_system(system), first, last, value, comp);
+    return thrust::equal_range(select_system(system), first, last, value, comp);
 }
 
 //////////////////////
@@ -363,135 +355,126 @@ equal_range(ForwardIterator first, ForwardIterator last, const T& value, StrictW
 //////////////////////
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator>
-OutputIterator lower_bound(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+OutputIterator lower_bound(ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::lower_bound(select_system(system1, system2, system3), first, last, values_first, values_last, output);
+    return thrust::lower_bound(select_system(system1,system2,system3), first, last, values_first, values_last, output);
 }
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator lower_bound(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+OutputIterator lower_bound(ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::lower_bound(
-    select_system(system1, system2, system3), first, last, values_first, values_last, output, comp);
+    return thrust::lower_bound(select_system(system1,system2,system3), first, last, values_first, values_last, output, comp);
 }
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator>
-OutputIterator upper_bound(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+OutputIterator upper_bound(ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::upper_bound(select_system(system1, system2, system3), first, last, values_first, values_last, output);
+    return thrust::upper_bound(select_system(system1,system2,system3), first, last, values_first, values_last, output);
 }
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator upper_bound(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+OutputIterator upper_bound(ForwardIterator first,
+                           ForwardIterator last,
+                           InputIterator values_first,
+                           InputIterator values_last,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::upper_bound(
-    select_system(system1, system2, system3), first, last, values_first, values_last, output, comp);
+    return thrust::upper_bound(select_system(system1,system2,system3), first, last, values_first, values_last, output, comp);
 }
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator>
-OutputIterator binary_search(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output)
+OutputIterator binary_search(ForwardIterator first,
+                             ForwardIterator last,
+                             InputIterator values_first,
+                             InputIterator values_last,
+                             OutputIterator output)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::binary_search(select_system(system1, system2, system3), first, last, values_first, values_last, output);
+    return thrust::binary_search(select_system(system1,system2,system3), first, last, values_first, values_last, output);
 }
 
 template <typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator binary_search(
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator values_first,
-  InputIterator values_last,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+OutputIterator binary_search(ForwardIterator first,
+                             ForwardIterator last,
+                             InputIterator values_first,
+                             InputIterator values_last,
+                             OutputIterator output,
+                             StrictWeakOrdering comp)
 {
-  using thrust::system::detail::generic::select_system;
+    using thrust::system::detail::generic::select_system;
 
-  using System1 = typename thrust::iterator_system<ForwardIterator>::type;
-  using System2 = typename thrust::iterator_system<InputIterator>::type;
-  using System3 = typename thrust::iterator_system<OutputIterator>::type;
+    using System1 = typename thrust::iterator_system<ForwardIterator>::type;
+    using System2 = typename thrust::iterator_system<InputIterator>::type;
+    using System3 = typename thrust::iterator_system<OutputIterator>::type;
 
-  System1 system1;
-  System2 system2;
-  System3 system3;
+    System1 system1;
+    System2 system2;
+    System3 system3;
 
-  return thrust::binary_search(
-    select_system(system1, system2, system3), first, last, values_first, values_last, output, comp);
+    return thrust::binary_search(select_system(system1,system2,system3), first, last, values_first, values_last, output, comp);
 }
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/caching_allocator.h b/projects/rocthrust/thrust/detail/caching_allocator.h
index 4f89f4fc7c18..d73764967d55 100644
--- a/projects/rocthrust/thrust/detail/caching_allocator.h
+++ b/projects/rocthrust/thrust/detail/caching_allocator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/mr/allocator.h>
 #include <thrust/mr/device_memory_resource.h>
 #include <thrust/mr/disjoint_tls_pool.h>
diff --git a/projects/rocthrust/thrust/detail/complex/arithmetic.h b/projects/rocthrust/thrust/detail/complex/arithmetic.h
index 78451401d132..e3254584c7bf 100644
--- a/projects/rocthrust/thrust/detail/complex/arithmetic.h
+++ b/projects/rocthrust/thrust/detail/complex/arithmetic.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,72 +32,82 @@ THRUST_NAMESPACE_BEGIN
 /* --- Binary Arithmetic Operators --- */
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() + y.real(), x.imag() + y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() + y, x.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator+(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator+(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x + y.real(), y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() - y.real(), x.imag() - y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() - y, x.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator-(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator-(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x - y.real(), -y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() * y.real() - x.imag() * y.imag(), x.real() * y.imag() + x.imag() * y.real());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() * y, x.imag() * y);
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator*(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator*(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x * y.real(), x * y.imag());
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
 
   // Find `abs` by ADL.
   using std::abs;
@@ -120,16 +130,18 @@ THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const co
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x.real() / y, x.imag() / y);
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> operator/(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+operator/(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return complex<T>(x) / y;
 }
 
@@ -191,7 +203,11 @@ template <typename T>
 THRUST_HOST_DEVICE T arg(const complex<T>& z)
 {
   // Find `atan2` by ADL.
+#ifdef __HIP_DEVICE_COMPILE__
+  using ::atan2;
+#else
   using std::atan2;
+#endif
   return atan2(z.imag(), z.real());
 }
 
@@ -213,7 +229,11 @@ THRUST_HOST_DEVICE inline float norm(const complex<float>& z)
 {
   // Find `abs` and `sqrt` by ADL.
   using std::abs;
+#ifdef __HIP_DEVICE_COMPILE__
+  using ::sqrt;
+#else
   using std::sqrt;
+#endif
 
   if (abs(z.real()) < sqrt(FLT_MIN) && abs(z.imag()) < sqrt(FLT_MIN))
   {
@@ -230,7 +250,11 @@ THRUST_HOST_DEVICE inline double norm(const complex<double>& z)
 {
   // Find `abs` and `sqrt` by ADL.
   using std::abs;
+#ifdef __HIP_DEVICE_COMPILE__
+  using ::sqrt;
+#else
   using std::sqrt;
+#endif
 
   if (abs(z.real()) < sqrt(DBL_MIN) && abs(z.imag()) < sqrt(DBL_MIN))
   {
@@ -243,13 +267,19 @@ THRUST_HOST_DEVICE inline double norm(const complex<double>& z)
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> polar(const T0& m, const T1& theta)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+polar(const T0& m, const T1& theta)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
 
   // Find `cos` and `sin` by ADL.
+#ifdef __HIP_DEVICE_COMPILE__
+  using ::cos;
+  using ::sin;
+#else
   using std::cos;
   using std::sin;
+#endif
 
   return complex<T>(m * cos(theta), m * sin(theta));
 }
diff --git a/projects/rocthrust/thrust/detail/complex/c99math.h b/projects/rocthrust/thrust/detail/complex/c99math.h
index 37b8bc820331..098dcada73bf 100644
--- a/projects/rocthrust/thrust/detail/complex/c99math.h
+++ b/projects/rocthrust/thrust/detail/complex/c99math.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 #include <cmath>
 
-#include <math.h>
+#include <math.h> // IWYU pragma: export
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -69,6 +69,24 @@ inline THRUST_HOST_DEVICE double infinity<double>()
   return res;
 }
 
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#  ifdef __HIP_DEVICE_COMPILE__
+using ::atan2;
+using ::cos;
+using ::exp;
+using ::log;
+using ::sin;
+using ::sqrt;
+#  else
+using std::atan2;
+using std::cos;
+using std::exp;
+using std::log;
+using std::sin;
+using std::sqrt;
+#  endif
+#endif // HIP compiler
+
 #if defined _MSC_VER
 THRUST_HOST_DEVICE inline int isinf(float x)
 {
@@ -112,13 +130,24 @@ THRUST_HOST_DEVICE inline int isfinite(double x)
 
 #else
 
-#  if (defined(__CUDACC__) && !(defined(__CUDA__) && defined(__clang__)) && !defined(_NVHPC_CUDA)) || defined(__HIP__)
+#  if defined(__CUDACC__) && !(defined(__CUDA__) && defined(__clang__)) && !defined(_NVHPC_CUDA)
 // NVCC implements at least some signature of these as functions not macros.
 using ::isfinite;
 using ::isinf;
 using ::isnan;
 using ::signbit;
 #  else
+
+#    ifdef __HIP_DEVICE_COMPILE__
+
+// hip_runtime.h provides these functions in the global scope
+using ::isfinite;
+using ::isinf;
+using ::isnan;
+using ::signbit;
+
+#    else
+
 // Some compilers do not provide these in the global scope, because they are
 // supposed to be macros. The versions in `std` are supposed to be functions.
 // Since we're not compiling with nvcc, it's safe to use the functions in std::
@@ -126,7 +155,9 @@ using std::isfinite;
 using std::isinf;
 using std::isnan;
 using std::signbit;
-#  endif // __CUDACC__|| __HIP__
+#    endif // __HIP_COMPILER__
+
+#  endif // __CUDACC__
 #endif // _MSC_VER
 
 using ::atanh;
@@ -154,11 +185,7 @@ THRUST_HOST_DEVICE inline float copysignf(float x, float y)
 #  if !defined(__CUDACC__) && !defined(_NVHPC_CUDA)
 
 // Simple approximation to log1p as Visual Studio is lacking one
-#    if THRUST_HAS_HIP_COMPILER() && defined(_MSC_VER) // fix HIP on Windows error
-THRUST_HOST_DEVICE
-#    endif
-inline double
-log1p(double x)
+THRUST_HOST_DEVICE inline double log1p(double x)
 {
   double u = 1.0 + x;
   if (u == 1.0)
@@ -179,11 +206,7 @@ log1p(double x)
   }
 }
 
-#    if THRUST_HAS_HIP_COMPILER() && defined(_MSC_VER) // fix HIP on Windows error
-THRUST_HOST_DEVICE
-#    endif
-inline float
-log1pf(float x)
+THRUST_HOST_DEVICE inline float log1pf(float x)
 {
   float u = 1.0f + x;
   if (u == 1.0f)
@@ -204,9 +227,10 @@ log1pf(float x)
   }
 }
 
-// add !THRUST_HAS_HIP_COMPILER() to fix HIP on Windows error
-#    if _MSV_VER <= 1500 && !THRUST_HAS_HIP_COMPILER()
-#      include <complex>
+#  endif // __HIP__
+
+#  if _MSC_VER <= 1500 && !defined(__clang__)
+#    include <complex>
 
 inline float hypotf(float x, float y)
 {
@@ -218,11 +242,9 @@ inline double hypot(double x, double y)
   return _hypot(x, y);
 }
 
-#    endif // _MSC_VER <= 1500 && !THRUST_HAS_HIP_COMPILER()
+#  endif // _MSC_VER <= 1500
 
-#  endif // __CUDACC__
-
-#endif // _MSC_VER
+#endif // __CUDACC__
 
 } // namespace complex
 
diff --git a/projects/rocthrust/thrust/detail/complex/ccosh.h b/projects/rocthrust/thrust/detail/complex/ccosh.h
index 42dce528dd79..15bc27e5db36 100644
--- a/projects/rocthrust/thrust/detail/complex/ccosh.h
+++ b/projects/rocthrust/thrust/detail/complex/ccosh.h
@@ -50,7 +50,6 @@
 #include <thrust/detail/config.h>
 
 #include <thrust/complex.h>
-#include <thrust/detail/complex/cexp.h>
 #include <thrust/detail/complex/math_private.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -68,7 +67,6 @@ namespace complex
  * Exceptional values are noted in the comments within the source code.
  * These values and the return value were taken from n1124.pdf.
  */
-
 THRUST_HOST_DEVICE inline thrust::complex<double> ccosh(const thrust::complex<double>& z)
 {
   const double huge = 8.98846567431157953864652595395e+307; // 0x1p1023
diff --git a/projects/rocthrust/thrust/detail/complex/ccoshf.h b/projects/rocthrust/thrust/detail/complex/ccoshf.h
index 8c01b247c411..eb5284e1629a 100644
--- a/projects/rocthrust/thrust/detail/complex/ccoshf.h
+++ b/projects/rocthrust/thrust/detail/complex/ccoshf.h
@@ -50,8 +50,6 @@
 #include <thrust/detail/config.h>
 
 #include <thrust/complex.h>
-#include <thrust/detail/complex/cexp.h>
-#include <thrust/detail/complex/cexpf.h>
 #include <thrust/detail/complex/math_private.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/complex/cexp.h b/projects/rocthrust/thrust/detail/complex/cexp.h
index 98e29b838901..b9de3ec30dec 100644
--- a/projects/rocthrust/thrust/detail/complex/cexp.h
+++ b/projects/rocthrust/thrust/detail/complex/cexp.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -172,7 +172,7 @@ THRUST_HOST_DEVICE inline complex<double> cexp(const complex<double>& z)
      *  -  x = +-Inf (generated by exp())
      *  -  x = NaN (spurious inexact exception from y)
      */
-    exp_x = std::exp(x);
+    exp_x = exp(x);
     return (complex<double>(exp_x * cos(y), exp_x * sin(y)));
   }
 }
diff --git a/projects/rocthrust/thrust/detail/complex/cexpf.h b/projects/rocthrust/thrust/detail/complex/cexpf.h
index 788b0d27e03c..f002d071355a 100644
--- a/projects/rocthrust/thrust/detail/complex/cexpf.h
+++ b/projects/rocthrust/thrust/detail/complex/cexpf.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ THRUST_HOST_DEVICE inline complex<float> ldexp_cexpf(complex<float> z, int expt)
   half_expt = expt - half_expt;
   set_float_word(scale2, (0x7f + half_expt) << 23);
 
-  return (complex<float>(std::cos(y) * exp_x * scale1 * scale2, std::sin(y) * exp_x * scale1 * scale2));
+  return (complex<float>(cos(y) * exp_x * scale1 * scale2, sin(y) * exp_x * scale1 * scale2));
 }
 
 THRUST_HOST_DEVICE inline complex<float> cexpf(const complex<float>& z)
@@ -112,13 +112,13 @@ THRUST_HOST_DEVICE inline complex<float> cexpf(const complex<float>& z)
   /* cexp(x + I 0) = exp(x) + I 0 */
   if (hy == 0)
   {
-    return (complex<float>(std::exp(x), y));
+    return (complex<float>(exp(x), y));
   }
   get_float_word(hx, x);
   /* cexp(0 + I y) = cos(y) + I sin(y) */
   if ((hx & 0x7fffffff) == 0)
   {
-    return (complex<float>(std::cos(y), std::sin(y)));
+    return (complex<float>(cos(y), sin(y)));
   }
   if (hy >= 0x7f800000)
   {
@@ -156,8 +156,8 @@ THRUST_HOST_DEVICE inline complex<float> cexpf(const complex<float>& z)
      *  -  x = +-Inf (generated by exp())
      *  -  x = NaN (spurious inexact exception from y)
      */
-    exp_x = std::exp(x);
-    return (complex<float>(exp_x * std::cos(y), exp_x * std::sin(y)));
+    exp_x = exp(x);
+    return (complex<float>(exp_x * cos(y), exp_x * sin(y)));
   }
 }
 
diff --git a/projects/rocthrust/thrust/detail/complex/clog.h b/projects/rocthrust/thrust/detail/complex/clog.h
index 003fe93306d4..030deade2d4c 100644
--- a/projects/rocthrust/thrust/detail/complex/clog.h
+++ b/projects/rocthrust/thrust/detail/complex/clog.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ THRUST_HOST_DEVICE inline complex<double> clog(const complex<double>& z)
   /* Handle NaNs using the general formula to mix them right. */
   if (x != x || y != y)
   {
-    return (complex<double>(std::log(norm(z)), std::atan2(y, x)));
+    return (complex<double>(log(norm(z)), atan2(y, x)));
   }
 
   ax = std::abs(x);
@@ -108,15 +108,15 @@ THRUST_HOST_DEVICE inline complex<double> clog(const complex<double>& z)
   // We expect that for values at or below ay = 5e307 this should not happen
   if (ay > 5e307)
   {
-    return (complex<double>(std::log(hypot(x / e, y / e)) + 1.0, std::atan2(y, x)));
+    return (complex<double>(log(hypot(x / e, y / e)) + 1.0, atan2(y, x)));
   }
   if (ax == 1.)
   {
     if (ay < 1e-150)
     {
-      return (complex<double>((ay * 0.5) * ay, std::atan2(y, x)));
+      return (complex<double>((ay * 0.5) * ay, atan2(y, x)));
     }
-    return (complex<double>(log1p(ay * ay) * 0.5, std::atan2(y, x)));
+    return (complex<double>(log1p(ay * ay) * 0.5, atan2(y, x)));
   }
 
   /*
@@ -125,7 +125,7 @@ THRUST_HOST_DEVICE inline complex<double> clog(const complex<double>& z)
    */
   if (ax < 1e-50 || ay < 1e-50 || ax > 1e50 || ay > 1e50)
   {
-    return (complex<double>(std::log(hypot(x, y)), std::atan2(y, x)));
+    return (complex<double>(log(hypot(x, y)), atan2(y, x)));
   }
 
   /*
@@ -142,7 +142,7 @@ THRUST_HOST_DEVICE inline complex<double> clog(const complex<double>& z)
 
   if (ax * ax + ay * ay <= 0.7)
   {
-    return (complex<double>(std::log(ax * ax + ay * ay) * 0.5, std::atan2(y, x)));
+    return (complex<double>(log(ax * ax + ay * ay) * 0.5, atan2(y, x)));
   }
 
   /*
diff --git a/projects/rocthrust/thrust/detail/complex/clogf.h b/projects/rocthrust/thrust/detail/complex/clogf.h
index 6d5700db9a88..c645be4acc33 100644
--- a/projects/rocthrust/thrust/detail/complex/clogf.h
+++ b/projects/rocthrust/thrust/detail/complex/clogf.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ THRUST_HOST_DEVICE inline complex<float> clogf(const complex<float>& z)
   /* Handle NaNs using the general formula to mix them right. */
   if (x != x || y != y)
   {
-    return (complex<float>(std::log(norm(z)), std::atan2(y, x)));
+    return (complex<float>(log(norm(z)), atan2(y, x)));
   }
 
   ax = std::abs(x);
@@ -109,15 +109,15 @@ THRUST_HOST_DEVICE inline complex<float> clogf(const complex<float>& z)
   // We expect that for values at or below ay = 1e34f this should not happen
   if (ay > 1e34f)
   {
-    return (complex<float>(std::log(hypotf(x / e, y / e)) + 1.0f, std::atan2(y, x)));
+    return (complex<float>(log(hypotf(x / e, y / e)) + 1.0f, atan2(y, x)));
   }
   if (ax == 1.f)
   {
     if (ay < 1e-19f)
     {
-      return (complex<float>((ay * 0.5f) * ay, std::atan2(y, x)));
+      return (complex<float>((ay * 0.5f) * ay, atan2(y, x)));
     }
-    return (complex<float>(log1pf(ay * ay) * 0.5f, std::atan2(y, x)));
+    return (complex<float>(log1pf(ay * ay) * 0.5f, atan2(y, x)));
   }
 
   /*
@@ -126,7 +126,7 @@ THRUST_HOST_DEVICE inline complex<float> clogf(const complex<float>& z)
    */
   if (ax < 1e-6f || ay < 1e-6f || ax > 1e6f || ay > 1e6f)
   {
-    return (complex<float>(std::log(hypotf(x, y)), std::atan2(y, x)));
+    return (complex<float>(log(hypotf(x, y)), atan2(y, x)));
   }
 
   /*
@@ -143,7 +143,7 @@ THRUST_HOST_DEVICE inline complex<float> clogf(const complex<float>& z)
 
   if (ax * ax + ay * ay <= 0.7f)
   {
-    return (complex<float>(std::log(ax * ax + ay * ay) * 0.5f, std::atan2(y, x)));
+    return (complex<float>(log(ax * ax + ay * ay) * 0.5f, atan2(y, x)));
   }
 
   /*
diff --git a/projects/rocthrust/thrust/detail/complex/complex.inl b/projects/rocthrust/thrust/detail/complex/complex.inl
index 1427f9e66d91..57b824aa319c 100644
--- a/projects/rocthrust/thrust/detail/complex/complex.inl
+++ b/projects/rocthrust/thrust/detail/complex/complex.inl
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2024 NVIDIA Corporation
+ *  Copyright 2008-2021 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,43 +28,46 @@ THRUST_NAMESPACE_BEGIN
 
 template <typename T>
 THRUST_HOST_DEVICE complex<T>::complex(const T& re)
-    // Initialize the storage in the member initializer list using C++ unicorn
-    // initialization. This allows `complex<T const>` to work.
-    : data{re, T()}
+  // Initialize the storage in the member initializer list using C++ unicorn
+  // initialization. This allows `complex<T const>` to work.
+  : data{re, T()}
 {}
 
+
 template <typename T>
 THRUST_HOST_DEVICE complex<T>::complex(const T& re, const T& im)
-    // Initialize the storage in the member initializer list using C++ unicorn
-    // initialization. This allows `complex<T const>` to work.
-    : data{re, im}
+  // Initialize the storage in the member initializer list using C++ unicorn
+  // initialization. This allows `complex<T const>` to work.
+  : data{re, im}
 {}
 
 template <typename T>
 template <typename U>
 THRUST_HOST_DEVICE complex<T>::complex(const complex<U>& z)
-    // Initialize the storage in the member initializer list using C++ unicorn
-    // initialization. This allows `complex<T const>` to work.
-    // We do a functional-style cast here to suppress conversion warnings.
-    : data{T(z.real()), T(z.imag())}
+  // Initialize the storage in the member initializer list using C++ unicorn
+  // initialization. This allows `complex<T const>` to work.
+  // We do a functional-style cast here to suppress conversion warnings.
+  : data{T(z.real()), T(z.imag())}
 {}
 
 template <typename T>
 THRUST_HOST THRUST_STD_COMPLEX_DEVICE complex<T>::complex(const std::complex<T>& z)
-    // Initialize the storage in the member initializer list using C++ unicorn
-    // initialization. This allows `complex<T const>` to work.
-    : data{THRUST_STD_COMPLEX_REAL(z), THRUST_STD_COMPLEX_IMAG(z)}
+  // Initialize the storage in the member initializer list using C++ unicorn
+  // initialization. This allows `complex<T const>` to work.
+  : data{THRUST_STD_COMPLEX_REAL(z), THRUST_STD_COMPLEX_IMAG(z)}
 {}
 
 template <typename T>
 template <typename U>
 THRUST_HOST THRUST_STD_COMPLEX_DEVICE complex<T>::complex(const std::complex<U>& z)
-    // Initialize the storage in the member initializer list using C++ unicorn
-    // initialization. This allows `complex<T const>` to work.
-    // We do a functional-style cast here to suppress conversion warnings.
-    : data{T(THRUST_STD_COMPLEX_REAL(z)), T(THRUST_STD_COMPLEX_IMAG(z))}
+  // Initialize the storage in the member initializer list using C++ unicorn
+  // initialization. This allows `complex<T const>` to work.
+  // We do a functional-style cast here to suppress conversion warnings.
+  : data{T(THRUST_STD_COMPLEX_REAL(z)), T(THRUST_STD_COMPLEX_IMAG(z))}
 {}
 
+
+
 /* --- Assignment Operators --- */
 
 template <typename T>
@@ -101,6 +104,8 @@ THRUST_HOST THRUST_STD_COMPLEX_DEVICE complex<T>& complex<T>::operator=(const st
   return *this;
 }
 
+
+
 /* --- Compound Assignment Operators --- */
 
 template <typename T>
@@ -167,6 +172,8 @@ THRUST_HOST_DEVICE complex<T>& complex<T>::operator/=(const U& z)
   return *this;
 }
 
+
+
 /* --- Equality Operators --- */
 
 template <typename T0, typename T1>
@@ -230,26 +237,25 @@ THRUST_HOST_DEVICE bool operator!=(const complex<T0>& x, const T1& y)
 }
 
 template <typename T>
-struct proclaim_trivially_relocatable<complex<T>> : thrust::true_type
-{};
+struct proclaim_trivially_relocatable<complex<T> > : thrust::true_type {};
 
 THRUST_NAMESPACE_END
 
 #include <thrust/detail/complex/arithmetic.h>
-#include <thrust/detail/complex/catrig.h>
-#include <thrust/detail/complex/catrigf.h>
-#include <thrust/detail/complex/ccosh.h>
-#include <thrust/detail/complex/ccoshf.h>
+#include <thrust/detail/complex/cproj.h>
 #include <thrust/detail/complex/cexp.h>
 #include <thrust/detail/complex/cexpf.h>
 #include <thrust/detail/complex/clog.h>
 #include <thrust/detail/complex/clogf.h>
 #include <thrust/detail/complex/cpow.h>
-#include <thrust/detail/complex/cproj.h>
+#include <thrust/detail/complex/ccosh.h>
+#include <thrust/detail/complex/ccoshf.h>
 #include <thrust/detail/complex/csinh.h>
 #include <thrust/detail/complex/csinhf.h>
-#include <thrust/detail/complex/csqrt.h>
-#include <thrust/detail/complex/csqrtf.h>
 #include <thrust/detail/complex/ctanh.h>
 #include <thrust/detail/complex/ctanhf.h>
+#include <thrust/detail/complex/csqrt.h>
+#include <thrust/detail/complex/csqrtf.h>
+#include <thrust/detail/complex/catrig.h>
+#include <thrust/detail/complex/catrigf.h>
 #include <thrust/detail/complex/stream.h>
diff --git a/projects/rocthrust/thrust/detail/complex/cpow.h b/projects/rocthrust/thrust/detail/complex/cpow.h
index b2b76f9f0d51..7c1c93bc7935 100644
--- a/projects/rocthrust/thrust/detail/complex/cpow.h
+++ b/projects/rocthrust/thrust/detail/complex/cpow.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,9 +26,10 @@
 THRUST_NAMESPACE_BEGIN
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const complex<T0>& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return exp(log(complex<T>(x)) * complex<T>(y));
 }
 
@@ -64,18 +65,24 @@ THRUST_HOST_DEVICE inline complex<float> pow(const complex<float>& x, const comp
 #endif
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const complex<T0>& x, const T1& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const complex<T0>& x, const T1& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
   return exp(log(complex<T>(x)) * T(y));
 }
 
 template <typename T0, typename T1>
-THRUST_HOST_DEVICE complex<::internal::common_type_t<T0, T1>> pow(const T0& x, const complex<T1>& y)
+THRUST_HOST_DEVICE complex<typename ::internal::promoted_numerical_type<T0, T1>::type>
+pow(const T0& x, const complex<T1>& y)
 {
-  using T = ::internal::common_type_t<T0, T1>;
+  using T = typename ::internal::promoted_numerical_type<T0, T1>::type;
+#ifdef __HIP_DEVICE_COMPILE__
+  using ::log;
+#else
   // Find `log` by ADL.
   using std::log;
+#endif
   return exp(log(T(x)) * complex<T>(y));
 }
 
diff --git a/projects/rocthrust/thrust/detail/complex/csinh.h b/projects/rocthrust/thrust/detail/complex/csinh.h
index dfbfa4e03831..2d72011b41c4 100644
--- a/projects/rocthrust/thrust/detail/complex/csinh.h
+++ b/projects/rocthrust/thrust/detail/complex/csinh.h
@@ -50,7 +50,6 @@
 #include <thrust/detail/config.h>
 
 #include <thrust/complex.h>
-#include <thrust/detail/complex/cexp.h>
 #include <thrust/detail/complex/math_private.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/complex/csinhf.h b/projects/rocthrust/thrust/detail/complex/csinhf.h
index 62fe0abe41a4..ec13036b4df6 100644
--- a/projects/rocthrust/thrust/detail/complex/csinhf.h
+++ b/projects/rocthrust/thrust/detail/complex/csinhf.h
@@ -50,8 +50,6 @@
 #include <thrust/detail/config.h>
 
 #include <thrust/complex.h>
-#include <thrust/detail/complex/cexp.h>
-#include <thrust/detail/complex/cexpf.h>
 #include <thrust/detail/complex/math_private.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/config.h b/projects/rocthrust/thrust/detail/config.h
index e7b3f5222e71..adcecc814e5a 100644
--- a/projects/rocthrust/thrust/detail/config.h
+++ b/projects/rocthrust/thrust/detail/config.h
@@ -19,13 +19,5 @@
 
 #pragma once
 
-#include <thrust/detail/config/config.h> // IWYU pragma: export
-#include <thrust/version.h> // IWYU pragma: export
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/config/config.h>
+#include <thrust/version.h>
diff --git a/projects/rocthrust/thrust/detail/config/compiler.h b/projects/rocthrust/thrust/detail/config/compiler.h
index 166b5be6bafd..4d5f0de4c3f6 100644
--- a/projects/rocthrust/thrust/detail/config/compiler.h
+++ b/projects/rocthrust/thrust/detail/config/compiler.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,9 +31,123 @@
 #  pragma system_header
 #endif // no system header
 
+// enumerate host compilers we know about
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_UNKNOWN 0
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_MSVC 1
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_GCC 2
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_CLANG 3
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_INTEL 4
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_NVHPC 5
+//! deprecated [Since 2.7]
+#define THRUST_HOST_COMPILER_NVRTC 6
+
+// enumerate device compilers we know about
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_UNKNOWN 0
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_MSVC 1
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_GCC 2
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_CLANG 3
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_NVCC 4
+//! deprecated [Since 2.7]
+#define THRUST_DEVICE_COMPILER_HIP 5
+
+// figure out which host compiler we're using
+#if defined(_MSC_VER)
+#  if defined(__clang__)
+//! deprecated [Since 2.7]
+#    define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_CLANG
+//! deprecated [Since 2.7]
+#    define THRUST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+#  else
+//! deprecated [Since 2.7]
+#    define THRUST_HOST_COMPILER     THRUST_HOST_COMPILER_MSVC
+//! deprecated [Since 2.7]
+#    define THRUST_MSVC_VERSION      _MSC_VER
+//! deprecated [Since 2.7]
+#    define THRUST_MSVC_VERSION_FULL _MSC_FULL_VER
+#  endif
+#elif defined(__INTEL_COMPILER)
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_INTEL
+#elif defined(__clang__)
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_CLANG
+//! deprecated [Since 2.7]
+#  define THRUST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+#elif defined(__GNUC__)
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_GCC
+//! deprecated [Since 2.7]
+#  define THRUST_GCC_VERSION   (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#  if (THRUST_GCC_VERSION >= 50000)
+//! deprecated [Since 2.7]
+#    define THRUST_MODERN_GCC
+#  else
+//! deprecated [Since 2.7]
+#    define THRUST_LEGACY_GCC
+#  endif
+#elif defined(__NVCOMPILER)
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_NVHPC
+#elif defined(__CUDACC_RTC__)
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_NVRTC
+#else
+//! deprecated [Since 2.7]
+#  define THRUST_HOST_COMPILER THRUST_HOST_COMPILER_UNKNOWN
+#endif // THRUST_HOST_COMPILER
+
+// figure out which device compiler we're using
+#if defined(__CUDACC__) || defined(_NVHPC_CUDA)
+//! deprecated [Since 2.7]
+#  define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_NVCC
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+//! deprecated [Since 2.7]
+#  define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_MSVC
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC
+//! deprecated [Since 2.7]
+#  define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_GCC
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+// CUDA-capable clang should behave similar to NVCC.
+#  if defined(__CUDA__)
+//! deprecated [Since 2.7]
+#    define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_NVCC
+#  elif defined(__HIP__)
+//! deprecated [Since 2.7]
+#    define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_HIP
+#  else
+//! deprecated [Since 2.7]
+#    define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_CLANG
+#  endif
+#else
+//! deprecated [Since 2.7]
+#  define THRUST_DEVICE_COMPILER THRUST_DEVICE_COMPILER_UNKNOWN
+#endif
+
 // is the device compiler capable of compiling omp?
 #if defined(_OPENMP) || defined(_NVHPC_STDPAR_OPENMP)
 #  define THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE THRUST_TRUE
 #else
 #  define THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE THRUST_FALSE
 #endif // _OPENMP
+
+// Convert parameter to string
+#define THRUST_TO_STRING2(_STR) #_STR
+#define THRUST_TO_STRING(_STR)  THRUST_TO_STRING2(_STR)
+
+// Define the pragma for the host compiler
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#  define THRUST_PRAGMA(x) __pragma(x)
+#else
+#  define THRUST_PRAGMA(x) _Pragma(THRUST_TO_STRING(x))
+#endif // defined(_CCCL_COMPILER_MSVC)
diff --git a/projects/rocthrust/thrust/detail/config/compiler_fence.h b/projects/rocthrust/thrust/detail/config/compiler_fence.h
new file mode 100644
index 000000000000..15741b3df14f
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/compiler_fence.h
@@ -0,0 +1,71 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/preprocessor.h>
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#  pragma message( \
+    "warning: The functionality in this header is unsafe, deprecated, and will soon be removed. Use C++11 atomics instead.")
+#else
+#warning The functionality in this header is unsafe, deprecated, and will soon be removed. Use C++11 or C11 atomics instead.
+#endif
+
+// msvc case
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+
+#  ifndef _DEBUG
+
+#    include <intrin.h>
+#    pragma intrinsic(_ReadWriteBarrier)
+#    define __thrust_compiler_fence() _ReadWriteBarrier()
+#  else
+
+#    define __thrust_compiler_fence() \
+      do                              \
+      {                               \
+      } while (0)
+
+#  endif // _DEBUG
+
+// gcc case
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC
+
+#  if THRUST_GCC_VERSION >= 40200 // atomic built-ins were introduced ~4.2
+#    define __thrust_compiler_fence() __sync_synchronize()
+#  else
+// allow the code to compile without any guarantees
+#    define __thrust_compiler_fence() \
+      do                              \
+      {                               \
+      } while (0)
+#  endif // THRUST_GCC_VERSION
+
+// unknown case
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+#  define __thrust_compiler_fence() __sync_synchronize()
+#else
+
+// allow the code to compile without any guarantees
+#  define __thrust_compiler_fence() \
+    do                              \
+    {                               \
+    } while (0)
+
+#endif
diff --git a/projects/rocthrust/thrust/detail/config/config.h b/projects/rocthrust/thrust/detail/config/config.h
index 237bf404f218..cc20911d3a23 100644
--- a/projects/rocthrust/thrust/detail/config/config.h
+++ b/projects/rocthrust/thrust/detail/config/config.h
@@ -20,8 +20,12 @@
 
 #pragma once
 
+#include <thrust/detail/config/libcxx.h> // IWYU pragma: export
+
 // For _CCCL_IMPLICIT_SYSTEM_HEADER
-#include <thrust/detail/libcxx_wrapper/__cccl_config.h> // IWYU pragma: export
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  include _THRUST_LIBCXX_INCLUDE(__cccl_config) // IWYU pragma: export
+#endif
 
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
 #  pragma GCC system_header
@@ -34,11 +38,17 @@
 // NOTE: The order of these #includes matters.
 
 #include <thrust/detail/config/compiler.h> // IWYU pragma: export
+#include <thrust/detail/config/cpp_compatibility.h> // IWYU pragma: export
 #include <thrust/detail/config/cpp_dialect.h> // IWYU pragma: export
+#include <thrust/detail/config/deprecated.h> // IWYU pragma: export
 #include <thrust/detail/config/simple_defines.h> // IWYU pragma: export
 // host_system.h & device_system.h must be #included as early as possible because other config headers depend on it
 #include <thrust/detail/config/host_system.h> // IWYU pragma: export
 
 #include <thrust/detail/config/device_system.h> // IWYU pragma: export
-#include <thrust/detail/config/libcxx.h> // IWYU pragma: export
+#include <thrust/detail/config/diagnostic.h> // IWYU pragma: export
+#include <thrust/detail/config/execution_space.h> // IWYU pragma: export
+#include <thrust/detail/config/global_workarounds.h> // IWYU pragma: export
 #include <thrust/detail/config/namespace.h> // IWYU pragma: export
+#include <thrust/detail/config/rtti.h> // IWYU pragma: export
+#include <thrust/detail/config/visibility.h> // IWYU pragma: export
diff --git a/projects/rocthrust/thrust/detail/config/cpp_compatibility.h b/projects/rocthrust/thrust/detail/config/cpp_compatibility.h
new file mode 100644
index 000000000000..ccd77729e009
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/cpp_compatibility.h
@@ -0,0 +1,123 @@
+/*
+ *  Copyright 2008-2018 NVIDIA Corporation
+ *  Modifications Copyright© 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+// Internal config header that is only included through thrust/detail/config/config.h
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <thrust/detail/config/cpp_dialect.h> // IWYU pragma: export
+#  include <thrust/detail/config/execution_space.h> // IWYU pragma: export
+#endif
+
+// deprecated [Since 2.8.0]
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  define THRUST_NODISCARD _CCCL_NODISCARD
+#else
+#  ifdef __has_cpp_attribute
+#    define THRUST_HAS_CPP_ATTRIBUTE(__x) __has_cpp_attribute(__x)
+#  else // ^^^ __has_cpp_attribute ^^^ / vvv !__has_cpp_attribute vvv
+#    define THRUST_HAS_CPP_ATTRIBUTE(__x) 0
+#  endif // !__has_cpp_attribute
+#  if THRUST_HAS_CPP_ATTRIBUTE(nodiscard) \
+    || ((THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && THRUST_CPP_DIALECT >= 2017)
+#    define THRUST_NODISCARD [[nodiscard]]
+#  else // ^^^ has nodiscard ^^^ / vvv no nodiscard vvv
+#    define THRUST_NODISCARD
+#  endif // no nodiscard
+#  undef THRUST_HAS_CPP_ATTRIBUTE
+#endif
+// deprecated [Since 2.8.0]
+#if defined(__CUDA_ARCH__)
+#  if defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ < 11 || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 3))
+#    define THRUST_INLINE_CONSTANT THRUST_DEVICE const
+#  else
+#    define THRUST_INLINE_CONSTANT THRUST_DEVICE constexpr
+#  endif
+#elif defined(__HIP__)
+#  define THRUST_INLINE_CONSTANT THRUST_DEVICE constexpr
+#else // ^^^ __CUDA_ARCH__ ^^^ / vvv !__CUDA_ARCH__ vvv
+#  define THRUST_INLINE_CONSTANT inline constexpr
+#endif // __CUDA_ARCH__
+// deprecated [Since 2.8.0]
+#define THRUST_INLINE_INTEGRAL_MEMBER_CONSTANT static constexpr
+
+#if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
+// libcu++ still needs to be ported to HIP, so for HIP backend these definitions
+// are still in use.
+#  if defined(__HIP_DEVICE_COMPILE__)
+#    define THRUST_IS_DEVICE_CODE      1
+#    define THRUST_IS_HOST_CODE        0
+#    define THRUST_INCLUDE_DEVICE_CODE 1
+#    define THRUST_INCLUDE_HOST_CODE   0
+#  else
+#    define THRUST_IS_DEVICE_CODE      0
+#    define THRUST_IS_HOST_CODE        1
+#    define THRUST_INCLUDE_DEVICE_CODE 0
+#    define THRUST_INCLUDE_HOST_CODE   1
+#  endif
+#else
+// These definitions were intended for internal use only and are now obsolete.
+// If you relied on them, consider porting your code to use the functionality
+// in libcu++'s <nv/target> header.
+// For a temporary workaround, define THRUST_PROVIDE_LEGACY_ARCH_MACROS to make
+// them available again. These should be considered deprecated and will be
+// fully removed in a future version.
+#  ifdef THRUST_PROVIDE_LEGACY_ARCH_MACROS
+#    ifndef THRUST_IS_DEVICE_CODE
+#      if defined(_NVHPC_CUDA)
+#        define THRUST_IS_DEVICE_CODE      __builtin_is_device_code()
+#        define THRUST_IS_HOST_CODE        (!__builtin_is_device_code())
+#        define THRUST_INCLUDE_DEVICE_CODE 1
+#        define THRUST_INCLUDE_HOST_CODE   1
+#      elif defined(__CUDA_ARCH__)
+#        define THRUST_IS_DEVICE_CODE      1
+#        define THRUST_IS_HOST_CODE        0
+#        define THRUST_INCLUDE_DEVICE_CODE 1
+#        define THRUST_INCLUDE_HOST_CODE   0
+#      else
+#        define THRUST_IS_DEVICE_CODE      0
+#        define THRUST_IS_HOST_CODE        1
+#        define THRUST_INCLUDE_DEVICE_CODE 0
+#        define THRUST_INCLUDE_HOST_CODE   1
+#      endif
+#    endif
+#  endif // THRUST_PROVIDE_LEGACY_ARCH_MACROS
+#endif
+
+// NVCC below 11.3 does not support nodiscard on friend operators
+// It always fails with clang
+#if (defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ < 11 || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 3))) \
+  || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+#  define THRUST_NODISCARD_FRIEND friend
+#else
+#  define THRUST_NODISCARD_FRIEND THRUST_NODISCARD friend
+#endif
+
+#if THRUST_CPP_DIALECT <= 2014 || (defined(__cpp_if_constexpr) && __cpp_if_constexpr < 201606L)
+#  define THRUST_IF_CONSTEXPR if
+#else // ^^^ C++14 ^^^ / vvv C++17 vvv
+#  define THRUST_IF_CONSTEXPR if constexpr
+#endif // THRUST_CPP_DIALECT > 2014
diff --git a/projects/rocthrust/thrust/detail/config/cpp_dialect.h b/projects/rocthrust/thrust/detail/config/cpp_dialect.h
index 83ddd7f2ee5d..c3fc343b7d81 100644
--- a/projects/rocthrust/thrust/detail/config/cpp_dialect.h
+++ b/projects/rocthrust/thrust/detail/config/cpp_dialect.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2020 NVIDIA Corporation
- *  Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,11 +21,6 @@
 
 #pragma once
 
-// TODO(libhipcxx): remove the headers below and replace THRUST_IGNORE* and THRUST*
-// with CCCL_IGNORE* and _CCCL* once libhipcxx gets ready
-
-#include <thrust/detail/config/config.h>
-
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
 #  pragma GCC system_header
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
@@ -38,20 +33,117 @@
 
 // Deprecation warnings may be silenced by defining the following macros. These
 // may be combined.
+// - THRUST_IGNORE_DEPRECATED_CPP_DIALECT:
+//   Ignore all deprecated C++ dialects and outdated compilers.
+// - THRUST_IGNORE_DEPRECATED_CPP_11:
+//   Ignore deprecation warnings when compiling with C++11. C++03 and outdated
+//   compilers will still issue warnings.
+// - THRUST_IGNORE_DEPRECATED_CPP_14:
+//   Ignore deprecation warnings when compiling with C++14. C++03 and outdated
+//   compilers will still issue warnings.
 // - THRUST_IGNORE_DEPRECATED_COMPILER
 //   Ignore deprecation warnings when using deprecated compilers. Compiling
-//   with deprecated C++ dialects will still issue warnings.
+//   with C++03, C++11 and C++14 will still issue warnings.
+
+// Define this to override the built-in detection.
+#ifndef THRUST_CPP_DIALECT
+
+// MSVC does not define __cplusplus correctly. _MSVC_LANG is used instead.
+// This macro is only defined in MSVC 2015U3+.
+#  if defined(_MSVC_LANG) && !defined(__HIP__) // Do not replace with THRUST_HOST_COMPILER test (see above)
+// MSVC2015 reports C++14 but lacks extended constexpr support. Treat as C++11.
+#    if THRUST_MSVC_VERSION < 1910 && _MSVC_LANG > 201103L /* MSVC < 2017 && CPP > 2011 */
+#      define THRUST_CPLUSPLUS 201103L /* Fix to 2011 */
+#    elif _MSVC_LANG <= 201103L
+#      define THRUST_CPLUSPLUS 201103L
+#    elif _MSVC_LANG > 202002L
+#      define THRUST_CPLUSPLUS 202302L
+#    else
+#      define THRUST_CPLUSPLUS _MSVC_LANG /* We'll trust this for now. */
+#    endif // MSVC 2015 C++14 fix
+#  else
+#    define THRUST_CPLUSPLUS __cplusplus
+#  endif
+
+// Detect current dialect:
+#  if THRUST_CPLUSPLUS <= 199711L
+#    define THRUST_CPP_DIALECT 2003
+#  elif THRUST_CPLUSPLUS <= 201103L
+#    define THRUST_CPP_DIALECT 2011
+#  elif THRUST_CPLUSPLUS <= 201402L
+#    define THRUST_CPP_DIALECT 2014
+#  elif THRUST_CPLUSPLUS <= 201703L
+#    define THRUST_CPP_DIALECT 2017
+#  elif THRUST_CPLUSPLUS <= 202002L
+#    define THRUST_CPP_DIALECT 2020
+#  elif THRUST_CPLUSPLUS <= 202302L
+#    define THRUST_CPP_DIALECT 2023
+#  else
+#    define THRUST_CPP_DIALECT 2024 // current year, or date of c++2c ratification
+#  endif
 
-#define THRUST_CPP_DIALECT THRUST_STD_VER
+#  undef THRUST_CPLUSPLUS // cleanup
+
+#endif // !THRUST_CPP_DIALECT
+
+// Macros to suppress deprecation compiler warnings, from "deprecated.h"
+// TODO: These macros start with `LIBCUDACXX`. So, when libhipcxx is
+// available in this scope, we should remove these macros and use the ones
+// from libhipcxx.
+// Check for deprecation opt-outs
+#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_DIALECT) || defined(CCCL_IGNORE_DEPRECATED_CPP_DIALECT) \
+  || defined(CUB_IGNORE_DEPRECATED_CPP_DIALECT)
+#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
+#    define THRUST_IGNORE_DEPRECATED_CPP_DIALECT
+#  endif
+#endif // suppress all dialect deprecation warnings
+#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_14) || defined(CCCL_IGNORE_DEPRECATED_CPP_14) \
+  || defined(CUB_IGNORE_DEPRECATED_CPP_14) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
+#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_14)
+#    define THRUST_IGNORE_DEPRECATED_CPP_14
+#  endif
+#endif // suppress all c++14 dialect deprecation warnings
+#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_11) || defined(CCCL_IGNORE_DEPRECATED_CPP_11)  \
+  || defined(CUB_IGNORE_DEPRECATED_CPP_11) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT) \
+  || defined(THRUST_IGNORE_DEPRECATED_CPP_14)
+#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_11)
+#    define THRUST_IGNORE_DEPRECATED_CPP_11
+#  endif
+#endif // suppress all c++11 dialect deprecation warnings
+#if defined(LIBCUDACXX_IGNORE_DEPRECATED_COMPILER) || defined(CCCL_IGNORE_DEPRECATED_COMPILER) \
+  || defined(CUB_IGNORE_DEPRECATED_COMPILER) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)  \
+  || defined(THRUST_IGNORE_DEPRECATED_CPP_14) || defined(THRUST_IGNORE_DEPRECATED_CPP_11)
+#  if !defined(THRUST_IGNORE_DEPRECATED_COMPILER)
+#    define THRUST_IGNORE_DEPRECATED_COMPILER
+#  endif
+#endif // suppress all compiler deprecation warnings
+
+// Constexpr feature macros:
+#if THRUST_CPP_DIALECT >= 2023
+#    define THRUST_CONSTEXPR_SINCE_CXX23 constexpr
+#else
+#    define THRUST_CONSTEXPR_SINCE_CXX23
+#endif
+
+#if THRUST_CPP_DIALECT >= 2020
+#    define THRUST_CONSTEXPR_SINCE_CXX20 constexpr
+#else
+#    define THRUST_CONSTEXPR_SINCE_CXX20
+#endif
+
+#if THRUST_CPP_DIALECT >= 2017
+#    define THRUST_CONSTEXPR_SINCE_CXX17 constexpr
+#else
+#    define THRUST_CONSTEXPR_SINCE_CXX17
+#endif
 
 // Define THRUST_COMPILER_DEPRECATION macro:
-#if THRUST_COMPILER(MSVC) || THRUST_COMPILER(NVRTC)
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
 #  define THRUST_COMP_DEPR_IMPL(msg) THRUST_PRAGMA(message(__FILE__ ":" THRUST_TO_STRING(__LINE__) ": warning: " #msg))
 #else // clang / gcc:
 #  define THRUST_COMP_DEPR_IMPL(msg) THRUST_PRAGMA(GCC warning #msg)
 #endif
 
-// Compiler checks:
 // clang-format off
 #define THRUST_COMPILER_DEPRECATION(REQ) \
   THRUST_COMP_DEPR_IMPL(Thrust requires at least REQ. Define THRUST_IGNORE_DEPRECATED_COMPILER to suppress this message.)
@@ -59,28 +151,39 @@
 #define THRUST_COMPILER_DEPRECATION_SOFT(REQ, CUR)                                                        \
   THRUST_COMP_DEPR_IMPL(                                                                                  \
     Thrust requires at least REQ. CUR is deprecated but still supported. CUR support will be removed in a \
-      future release. Define THRUST_IGNORE_DEPRECATED_COMPILER to suppress this message.)
+      future release. Define THRUST_IGNORE_DEPRECATED_CPP_DIALECT to suppress this message.)
 // clang-format on
 
 #ifndef THRUST_IGNORE_DEPRECATED_COMPILER
-#  if THRUST_COMPILER(GCC, <, 7)
-THRUST_COMPILER_DEPRECATION(GCC 7.0);
-#  elif THRUST_COMPILER(CLANG, <, 7)
+
+// Compiler checks:
+#  if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC && THRUST_GCC_VERSION < 50000
+THRUST_COMPILER_DEPRECATION(GCC 5.0);
+#  elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG && THRUST_CLANG_VERSION < 70000
 THRUST_COMPILER_DEPRECATION(Clang 7.0);
-#  elif THRUST_COMPILER(MSVC, <, 19, 10)
+#  elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && THRUST_MSVC_VERSION < 1910
 // <2017. Hard upgrade message:
 THRUST_COMPILER_DEPRECATION(MSVC 2019(19.20 / 16.0 / 14.20));
+#  elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && THRUST_MSVC_VERSION < 1920
+// >=2017, <2019. Soft deprecation message:
+THRUST_COMPILER_DEPRECATION_SOFT(MSVC 2019(19.20 / 16.0 / 14.20), MSVC 2017);
 #  endif
+
 #endif // THRUST_IGNORE_DEPRECATED_COMPILER
 
+#if THRUST_CPP_DIALECT < 2011
+// <C++11. Hard upgrade message:
+THRUST_COMPILER_DEPRECATION(C++ 17);
+#elif THRUST_CPP_DIALECT == 2011 && !defined(THRUST_IGNORE_DEPRECATED_CPP_11)
+// =C++11. Soft upgrade message:
+THRUST_COMPILER_DEPRECATION_SOFT(C++ 17, C++ 11);
+#elif THRUST_CPP_DIALECT == 2014 && !defined(THRUST_IGNORE_DEPRECATED_CPP_14)
+// =C++14. Soft upgrade message:
+THRUST_COMPILER_DEPRECATION_SOFT(C++ 17, C++ 14);
+#endif // THRUST_CPP_DIALECT < 2011
+
 #undef THRUST_COMPILER_DEPRECATION_SOFT
 #undef THRUST_COMPILER_DEPRECATION
-
-// C++17 dialect check:
-#ifndef THRUST_IGNORE_DEPRECATED_CPP_DIALECT
-#  if THRUST_STD_VER < 2017
-#    error Thrust requires at least C++17. Define THRUST_IGNORE_DEPRECATED_CPP_DIALECT to suppress this message.
-#  endif // THRUST_STD_VER >= 2017
-#endif
-
 #undef THRUST_COMP_DEPR_IMPL
+#undef THRUST_COMP_DEPR_IMPL0
+#undef THRUST_COMP_DEPR_IMPL1
diff --git a/projects/rocthrust/thrust/detail/config/deprecated.h b/projects/rocthrust/thrust/detail/config/deprecated.h
new file mode 100644
index 000000000000..1a1a47132fa1
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/deprecated.h
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//Add commentMore actions
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+// Add commentMore actions
+//===----------------------------------------------------------------------===//
+
+#ifndef THRUST_DETAIL_CONFIG_DEPRECATED_H
+#define THRUST_DETAIL_CONFIG_DEPRECATED_H
+
+#include <thrust/detail/config/cpp_dialect.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if defined(LIBCUDACXX_IGNORE_DEPRECATED_API) || defined(CCCL_IGNORE_DEPRECATED_API) \
+  || defined(CUB_IGNORE_DEPRECATED_API)
+#  if !defined(THRUST_IGNORE_DEPRECATED_API)
+#    define THRUST_IGNORE_DEPRECATED_API
+#  endif
+#endif // suppress all API deprecation warnings
+
+#ifdef THRUST_IGNORE_DEPRECATED_API
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG)
+#elif THRUST_CPP_DIALECT >= 2017
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED              [[deprecated]]
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG) [[deprecated(MSG)]]
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED              __declspec(deprecated)
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG) __declspec(deprecated(MSG))
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED              __attribute__((deprecated))
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG) __attribute__((deprecated(MSG)))
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED              __attribute__((deprecated))
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG) __attribute__((deprecated(MSG)))
+#else
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED
+//! deprecated [Since 2.8]
+#  define THRUST_DEPRECATED_BECAUSE(MSG)
+#endif
+
+#if defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ < 11 || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 3))
+#  define THRUST_ALIAS_ATTRIBUTE(...)
+#else
+#  define THRUST_ALIAS_ATTRIBUTE(...) __VA_ARGS__
+#endif
+
+#endif // THRUST_DETAIL_CONFIG_DEPRECATED_H
diff --git a/projects/rocthrust/thrust/detail/config/device_system.h b/projects/rocthrust/thrust/detail/config/device_system.h
index e6bedd7b77ac..0950771033c0 100644
--- a/projects/rocthrust/thrust/detail/config/device_system.h
+++ b/projects/rocthrust/thrust/detail/config/device_system.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 // Internal config header that is only included through thrust/detail/config/config.h
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // reserve 0 for undefined
 #define THRUST_DEVICE_SYSTEM_CUDA 1
 #define THRUST_DEVICE_SYSTEM_OMP  2
@@ -35,9 +27,9 @@
 #define THRUST_DEVICE_SYSTEM_HIP  5
 
 #ifndef THRUST_DEVICE_SYSTEM
-#  if defined(__HIP__)
+#  if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #    define THRUST_DEVICE_SYSTEM THRUST_DEVICE_SYSTEM_HIP
-#  elif defined(__clang__) || defined(__GNUC__)
+#  elif THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_CLANG || THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_GCC
 #    define THRUST_DEVICE_SYSTEM THRUST_DEVICE_SYSTEM_CPP
 #  else
 #    define THRUST_DEVICE_SYSTEM THRUST_DEVICE_SYSTEM_CUDA
diff --git a/projects/rocthrust/thrust/detail/config/diagnostic.h b/projects/rocthrust/thrust/detail/config/diagnostic.h
new file mode 100644
index 000000000000..a5aa194286d9
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/diagnostic.h
@@ -0,0 +1,99 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef THRUST_DETAIL_CONFIG_DIAGNOSTIC_H
+#define THRUST_DETAIL_CONFIG_DIAGNOSTIC_H
+
+#include <thrust/detail/config/compiler.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// Enable us to selectively silence host compiler warnings
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG
+#  define THRUST_DIAG_PUSH                THRUST_PRAGMA(clang diagnostic push)
+#  define THRUST_DIAG_POP                 THRUST_PRAGMA(clang diagnostic pop)
+#  define THRUST_DIAG_SUPPRESS_CLANG(str) THRUST_PRAGMA(clang diagnostic ignored str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str)
+#  define THRUST_DIAG_SUPPRESS_ICC(str)
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC
+#  define THRUST_DIAG_PUSH THRUST_PRAGMA(GCC diagnostic push)
+#  define THRUST_DIAG_POP  THRUST_PRAGMA(GCC diagnostic pop)
+#  define THRUST_DIAG_SUPPRESS_CLANG(str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str) THRUST_PRAGMA(GCC diagnostic ignored str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str)
+#  define THRUST_DIAG_SUPPRESS_ICC(str)
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL
+#  define THRUST_DIAG_PUSH THRUST_PRAGMA(GCC diagnostic push)
+#  define THRUST_DIAG_POP  THRUST_PRAGMA(GCC diagnostic pop)
+#  define THRUST_DIAG_SUPPRESS_CLANG(str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str) THRUST_PRAGMA(GCC diagnostic ignored str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str)
+#  define THRUST_DIAG_SUPPRESS_ICC(str) THRUST_PRAGMA(warning disable str)
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+#  define THRUST_DIAG_PUSH THRUST_PRAGMA(diagnostic push)
+#  define THRUST_DIAG_POP  THRUST_PRAGMA(diagnostic pop)
+#  define THRUST_DIAG_SUPPRESS_CLANG(str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str) THRUST_PRAGMA(diag_suppress str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str)
+#  define THRUST_DIAG_SUPPRESS_ICC(str)
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#  define THRUST_DIAG_PUSH THRUST_PRAGMA(warning(push))
+#  define THRUST_DIAG_POP  THRUST_PRAGMA(warning(pop))
+#  define THRUST_DIAG_SUPPRESS_CLANG(str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str) THRUST_PRAGMA(warning(disable : str))
+#  define THRUST_DIAG_SUPPRESS_ICC(str)
+#else
+#  define THRUST_DIAG_PUSH
+#  define THRUST_DIAG_POP
+#  define THRUST_DIAG_SUPPRESS_CLANG(str)
+#  define THRUST_DIAG_SUPPRESS_GCC(str)
+#  define THRUST_DIAG_SUPPRESS_NVHPC(str)
+#  define THRUST_DIAG_SUPPRESS_MSVC(str)
+#  define THRUST_DIAG_SUPPRESS_ICC(str)
+#endif
+
+// Convenient shortcuts to silence common warnings
+#if THRUST_HOST_COMPILER == THRUST_DEVICE_COMPILER_CLANG
+#  define THRUST_SUPPRESS_DEPRECATED_PUSH      \
+    THRUST_DIAG_PUSH                           \
+    THRUST_DIAG_SUPPRESS_CLANG("-Wdeprecated") \
+    THRUST_DIAG_SUPPRESS_CLANG("-Wdeprecated-declarations")
+#  define THRUST_SUPPRESS_DEPRECATED_POP THRUST_DIAG_POP
+#elif (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) || (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_INTEL)
+#  define THRUST_SUPPRESS_DEPRECATED_PUSH    \
+    THRUST_DIAG_PUSH                         \
+    THRUST_DIAG_SUPPRESS_GCC("-Wdeprecated") \
+    THRUST_DIAG_SUPPRESS_GCC("-Wdeprecated-declarations")
+#  define THRUST_SUPPRESS_DEPRECATED_POP THRUST_DIAG_POP
+#elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#  define THRUST_SUPPRESS_DEPRECATED_PUSH \
+    THRUST_DIAG_PUSH                      \
+    THRUST_DIAG_SUPPRESS_MSVC(4996)
+#  define THRUST_SUPPRESS_DEPRECATED_POP THRUST_DIAG_POP
+#else // !THRUST_COMPILER_CLANG && !THRUST_COMPILER_GCC
+#  define THRUST_SUPPRESS_DEPRECATED_PUSH
+#  define THRUST_SUPPRESS_DEPRECATED_POP
+#endif // !THRUST_COMPILER_CLANG && !THRUST_COMPILER_GCC
+
+#endif // THRUST_DETAIL_CONFIG_DIAGNOSTIC_H
diff --git a/projects/rocthrust/thrust/detail/config/execution_space.h b/projects/rocthrust/thrust/detail/config/execution_space.h
new file mode 100644
index 000000000000..2a66fb5f18df
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/execution_space.h
@@ -0,0 +1,51 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef THRUST_DETAIL_CONFIG_EXECUTION_SPACE_H
+#define THRUST_DETAIL_CONFIG_EXECUTION_SPACE_H
+
+#include <thrust/detail/config/compiler.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// We need to ensure that we not only compile with a cuda or hip compiler but also compile cuda or hip source files
+#if (defined(__NVCC__) || defined(_NVHPC_CUDA)                                    \
+     || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+     || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC)                       \
+  || (THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP)
+#  define THRUST_HOST        __host__
+#  define THRUST_DEVICE      __device__
+#  define THRUST_HOST_DEVICE __host__ __device__
+#else // ^^^ (CUDA_COMPILATION || HIP_COMPILATION) ^^^ / vvv !(CUDA_COMPILATION || HIP_COMPILATION) vvv
+#  define THRUST_HOST
+#  define THRUST_DEVICE
+#  define THRUST_HOST_DEVICE
+#endif // !(CUDA_COMPILATION || HIP_COMPILATION)
+
+#if !defined(__HIP__)
+#  if !defined(THRUST_EXEC_CHECK_DISABLE)
+#    if defined(__NVCC__)
+#      define THRUST_EXEC_CHECK_DISABLE THRUST_PRAGMA(nv_exec_check_disable)
+#    else
+#      define THRUST_EXEC_CHECK_DISABLE
+#    endif // __NVCC__
+#  endif // !THRUST_EXEC_CHECK_DISABLE
+#else
+#  define THRUST_EXEC_CHECK_DISABLE
+#endif // !HIP
+
+#endif // THRUST_DETAIL_CONFIG_EXECUTION_SPACE_H
diff --git a/projects/rocthrust/thrust/detail/config/global_workarounds.h b/projects/rocthrust/thrust/detail/config/global_workarounds.h
new file mode 100644
index 000000000000..c3bc3066e8e0
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/global_workarounds.h
@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config/compiler.h>
+
+// XXX workaround gcc 4.8+'s complaints about unused local aliases by silencing them globally
+#if defined(THRUST_GCC_VERSION) && (THRUST_GCC_VERSION >= 40800)
+#  if defined(__NVCC__) && (CUDART_VERSION >= 6000)
+#    pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#  endif // nvcc & cuda 6+
+#endif // gcc 4.8
diff --git a/projects/rocthrust/thrust/detail/config/host_system.h b/projects/rocthrust/thrust/detail/config/host_system.h
index 5c61440446d8..111e4da6d4eb 100644
--- a/projects/rocthrust/thrust/detail/config/host_system.h
+++ b/projects/rocthrust/thrust/detail/config/host_system.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Internal config header that is only included through thrust/detail/config/config.h
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // reserve 0 for undefined
 #define THRUST_HOST_SYSTEM_CPP 1
 #define THRUST_HOST_SYSTEM_OMP 2
@@ -35,6 +25,10 @@
 #  define THRUST_HOST_SYSTEM THRUST_HOST_SYSTEM_CPP
 #endif // THRUST_HOST_SYSTEM
 
+#ifdef THRUST_HOST_BACKEND
+#  error THRUST_HOST_BACKEND is no longer supported; use THRUST_HOST_SYSTEM instead.
+#endif // THRUST_HOST_BACKEND
+
 #if THRUST_HOST_SYSTEM == THRUST_HOST_SYSTEM_CPP
 #  define __THRUST_HOST_SYSTEM_NAMESPACE cpp
 #elif THRUST_HOST_SYSTEM == THRUST_HOST_SYSTEM_OMP
diff --git a/projects/rocthrust/thrust/detail/config/libcxx.h b/projects/rocthrust/thrust/detail/config/libcxx.h
index 993a94cca4d6..e81969f4e96b 100644
--- a/projects/rocthrust/thrust/detail/config/libcxx.h
+++ b/projects/rocthrust/thrust/detail/config/libcxx.h
@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h>
+#include <thrust/detail/config/preprocessor.h>
 
 // This is a utility file that helps managing which
 // 'std' implementation we're using. The provided
@@ -36,8 +36,8 @@
 // Version that we depend on. We can ignore patch for now
 // since we're only interested in breaking (major) and
 // features (minor).
-#define _THRUST_REQUIRED_LIBCXX_VERSION_MAJOR 3
-#define _THRUST_REQUIRED_LIBCXX_VERSION_MINOR 0
+#define _THRUST_REQUIRED_LIBCXX_VERSION_MAJOR 2
+#define _THRUST_REQUIRED_LIBCXX_VERSION_MINOR 8
 
 // Set default values if not explictly set
 #ifndef USE_LIBCUDACXX
@@ -53,11 +53,11 @@
 #  include <cuda/std/version>
 // If version matches and '_CUDA_VSTD' is available.
 #  if _LIBCUDACXX_CUDA_API_VERSION_MAJOR == _THRUST_REQUIRED_LIBCXX_VERSION_MAJOR \
-    && _LIBCUDACXX_CUDA_API_VERSION_MINOR >= _THRUST_REQUIRED_LIBCXX_VERSION_MINOR && defined(_CUDA_VSTD)
+    && _LIBCUDACXX_CUDA_API_VERSION_MINOR >= _THRUST_REQUIRED_LIBCXX_VERSION_MINOR \
+    && defined (_CUDA_VSTD)
 #    define _THRUST_LIBCXX_INCLUDE(LIB)   <cuda/LIB>
 #    define _THRUST_STD_INCLUDE(LIB)      <cuda/std/LIB>
 #    define _THRUST_LIBCXX                ::cuda
-#    define _THRUST_STD_NOVERSION         _CUDA_VSTD_NOVERSION
 #    define _THRUST_STD                   _CUDA_VSTD
 #    define _THRUST_HAS_DEVICE_SYSTEM_STD 1
 #    define _THRUST_STD_NAMESPACE_BEGIN   _LIBCUDACXX_BEGIN_NAMESPACE_STD
@@ -69,14 +69,14 @@
 #elif THRUST_HAS_INCLUDE(<hip/std/version>) && USE_LIBHIPCXX
 #  include <hip/std/version>
 // If version matches and '_CUDA_VSTD' is available.
-#  if _LIBCUDACXX_CUDA_API_VERSION_MAJOR == _THRUST_REQUIRED_LIBCXX_VERSION_MAJOR \
-    && _LIBCUDACXX_CUDA_API_VERSION_MINOR >= _THRUST_REQUIRED_LIBCXX_VERSION_MINOR && defined(_CUDA_VSTD)
+#  if _LIBCUDACXX_CUDA_API_VERSION_MAJOR == _THRUST_REQUIRED_LIBCXX_VERSION_MINOR \
+    && _LIBCUDACXX_CUDA_API_VERSION_MINOR >= _THRUST_REQUIRED_LIBCXX_VERSION_MINOR \
+    && defined(_CUDA_VSTD)
 #    define _THRUST_LIBCXX_INCLUDE(LIB)   <hip/LIB>
 #    define _THRUST_STD_INCLUDE(LIB)      <hip/std/LIB>
-// In 'libhipcxx' the '::hip' namespace is synonymous with '::cuda'.
+// In 'libhipcxx' the '::hip' namespace is synonymous with '::cuda'. 
 #    define _THRUST_LIBCXX                ::hip
 // In 'libhipcxx' the macro '_CUDA_VSTD' is also defined.
-#    define _THRUST_STD_NOVERSION         ::hip::std
 #    define _THRUST_STD                   _CUDA_VSTD
 #    define _THRUST_HAS_DEVICE_SYSTEM_STD 1
 #    define _THRUST_STD_NAMESPACE_BEGIN   _LIBCUDACXX_BEGIN_NAMESPACE_STD
@@ -91,7 +91,6 @@
 #  define _THRUST_LIBCXX_INCLUDE(LIB)
 #  define _THRUST_STD_INCLUDE(LIB) <LIB>
 #  define _THRUST_LIBCXX
-#  define _THRUST_STD_NOVERSION         ::std
 #  define _THRUST_STD                   ::std
 #  define _THRUST_HAS_DEVICE_SYSTEM_STD 0
 #  define _THRUST_STD_NAMESPACE_BEGIN \
@@ -100,52 +99,3 @@
 #  define _THRUST_STD_NAMESPACE_END }
 #  define _THRUST_USE_ROCPRIM (THRUST_DEVICE_SYSTEM != THRUST_DEVICE_SYSTEM_CPP)
 #endif
-
-// In case libhipcxx is not available, load a basic version from our libcxx wrapper.
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-// libhipcxx exposes <nv/target>, but does not expose <hip/target>.
-#  include <nv/target>
-#else
-#  include <thrust/detail/libcxx_wrapper/nv/detail/__target_macros.h>
-#endif
-
-// NV_* macros provided by 'libhipcxx' are suffixed with _LIBHIPCXX.
-#if defined(NV_IF_TARGET)
-#  define _THRUST_IF_TARGET NV_IF_TARGET
-#elif defined(NV_IF_TARGET_LIBHIPCXX)
-#  define _THRUST_IF_TARGET NV_IF_TARGET_LIBHIPCXX
-#else
-#  error Could not find definition for '_THRUST_IF_TARGET'!
-#endif
-
-#if defined(NV_IF_ELSE_TARGET)
-#  define _THRUST_IF_ELSE_TARGET NV_IF_ELSE_TARGET
-#elif defined(NV_IF_ELSE_TARGET_LIBHIPCXX)
-#  define _THRUST_IF_ELSE_TARGET NV_IF_ELSE_TARGET_LIBHIPCXX
-#else
-#  error Could not find definition for '_THRUST_IF_ELSE_TARGET'!
-#endif
-
-#if defined(NV_IS_HOST)
-#  define _THRUST_IS_HOST NV_IS_HOST
-#elif defined(NV_IS_HOST_LIBHIPCXX)
-#  define _THRUST_IS_HOST NV_IS_HOST_LIBHIPCXX
-#else
-#  error Could not find definition for '_THRUST_IS_HOST'!
-#endif
-
-#if defined(NV_IS_DEVICE)
-#  define _THRUST_IS_DEVICE NV_IS_DEVICE
-#elif defined(NV_IS_DEVICE_LIBHIPCXX)
-#  define _THRUST_IS_DEVICE NV_IS_DEVICE_LIBHIPCXX
-#else
-#  error Could not find definition for '_THRUST_IS_DEVICE'!
-#endif
-
-#if defined(NV_ANY_TARGET)
-#  define _THRUST_ANY_TARGET NV_ANY_TARGET
-#elif defined(NV_ANY_TARGET_LIBHIPCXX)
-#  define _THRUST_ANY_TARGET NV_ANY_TARGET_LIBHIPCXX
-#else
-#  error Could not find definition for '_THRUST_ANY_TARGET'!
-#endif
diff --git a/projects/rocthrust/thrust/detail/config/memory_resource.h b/projects/rocthrust/thrust/detail/config/memory_resource.h
index 8b5b7506bdfb..f9afe4f9e446 100644
--- a/projects/rocthrust/thrust/detail/config/memory_resource.h
+++ b/projects/rocthrust/thrust/detail/config/memory_resource.h
@@ -27,6 +27,7 @@
 #endif // no system header
 
 #include <thrust/detail/alignment.h>
+#include <thrust/detail/config/cpp_compatibility.h>
 
 #include <cstddef>
 
@@ -35,7 +36,9 @@
 #if THRUST_HAS_INCLUDE(<memory_resource>)
 #  define THRUST_MR_STD_MR_HEADER <memory_resource>
 #  define THRUST_MR_STD_MR_NS     std::pmr
+// clang-format off
 #elif THRUST_HAS_INCLUDE(<experimental/memory_resource>)
+// clang-format on
 #  define THRUST_MR_STD_MR_HEADER <experimental/memory_resource>
 #  define THRUST_MR_STD_MR_NS     std::experimental::pmr
 #endif
diff --git a/projects/rocthrust/thrust/detail/config/namespace.h b/projects/rocthrust/thrust/detail/config/namespace.h
index bfe9a4971d4c..bd7dbd3321b5 100644
--- a/projects/rocthrust/thrust/detail/config/namespace.h
+++ b/projects/rocthrust/thrust/detail/config/namespace.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2021 NVIDIA Corporation
- *  Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -102,6 +102,116 @@
 #endif
 
 #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
+#  define THRUST_DETAIL_PP_EXPAND(...) __VA_ARGS__
+#  define THRUST_PP_EVAL(_M, ...)      _M(__VA_ARGS__)
+
+#  define THRUST_PP_CAT(_X, _Y) THRUST_PP_CAT_IMPL0(_X, _Y)
+
+#  if defined(_MSC_VER) && (defined(__EDG__) || defined(__EDG_VERSION__)) \
+    && (defined(__INTELLISENSE__) || __EDG_VERSION__ >= 308)
+#    define THRUST_PP_CAT_IMPL0(_X, _Y) THRUST_PP_CAT_IMPL1(~, _X##_Y)
+#    define THRUST_PP_CAT_IMPL1(_X, _Y) _Y
+#  else
+#    define THRUST_PP_CAT_IMPL0(_X, _Y) _X##_Y
+#  endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Count the number of arguments. There must be at least one argument and fewer
+// than 126 arguments.
+// clang-format off
+#  define THRUST_PP_COUNT_IMPL(                                                                     \
+    _125, _124, _123, _122, _121, _120, _119, _118, _117, _116, _115, _114, _113, _112, _111, _110, \
+    _109, _108, _107, _106, _105, _104, _103, _102, _101, _100, _99, _98, _97, _96, _95, _94,       \
+    _93, _92, _91, _90, _89, _88, _87, _86, _85, _84, _83, _82, _81, _80, _79, _78,                 \
+    _77, _76, _75, _74, _73, _72, _71, _70, _69, _68, _67, _66, _65, _64, _63, _62,                 \
+    _61, _60, _59, _58, _57, _56, _55, _54, _53, _52, _51, _50, _49, _48, _47, _46,                 \
+    _45, _44, _43, _42, _41, _40, _39, _38, _37, _36, _35, _34, _33, _32, _31, _30,                 \
+    _29, _28, _27, _26, _25, _24, _23, _22, _21, _20, _19, _18, _17, _16, _15, _14,                 \
+    _13, _12, _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, _0, ...) _0
+
+#  define THRUST_PP_COUNT(...)                                                        \
+    THRUST_DETAIL_PP_EXPAND(THRUST_PP_COUNT_IMPL( __VA_ARGS__,                        \
+      125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, \
+      109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94,       \
+      93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78,                 \
+      77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62,                 \
+      61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46,                 \
+      45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30,                 \
+      29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14,                 \
+      13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
+// clang-format on
+
+///////////////////////////////////////////////////////////////////////////////
+
+#  define THRUST_PP_SPLICE_WITH_IMPL1(SEP, P1) P1
+#  define THRUST_PP_SPLICE_WITH_IMPL2(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL1(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL3(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL2(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL4(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL3(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL5(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL4(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL6(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL5(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL7(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL6(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL8(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL7(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL9(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL8(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL10(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL9(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL11(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL10(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL12(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL11(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL13(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL12(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL14(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL13(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL15(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL14(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL16(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL15(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL17(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL16(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL18(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL17(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL19(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL18(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL20(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL19(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL21(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL20(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL22(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL21(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL23(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL22(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL24(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL23(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL25(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL24(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL26(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL25(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL27(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL26(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL28(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL27(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL29(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL28(SEP, __VA_ARGS__))
+#  define THRUST_PP_SPLICE_WITH_IMPL30(SEP, P1, ...) \
+    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL29(SEP, __VA_ARGS__))
+
+#  define THRUST_PP_SPLICE_WITH_IMPL_DISPATCH(N) THRUST_PP_SPLICE_WITH_IMPL##N
+
+// Splices a pack of arguments into a single token, separated by SEP
+// E.g., THRUST_PP_SPLICE_WITH(_, A, B, C) will evaluate to A_B_C
+#  define THRUST_PP_SPLICE_WITH(SEP, ...) \
+    THRUST_DETAIL_PP_EXPAND(              \
+      THRUST_PP_EVAL(THRUST_PP_SPLICE_WITH_IMPL_DISPATCH, THRUST_PP_COUNT(__VA_ARGS__))(SEP, __VA_ARGS__))
+
 #  if defined(THRUST_DISABLE_ABI_NAMESPACE) || defined(THRUST_WRAPPED_NAMESPACE)
 #    if !defined(THRUST_WRAPPED_NAMESPACE)
 #      if !defined(THRUST_IGNORE_ABI_NAMESPACE_ERROR)
@@ -130,7 +240,7 @@
 #      define THRUST_DETAIL_ABI_NS_END }
 #    endif // THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
 #  endif // not defined(THRUST_DISABLE_ABI_NAMESPACE)
-#else // THRUST_DEVICE_SYSTEM != THRUST_DEVICE_SYSTEM_CUDA && THRUST_DEVICE_SYSTEM != THRUST_DEVICE_SYSTEM_HIP
+#else // !(THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP)
 #  define THRUST_DETAIL_ABI_NS_BEGIN
 #  define THRUST_DETAIL_ABI_NS_END
 #endif // THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP
diff --git a/projects/rocthrust/thrust/detail/config/preprocessor.h b/projects/rocthrust/thrust/detail/config/preprocessor.h
new file mode 100644
index 000000000000..d5d0d7405f41
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/preprocessor.h
@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef CONFIG_PREPROCESSOR_H
+#define CONFIG_PREPROCESSOR_H
+
+#ifdef __has_include
+#  define THRUST_HAS_INCLUDE(_X) __has_include(_X)
+#else
+#  define THRUST_HAS_INCLUDE(_X) 0
+#endif
+
+#endif // CONFIG_PREPROCESSOR_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/rtti.h b/projects/rocthrust/thrust/detail/config/rtti.h
similarity index 58%
rename from projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/rtti.h
rename to projects/rocthrust/thrust/detail/config/rtti.h
index a9831923f9ad..a62567d0235c 100644
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/rtti.h
+++ b/projects/rocthrust/thrust/detail/config/rtti.h
@@ -5,36 +5,36 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIBCXX_WRAPPER_STD__CCCL_RTTI_H
-#define LIBCXX_WRAPPER_STD__CCCL_RTTI_H
+#ifndef CONFIG_RTTI_H
+#define CONFIG_RTTI_H
 
-// TODO(libhipcxx): remove this file and replace THRUST_NO_RTTI with _CCCL_NO_RTTI in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
+#include <thrust/detail/config/device_system.h>
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 
+// clang-format off
 #  include _THRUST_STD_INCLUDE(__cccl/rtti.h)
+// clang-format on
 
-#  if !defined(CCCL_DISABLE_RTTI) && THRUST_HAS_HIP_COMPILER()
-#    undef _CCCL_NO_RTTI
-#    if !_CCCL_HAS_FEATURE(cxx_rtti)
-#      define _CCCL_NO_RTTI
-#    endif
-#  endif
 #  ifdef _CCCL_NO_RTTI
 #    define THRUST_NO_RTTI
 #  endif // _CCCL_NO_RTTI
 
 #else
 
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/builtin.h>
+#  include <thrust/detail/config/compiler.h>
+
+#  if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#    pragma GCC system_header
+#  elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#    pragma clang system_header
+#  elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#    pragma system_header
+#  endif // no system header
 
 // NOTE: some compilers support the `typeid` feature but not the `dynamic_cast`
 // feature. This is why we have separate macros for each.
@@ -42,16 +42,16 @@
 #  ifndef THRUST_NO_RTTI
 #    if defined(THRUST_DISABLE_RTTI) // Escape hatch for users to manually disable RTTI
 #      define THRUST_NO_RTTI
-#    elif defined(__CUDA_ARCH__)
-#      define THRUST_NO_RTTI // No RTTI in CUDA device code
-#    elif THRUST_COMPILER(NVRTC)
-#      define THRUST_NO_RTTI
-#    elif THRUST_COMPILER(MSVC)
+#    elif defined(__INTEL_COMPILER)
+#      if __RTTI == 0 && __INTEL_RTTI__ == 0 && __GXX_RTTI == 0 && _CPPRTTI == 0
+#        define THRUST_NO_RTTI
+#      endif
+#    elif defined(_MSC_VER)
 #      if _CPPRTTI == 0
 #        define THRUST_NO_RTTI
 #      endif
-#    elif THRUST_COMPILER(CLANG)
-#      if !THRUST_HAS_FEATURE(cxx_rtti)
+#    elif defined(__clang__)
+#      if !__has_feature(cxx_rtti)
 #        define THRUST_NO_RTTI
 #      endif
 #    else
@@ -63,4 +63,4 @@
 
 #endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
-#endif // LIBCXX_WRAPPER_STD__CCCL_RTTI_H
+#endif // CONFIG_RTTI_H
diff --git a/projects/rocthrust/thrust/detail/config/simple_defines.h b/projects/rocthrust/thrust/detail/config/simple_defines.h
index 8f8b5ca8f3e9..1194e30acb7f 100644
--- a/projects/rocthrust/thrust/detail/config/simple_defines.h
+++ b/projects/rocthrust/thrust/detail/config/simple_defines.h
@@ -20,29 +20,14 @@
 
 #pragma once
 
-// Internal config header that is only included through thrust/detail/config/config.h
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-//! Deprecated [Since 3.0]
 #define THRUST_UNKNOWN 0
-//! Deprecated [Since 3.0]
-#define THRUST_FALSE 0
-//! Deprecated [Since 3.0]
-#define THRUST_TRUE 1
+#define THRUST_FALSE   0
+#define THRUST_TRUE    1
 
-//! Deprecated [Since 3.0]
 #define THRUST_UNUSED_VAR(expr) \
   do                            \
   {                             \
     (void) (expr);              \
   } while (0)
 
-//! Deprecated [Since 3.0]
 #define THRUST_PREVENT_MACRO_SUBSTITUTION
diff --git a/projects/rocthrust/thrust/detail/config/visibility.h b/projects/rocthrust/thrust/detail/config/visibility.h
new file mode 100644
index 000000000000..f0bff42f7359
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/config/visibility.h
@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef THRUST_DETAIL_CONFIG_VISIBILITY_H
+#define THRUST_DETAIL_CONFIG_VISIBILITY_H
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#  define THRUST_FORCEINLINE __forceinline
+#else // ^^^ THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC ^^^ / vvv THRUST_HOST_COMPILER !=
+      // THRUST_HOST_COMPILER_MSVC vvv
+#  define THRUST_FORCEINLINE __inline__ __attribute__((__always_inline__))
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+
+#endif // THRUST_DETAIL_CONFIG_VISIBILITY_H
diff --git a/projects/rocthrust/thrust/detail/contiguous_storage.h b/projects/rocthrust/thrust/detail/contiguous_storage.h
index 3e319cf5ff23..75df12b508ba 100644
--- a/projects/rocthrust/thrust/detail/contiguous_storage.h
+++ b/projects/rocthrust/thrust/detail/contiguous_storage.h
@@ -29,13 +29,7 @@
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/detail/normal_iterator.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/swap.h>
-#endif
-
-#include _THRUST_STD_INCLUDE(utility)
-
-#include <stdexcept>
+#include <thrust/sequence_access.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -45,13 +39,6 @@ namespace detail
 struct copy_allocator_t
 {};
 
-struct allocator_mismatch_on_swap : std::runtime_error
-{
-  allocator_mismatch_on_swap()
-      : std::runtime_error("swap called on containers with allocators that propagate on swap, but compare non-equal")
-  {}
-};
-
 // XXX parameter T is redundant with parameter Alloc
 template <typename T, typename Alloc>
 class contiguous_storage
@@ -84,8 +71,6 @@ class contiguous_storage
   THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE explicit contiguous_storage(copy_allocator_t, const contiguous_storage& other, size_type n);
 
-  contiguous_storage& operator=(const contiguous_storage& x) = delete;
-
   THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE ~contiguous_storage();
 
@@ -116,33 +101,7 @@ class contiguous_storage
 
   THRUST_HOST_DEVICE void deallocate() noexcept;
 
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE void swap(contiguous_storage& other)
-  {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    using _THRUST_STD::swap;
-#else
-    using thrust::swap;
-#endif
-    swap(m_begin, other.m_begin);
-    swap(m_size, other.m_size);
-
-    // From C++ standard [container.reqmts]
-    //   If allocator_traits<allocator_type>::propagate_on_container_swap::value is true, then allocator_type
-    //   shall meet the Cpp17Swappable requirements and the allocators of a and b shall also be exchanged by calling
-    //   swap as described in [swappable.requirements]. Otherwise, the allocators shall not be swapped, and the behavior
-    //   is undefined unless a.get_allocator() == b.get_allocator().
-    if constexpr (allocator_traits<Alloc>::propagate_on_container_swap::value)
-    {
-      swap(m_allocator, other.m_allocator);
-    }
-    else if constexpr (!allocator_traits<Alloc>::is_always_equal::value)
-    {
-      _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                        (assert(m_allocator == other.m_allocator);),
-                        (if (m_allocator != other.m_allocator) { throw allocator_mismatch_on_swap(); }));
-    }
-  }
+  THRUST_HOST_DEVICE void swap(contiguous_storage& x);
 
   THRUST_HOST_DEVICE void value_initialize_n(iterator first, size_type n);
 
@@ -164,56 +123,23 @@ class contiguous_storage
 
   THRUST_HOST_DEVICE void destroy(iterator first, iterator last) noexcept;
 
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE void deallocate_on_allocator_mismatch(const contiguous_storage& other) noexcept
-  {
-    if constexpr (allocator_traits<Alloc>::propagate_on_container_copy_assignment::value)
-    {
-      if (m_allocator != other.m_allocator)
-      {
-        deallocate();
-      }
-    }
-  }
+  THRUST_HOST_DEVICE void deallocate_on_allocator_mismatch(const contiguous_storage& other) noexcept;
 
-  THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE void
-  destroy_on_allocator_mismatch(const contiguous_storage& other, iterator first, iterator last) noexcept
-  {
-    if constexpr (allocator_traits<Alloc>::propagate_on_container_copy_assignment::value)
-    {
-      if (m_allocator != other.m_allocator)
-      {
-        destroy(first, last);
-      }
-    }
-#if THRUST_COMPILER(GCC, <, 10)
-    (void) first;
-    (void) last;
-#endif
-  }
+  destroy_on_allocator_mismatch(const contiguous_storage& other, iterator first, iterator last) noexcept;
 
   THRUST_HOST_DEVICE void set_allocator(const allocator_type& alloc);
 
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE void propagate_allocator(const contiguous_storage& other)
-  {
-    if constexpr (allocator_traits<Alloc>::propagate_on_container_copy_assignment::value)
-    {
-      m_allocator = other.m_allocator;
-    }
-  }
+  THRUST_HOST_DEVICE bool is_allocator_not_equal(const allocator_type& alloc) const;
 
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE void propagate_allocator(contiguous_storage& other)
-  {
-    if constexpr (allocator_traits<Alloc>::propagate_on_container_move_assignment::value)
-    {
-      m_allocator = _THRUST_STD::move(other.m_allocator);
-    }
-  }
+  THRUST_HOST_DEVICE bool is_allocator_not_equal(const contiguous_storage& other) const;
+
+  THRUST_HOST_DEVICE void propagate_allocator(const contiguous_storage& other);
+
+  THRUST_HOST_DEVICE void propagate_allocator(contiguous_storage& other);
 
   // allow move assignment for a sane implementation of allocator propagation
+  // on move assignment
   THRUST_HOST_DEVICE contiguous_storage& operator=(contiguous_storage&& other);
 
   THRUST_SYNTHESIZE_SEQUENCE_ACCESS(contiguous_storage, const_iterator);
@@ -226,6 +152,36 @@ class contiguous_storage
 
   size_type m_size;
 
+  // disallow assignment
+  contiguous_storage& operator=(const contiguous_storage& x);
+
+  THRUST_HOST_DEVICE void swap_allocators(true_type, const allocator_type&);
+
+  THRUST_HOST_DEVICE void swap_allocators(false_type, allocator_type&);
+
+  THRUST_HOST_DEVICE bool is_allocator_not_equal_dispatch(true_type, const allocator_type&) const;
+
+  THRUST_HOST_DEVICE bool is_allocator_not_equal_dispatch(false_type, const allocator_type&) const;
+
+  THRUST_HOST_DEVICE void deallocate_on_allocator_mismatch_dispatch(true_type, const contiguous_storage& other) noexcept;
+
+  THRUST_HOST_DEVICE void
+  deallocate_on_allocator_mismatch_dispatch(false_type, const contiguous_storage& other) noexcept;
+
+  THRUST_HOST_DEVICE void destroy_on_allocator_mismatch_dispatch(
+    true_type, const contiguous_storage& other, iterator first, iterator last) noexcept;
+
+  THRUST_HOST_DEVICE void destroy_on_allocator_mismatch_dispatch(
+    false_type, const contiguous_storage& other, iterator first, iterator last) noexcept;
+
+  THRUST_HOST_DEVICE void propagate_allocator_dispatch(true_type, const contiguous_storage& other);
+
+  THRUST_HOST_DEVICE void propagate_allocator_dispatch(false_type, const contiguous_storage& other);
+
+  THRUST_HOST_DEVICE void propagate_allocator_dispatch(true_type, contiguous_storage& other);
+
+  THRUST_HOST_DEVICE void propagate_allocator_dispatch(false_type, contiguous_storage& other);
+
   friend THRUST_HOST_DEVICE void swap(contiguous_storage& lhs, contiguous_storage& rhs) noexcept(noexcept(lhs.swap(rhs)))
   {
     lhs.swap(rhs);
diff --git a/projects/rocthrust/thrust/detail/contiguous_storage.inl b/projects/rocthrust/thrust/detail/contiguous_storage.inl
index 1040b4dac00b..fb79cea04dff 100644
--- a/projects/rocthrust/thrust/detail/contiguous_storage.inl
+++ b/projects/rocthrust/thrust/detail/contiguous_storage.inl
@@ -26,12 +26,17 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
+#include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/allocator/copy_construct_range.h>
 #include <thrust/detail/allocator/destroy_range.h>
 #include <thrust/detail/allocator/fill_construct_range.h>
 #include <thrust/detail/allocator/value_initialize_range.h>
 #include <thrust/detail/contiguous_storage.h>
+#include <thrust/detail/nv_target.h>
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  include _THRUST_STD_INCLUDE(utility)
+#endif
 
 #include <stdexcept> // for std::runtime_error
 
@@ -40,6 +45,14 @@ THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
+class allocator_mismatch_on_swap : public std::runtime_error
+{
+public:
+  allocator_mismatch_on_swap()
+      : std::runtime_error("swap called on containers with allocators that propagate on swap, but compare non-equal")
+  {}
+};
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename T, typename Alloc>
 THRUST_HOST_DEVICE contiguous_storage<T, Alloc>::contiguous_storage(const Alloc& alloc)
@@ -179,6 +192,29 @@ THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::deallocate() noexcept
   } // end if
 } // end contiguous_storage::deallocate()
 
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::swap(contiguous_storage& x)
+{
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+  using _THRUST_STD::swap;
+  swap(m_begin, x.m_begin);
+  swap(m_size, x.m_size);
+#else
+  thrust::swap(m_begin, x.m_begin);
+  thrust::swap(m_size, x.m_size);
+#endif
+
+  // FIXME(bgruber): swap_allocators already swaps m_allocator, so we are swapping twice here !!
+  swap_allocators(integral_constant<bool, allocator_traits<Alloc>::propagate_on_container_swap::value>(),
+                  x.m_allocator);
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+  swap(m_allocator, x.m_allocator);
+#else
+  thrust::swap(m_allocator, x.m_allocator);
+#endif
+} // end contiguous_storage::swap()
+
 template <typename T, typename Alloc>
 THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::value_initialize_n(iterator first, size_type n)
 {
@@ -236,6 +272,24 @@ THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::destroy(iterator first, it
   destroy_range(m_allocator, first.base(), last - first);
 } // end contiguous_storage::destroy()
 
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void
+contiguous_storage<T, Alloc>::deallocate_on_allocator_mismatch(const contiguous_storage& other) noexcept
+{
+  integral_constant<bool, allocator_traits<Alloc>::propagate_on_container_copy_assignment::value> c;
+
+  deallocate_on_allocator_mismatch_dispatch(c, other);
+} // end contiguous_storage::deallocate_on_allocator_mismatch
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::destroy_on_allocator_mismatch(
+  const contiguous_storage& other, iterator first, iterator last) noexcept
+{
+  integral_constant<bool, allocator_traits<Alloc>::propagate_on_container_copy_assignment::value> c;
+
+  destroy_on_allocator_mismatch_dispatch(c, other, first, last);
+} // end contiguous_storage::destroy_on_allocator_mismatch
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename T, typename Alloc>
 THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::set_allocator(const Alloc& alloc)
@@ -243,7 +297,36 @@ THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::set_allocator(const Alloc&
   m_allocator = alloc;
 } // end contiguous_storage::set_allocator()
 
-THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE bool contiguous_storage<T, Alloc>::is_allocator_not_equal(const Alloc& alloc) const
+{
+  return is_allocator_not_equal_dispatch(
+    integral_constant<bool, allocator_traits<Alloc>::is_always_equal::value>(), alloc);
+} // end contiguous_storage::is_allocator_not_equal()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE bool
+contiguous_storage<T, Alloc>::is_allocator_not_equal(const contiguous_storage<T, Alloc>& other) const
+{
+  return is_allocator_not_equal(m_allocator, other.m_allocator);
+} // end contiguous_storage::is_allocator_not_equal()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::propagate_allocator(const contiguous_storage& other)
+{
+  integral_constant<bool, allocator_traits<Alloc>::propagate_on_container_copy_assignment::value> c;
+
+  propagate_allocator_dispatch(c, other);
+} // end contiguous_storage::propagate_allocator()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::propagate_allocator(contiguous_storage& other)
+{
+  integral_constant<bool, allocator_traits<Alloc>::propagate_on_container_move_assignment::value> c;
+
+  propagate_allocator_dispatch(c, other);
+} // end contiguous_storage::propagate_allocator()
+
 template <typename T, typename Alloc>
 THRUST_HOST_DEVICE contiguous_storage<T, Alloc>& contiguous_storage<T, Alloc>::operator=(contiguous_storage&& other)
 {
@@ -251,11 +334,7 @@ THRUST_HOST_DEVICE contiguous_storage<T, Alloc>& contiguous_storage<T, Alloc>::o
   {
     deallocate();
   }
-  if constexpr (allocator_traits<Alloc>::propagate_on_container_move_assignment::value)
-  {
-    m_allocator = _THRUST_STD::move(other.m_allocator);
-  }
-
+  propagate_allocator(other);
   m_begin = std::move(other.m_begin);
   m_size  = std::move(other.m_size);
 
@@ -263,7 +342,100 @@ THRUST_HOST_DEVICE contiguous_storage<T, Alloc>& contiguous_storage<T, Alloc>::o
   other.m_size  = 0;
 
   return *this;
-}
+} // end contiguous_storage::propagate_allocator()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::swap_allocators(true_type, const Alloc&)
+{} // end contiguous_storage::swap_allocators()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::swap_allocators(false_type, Alloc& other)
+{
+  // FIXME(bgruber): it is really concerning, that swapping an allocator can throw. swap() should be noexcept in
+  // general.
+  NV_IF_TARGET(NV_IS_DEVICE,
+               (
+                 // allocators must be equal when swapping containers with allocators that propagate on swap
+                 assert(!is_allocator_not_equal(other));),
+               (if (is_allocator_not_equal(other)) { throw allocator_mismatch_on_swap(); }));
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+  using _THRUST_STD::swap;
+  swap(m_allocator, other);
+#else
+  thrust::swap(m_allocator, other);
+#endif
+} // end contiguous_storage::swap_allocators()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE bool
+contiguous_storage<T, Alloc>::is_allocator_not_equal_dispatch(true_type /*is_always_equal*/, const Alloc&) const
+{
+  return false;
+} // end contiguous_storage::is_allocator_not_equal_dispatch()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE bool
+contiguous_storage<T, Alloc>::is_allocator_not_equal_dispatch(false_type /*!is_always_equal*/, const Alloc& other) const
+{
+  return m_allocator != other;
+} // end contiguous_storage::is_allocator_not_equal_dispatch()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::deallocate_on_allocator_mismatch_dispatch(
+  true_type, const contiguous_storage& other) noexcept
+{
+  if (m_allocator != other.m_allocator)
+  {
+    deallocate();
+  }
+} // end contiguous_storage::deallocate_on_allocator_mismatch()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void
+contiguous_storage<T, Alloc>::deallocate_on_allocator_mismatch_dispatch(false_type, const contiguous_storage&) noexcept
+{} // end contiguous_storage::deallocate_on_allocator_mismatch()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::destroy_on_allocator_mismatch_dispatch(
+  true_type, const contiguous_storage& other, iterator first, iterator last) noexcept
+{
+  if (m_allocator != other.m_allocator)
+  {
+    destroy(first, last);
+  }
+} // end contiguous_storage::destroy_on_allocator_mismatch()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::destroy_on_allocator_mismatch_dispatch(
+  false_type, const contiguous_storage&, iterator, iterator) noexcept
+{} // end contiguous_storage::destroy_on_allocator_mismatch()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void
+contiguous_storage<T, Alloc>::propagate_allocator_dispatch(true_type, const contiguous_storage& other)
+{
+  m_allocator = other.m_allocator;
+} // end contiguous_storage::propagate_allocator()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::propagate_allocator_dispatch(false_type, const contiguous_storage&)
+{} // end contiguous_storage::propagate_allocator()
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::propagate_allocator_dispatch(true_type, contiguous_storage& other)
+{
+  m_allocator = std::move(other.m_allocator);
+} // end contiguous_storage::propagate_allocator()
+
+template <typename T, typename Alloc>
+THRUST_HOST_DEVICE void contiguous_storage<T, Alloc>::propagate_allocator_dispatch(false_type, contiguous_storage&)
+{} // end contiguous_storage::propagate_allocator()
 
 } // namespace detail
 
diff --git a/projects/rocthrust/thrust/detail/copy.h b/projects/rocthrust/thrust/detail/copy.h
index 8cb5a95d56d3..ba4c18abace1 100644
--- a/projects/rocthrust/thrust/detail/copy.h
+++ b/projects/rocthrust/thrust/detail/copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/copy.inl b/projects/rocthrust/thrust/detail/copy.inl
index f97a491299c5..3ae5f3e67871 100644
--- a/projects/rocthrust/thrust/detail/copy.inl
+++ b/projects/rocthrust/thrust/detail/copy.inl
@@ -17,87 +17,88 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/copy.h>
-#include <thrust/system/detail/adl/copy.h>
-#include <thrust/system/detail/generic/copy.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/copy.h>
+#include <thrust/system/detail/adl/copy.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator
-copy(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-     InputIterator first,
-     InputIterator last,
-     OutputIterator result)
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result)
 {
   using thrust::system::detail::generic::copy;
   return copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator copy_n(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, Size n, OutputIterator result)
+template<typename DerivedPolicy, typename InputIterator, typename Size, typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result)
 {
   using thrust::system::detail::generic::copy_n;
   return copy_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, result);
 } // end copy_n()
 
+
 namespace detail
 {
 
+
 THRUST_EXEC_CHECK_DISABLE // because we might call e.g. std::ostream_iterator's constructor
-template <typename System1, typename System2, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator two_system_copy(
-  const thrust::execution_policy<System1>& system1,
-  const thrust::execution_policy<System2>& system2,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result)
+template<typename System1,
+         typename System2,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator two_system_copy(const thrust::execution_policy<System1> &system1,
+                                 const thrust::execution_policy<System2> &system2,
+                                 InputIterator first,
+                                 InputIterator last,
+                                 OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
-  return thrust::copy(
-    select_system(thrust::detail::derived_cast(thrust::detail::strip_const(system1)),
-                  thrust::detail::derived_cast(thrust::detail::strip_const(system2))),
-    first,
-    last,
-    result);
+  return thrust::copy(select_system(thrust::detail::derived_cast(thrust::detail::strip_const(system1)), thrust::detail::derived_cast(thrust::detail::strip_const(system2))), first, last, result);
 } // end two_system_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE // because we might call e.g. std::ostream_iterator's constructor
-template <typename System1, typename System2, typename InputIterator, typename Size, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator two_system_copy_n(
-  const thrust::execution_policy<System1>& system1,
-  const thrust::execution_policy<System2>& system2,
-  InputIterator first,
-  Size n,
-  OutputIterator result)
+template<typename System1,
+         typename System2,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator two_system_copy_n(const thrust::execution_policy<System1> &system1,
+                                   const thrust::execution_policy<System2> &system2,
+                                   InputIterator first,
+                                   Size n,
+                                   OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
-  return thrust::copy_n(
-    select_system(thrust::detail::derived_cast(thrust::detail::strip_const(system1)),
-                  thrust::detail::derived_cast(thrust::detail::strip_const(system2))),
-    first,
-    n,
-    result);
+  return thrust::copy_n(select_system(thrust::detail::derived_cast(thrust::detail::strip_const(system1)), thrust::detail::derived_cast(thrust::detail::strip_const(system2))), first, n, result);
 } // end two_system_copy_n()
 
-} // namespace detail
 
-template <typename InputIterator, typename OutputIterator>
-OutputIterator copy(InputIterator first, InputIterator last, OutputIterator result)
+} // end detail
+
+
+template<typename InputIterator,
+         typename OutputIterator>
+  OutputIterator copy(InputIterator first,
+                      InputIterator last,
+                      OutputIterator result)
 {
   using System1 = typename thrust::iterator_system<InputIterator>::type;
   using System2 = typename thrust::iterator_system<OutputIterator>::type;
@@ -108,8 +109,13 @@ OutputIterator copy(InputIterator first, InputIterator last, OutputIterator resu
   return thrust::detail::two_system_copy(system1, system2, first, last, result);
 } // end copy()
 
-template <typename InputIterator, typename Size, typename OutputIterator>
-OutputIterator copy_n(InputIterator first, Size n, OutputIterator result)
+
+template<typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+  OutputIterator copy_n(InputIterator first,
+                        Size n,
+                        OutputIterator result)
 {
   using System1 = typename thrust::iterator_system<InputIterator>::type;
   using System2 = typename thrust::iterator_system<OutputIterator>::type;
diff --git a/projects/rocthrust/thrust/detail/copy_if.h b/projects/rocthrust/thrust/detail/copy_if.h
index ea001049c72f..5cf679957bac 100644
--- a/projects/rocthrust/thrust/detail/copy_if.h
+++ b/projects/rocthrust/thrust/detail/copy_if.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/copy_if.inl b/projects/rocthrust/thrust/detail/copy_if.inl
index 87831438974e..1c77435e5cec 100644
--- a/projects/rocthrust/thrust/detail/copy_if.inl
+++ b/projects/rocthrust/thrust/detail/copy_if.inl
@@ -17,55 +17,57 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/copy_if.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/copy_if.h>
 #include <thrust/system/detail/generic/copy_if.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/adl/copy_if.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate>
-THRUST_HOST_DEVICE OutputIterator copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator first,
+                         InputIterator last,
+                         OutputIterator result,
+                         Predicate pred)
 {
   using thrust::system::detail::generic::copy_if;
   return copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, pred);
 } // end copy_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-THRUST_HOST_DEVICE OutputIterator copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator1 first,
+                         InputIterator1 last,
+                         InputIterator2 stencil,
+                         OutputIterator result,
+                         Predicate pred)
 {
   using thrust::system::detail::generic::copy_if;
   return copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, pred);
 } // end copy_if()
 
-template <typename InputIterator, typename OutputIterator, typename Predicate>
-OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator copy_if(InputIterator first,
+                         InputIterator last,
+                         OutputIterator result,
+                         Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -75,12 +77,19 @@ OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator r
   System1 system1;
   System2 system2;
 
-  return thrust::copy_if(select_system(system1, system2), first, last, result, pred);
+  return thrust::copy_if(select_system(system1,system2), first, last, result, pred);
 } // end copy_if()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate>
-OutputIterator
-copy_if(InputIterator1 first, InputIterator1 last, InputIterator2 stencil, OutputIterator result, Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator copy_if(InputIterator1 first,
+                         InputIterator1 last,
+                         InputIterator2 stencil,
+                         OutputIterator result,
+                         Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -92,7 +101,7 @@ copy_if(InputIterator1 first, InputIterator1 last, InputIterator2 stencil, Outpu
   System2 system2;
   System3 system3;
 
-  return thrust::copy_if(select_system(system1, system2, system3), first, last, stencil, result, pred);
+  return thrust::copy_if(select_system(system1,system2,system3), first, last, stencil, result, pred);
 } // end copy_if()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/count.h b/projects/rocthrust/thrust/detail/count.h
index 26178bd0840d..8381b698cb7f 100644
--- a/projects/rocthrust/thrust/detail/count.h
+++ b/projects/rocthrust/thrust/detail/count.h
@@ -18,37 +18,31 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
 
 template <typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
       InputIterator first,
       InputIterator last,
       const EqualityComparable& value);
 
 template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
          InputIterator first,
          InputIterator last,
          Predicate pred);
 
 template <typename InputIterator, typename EqualityComparable>
-thrust::detail::it_difference_t<InputIterator>
+typename thrust::iterator_traits<InputIterator>::difference_type
 count(InputIterator first, InputIterator last, const EqualityComparable& value);
 
 template <typename InputIterator, typename Predicate>
-thrust::detail::it_difference_t<InputIterator> count_if(InputIterator first, InputIterator last, Predicate pred);
+typename thrust::iterator_traits<InputIterator>::difference_type
+count_if(InputIterator first, InputIterator last, Predicate pred);
 
 THRUST_NAMESPACE_END
 
diff --git a/projects/rocthrust/thrust/detail/count.inl b/projects/rocthrust/thrust/detail/count.inl
index e7c36e7e7997..c39791e269f5 100644
--- a/projects/rocthrust/thrust/detail/count.inl
+++ b/projects/rocthrust/thrust/detail/count.inl
@@ -17,48 +17,38 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/count.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/count.h>
-#include <thrust/system/detail/generic/count.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/count.h>
+#include <thrust/system/detail/adl/count.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-count(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-      InputIterator first,
-      InputIterator last,
-      const EqualityComparable& value)
+template<typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    count(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last, const EqualityComparable& value)
 {
   using thrust::system::detail::generic::count;
   return count(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 } // end count()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-count_if(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-         InputIterator first,
-         InputIterator last,
-         Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    count_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::count_if;
   return count_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end count_if()
 
+
 template <typename InputIterator, typename EqualityComparable>
-thrust::detail::it_difference_t<InputIterator>
+typename thrust::iterator_traits<InputIterator>::difference_type
 count(InputIterator first, InputIterator last, const EqualityComparable& value)
 {
   using thrust::system::detail::generic::select_system;
@@ -70,8 +60,10 @@ count(InputIterator first, InputIterator last, const EqualityComparable& value)
   return thrust::count(select_system(system), first, last, value);
 } // end count()
 
+
 template <typename InputIterator, typename Predicate>
-thrust::detail::it_difference_t<InputIterator> count_if(InputIterator first, InputIterator last, Predicate pred)
+typename thrust::iterator_traits<InputIterator>::difference_type
+count_if(InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/cpp_version_check.h b/projects/rocthrust/thrust/detail/cpp_version_check.h
new file mode 100644
index 000000000000..2c44ad7045aa
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/cpp_version_check.h
@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config/cpp_dialect.h>
+
+// This should be removed after cpp14 is fully deprecated.
+#ifdef THRUST_CPP14_REQUIRED_NO_ERROR
+#  define THRUST_CPP_VERSTION_CHECK_NO_ERROR
+#endif
+
+#ifndef THRUST_CPP_VERSTION_CHECK_NO_ERROR
+#  if THRUST_CPP_DIALECT < 2017
+#    error C++17 is required for this Thrust feature; please upgrade your compiler or pass the appropriate -std=c++17 flag to it.
+#  endif
+#endif
diff --git a/projects/rocthrust/thrust/detail/dependencies_aware_execution_policy.h b/projects/rocthrust/thrust/detail/dependencies_aware_execution_policy.h
new file mode 100644
index 000000000000..b1c26cf7e760
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/dependencies_aware_execution_policy.h
@@ -0,0 +1,85 @@
+/*
+ *  Copyright 2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/execute_with_dependencies.h>
+
+#include <tuple>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template <template <typename> class ExecutionPolicyCRTPBase>
+struct THRUST_DEPRECATED dependencies_aware_execution_policy
+{
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  after(Dependencies&&... dependencies) const
+  {
+    return {capture_as_dependency(THRUST_FWD(dependencies))...};
+  }
+
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  after(std::tuple<Dependencies...>& dependencies) const
+  {
+    return {capture_as_dependency(dependencies)};
+  }
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  after(std::tuple<Dependencies...>&& dependencies) const
+  {
+    return {capture_as_dependency(std::move(dependencies))};
+  }
+
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  rebind_after(Dependencies&&... dependencies) const
+  {
+    return {capture_as_dependency(THRUST_FWD(dependencies))...};
+  }
+
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  rebind_after(std::tuple<Dependencies...>& dependencies) const
+  {
+    return {capture_as_dependency(dependencies)};
+  }
+  template <typename... Dependencies>
+  THRUST_HOST thrust::detail::execute_with_dependencies<ExecutionPolicyCRTPBase, Dependencies...>
+  rebind_after(std::tuple<Dependencies...>&& dependencies) const
+  {
+    return {capture_as_dependency(std::move(dependencies))};
+  }
+};
+
+} // namespace detail
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/device_delete.inl b/projects/rocthrust/thrust/detail/device_delete.inl
index d16a7efae1a7..87f73aad9023 100644
--- a/projects/rocthrust/thrust/detail/device_delete.inl
+++ b/projects/rocthrust/thrust/detail/device_delete.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/allocator/destroy_range.h>
 #include <thrust/device_delete.h>
 #include <thrust/device_free.h>
+#include <thrust/detail/allocator/destroy_range.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -35,13 +27,13 @@ namespace detail
 {
 
 // define an empty allocator class to use below
-struct device_delete_allocator
-{};
+struct device_delete_allocator {};
 
-} // namespace detail
+}
 
-template <typename T>
-void device_delete(device_ptr<T> ptr, const size_t n)
+template<typename T>
+  void device_delete(device_ptr<T> ptr,
+                     const size_t n)
 {
   // we can use device_allocator to destroy the range
   thrust::detail::device_delete_allocator a;
diff --git a/projects/rocthrust/thrust/detail/device_free.inl b/projects/rocthrust/thrust/detail/device_free.inl
index 27c17d032704..9c5f116de322 100644
--- a/projects/rocthrust/thrust/detail/device_free.inl
+++ b/projects/rocthrust/thrust/detail/device_free.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/malloc_and_free.h>
 #include <thrust/device_free.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/detail/malloc_and_free.h>
 
 THRUST_NAMESPACE_BEGIN
 
diff --git a/projects/rocthrust/thrust/detail/device_malloc.inl b/projects/rocthrust/thrust/detail/device_malloc.inl
index 160ff7a3f2c6..a2f323f0f539 100644
--- a/projects/rocthrust/thrust/detail/device_malloc.inl
+++ b/projects/rocthrust/thrust/detail/device_malloc.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/malloc_and_free.h>
 #include <thrust/device_malloc.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/detail/malloc_and_free.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -44,8 +36,9 @@ thrust::device_ptr<void> device_malloc(const std::size_t n)
   return thrust::device_ptr<void>(thrust::malloc(s, n).get());
 } // end device_malloc()
 
-template <typename T>
-thrust::device_ptr<T> device_malloc(const std::size_t n)
+
+template<typename T>
+  thrust::device_ptr<T> device_malloc(const std::size_t n)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -54,7 +47,7 @@ thrust::device_ptr<T> device_malloc(const std::size_t n)
   // XXX lower to select_system(system) here
   system s;
 
-  return thrust::device_ptr<T>(thrust::malloc<T>(s, n).get());
+  return thrust::device_ptr<T>(thrust::malloc<T>(s,n).get());
 } // end device_malloc()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/device_new.inl b/projects/rocthrust/thrust/detail/device_new.inl
index 4b0147769d66..c66e2cbff6cb 100644
--- a/projects/rocthrust/thrust/detail/device_new.inl
+++ b/projects/rocthrust/thrust/detail/device_new.inl
@@ -17,22 +17,15 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/device_malloc.h>
 #include <thrust/device_new.h>
+#include <thrust/device_malloc.h>
 #include <thrust/uninitialized_fill.h>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename T>
-device_ptr<T> device_new(device_ptr<void> p, const size_t n)
+template<typename T>
+  device_ptr<T> device_new(device_ptr<void> p,
+                           const size_t n)
 {
   // XXX TODO dispatch n null device constructors at p here
   // in the meantime, dispatch 1 null host constructor here
@@ -40,8 +33,10 @@ device_ptr<T> device_new(device_ptr<void> p, const size_t n)
   return device_new<T>(p, T(), n);
 } // end device_new()
 
-template <typename T>
-device_ptr<T> device_new(device_ptr<void> p, const T& exemplar, const size_t n)
+template<typename T>
+  device_ptr<T> device_new(device_ptr<void> p,
+                           const T &exemplar,
+                           const size_t n)
 {
   device_ptr<T> result(reinterpret_cast<T*>(p.get()));
 
@@ -51,8 +46,8 @@ device_ptr<T> device_new(device_ptr<void> p, const T& exemplar, const size_t n)
   return result;
 } // end device_new()
 
-template <typename T>
-device_ptr<T> device_new(const size_t n)
+template<typename T>
+  device_ptr<T> device_new(const size_t n)
 {
   // call placement new
   return device_new<T>(thrust::device_malloc<T>(n));
diff --git a/projects/rocthrust/thrust/detail/distance.inl b/projects/rocthrust/thrust/detail/distance.inl
index bfc6cb24af1a..ebaf0b557c30 100644
--- a/projects/rocthrust/thrust/detail/distance.inl
+++ b/projects/rocthrust/thrust/detail/distance.inl
@@ -16,25 +16,18 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/advance.h>
-#include <thrust/iterator/iterator_traits.h>
+#include <thrust/detail/config.h>
 #include <thrust/system/detail/generic/distance.h>
+#include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator> distance(InputIterator first, InputIterator last)
+template<typename InputIterator>
+inline THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    distance(InputIterator first, InputIterator last)
 {
   return thrust::system::detail::generic::distance(first, last);
 } // end distance()
diff --git a/projects/rocthrust/thrust/detail/equal.inl b/projects/rocthrust/thrust/detail/equal.inl
index 927054db9b9f..6ff1d0b04294 100644
--- a/projects/rocthrust/thrust/detail/equal.inl
+++ b/projects/rocthrust/thrust/detail/equal.inl
@@ -17,49 +17,37 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/equal.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/equal.h>
-#include <thrust/system/detail/generic/equal.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/equal.h>
+#include <thrust/system/detail/adl/equal.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename System, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE bool
-equal(const thrust::detail::execution_policy_base<System>& system,
-      InputIterator1 first1,
-      InputIterator1 last1,
-      InputIterator2 first2)
+template<typename System, typename InputIterator1, typename InputIterator2>
+THRUST_HOST_DEVICE
+bool equal(const thrust::detail::execution_policy_base<System> &system, InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
 {
   using thrust::system::detail::generic::equal;
   return equal(thrust::detail::derived_cast(thrust::detail::strip_const(system)), first1, last1, first2);
 } // end equal()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename System, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE bool
-equal(const thrust::detail::execution_policy_base<System>& system,
-      InputIterator1 first1,
-      InputIterator1 last1,
-      InputIterator2 first2,
-      BinaryPredicate binary_pred)
+template<typename System, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+bool equal(const thrust::detail::execution_policy_base<System> &system, InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::equal;
   return equal(thrust::detail::derived_cast(thrust::detail::strip_const(system)), first1, last1, first2, binary_pred);
 } // end equal()
 
+
 template <typename InputIterator1, typename InputIterator2>
-bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
+bool equal(InputIterator1 first1, InputIterator1 last1,
+           InputIterator2 first2)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -69,11 +57,14 @@ bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
   System1 system1;
   System2 system2;
 
-  return thrust::equal(select_system(system1, system2), first1, last1, first2);
+  return thrust::equal(select_system(system1,system2), first1, last1, first2);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate binary_pred)
+
+template <typename InputIterator1, typename InputIterator2,
+          typename BinaryPredicate>
+bool equal(InputIterator1 first1, InputIterator1 last1,
+           InputIterator2 first2, BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -83,7 +74,7 @@ bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, B
   System1 system1;
   System2 system2;
 
-  return thrust::equal(select_system(system1, system2), first1, last1, first2, binary_pred);
+  return thrust::equal(select_system(system1,system2), first1, last1, first2, binary_pred);
 }
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/event_error.h b/projects/rocthrust/thrust/detail/event_error.h
index f6a97ebbb73f..66c6a51a1ab1 100644
--- a/projects/rocthrust/thrust/detail/event_error.h
+++ b/projects/rocthrust/thrust/detail/event_error.h
@@ -21,18 +21,14 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
 
-#include <thrust/detail/type_traits.h>
-#include <thrust/system/error_code.h>
+#if THRUST_CPP_DIALECT >= 2017
 
-#include <stdexcept>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/system/error_code.h>
+
+#  include <stdexcept>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -158,3 +154,5 @@ inline bool operator<(event_error const& lhs, event_error const& rhs) noexcept
 }
 
 THRUST_NAMESPACE_END
+
+#endif // C++14
diff --git a/projects/rocthrust/thrust/detail/execute_with_allocator.h b/projects/rocthrust/thrust/detail/execute_with_allocator.h
index 8ec9b4ecffae..da6d583fc398 100644
--- a/projects/rocthrust/thrust/detail/execute_with_allocator.h
+++ b/projects/rocthrust/thrust/detail/execute_with_allocator.h
@@ -79,6 +79,48 @@ THRUST_HOST void return_temporary_buffer(
   alloc_traits::deallocate(system.get_allocator(), to_ptr, num_elements);
 }
 
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename T, template <typename> class BaseSystem, typename Allocator, typename... Dependencies>
+THRUST_DEPRECATED THRUST_HOST thrust::pair<T*, std::ptrdiff_t> get_temporary_buffer(
+  thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>& system,
+  std::ptrdiff_t n)
+{
+  using naked_allocator = _THRUST_STD::remove_reference_t<Allocator>;
+  using alloc_traits    = typename thrust::detail::allocator_traits<naked_allocator>;
+  using void_pointer    = typename alloc_traits::void_pointer;
+  using size_type       = typename alloc_traits::size_type;
+  using value_type      = typename alloc_traits::value_type;
+
+  // How many elements of type value_type do we need to accommodate n elements
+  // of type T?
+  size_type num_elements = divide_ri(sizeof(T) * n, sizeof(value_type));
+
+  void_pointer ptr = alloc_traits::allocate(system.get_allocator(), num_elements);
+
+  // Return the pointer and the number of elements of type T allocated.
+  return thrust::make_pair(thrust::reinterpret_pointer_cast<T*>(ptr), n);
+}
+
+template <typename Pointer, template <typename> class BaseSystem, typename Allocator, typename... Dependencies>
+THRUST_HOST void return_temporary_buffer(
+  thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>& system,
+  Pointer p,
+  std::ptrdiff_t n)
+{
+  using naked_allocator = _THRUST_STD::remove_reference_t<Allocator>;
+  using alloc_traits    = typename thrust::detail::allocator_traits<naked_allocator>;
+  using pointer         = typename alloc_traits::pointer;
+  using size_type       = typename alloc_traits::size_type;
+  using value_type      = typename alloc_traits::value_type;
+  using T               = typename thrust::detail::pointer_traits<Pointer>::element_type;
+
+  size_type num_elements = divide_ri(sizeof(T) * n, sizeof(value_type));
+
+  pointer to_ptr = thrust::reinterpret_pointer_cast<pointer>(p);
+  alloc_traits::deallocate(system.get_allocator(), to_ptr, num_elements);
+}
+THRUST_SUPPRESS_DEPRECATED_POP
+
 } // namespace detail
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/execute_with_allocator_fwd.h b/projects/rocthrust/thrust/detail/execute_with_allocator_fwd.h
index 31bb492ef334..347749dca4fc 100644
--- a/projects/rocthrust/thrust/detail/execute_with_allocator_fwd.h
+++ b/projects/rocthrust/thrust/detail/execute_with_allocator_fwd.h
@@ -27,6 +27,9 @@
 #endif // no system header
 
 #include <thrust/detail/type_traits.h>
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
+#  include <thrust/detail/execute_with_dependencies.h>
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
@@ -36,8 +39,9 @@ THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-template <typename Allocator, template <typename> class BaseSystem>
-struct execute_with_allocator : BaseSystem<execute_with_allocator<Allocator, BaseSystem>>
+THRUST_SUPPRESS_DEPRECATED_PUSH // because of execute_with_allocator_and_dependencies
+  template <typename Allocator, template <typename> class BaseSystem>
+  struct execute_with_allocator : BaseSystem<execute_with_allocator<Allocator, BaseSystem>>
 {
 private:
   using super_t = BaseSystem<execute_with_allocator<Allocator, BaseSystem>>;
@@ -59,7 +63,51 @@ struct execute_with_allocator : BaseSystem<execute_with_allocator<Allocator, Bas
   {
     return alloc;
   }
+
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  after(Dependencies&&... dependencies) const
+  {
+    return {alloc, capture_as_dependency(THRUST_FWD(dependencies))...};
+  }
+
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  after(std::tuple<Dependencies...>& dependencies) const
+  {
+    return {alloc, capture_as_dependency(dependencies)};
+  }
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  after(std::tuple<Dependencies...>&& dependencies) const
+  {
+    return {alloc, capture_as_dependency(std::move(dependencies))};
+  }
+
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  rebind_after(Dependencies&&... dependencies) const
+  {
+    return {alloc, capture_as_dependency(THRUST_FWD(dependencies))...};
+  }
+
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  rebind_after(std::tuple<Dependencies...>& dependencies) const
+  {
+    return {alloc, capture_as_dependency(dependencies)};
+  }
+  template <typename... Dependencies>
+  THRUST_DEPRECATED THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>
+  rebind_after(std::tuple<Dependencies...>&& dependencies) const
+  {
+    return {alloc, capture_as_dependency(std::move(dependencies))};
+  }
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
 };
+
+THRUST_SUPPRESS_DEPRECATED_POP
 } // namespace detail
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/execute_with_dependencies.h b/projects/rocthrust/thrust/detail/execute_with_dependencies.h
new file mode 100644
index 000000000000..2b2bd6f22dd5
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/execute_with_dependencies.h
@@ -0,0 +1,226 @@
+/*
+ *  Copyright 2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_deduction.h>
+#include <thrust/detail/type_traits.h>
+
+#include <tuple>
+#include <type_traits>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+struct THRUST_DEPRECATED capture_as_dependency_fn
+{
+  template <typename Dependency>
+  auto operator()(Dependency&& dependency) const THRUST_DECLTYPE_RETURNS(capture_as_dependency(THRUST_FWD(dependency)))
+};
+
+// Default implementation: universal forwarding.
+template <typename Dependency>
+THRUST_DEPRECATED auto capture_as_dependency(Dependency&& dependency) THRUST_DECLTYPE_RETURNS(THRUST_FWD(dependency))
+
+  THRUST_SUPPRESS_DEPRECATED_PUSH template <typename... Dependencies>
+  THRUST_DEPRECATED auto capture_as_dependency(std::tuple<Dependencies...>& dependencies)
+    THRUST_DECLTYPE_RETURNS(tuple_for_each(THRUST_FWD(dependencies), capture_as_dependency_fn{}))
+      THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <template <typename> class BaseSystem, typename... Dependencies>
+  struct THRUST_DEPRECATED execute_with_dependencies
+    : BaseSystem<execute_with_dependencies<BaseSystem, Dependencies...>>
+{
+private:
+  using super_t = BaseSystem<execute_with_dependencies<BaseSystem, Dependencies...>>;
+
+  std::tuple<::internal::remove_cvref_t<Dependencies>...> dependencies;
+
+public:
+  THRUST_HOST execute_with_dependencies(super_t const& super, Dependencies&&... deps)
+      : super_t(super)
+      , dependencies(std::forward<Dependencies>(deps)...)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies(super_t const& super, UDependencies&&... deps)
+      : super_t(super)
+      , dependencies(THRUST_FWD(deps)...)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies(UDependencies&&... deps)
+      : dependencies(THRUST_FWD(deps)...)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies(super_t const& super, std::tuple<UDependencies...>&& deps)
+      : super_t(super)
+      , dependencies(std::move(deps))
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies(std::tuple<UDependencies...>&& deps)
+      : dependencies(std::move(deps))
+  {}
+
+  std::tuple<::internal::remove_cvref_t<Dependencies>...> THRUST_HOST extract_dependencies()
+  {
+    return std::move(dependencies);
+  }
+
+  // Rebinding.
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies<BaseSystem, UDependencies...>
+  rebind_after(UDependencies&&... udependencies) const
+  {
+    return {capture_as_dependency(THRUST_FWD(udependencies))...};
+  }
+
+  // Rebinding.
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies<BaseSystem, UDependencies...>
+  rebind_after(std::tuple<UDependencies...>& udependencies) const
+  {
+    return {capture_as_dependency(udependencies)};
+  }
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_dependencies<BaseSystem, UDependencies...>
+  rebind_after(std::tuple<UDependencies...>&& udependencies) const
+  {
+    return {capture_as_dependency(std::move(udependencies))};
+  }
+};
+
+template <typename Allocator, template <typename> class BaseSystem, typename... Dependencies>
+struct THRUST_DEPRECATED execute_with_allocator_and_dependencies
+    : BaseSystem<execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>>
+{
+private:
+  using super_t = BaseSystem<execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>>;
+
+  std::tuple<::internal::remove_cvref_t<Dependencies>...> dependencies;
+  Allocator alloc;
+
+public:
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies(super_t const& super, Allocator a, UDependencies&&... deps)
+      : super_t(super)
+      , dependencies(THRUST_FWD(deps)...)
+      , alloc(a)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies(Allocator a, UDependencies&&... deps)
+      : dependencies(THRUST_FWD(deps)...)
+      , alloc(a)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST
+  execute_with_allocator_and_dependencies(super_t const& super, Allocator a, std::tuple<UDependencies...>&& deps)
+      : super_t(super)
+      , dependencies(std::move(deps))
+      , alloc(a)
+  {}
+
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies(Allocator a, std::tuple<UDependencies...>&& deps)
+      : dependencies(std::move(deps))
+      , alloc(a)
+  {}
+
+  std::tuple<::internal::remove_cvref_t<Dependencies>...> THRUST_HOST extract_dependencies()
+  {
+    return std::move(dependencies);
+  }
+
+  THRUST_HOST typename std::add_lvalue_reference<Allocator>::type get_allocator()
+  {
+    return alloc;
+  }
+
+  // Rebinding.
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, UDependencies...>
+  rebind_after(UDependencies&&... udependencies) const
+  {
+    return {alloc, capture_as_dependency(THRUST_FWD(udependencies))...};
+  }
+
+  // Rebinding.
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, UDependencies...>
+  rebind_after(std::tuple<UDependencies...>& udependencies) const
+  {
+    return {alloc, capture_as_dependency(udependencies)};
+  }
+  template <typename... UDependencies>
+  THRUST_HOST execute_with_allocator_and_dependencies<Allocator, BaseSystem, UDependencies...>
+  rebind_after(std::tuple<UDependencies...>&& udependencies) const
+  {
+    return {alloc, capture_as_dependency(std::move(udependencies))};
+  }
+};
+
+template <template <typename> class BaseSystem, typename... Dependencies>
+THRUST_DEPRECATED THRUST_HOST std::tuple<::internal::remove_cvref_t<Dependencies>...>
+extract_dependencies(thrust::detail::execute_with_dependencies<BaseSystem, Dependencies...>&& system)
+{
+  return std::move(system).extract_dependencies();
+}
+template <template <typename> class BaseSystem, typename... Dependencies>
+THRUST_DEPRECATED THRUST_HOST std::tuple<::internal::remove_cvref_t<Dependencies>...>
+extract_dependencies(thrust::detail::execute_with_dependencies<BaseSystem, Dependencies...>& system)
+{
+  return std::move(system).extract_dependencies();
+}
+
+template <typename Allocator, template <typename> class BaseSystem, typename... Dependencies>
+THRUST_DEPRECATED THRUST_HOST std::tuple<::internal::remove_cvref_t<Dependencies>...> extract_dependencies(
+  thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>&& system)
+{
+  return std::move(system).extract_dependencies();
+}
+template <typename Allocator, template <typename> class BaseSystem, typename... Dependencies>
+THRUST_DEPRECATED THRUST_HOST std::tuple<::internal::remove_cvref_t<Dependencies>...> extract_dependencies(
+  thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem, Dependencies...>& system)
+{
+  return std::move(system).extract_dependencies();
+}
+
+template <typename System>
+THRUST_DEPRECATED THRUST_HOST std::tuple<> extract_dependencies(System&&)
+{
+  return std::tuple<>{};
+}
+
+} // namespace detail
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/extrema.inl b/projects/rocthrust/thrust/detail/extrema.inl
index 13d503c5aef0..0cbc87fc980b 100644
--- a/projects/rocthrust/thrust/detail/extrema.inl
+++ b/projects/rocthrust/thrust/detail/extrema.inl
@@ -17,85 +17,74 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/extrema.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/extrema.h>
-#include <thrust/system/detail/generic/extrema.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/extrema.h>
+#include <thrust/system/detail/adl/extrema.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator min_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+ForwardIterator min_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::min_element;
   return min_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end min_element()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE ForwardIterator min_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+ForwardIterator min_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   using thrust::system::detail::generic::min_element;
   return min_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end min_element()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator max_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+ForwardIterator max_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::max_element;
   return max_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end max_element()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE ForwardIterator max_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+ForwardIterator max_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   using thrust::system::detail::generic::max_element;
   return max_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end max_element()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator,ForwardIterator> minmax_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::minmax_element;
   return minmax_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end minmax_element()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator,ForwardIterator> minmax_element(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   using thrust::system::detail::generic::minmax_element;
   return minmax_element(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end minmax_element()
 
+
 template <typename ForwardIterator>
 ForwardIterator min_element(ForwardIterator first, ForwardIterator last)
 {
@@ -108,8 +97,10 @@ ForwardIterator min_element(ForwardIterator first, ForwardIterator last)
   return thrust::min_element(select_system(system), first, last);
 } // end min_element()
 
+
 template <typename ForwardIterator, typename BinaryPredicate>
-ForwardIterator min_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
+ForwardIterator min_element(ForwardIterator first, ForwardIterator last,
+                            BinaryPredicate comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -120,6 +111,7 @@ ForwardIterator min_element(ForwardIterator first, ForwardIterator last, BinaryP
   return thrust::min_element(select_system(system), first, last, comp);
 } // end min_element()
 
+
 template <typename ForwardIterator>
 ForwardIterator max_element(ForwardIterator first, ForwardIterator last)
 {
@@ -132,8 +124,10 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last)
   return thrust::max_element(select_system(system), first, last);
 } // end max_element()
 
+
 template <typename ForwardIterator, typename BinaryPredicate>
-ForwardIterator max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
+ForwardIterator max_element(ForwardIterator first, ForwardIterator last,
+                            BinaryPredicate comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -144,8 +138,10 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last, BinaryP
   return thrust::max_element(select_system(system), first, last, comp);
 } // end max_element()
 
+
 template <typename ForwardIterator>
-thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last)
+thrust::pair<ForwardIterator,ForwardIterator>
+minmax_element(ForwardIterator first, ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -156,8 +152,9 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
   return thrust::minmax_element(select_system(system), first, last);
 } // end minmax_element()
 
+
 template <typename ForwardIterator, typename BinaryPredicate>
-thrust::pair<ForwardIterator, ForwardIterator>
+thrust::pair<ForwardIterator,ForwardIterator>
 minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp)
 {
   using thrust::system::detail::generic::select_system;
diff --git a/projects/rocthrust/thrust/detail/fill.inl b/projects/rocthrust/thrust/detail/fill.inl
index 1ce94e34bbb7..b24601d72480 100644
--- a/projects/rocthrust/thrust/detail/fill.inl
+++ b/projects/rocthrust/thrust/detail/fill.inl
@@ -18,45 +18,45 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/fill.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/fill.h>
-#include <thrust/system/detail/generic/fill.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/fill.h>
+#include <thrust/system/detail/adl/fill.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void
-fill(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-     ForwardIterator first,
-     ForwardIterator last,
-     const T& value)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void fill(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+            ForwardIterator first,
+            ForwardIterator last,
+            const T &value)
 {
   using thrust::system::detail::generic::fill;
   return fill(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 } // end fill()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename OutputIterator, typename Size, typename T>
-THRUST_HOST_DEVICE OutputIterator
-fill_n(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, OutputIterator first, Size n, const T& value)
+template<typename DerivedPolicy, typename OutputIterator, typename Size, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator fill_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                        OutputIterator first,
+                        Size n,
+                        const T &value)
 {
   using thrust::system::detail::generic::fill_n;
   return fill_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, value);
 } // end fill_n()
 
-template <typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void fill(ForwardIterator first, ForwardIterator last, const T& value)
+
+template<typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void fill(ForwardIterator first,
+            ForwardIterator last,
+            const T &value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -67,8 +67,12 @@ THRUST_HOST_DEVICE void fill(ForwardIterator first, ForwardIterator last, const
   thrust::fill(select_system(system), first, last, value);
 } // end fill()
 
-template <typename OutputIterator, typename Size, typename T>
-THRUST_HOST_DEVICE OutputIterator fill_n(OutputIterator first, Size n, const T& value)
+
+template<typename OutputIterator, typename Size, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator fill_n(OutputIterator first,
+                        Size n,
+                        const T &value)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/find.inl b/projects/rocthrust/thrust/detail/find.inl
index b9b3d08a8a7a..a0f2f1dca694 100644
--- a/projects/rocthrust/thrust/detail/find.inl
+++ b/projects/rocthrust/thrust/detail/find.inl
@@ -17,59 +17,56 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/find.h>
-#include <thrust/system/detail/generic/find.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/find.h>
+#include <thrust/system/detail/adl/find.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename T>
-THRUST_HOST_DEVICE InputIterator
-find(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-     InputIterator first,
-     InputIterator last,
-     const T& value)
+template<typename DerivedPolicy, typename InputIterator, typename T>
+THRUST_HOST_DEVICE
+InputIterator find(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   InputIterator first,
+                   InputIterator last,
+                   const T& value)
 {
   using thrust::system::detail::generic::find;
   return find(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 } // end find()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE InputIterator find_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+InputIterator find_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
   using thrust::system::detail::generic::find_if;
   return find_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end find_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE InputIterator find_if_not(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+InputIterator find_if_not(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::find_if_not;
   return find_if_not(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end find_if_not()
 
+
 template <typename InputIterator, typename T>
-InputIterator find(InputIterator first, InputIterator last, const T& value)
+InputIterator find(InputIterator first,
+                   InputIterator last,
+                   const T& value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -81,7 +78,9 @@ InputIterator find(InputIterator first, InputIterator last, const T& value)
 }
 
 template <typename InputIterator, typename Predicate>
-InputIterator find_if(InputIterator first, InputIterator last, Predicate pred)
+InputIterator find_if(InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -93,7 +92,9 @@ InputIterator find_if(InputIterator first, InputIterator last, Predicate pred)
 }
 
 template <typename InputIterator, typename Predicate>
-InputIterator find_if_not(InputIterator first, InputIterator last, Predicate pred)
+InputIterator find_if_not(InputIterator first,
+                          InputIterator last,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/for_each.inl b/projects/rocthrust/thrust/detail/for_each.inl
index 11553d7bd321..2be8abc7d959 100644
--- a/projects/rocthrust/thrust/detail/for_each.inl
+++ b/projects/rocthrust/thrust/detail/for_each.inl
@@ -17,37 +17,35 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/for_each.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/for_each.h>
-#include <thrust/system/detail/generic/for_each.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/for_each.h>
+#include <thrust/system/detail/adl/for_each.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename UnaryFunction>
-THRUST_HOST_DEVICE InputIterator for_each(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  UnaryFunction f)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename UnaryFunction>
+THRUST_HOST_DEVICE
+  InputIterator for_each(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator first,
+                         InputIterator last,
+                         UnaryFunction f)
 {
   using thrust::system::detail::generic::for_each;
 
   return for_each(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, f);
 }
 
-template <typename InputIterator, typename UnaryFunction>
-InputIterator for_each(InputIterator first, InputIterator last, UnaryFunction f)
+
+template<typename InputIterator,
+         typename UnaryFunction>
+InputIterator for_each(InputIterator first,
+                       InputIterator last,
+                       UnaryFunction f)
 {
   using thrust::system::detail::generic::select_system;
   using System = typename thrust::iterator_system<InputIterator>::type;
@@ -57,17 +55,25 @@ InputIterator for_each(InputIterator first, InputIterator last, UnaryFunction f)
 } // end for_each()
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename UnaryFunction>
-THRUST_HOST_DEVICE InputIterator for_each_n(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, Size n, UnaryFunction f)
+template<typename DerivedPolicy, typename InputIterator, typename Size, typename UnaryFunction>
+THRUST_HOST_DEVICE
+  InputIterator for_each_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator first,
+                           Size n,
+                           UnaryFunction f)
 {
   using thrust::system::detail::generic::for_each_n;
 
   return for_each_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, f);
 } // end for_each_n()
 
-template <typename InputIterator, typename Size, typename UnaryFunction>
-InputIterator for_each_n(InputIterator first, Size n, UnaryFunction f)
+
+template<typename InputIterator,
+         typename Size,
+         typename UnaryFunction>
+InputIterator for_each_n(InputIterator first,
+                         Size n,
+                         UnaryFunction f)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/functional.inl b/projects/rocthrust/thrust/detail/functional.inl
new file mode 100644
index 000000000000..00f73f8c489c
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/functional.inl
@@ -0,0 +1,138 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/functional.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template<typename Operation>
+  struct unary_traits_imp;
+
+template<typename Operation>
+  struct unary_traits_imp<Operation*>
+{
+  using function_type = Operation;
+  using param_type    = const function_type&;
+  using result_type   = typename Operation::result_type;
+  using argument_type = typename Operation::argument_type;
+}; // end unary_traits_imp
+
+template<typename Result, typename Argument>
+  struct unary_traits_imp<Result(*)(Argument)>
+{
+  using function_type = Result (*)(Argument);
+  using param_type    = Result (*)(Argument);
+  using result_type   = Result;
+  using argument_type = Argument;
+}; // end unary_traits_imp
+
+template<typename Operation>
+  struct binary_traits_imp;
+
+template<typename Operation>
+  struct binary_traits_imp<Operation*>
+{
+  using function_type        = Operation;
+  using param_type           = const function_type&;
+  using result_type          = typename Operation::result_type;
+  using first_argument_type  = typename Operation::first_argument_type;
+  using second_argument_type = typename Operation::second_argument_type;
+}; // end binary_traits_imp
+
+template<typename Result, typename Argument1, typename Argument2>
+  struct binary_traits_imp<Result(*)(Argument1, Argument2)>
+{
+  using function_type        = Result (*)(Argument1, Argument2);
+  using param_type           = Result (*)(Argument1, Argument2);
+  using result_type          = Result;
+  using first_argument_type  = Argument1;
+  using second_argument_type = Argument2;
+}; // end binary_traits_imp
+
+} // end detail
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename Operation>
+struct unary_traits
+{
+  using function_type = typename detail::unary_traits_imp<Operation*>::function_type;
+  using param_type    = typename detail::unary_traits_imp<Operation*>::param_type;
+  using result_type   = typename detail::unary_traits_imp<Operation*>::result_type;
+  using argument_type = typename detail::unary_traits_imp<Operation*>::argument_type;
+}; // end unary_traits
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename Result, typename Argument>
+struct unary_traits<Result (*)(Argument)>
+{
+  using function_type = Result (*)(Argument);
+  using param_type    = Result (*)(Argument);
+  using result_type   = Result;
+  using argument_type = Argument;
+}; // end unary_traits
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename Operation>
+struct binary_traits
+{
+  using function_type        = typename detail::binary_traits_imp<Operation*>::function_type;
+  using param_type           = typename detail::binary_traits_imp<Operation*>::param_type;
+  using result_type          = typename detail::binary_traits_imp<Operation*>::result_type;
+  using first_argument_type  = typename detail::binary_traits_imp<Operation*>::first_argument_type;
+  using second_argument_type = typename detail::binary_traits_imp<Operation*>::second_argument_type;
+}; // end binary_traits
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename Result, typename Argument1, typename Argument2>
+struct binary_traits<Result (*)(Argument1, Argument2)>
+{
+  using function_type        = Result (*)(Argument1, Argument2);
+  using param_type           = Result (*)(Argument1, Argument2);
+  using result_type          = Result;
+  using first_argument_type  = Argument1;
+  using second_argument_type = Argument2;
+}; // end binary_traits
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename Predicate>
+  THRUST_HOST_DEVICE
+  unary_negate<Predicate> not1(const Predicate& pred)
+{
+  return unary_negate<Predicate>(pred);
+} // end not1()
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename BinaryPredicate>
+  THRUST_HOST_DEVICE
+  binary_negate<BinaryPredicate> not2(const BinaryPredicate& pred)
+{
+  return binary_negate<BinaryPredicate>(pred);
+} // end not2()
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/functional/actor.h b/projects/rocthrust/thrust/detail/functional/actor.h
index 5962d4c8f93e..0cc0aa851edf 100644
--- a/projects/rocthrust/thrust/detail/functional/actor.h
+++ b/projects/rocthrust/thrust/detail/functional/actor.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2024 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/type_deduction.h>
-#include <thrust/detail/type_traits.h> // for internal::decay_t
+#include <thrust/detail/type_traits.h>
 #include <thrust/tuple.h>
 
 #include _THRUST_STD_INCLUDE(type_traits)
diff --git a/projects/rocthrust/thrust/detail/functional/address_stability.h b/projects/rocthrust/thrust/detail/functional/address_stability.h
new file mode 100644
index 000000000000..fecbdc981f98
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/functional/address_stability.h
@@ -0,0 +1,133 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DETAIL_FUNCTIONAL_ADDRESS_STABILITY_H
+#define DETAIL_FUNCTIONAL_ADDRESS_STABILITY_H
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
+#  include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
+// clang-format on
+#else
+#  include <functional>
+#  include <type_traits>
+#  include <utility>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+
+using _THRUST_LIBCXX::__has_builtin_operators;
+using _THRUST_LIBCXX::proclaim_copyable_arguments;
+using _THRUST_LIBCXX::proclaims_copyable_arguments;
+#  define THRUST_MARK_CAN_COPY_ARGUMENTS(functor)                                              \
+    /*we know what plus<T> etc. does if T is not a type that could have a weird operatorX() */ \
+    template <typename T>                                                                      \
+    struct proclaims_copyable_arguments<functor<T>> : __has_builtin_operators<T>               \
+    {};                                                                                        \
+    /*we do not know what plus<void> etc. does, which depends on the types it is invoked on */ \
+    template <>                                                                                \
+    struct proclaims_copyable_arguments<functor<void>> : _THRUST_STD::false_type               \
+    {};
+
+#else
+
+//! Trait telling whether a function object type F does not rely on the memory addresses of its arguments. The nested
+//! value is true when the addresses of the arguments do not matter and arguments can be provided from arbitrary copies
+//! of the respective sources. This trait can be specialized for custom function objects types.
+//! @see proclaim_copyable_arguments
+template <typename F, typename SFINAE = void>
+struct proclaims_copyable_arguments : ::std::false_type
+{};
+
+template <typename F, typename... Args>
+inline constexpr bool proclaims_copyable_arguments_v = proclaims_copyable_arguments<F, Args...>::value;
+
+// Wrapper for a callable to mark it as permitting copied arguments
+template <typename F>
+struct callable_permitting_copied_arguments : F
+{
+  using F::operator();
+};
+
+template <typename F>
+struct proclaims_copyable_arguments<callable_permitting_copied_arguments<F>> : ::std::true_type
+{};
+
+//! Creates a new function object from an existing one, which is marked as permitting its arguments to be copies of
+//! whatever source they come from. This implies that the addresses of the arguments are irrelevant to the function
+//! object. Some algorithms, like thrust::transform, can benefit from this information and choose a more efficient
+//! implementation.
+//! @see proclaims_copyable_arguments
+template <typename F>
+THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr auto proclaim_copyable_arguments(F&& f)
+  -> callable_permitting_copied_arguments<::std::decay_t<F>>
+{
+  return {::std::forward<F>(f)};
+}
+
+// Specializations for libcu++ function objects are provided here to not pull this include into `<cuda/std/...>` headers
+
+template <typename T>
+struct has_builtin_operators
+    : ::std::bool_constant<!::std::is_class_v<T> && !::std::is_enum_v<T> && !::std::is_void_v<T>>
+{};
+
+#  define THRUST_MARK_CAN_COPY_ARGUMENTS(functor)                                              \
+    /*we know what plus<T> etc. does if T is not a type that could have a weird operatorX() */ \
+    template <typename T>                                                                      \
+    struct proclaims_copyable_arguments<functor<T>> : has_builtin_operators<T>                 \
+    {};                                                                                        \
+    /*we do not know what plus<void> etc. does, which depends on the types it is invoked on */ \
+    template <>                                                                                \
+    struct proclaims_copyable_arguments<functor<void>> : ::std::false_type                     \
+    {};
+
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::plus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::minus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::multiplies);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::divides);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::modulus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::negate);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_and);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_not);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_or);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_xor);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::equal_to);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::not_equal_to);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::less);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::less_equal);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::greater_equal);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::greater);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_and);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_not);
+THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_or);
+
+#endif
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
+
+#endif // DETAIL_FUNCTIONAL_ADDRESS_STABILITY_H
diff --git a/projects/rocthrust/thrust/detail/gather.inl b/projects/rocthrust/thrust/detail/gather.inl
index 2148b0c21d58..21caaf5f9ce1 100644
--- a/projects/rocthrust/thrust/detail/gather.inl
+++ b/projects/rocthrust/thrust/detail/gather.inl
@@ -18,85 +18,78 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/gather.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/gather.h>
-#include <thrust/system/detail/generic/gather.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/gather.h>
+#include <thrust/system/detail/adl/gather.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename RandomAccessIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator gather(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator map_first,
-  InputIterator map_last,
-  RandomAccessIterator input_first,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename RandomAccessIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator gather(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                        InputIterator                                               map_first,
+                        InputIterator                                               map_last,
+                        RandomAccessIterator                                        input_first,
+                        OutputIterator                                              result)
 {
   using thrust::system::detail::generic::gather;
-  return gather(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), map_first, map_last, input_first, result);
+  return gather(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), map_first, map_last, input_first, result);
 } // end gather()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename RandomAccessIterator,
-          typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator gather_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 map_first,
-  InputIterator1 map_last,
-  InputIterator2 stencil,
-  RandomAccessIterator input_first,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator gather_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator1                                              map_first,
+                           InputIterator1                                              map_last,
+                           InputIterator2                                              stencil,
+                           RandomAccessIterator                                        input_first,
+                           OutputIterator                                              result)
 {
   using thrust::system::detail::generic::gather_if;
-  return gather_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), map_first, map_last, stencil, input_first, result);
+  return gather_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), map_first, map_last, stencil, input_first, result);
 } // end gather_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename RandomAccessIterator,
-          typename OutputIterator,
-          typename Predicate>
-THRUST_HOST_DEVICE OutputIterator gather_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 map_first,
-  InputIterator1 map_last,
-  InputIterator2 stencil,
-  RandomAccessIterator input_first,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator gather_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator1                                              map_first,
+                           InputIterator1                                              map_last,
+                           InputIterator2                                              stencil,
+                           RandomAccessIterator                                        input_first,
+                           OutputIterator                                              result,
+                           Predicate                                                   pred)
 {
   using thrust::system::detail::generic::gather_if;
-  return gather_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    map_first,
-    map_last,
-    stencil,
-    input_first,
-    result,
-    pred);
+  return gather_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), map_first, map_last, stencil, input_first, result, pred);
 } // end gather_if()
 
-template <typename InputIterator, typename RandomAccessIterator, typename OutputIterator>
-OutputIterator
-gather(InputIterator map_first, InputIterator map_last, RandomAccessIterator input_first, OutputIterator result)
+
+template<typename InputIterator,
+         typename RandomAccessIterator,
+         typename OutputIterator>
+  OutputIterator gather(InputIterator        map_first,
+                        InputIterator        map_last,
+                        RandomAccessIterator input_first,
+                        OutputIterator       result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -108,16 +101,19 @@ gather(InputIterator map_first, InputIterator map_last, RandomAccessIterator inp
   System2 system2;
   System3 system3;
 
-  return thrust::gather(select_system(system1, system2, system3), map_first, map_last, input_first, result);
+  return thrust::gather(select_system(system1,system2,system3), map_first, map_last, input_first, result);
 } // end gather()
 
-template <typename InputIterator1, typename InputIterator2, typename RandomAccessIterator, typename OutputIterator>
-OutputIterator gather_if(
-  InputIterator1 map_first,
-  InputIterator1 map_last,
-  InputIterator2 stencil,
-  RandomAccessIterator input_first,
-  OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator,
+         typename OutputIterator>
+  OutputIterator gather_if(InputIterator1       map_first,
+                           InputIterator1       map_last,
+                           InputIterator2       stencil,
+                           RandomAccessIterator input_first,
+                           OutputIterator       result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -131,22 +127,21 @@ OutputIterator gather_if(
   System3 system3;
   System4 system4;
 
-  return thrust::gather_if(
-    select_system(system1, system2, system3, system4), map_first, map_last, stencil, input_first, result);
+  return thrust::gather_if(select_system(system1,system2,system3,system4), map_first, map_last, stencil, input_first, result);
 } // end gather_if()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename RandomAccessIterator,
-          typename OutputIterator,
-          typename Predicate>
-OutputIterator gather_if(
-  InputIterator1 map_first,
-  InputIterator1 map_last,
-  InputIterator2 stencil,
-  RandomAccessIterator input_first,
-  OutputIterator result,
-  Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator gather_if(InputIterator1       map_first,
+                           InputIterator1       map_last,
+                           InputIterator2       stencil,
+                           RandomAccessIterator input_first,
+                           OutputIterator       result,
+                           Predicate            pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -160,8 +155,7 @@ OutputIterator gather_if(
   System3 system3;
   System4 system4;
 
-  return thrust::gather_if(
-    select_system(system1, system2, system3, system4), map_first, map_last, stencil, input_first, result, pred);
+  return thrust::gather_if(select_system(system1,system2,system3,system4), map_first, map_last, stencil, input_first, result, pred);
 } // end gather_if()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/generate.inl b/projects/rocthrust/thrust/detail/generate.inl
index 2bba44d8d99f..68028d155ae1 100644
--- a/projects/rocthrust/thrust/detail/generate.inl
+++ b/projects/rocthrust/thrust/detail/generate.inl
@@ -18,45 +18,50 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/generate.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/generate.h>
-#include <thrust/system/detail/generic/generate.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/generate.h>
+#include <thrust/system/detail/adl/generate.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Generator>
-THRUST_HOST_DEVICE void
-generate(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-         ForwardIterator first,
-         ForwardIterator last,
-         Generator gen)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Generator>
+THRUST_HOST_DEVICE
+  void generate(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                Generator gen)
 {
   using thrust::system::detail::generic::generate;
   return generate(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, gen);
 } // end generate()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename OutputIterator, typename Size, typename Generator>
-THRUST_HOST_DEVICE OutputIterator generate_n(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, OutputIterator first, Size n, Generator gen)
+template<typename DerivedPolicy,
+         typename OutputIterator,
+         typename Size,
+         typename Generator>
+THRUST_HOST_DEVICE
+  OutputIterator generate_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            OutputIterator first,
+                            Size n,
+                            Generator gen)
 {
   using thrust::system::detail::generic::generate_n;
   return generate_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, gen);
 } // end generate_n()
 
-template <typename ForwardIterator, typename Generator>
-void generate(ForwardIterator first, ForwardIterator last, Generator gen)
+
+template<typename ForwardIterator,
+         typename Generator>
+  void generate(ForwardIterator first,
+                ForwardIterator last,
+                Generator gen)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -67,8 +72,13 @@ void generate(ForwardIterator first, ForwardIterator last, Generator gen)
   return thrust::generate(select_system(system), first, last, gen);
 } // end generate()
 
-template <typename OutputIterator, typename Size, typename Generator>
-OutputIterator generate_n(OutputIterator first, Size n, Generator gen)
+
+template<typename OutputIterator,
+         typename Size,
+         typename Generator>
+  OutputIterator generate_n(OutputIterator first,
+                            Size n,
+                            Generator gen)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/get_iterator_value.h b/projects/rocthrust/thrust/detail/get_iterator_value.h
index 4e9afee4e772..2948c7f5d4e4 100644
--- a/projects/rocthrust/thrust/detail/get_iterator_value.h
+++ b/projects/rocthrust/thrust/detail/get_iterator_value.h
@@ -1,3 +1,4 @@
+#pragma once
 /*
  *  Copyright 2008-2016 NVIDIA Corporation
  *
@@ -13,18 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-#pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/execution_policy.h>
 #include <thrust/iterator/iterator_traits.h>
@@ -39,7 +31,8 @@ namespace detail
 // --------------------------------------------------
 // it is okay to dereference iterator in the usual way
 template <typename DerivedPolicy, typename Iterator>
-THRUST_HOST_DEVICE it_value_t<Iterator> get_iterator_value(thrust::execution_policy<DerivedPolicy>&, Iterator it)
+THRUST_HOST_DEVICE typename thrust::iterator_traits<Iterator>::value_type
+get_iterator_value(thrust::execution_policy<DerivedPolicy>&, Iterator it)
 {
   return *it;
 } // get_iterator_value(exec,Iterator);
diff --git a/projects/rocthrust/thrust/detail/inner_product.inl b/projects/rocthrust/thrust/detail/inner_product.inl
index 71876c9df680..bc1716042d0d 100644
--- a/projects/rocthrust/thrust/detail/inner_product.inl
+++ b/projects/rocthrust/thrust/detail/inner_product.inl
@@ -17,64 +17,56 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/inner_product.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/inner_product.h>
-#include <thrust/system/detail/generic/inner_product.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/inner_product.h>
+#include <thrust/system/detail/adl/inner_product.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputType>
-THRUST_HOST_DEVICE OutputType inner_product(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputType init)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputType>
+THRUST_HOST_DEVICE
+OutputType inner_product(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         OutputType init)
 {
   using thrust::system::detail::generic::inner_product;
   return inner_product(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, init);
 } // end inner_product()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputType,
-          typename BinaryFunction1,
-          typename BinaryFunction2>
-THRUST_HOST_DEVICE OutputType inner_product(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputType init,
-  BinaryFunction1 binary_op1,
-  BinaryFunction2 binary_op2)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputType,
+         typename BinaryFunction1,
+         typename BinaryFunction2>
+THRUST_HOST_DEVICE
+OutputType inner_product(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         OutputType init,
+                         BinaryFunction1 binary_op1,
+                         BinaryFunction2 binary_op2)
 {
   using thrust::system::detail::generic::inner_product;
-  return inner_product(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first1,
-    last1,
-    first2,
-    init,
-    binary_op1,
-    binary_op2);
+  return inner_product(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, init, binary_op1, binary_op2);
 } // end inner_product()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputType>
-OutputType inner_product(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputType init)
+
+template<typename InputIterator1, typename InputIterator2, typename OutputType>
+OutputType
+inner_product(InputIterator1 first1, InputIterator1 last1,
+              InputIterator2 first2, OutputType init)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -84,21 +76,16 @@ OutputType inner_product(InputIterator1 first1, InputIterator1 last1, InputItera
   System1 system1;
   System2 system2;
 
-  return thrust::inner_product(select_system(system1, system2), first1, last1, first2, init);
+  return thrust::inner_product(select_system(system1,system2), first1, last1, first2, init);
 } // end inner_product()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputType,
-          typename BinaryFunction1,
-          typename BinaryFunction2>
-OutputType inner_product(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputType init,
-  BinaryFunction1 binary_op1,
-  BinaryFunction2 binary_op2)
+
+template<typename InputIterator1, typename InputIterator2, typename OutputType,
+         typename BinaryFunction1, typename BinaryFunction2>
+OutputType
+inner_product(InputIterator1 first1, InputIterator1 last1,
+              InputIterator2 first2, OutputType init,
+              BinaryFunction1 binary_op1, BinaryFunction2 binary_op2)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -108,7 +95,7 @@ OutputType inner_product(
   System1 system1;
   System2 system2;
 
-  return thrust::inner_product(select_system(system1, system2), first1, last1, first2, init, binary_op1, binary_op2);
+  return thrust::inner_product(select_system(system1,system2), first1, last1, first2, init, binary_op1, binary_op2);
 } // end inner_product()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/integer_math.h b/projects/rocthrust/thrust/detail/integer_math.h
index 06d6aa02d727..1313ebdf301c 100644
--- a/projects/rocthrust/thrust/detail/integer_math.h
+++ b/projects/rocthrust/thrust/detail/integer_math.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,18 +19,11 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/nv_target.h>
 #include <thrust/detail/type_deduction.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
 #include <limits>
+#include <type_traits>
 
 THRUST_NAMESPACE_BEGIN
 namespace detail
@@ -40,19 +33,16 @@ template <typename Integer>
 THRUST_HOST_DEVICE THRUST_FORCEINLINE Integer clz(Integer x)
 {
   Integer result;
-
-  _THRUST_IF_TARGET(
-    _THRUST_IS_DEVICE,
-    (result = ::__clz(x);),
-    (int num_bits = 8 * sizeof(Integer); int num_bits_minus_one = num_bits - 1; result = num_bits;
-     for (int i = num_bits_minus_one; i >= 0; --i) {
-       if ((Integer(1) << i) & x)
-       {
-         result = num_bits_minus_one - i;
-         break;
-       }
-     }));
-
+  NV_IF_TARGET(NV_IS_DEVICE,
+               (result = ::__clz(x);),
+               (int num_bits = 8 * sizeof(Integer); int num_bits_minus_one = num_bits - 1; result = num_bits;
+                for (int i = num_bits_minus_one; i >= 0; --i) {
+                  if ((Integer(1) << i) & x)
+                  {
+                    result = num_bits_minus_one - i;
+                    break;
+                  }
+                }));
   return result;
 }
 
diff --git a/projects/rocthrust/thrust/detail/integer_traits.h b/projects/rocthrust/thrust/detail/integer_traits.h
new file mode 100644
index 000000000000..1bd701172b23
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/integer_traits.h
@@ -0,0 +1,120 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <limits>
+
+#include <limits.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template <typename T>
+class integer_traits
+{
+public:
+  static constexpr bool is_integral = false;
+};
+
+template <typename T, T min_val, T max_val>
+class integer_traits_base
+{
+public:
+  static constexpr bool is_integral = true;
+  static constexpr T const_min      = min_val;
+  static constexpr T const_max      = max_val;
+};
+
+template <>
+class integer_traits<bool>
+    : public std::numeric_limits<bool>
+    , public integer_traits_base<bool, false, true>
+{};
+
+template <>
+class integer_traits<char>
+    : public std::numeric_limits<char>
+    , public integer_traits_base<char, CHAR_MIN, CHAR_MAX>
+{};
+
+template <>
+class integer_traits<signed char>
+    : public std::numeric_limits<signed char>
+    , public integer_traits_base<signed char, SCHAR_MIN, SCHAR_MAX>
+{};
+
+template <>
+class integer_traits<unsigned char>
+    : public std::numeric_limits<unsigned char>
+    , public integer_traits_base<unsigned char, 0, UCHAR_MAX>
+{};
+
+template <>
+class integer_traits<short>
+    : public std::numeric_limits<short>
+    , public integer_traits_base<short, SHRT_MIN, SHRT_MAX>
+{};
+
+template <>
+class integer_traits<unsigned short>
+    : public std::numeric_limits<unsigned short>
+    , public integer_traits_base<unsigned short, 0, USHRT_MAX>
+{};
+
+template <>
+class integer_traits<int>
+    : public std::numeric_limits<int>
+    , public integer_traits_base<int, INT_MIN, INT_MAX>
+{};
+
+template <>
+class integer_traits<unsigned int>
+    : public std::numeric_limits<unsigned int>
+    , public integer_traits_base<unsigned int, 0, UINT_MAX>
+{};
+
+template <>
+class integer_traits<long>
+    : public std::numeric_limits<long>
+    , public integer_traits_base<long, LONG_MIN, LONG_MAX>
+{};
+
+template <>
+class integer_traits<unsigned long>
+    : public std::numeric_limits<unsigned long>
+    , public integer_traits_base<unsigned long, 0, ULONG_MAX>
+{};
+
+template <>
+class integer_traits<long long>
+    : public std::numeric_limits<long long>
+    , public integer_traits_base<long long, LLONG_MIN, LLONG_MAX>
+{};
+
+template <>
+class integer_traits<unsigned long long>
+    : public std::numeric_limits<unsigned long long>
+    , public integer_traits_base<unsigned long long, 0, ULLONG_MAX>
+{};
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/internal_functional.h b/projects/rocthrust/thrust/detail/internal_functional.h
index d5eeedcad586..627edd277f27 100644
--- a/projects/rocthrust/thrust/detail/internal_functional.h
+++ b/projects/rocthrust/thrust/detail/internal_functional.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/memory_wrapper.h> // for ::new
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/detail/static_assert.h>
@@ -118,6 +117,79 @@ struct tuple_not_binary_predicate
   mutable Predicate pred;
 };
 
+template <typename Generator>
+struct host_generate_functor
+{
+  using result_type = void;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE host_generate_functor(Generator g)
+      : gen(g)
+  {}
+
+  // operator() does not take an lvalue reference because some iterators
+  // produce temporary proxy references when dereferenced. for example,
+  // consider the temporary tuple of references produced by zip_iterator.
+  // such temporaries cannot bind to an lvalue reference.
+  //
+  // to WAR this, accept a const reference (which is bindable to a temporary),
+  // and const_cast in the implementation.
+  //
+  // XXX change to an rvalue reference upon c++0x (which either a named variable
+  //     or temporary can bind to)
+  template <typename T>
+  THRUST_HOST void operator()(const T& x)
+  {
+    // we have to be naughty and const_cast this to get it to work
+    T& lvalue = const_cast<T&>(x);
+
+    // this assigns correctly whether x is a true reference or proxy
+    lvalue = gen();
+  }
+
+  Generator gen;
+};
+
+template <typename Generator>
+struct device_generate_functor
+{
+  using result_type = void;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE device_generate_functor(Generator g)
+      : gen(g)
+  {}
+
+  // operator() does not take an lvalue reference because some iterators
+  // produce temporary proxy references when dereferenced. for example,
+  // consider the temporary tuple of references produced by zip_iterator.
+  // such temporaries cannot bind to an lvalue reference.
+  //
+  // to WAR this, accept a const reference (which is bindable to a temporary),
+  // and const_cast in the implementation.
+  //
+  // XXX change to an rvalue reference upon c++0x (which either a named variable
+  //     or temporary can bind to)
+  template <typename T>
+  THRUST_HOST_DEVICE void operator()(const T& x)
+  {
+    // we have to be naughty and const_cast this to get it to work
+    T& lvalue = const_cast<T&>(x);
+
+    // this assigns correctly whether x is a true reference or proxy
+    lvalue = gen();
+  }
+
+  Generator gen;
+};
+
+template <typename System, typename Generator>
+struct generate_functor
+    : thrust::detail::eval_if<_THRUST_STD::is_convertible<System, thrust::host_system_tag>::value,
+                              thrust::detail::identity_<host_generate_functor<Generator>>,
+                              thrust::detail::identity_<device_generate_functor<Generator>>>
+{};
+
 template <typename T>
 struct is_non_const_reference
     : ::internal::_And<thrust::detail::not_<_THRUST_STD::is_const<T>>,
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/__cccl_config.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/__cccl_config.h
deleted file mode 100644
index d7a1eb5162a5..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/__cccl_config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023-24 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER__CCCL_CONFIG_H
-#define LIBCXX_WRAPPER__CCCL_CONFIG_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(__cccl_config) // IWYU pragma: export
-#endif
-
-#include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/builtin.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/cuda_toolkit.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/deprecated.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/diagnostic.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/exceptions.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/rtti.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/sequence_access.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/unreachable.h> // IWYU pragma: export
-#include <thrust/detail/libcxx_wrapper/std/__cccl/visibility.h> // IWYU pragma: export
-
-#endif // LIBCXX_WRAPPER__CCCL_CONFIG_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/address_stability.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/address_stability.h
deleted file mode 100644
index c20bbec71dba..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/address_stability.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_FUNCTIONAL_ADDRESS_STABILITY_H
-#define LIBCXX_WRAPPER_FUNCTIONAL_ADDRESS_STABILITY_H
-
-// TODO(libhipcxx): remove this file, check all the usage of proclaim_copyable_arguments and
-// proclaims_copyable_arguments, and replace THRUST_NS_QUALIFIER::detail::* with _THRUST_LIBCXX::* in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(__functional/address_stability.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__functional/not_fn.h>
-#  include <thrust/detail/type_traits.h>
-
-#  include <functional>
-#  include <type_traits>
-#  include <utility>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_LIBCXX::proclaim_copyable_arguments;
-using _THRUST_LIBCXX::proclaims_copyable_arguments;
-
-#else
-
-template <typename F, typename SFINAE = void>
-struct proclaims_copyable_arguments : ::std::false_type
-{};
-
-namespace detail
-{
-template <typename F>
-struct callable_permitting_copied_arguments : F
-{
-  using F::operator();
-};
-} // namespace detail
-
-template <typename F>
-struct proclaims_copyable_arguments<detail::callable_permitting_copied_arguments<F>> : ::std::true_type
-{};
-
-template <typename F>
-THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr auto
-proclaim_copyable_arguments(F&& f) -> detail::callable_permitting_copied_arguments<::internal::decay_t<F>>
-{
-  return {::std::forward<F>(f)};
-}
-
-template <typename Fn>
-struct proclaims_copyable_arguments<not_fn_t<Fn>> : proclaims_copyable_arguments<Fn>
-{};
-
-namespace detail
-{
-template <typename Tp>
-struct has_builtin_operators
-    : ::std::bool_constant<!THRUST_TRAIT(::std::is_class, Tp) && !THRUST_TRAIT(::std::is_enum, Tp)
-                           && !THRUST_TRAIT(::std::is_void, Tp)>
-{};
-} // namespace detail
-
-#  define THRUST_MARK_CAN_COPY_ARGUMENTS(functor)                                        \
-    template <typename Tp>                                                               \
-    struct proclaims_copyable_arguments<functor<Tp>> : detail::has_builtin_operators<Tp> \
-    {};                                                                                  \
-    template <>                                                                          \
-    struct proclaims_copyable_arguments<functor<void>> : ::std::false_type               \
-    {};
-
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::plus);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::minus);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::multiplies);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::divides);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::modulus);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::negate);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_and);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_not);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_or);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::bit_xor);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::equal_to);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::not_equal_to);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::less);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::less_equal);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::greater_equal);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::greater);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_and);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_not);
-THRUST_MARK_CAN_COPY_ARGUMENTS(::std::logical_or);
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_FUNCTIONAL_ADDRESS_STABILITY_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/maximum.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/maximum.h
deleted file mode 100644
index c31032031586..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/maximum.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_FUNCTIONAL_MAXIMUM_H
-#define LIBCXX_WRAPPER_FUNCTIONAL_MAXIMUM_H
-
-// TODO(libhipcxx): remove this file and replace ::internal with _THRUST_STD in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(__functional/maximum.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/detail/libcxx/include/__config.h>
-
-#  include <type_traits>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_LIBCXX::maximum;
-
-#else
-
-template <typename Tp = void>
-struct maximum
-{
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr Tp operator()(const Tp& lhs, const Tp& rhs) const
-    noexcept(noexcept((lhs < rhs) ? rhs : lhs))
-  {
-    return (lhs < rhs) ? rhs : lhs;
-  }
-};
-THRUST_CTAD_SUPPORTED_FOR_TYPE(maximum);
-
-template <>
-struct maximum<void>
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T1, typename T2>
-  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr ::std::common_type_t<T1, T2>
-  operator()(const T1& lhs, const T2& rhs) const noexcept(noexcept((lhs < rhs) ? rhs : lhs))
-  {
-    return (lhs < rhs) ? rhs : lhs;
-  }
-};
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_FUNCTIONAL_MAXIMUM_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/minimum.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/minimum.h
deleted file mode 100644
index 5f5f1baa1ef6..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/__functional/minimum.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_FUNCTIONAL_MINIMUM_H
-#define LIBCXX_WRAPPER_FUNCTIONAL_MINIMUM_H
-
-// TODO(libhipcxx): remove this file and replace ::internal with _THRUST_STD in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(__functional/minimum.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/detail/libcxx/include/__config.h>
-
-#  include <type_traits>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_LIBCXX::minimum;
-
-#else
-
-template <typename Tp = void>
-struct minimum
-{
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr Tp operator()(const Tp& lhs, const Tp& rhs) const
-    noexcept(noexcept((lhs < rhs) ? lhs : rhs))
-  {
-    return (lhs < rhs) ? lhs : rhs;
-  }
-};
-THRUST_CTAD_SUPPORTED_FOR_TYPE(minimum);
-
-template <>
-struct minimum<void>
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T1, typename T2>
-  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr ::std::common_type_t<T1, T2>
-  operator()(const T1& lhs, const T2& rhs) const noexcept(noexcept((lhs < rhs) ? lhs : rhs))
-  {
-    return (lhs < rhs) ? lhs : rhs;
-  }
-};
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_FUNCTIONAL_MINIMUM_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/attributes.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/attributes.h
deleted file mode 100644
index be6d1168730b..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/attributes.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_ATTRIBUTES_H
-#define LIBCXX_WRAPPER_STD__CCCL_ATTRIBUTES_H
-
-// TODO(libhipcxx): remove this file and replace THRUST_DECLSPEC_EMPTY_BASES, THRUST_NODISCARD* and
-// THRUST_ALIAS_ATTRIBUTE with _CCCL_DECLSPEC_EMPTY_BASES, _CCCL_NODISCARD* and _CCCL_ALIAS_ATTRIBUTE in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/attributes.h)
-
-#  define THRUST_HAS_ATTRIBUTE(__x)     _CCCL_HAS_ATTRIBUTE(__x)
-#  define THRUST_HAS_CPP_ATTRIBUTE(__x) _CCCL_HAS_CPP_ATTRIBUTE(__x)
-#  define THRUST_DECLSPEC_EMPTY_BASES   _CCCL_DECLSPEC_EMPTY_BASES
-#  define THRUST_NODISCARD              _CCCL_NODISCARD
-#  define THRUST_NODISCARD_FRIEND       _CCCL_NODISCARD_FRIEND
-#  define THRUST_NORETURN               _CCCL_NORETURN
-
-#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  ifdef __has_attribute
-#    define THRUST_HAS_ATTRIBUTE(__x) __has_attribute(__x)
-#  else // ^^^ __has_attribute ^^^ / vvv !__has_attribute vvv
-#    define THRUST_HAS_ATTRIBUTE(__x) 0
-#  endif // !__has_attribute
-
-#  ifdef __has_cpp_attribute
-#    define THRUST_HAS_CPP_ATTRIBUTE(__x) __has_cpp_attribute(__x)
-#  else // ^^^ __has_cpp_attribute ^^^ / vvv !__has_cpp_attribute vvv
-#    define THRUST_HAS_CPP_ATTRIBUTE(__x) 0
-#  endif // !__has_cpp_attribute
-
-#  ifdef __has_declspec_attribute
-#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) __has_declspec_attribute(__x)
-#  else // ^^^ __has_declspec_attribute ^^^ / vvv !__has_declspec_attribute vvv
-#    define THRUST_HAS_DECLSPEC_ATTRIBUTE(__x) 0
-#  endif // !__has_declspec_attribute
-
-#  if THRUST_COMPILER(MSVC) || THRUST_HAS_DECLSPEC_ATTRIBUTE(empty_bases)
-#    define THRUST_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
-#  else // ^^^ THRUST_COMPILER(MSVC) ^^^ / vvv !THRUST_COMPILER(MSVC) vvv
-#    define THRUST_DECLSPEC_EMPTY_BASES
-#  endif // !THRUST_COMPILER(MSVC)
-
-#  if THRUST_HAS_CPP_ATTRIBUTE(nodiscard) || THRUST_COMPILER(MSVC)
-#    define THRUST_NODISCARD [[nodiscard]]
-#  else // ^^^ has nodiscard ^^^ / vvv no nodiscard vvv
-#    define THRUST_NODISCARD
-#  endif // no nodiscard
-
-#  if THRUST_COMPILER(CLANG)
-#    define THRUST_NODISCARD_FRIEND friend
-#  else
-#    define THRUST_NODISCARD_FRIEND THRUST_NODISCARD friend
-#  endif
-
-#  if THRUST_COMPILER(MSVC)
-#    define THRUST_NORETURN __declspec(noreturn)
-#  elif THRUST_HAS_CPP_ATTRIBUTE(noreturn)
-#    define THRUST_NORETURN [[noreturn]]
-#  else
-#    define THRUST_NORETURN __attribute__((noreturn))
-#  endif
-
-#endif // _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_ATTRIBUTES_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/builtin.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/builtin.h
deleted file mode 100644
index bfb2ca3d17cf..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/builtin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_BUILTIN_H
-#define LIBCXX_WRAPPER_STD__CCCL_BUILTIN_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  ifdef __has_feature
-#    define THRUST_HAS_FEATURE(__x) __has_feature(__x)
-#  else // ^^^ __has_feature ^^^ / vvv !__has_feature vvv
-#    define THRUST_HAS_FEATURE(__x) 0
-#  endif // !__has_feature
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_BUILTIN_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/compiler.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/compiler.h
deleted file mode 100644
index 09521ba0f03d..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/compiler.h
+++ /dev/null
@@ -1,217 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_COMPILER_H
-#define LIBCXX_WRAPPER_STD__CCCL_COMPILER_H
-
-// TODO(libhipcxx): check if libhipcxx supports THRUST_COMPILER_HIP, remove this file,
-// and replace all THRUST* with _CCCL* in rocThrust once libhipcxx gets ready.
-
-#include <thrust/detail/config/libcxx.h>
-
-// 'libhipcxx' does not provide _CCCL_HAS_HIP_COMPILER, we must add it ourselves.
-// When fully swapping over to libhipcxx, do not forget to port this properly!
-#if defined(__HIP__)
-#  define THRUST_HAS_HIP_COMPILER() 1
-#else
-#  define THRUST_HAS_HIP_COMPILER() 0
-#endif // __HIP__
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/compiler.h)
-
-#  define THRUST_COMPILER(...) _CCCL_COMPILER(__VA_ARGS__)
-
-#  define THRUST_CUDA_COMPILER(...)  _CCCL_CUDA_COMPILER(__VA_ARGS__)
-#  define THRUST_HAS_CUDA_COMPILER() _CCCL_HAS_CUDA_COMPILER()
-#  define THRUST_CUDA_COMPILATION()  _CCCL_CUDA_COMPILATION()
-
-#  define THRUST_PRAGMA(ARG)          _CCCL_PRAGMA(ARG)
-#  define THRUST_PRAGMA_UNROLL_FULL() _CCCL_PRAGMA_UNROLL_FULL()
-
-#else
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/deprecated.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h>
-
-// Utility to compare version numbers. To use:
-// 1) Define a macro that makes a pair of (major, minor) numbers:
-//    #define MYPRODUCT_MAKE_VERSION(_MAJOR, _MINOR) (_MAJOR * 100 + _MINOR)
-// 2) Define a macro that you will use to compare versions, e.g.:
-//    #define MYPRODUCT(...) THRUST_VERSION_COMPARE(MYPRODUCT, MYPRODUCT_##__VA_ARGS__)
-//    Signatures:
-//       MYPRODUCT(_PROD)                      - is the product _PROD version non-zero?
-//       MYPRODUCT(_PROD, _OP, _MAJOR)         - compare the product _PROD major version to _MAJOR using operator _OP
-//       MYPRODUCT(_PROD, _OP, _MAJOR, _MINOR) - compare the product _PROD version to _MAJOR._MINOR using operator _OP
-// 3) Define the product version macros as a function-like macro that returns the version number or
-//    THRUST_VERSION_INVALID() if the version cannot be determined, e. g.:
-//    #define MYPRODUCT_<_PROD>() (1, 2)
-//      or
-//    #define MYPRODUCT_<_PROD>() THRUST_VERSION_INVALID()
-#  define THRUST_VERSION_MAJOR_(_MAJOR, _MINOR) _MAJOR
-#  define THRUST_VERSION_MAJOR(_PAIR)           THRUST_VERSION_MAJOR_ _PAIR
-#  define THRUST_VERSION_INVALID()              (-1, -1)
-#  define THRUST_MAKE_VERSION(_PREFIX, _PAIR) \
-    (THRUST_PP_EVAL(THRUST_PP_CAT(_PREFIX, MAKE_VERSION), THRUST_PP_EXPAND _PAIR))
-#  define THRUST_VERSION_IS_INVALID(_PAIR) \
-    (THRUST_VERSION_MAJOR(_PAIR) == THRUST_VERSION_MAJOR(THRUST_VERSION_INVALID()))
-#  define THRUST_VERSION_COMPARE_1(_PREFIX, _VER) (!THRUST_VERSION_IS_INVALID(_VER()))
-#  define THRUST_VERSION_COMPARE_3(_PREFIX, _VER, _OP, _MAJOR) \
-    (!THRUST_VERSION_IS_INVALID(_VER()) && (THRUST_VERSION_MAJOR(_VER()) _OP _MAJOR))
-#  define THRUST_VERSION_COMPARE_4(_PREFIX, _VER, _OP, _MAJOR, _MINOR) \
-    (!THRUST_VERSION_IS_INVALID(_VER())                                \
-     && (THRUST_MAKE_VERSION(_PREFIX, _VER()) _OP THRUST_MAKE_VERSION(_PREFIX, (_MAJOR, _MINOR))))
-#  define THRUST_VERSION_SELECT_COUNT(_ARG1, _ARG2, _ARG3, _ARG4, _ARG5, ...) _ARG5
-#  define THRUST_VERSION_SELECT2(_ARGS)                                       THRUST_VERSION_SELECT_COUNT _ARGS
-#  define THRUST_VERSION_SELECT(...)         \
-    THRUST_VERSION_SELECT2(                  \
-      (__VA_ARGS__,                          \
-       THRUST_VERSION_COMPARE_4,             \
-       THRUST_VERSION_COMPARE_3,             \
-       THRUST_VERSION_COMPARE_BAD_ARG_COUNT, \
-       THRUST_VERSION_COMPARE_1,             \
-       THRUST_VERSION_COMPARE_BAD_ARG_COUNT))
-#  define THRUST_VERSION_COMPARE(_PREFIX, ...) THRUST_VERSION_SELECT(__VA_ARGS__)(_PREFIX, __VA_ARGS__)
-
-#  define THRUST_COMPILER_MAKE_VERSION(_MAJOR, _MINOR) ((_MAJOR) * 100 + (_MINOR))
-#  define THRUST_COMPILER(...)                         THRUST_VERSION_COMPARE(THRUST_COMPILER_, THRUST_COMPILER_##__VA_ARGS__)
-
-#  define THRUST_COMPILER_NVHPC()    THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_CLANG()    THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_GCC()      THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_MSVC()     THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_MSVC2019() THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_MSVC2022() THRUST_VERSION_INVALID()
-#  define THRUST_COMPILER_NVRTC()    THRUST_VERSION_INVALID()
-
-#  if defined(__INTEL_COMPILER)
-#    ifndef THRUST_IGNORE_DEPRECATED_COMPILER
-#      warning \
-        "The Intel C++ Compiler Classic (icc/icpc) is not supported by CCCL. Define THRUST_IGNORE_DEPRECATED_COMPILER to suppress this message."
-#    endif // !THRUST_IGNORE_DEPRECATED_COMPILER
-#  elif defined(__NVCOMPILER)
-#    undef THRUST_COMPILER_NVHPC
-#    define THRUST_COMPILER_NVHPC() (__NVCOMPILER_MAJOR__, __NVCOMPILER_MINOR__)
-#  elif defined(__clang__)
-#    undef THRUST_COMPILER_CLANG
-#    define THRUST_COMPILER_CLANG() (__clang_major__, __clang_minor__)
-#  elif defined(__GNUC__)
-#    undef THRUST_COMPILER_GCC
-#    define THRUST_COMPILER_GCC() (__GNUC__, __GNUC_MINOR__)
-#  elif defined(_MSC_VER)
-#    undef THRUST_COMPILER_MSVC
-#    define THRUST_COMPILER_MSVC() (_MSC_VER / 100, _MSC_VER % 100)
-#    if THRUST_COMPILER(MSVC, <, 19, 20)
-#      ifndef THRUST_IGNORE_DEPRECATED_COMPILER
-#        error \
-          "Visual Studio 2017 (MSC_VER < 1920) and older are not supported by rocThrust. Define THRUST_IGNORE_DEPRECATED_COMPILER to suppress this error."
-#      endif
-#    endif // THRUST_COMPILER(MSVC, <, 19, 20)
-#    if THRUST_COMPILER(MSVC, >=, 19, 20) && THRUST_COMPILER(MSVC, <, 19, 30)
-#      undef THRUST_COMPILER_MSVC2019
-#      define THRUST_COMPILER_MSVC2019() THRUST_COMPILER_MSVC()
-#    endif // THRUST_COMPILER(MSVC, >=, 19, 20) && THRUST_COMPILER(MSVC, <, 19, 30)
-#    if THRUST_COMPILER(MSVC, >=, 19, 30) && THRUST_COMPILER(MSVC, <, 19, 40)
-#      undef THRUST_COMPILER_MSVC2022
-#      define THRUST_COMPILER_MSVC2022() THRUST_COMPILER_MSVC()
-#    endif // THRUST_COMPILER(MSVC, >=, 19, 30) && THRUST_COMPILER(MSVC, <, 19, 40)
-#  elif defined(__CUDACC_RTC__)
-#    undef THRUST_COMPILER_NVRTC
-#    define THRUST_COMPILER_NVRTC() (__CUDACC_VER_MAJOR__, __CUDACC_VER_MINOR__)
-#  endif
-
-#  define THRUST_CUDA_COMPILER_MAKE_VERSION(_MAJOR, _MINOR) THRUST_COMPILER_MAKE_VERSION(_MAJOR, _MINOR)
-#  define THRUST_CUDA_COMPILER(...)                         THRUST_VERSION_COMPARE(THRUST_CUDA_COMPILER_, THRUST_CUDA_COMPILER_##__VA_ARGS__)
-
-#  define THRUST_CUDA_COMPILER_NVCC()  THRUST_VERSION_INVALID()
-#  define THRUST_CUDA_COMPILER_NVHPC() THRUST_VERSION_INVALID()
-#  define THRUST_CUDA_COMPILER_CLANG() THRUST_VERSION_INVALID()
-#  define THRUST_CUDA_COMPILER_NVRTC() THRUST_VERSION_INVALID()
-
-#  if defined(__NVCC__)
-#    undef THRUST_CUDA_COMPILER_NVCC
-#    define THRUST_CUDA_COMPILER_NVCC() (__CUDACC_VER_MAJOR__, __CUDACC_VER_MINOR__)
-#  elif defined(_NVHPC_CUDA)
-#    undef THRUST_CUDA_COMPILER_NVHPC
-#    define THRUST_CUDA_COMPILER_NVHPC() THRUST_COMPILER_NVHPC()
-#  elif defined(__CUDA__) && THRUST_COMPILER(CLANG)
-#    undef THRUST_CUDA_COMPILER_CLANG
-#    define THRUST_CUDA_COMPILER_CLANG() THRUST_COMPILER_CLANG()
-#  elif THRUST_COMPILER(NVRTC)
-#    undef THRUST_CUDA_COMPILER_NVRTC
-#    define THRUST_CUDA_COMPILER_NVRTC() THRUST_COMPILER_NVRTC()
-#  endif // ^^^ THRUST_COMPILER(NVRTC) ^^^
-
-#  if THRUST_CUDA_COMPILER(NVCC) || THRUST_CUDA_COMPILER(CLANG) || THRUST_CUDA_COMPILER(NVHPC) \
-    || THRUST_CUDA_COMPILER(NVRTC)
-#    define THRUST_HAS_CUDA_COMPILER() 1
-#  else // ^^^ has cuda compiler ^^^ / vvv no cuda compiler vvv
-#    define THRUST_HAS_CUDA_COMPILER() 0
-#  endif // ^^^ no cuda compiler ^^^
-
-#  if defined(__CUDACC__) || THRUST_CUDA_COMPILER(NVHPC)
-#    define THRUST_CUDA_COMPILATION() 1
-#  else // ^^^ compiling .cu file ^^^ / vvv not compiling .cu file vvv
-#    define THRUST_CUDA_COMPILATION() 0
-#  endif // ^^^ not compiling .cu file ^^^
-
-#  if (THRUST_CUDA_COMPILATION() && defined(__CUDA_ARCH__)) || THRUST_CUDA_COMPILER(NVHPC)
-#    define THRUST_DEVICE_COMPILATION() 1
-#  else // ^^^ compiling device code ^^^ / vvv not compiling device code vvv
-#    define THRUST_DEVICE_COMPILATION() 0
-#  endif // ^^^ not compiling device code ^^^
-
-#  define THRUST_CUDACC_MAKE_VERSION(_MAJOR, _MINOR) ((_MAJOR) * 1000 + (_MINOR) * 10)
-
-#  if THRUST_CUDA_COMPILER(NVCC) || THRUST_CUDA_COMPILER(NVHPC) || THRUST_CUDA_COMPILER(NVRTC)
-#    define THRUST_CUDACC() (__CUDACC_VER_MAJOR__, __CUDACC_VER_MINOR__)
-#  elif THRUST_CUDA_COMPILER(CLANG)
-#    define THRUST_CUDACC() (CUDA_VERSION / 1000, (CUDA_VERSION % 1000) / 10)
-#  endif // ^^^ has cuda compiler ^^^
-
-#  if !defined(THRUST_CUDACC) || !THRUST_CUDA_COMPILATION()
-#    undef THRUST_CUDACC
-#    define THRUST_CUDACC() THRUST_VERSION_INVALID()
-#  endif // !THRUST_CUDACC || !THRUST_CUDA_COMPILATION()
-
-#  define THRUST_CUDACC_EQUAL(...) THRUST_VERSION_COMPARE(THRUST_CUDACC_, THRUST_CUDACC, ==, __VA_ARGS__)
-#  define THRUST_CUDACC_BELOW(...) THRUST_VERSION_COMPARE(THRUST_CUDACC_, THRUST_CUDACC, <, __VA_ARGS__)
-
-#  if THRUST_CUDA_COMPILATION() && THRUST_CUDACC_BELOW(12) && !defined(THRUST_IGNORE_DEPRECATED_CUDA_BELOW_12)
-#    error "CUDA versions below 12 are not supported." \
-"Define THRUST_IGNORE_DEPRECATED_CUDA_BELOW_12 to suppress this message."
-#  endif
-
-#  if THRUST_COMPILER(MSVC)
-#    define THRUST_PRAGMA(ARG) __pragma(ARG)
-#  else
-#    define THRUST_PRAGMA(ARG) _Pragma(THRUST_TO_STRING(ARG))
-#  endif // THRUST_COMPILER(MSVC)
-
-#  if THRUST_DEVICE_COMPILATION()
-#    define THRUST_PRAGMA_UNROLL(_N)    THRUST_PRAGMA(unroll _N)
-#    define THRUST_PRAGMA_UNROLL_FULL() THRUST_PRAGMA(unroll)
-#  elif THRUST_COMPILER(NVHPC) || THRUST_COMPILER(NVRTC) || THRUST_COMPILER(CLANG)
-#    define THRUST_PRAGMA_UNROLL(_N)    THRUST_PRAGMA(unroll _N)
-#    define THRUST_PRAGMA_UNROLL_FULL() THRUST_PRAGMA(unroll)
-#  elif THRUST_COMPILER(GCC, >=, 8)
-#    define THRUST_PRAGMA_UNROLL(_N) \
-      THRUST_BEGIN_NV_DIAG_SUPPRESS(1675) THRUST_PRAGMA(GCC unroll _N) THRUST_END_NV_DIAG_SUPPRESS()
-#    define THRUST_PRAGMA_UNROLL_FULL() THRUST_PRAGMA_UNROLL(65534)
-#  else // ^^^ has pragma unroll support ^^^ / vvv no pragma unroll support vvv
-#    define THRUST_PRAGMA_UNROLL(_N)
-#    define THRUST_PRAGMA_UNROLL_FULL()
-#  endif // ^^^ no pragma unroll support ^^^
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_COMPILER_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/cuda_toolkit.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/cuda_toolkit.h
deleted file mode 100644
index e451bb466e03..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/cuda_toolkit.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_CUDA_TOOLKIT_H
-#define LIBCXX_WRAPPER_STD__CCCL_CUDA_TOOLKIT_H
-
-// TODO(libhipcxx): remove this file and replace all THRUST* with _CCCL* in rocThrust once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/cuda_toolkit.h)
-
-#  define THRUST_CTK_AT_LEAST(...) _CCCL_CTK_AT_LEAST(__VA_ARGS__)
-
-#else
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h>
-
-#  if THRUST_CUDA_COMPILATION() || THRUST_HAS_INCLUDE(<cuda_runtime_api.h>)
-#    define THRUST_HAS_CTK() 1
-#  else // ^^^ has cuda toolkit ^^^ / vvv no cuda toolkit vvv
-#    define THRUST_HAS_CTK() 0
-#  endif // ^^^ no cuda toolkit ^^^
-
-// CUDA compilers preinclude cuda_runtime.h, so we need to include it here to get the CUDART_VERSION macro
-#  if THRUST_HAS_CTK() && !THRUST_CUDA_COMPILATION()
-#    include <cuda_runtime_api.h>
-#  endif // THRUST_HAS_CTK() && !THRUST_CUDA_COMPILATION()
-
-// Check compatibility of the CUDA compiler and CUDA toolkit headers
-#  if THRUST_CUDA_COMPILATION()
-#    if !THRUST_CUDACC_EQUAL((CUDART_VERSION / 1000), (CUDART_VERSION % 1000) / 10)
-#      error "CUDA compiler and CUDA toolkit headers are incompatible, please check your include paths"
-#    endif // !THRUST_CUDACC_EQUAL((CUDART_VERSION / 1000), (CUDART_VERSION % 1000) / 10)
-#  endif // THRUST_CUDA_COMPILATION()
-
-#  define THRUST_CTK_MAKE_VERSION(_MAJOR, _MINOR) ((_MAJOR) * 1000 + (_MINOR) * 10)
-#  define THRUST_CTK()                            (CUDART_VERSION / 1000, (CUDART_VERSION % 1000) / 10)
-#  define THRUST_CTK_AT_LEAST(...)                THRUST_HAS_CTK() && THRUST_VERSION_COMPARE(THRUST_CTK_, THRUST_CTK, >=, __VA_ARGS__)
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_CUDA_TOOLKIT_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/deprecated.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/deprecated.h
deleted file mode 100644
index a3fc20f24d89..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/deprecated.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//===----------------------------------------------------------------------===//Add commentMore actions
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-// Add commentMore actions
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_DEPRECATED_H
-#define LIBCXX_WRAPPER_STD__CCCL_DEPRECATED_H
-
-// TODO(libhipcxx): remove this file and replace THRUST* with CCCL* in rocThrust once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__cccl/deprecated.h)
-#endif
-
-// Check for deprecation opt outs
-#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_DIALECT)
-#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
-#    define THRUST_IGNORE_DEPRECATED_CPP_DIALECT
-#  endif
-#endif // suppress all dialect deprecation warnings
-#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_14) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)
-#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_14)
-#    define THRUST_IGNORE_DEPRECATED_CPP_14
-#  endif
-#endif // suppress all c++14 dialect deprecation warnings
-#if defined(LIBCUDACXX_IGNORE_DEPRECATED_CPP_11) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT) \
-  || defined(THRUST_IGNORE_DEPRECATED_CPP_14)
-#  if !defined(THRUST_IGNORE_DEPRECATED_CPP_11)
-#    define THRUST_IGNORE_DEPRECATED_CPP_11
-#  endif
-#endif // suppress all c++11 dialect deprecation warnings
-#if defined(LIBCUDACXX_IGNORE_DEPRECATED_COMPILER) || defined(CCCL_IGNORE_DEPRECATED_COMPILER) \
-  || defined(CUB_IGNORE_DEPRECATED_COMPILER) || defined(THRUST_IGNORE_DEPRECATED_CPP_DIALECT)  \
-  || defined(THRUST_IGNORE_DEPRECATED_CPP_14) || defined(THRUST_IGNORE_DEPRECATED_CPP_11)
-#  if !defined(THRUST_IGNORE_DEPRECATED_COMPILER)
-#    define THRUST_IGNORE_DEPRECATED_COMPILER
-#  endif
-#endif // suppress all compiler deprecation warnings
-#if defined(LIBCUDACXX_IGNORE_DEPRECATED_API) || defined(CCCL_IGNORE_DEPRECATED_API) \
-  || defined(CUB_IGNORE_DEPRECATED_API)
-#  if !defined(THRUST_IGNORE_DEPRECATED_API)
-#    define THRUST_IGNORE_DEPRECATED_API
-#  endif
-#endif // suppress all API deprecation warnings
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  define THRUST_DEPRECATED              CCCL_DEPRECATED
-#  define THRUST_DEPRECATED_BECAUSE(MSG) CCCL_DEPRECATED_BECAUSE(MSG)
-
-#else
-
-#  ifdef THRUST_IGNORE_DEPRECATED_API
-//! deprecated [Since 2.8]
-#    define THRUST_DEPRECATED
-//! deprecated [Since 2.8]
-#    define THRUST_DEPRECATED_BECAUSE(MSG)
-#  else // ^^^ THRUST_IGNORE_DEPRECATED_API ^^^ / vvv !THRUST_IGNORE_DEPRECATED_API vvv
-//! deprecated [Since 2.8]
-#    define THRUST_DEPRECATED              [[deprecated]]
-//! deprecated [Since 2.8]
-#    define THRUST_DEPRECATED_BECAUSE(MSG) [[deprecated(MSG)]]
-#  endif // !THRUST_IGNORE_DEPRECATED_API
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_DEPRECATED_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/diagnostic.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/diagnostic.h
deleted file mode 100644
index adab7f6a346a..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/diagnostic.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_DIAGNOSTIC_H
-#define LIBCXX_WRAPPER_STD__CCCL_DIAGNOSTIC_H
-
-// TODO(libhipcxx): remove this file and replace all the THRUST* macros with _CCCL* macros in rocThrust
-// once libhipcxx v3.0.1 gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD && _LIBCUDACXX_CUDA_API_VERSION_PATCH >= 1
-
-#  include _THRUST_STD_INCLUDE(__cccl/diagnostic.h)
-
-#  define THRUST_DIAG_PUSH                     _CCCL_DIAG_PUSH
-#  define THRUST_DIAG_POP                      _CCCL_DIAG_POP
-#  define THRUST_DIAG_SUPPRESS_CLANG(_WARNING) _CCCL_DIAG_SUPPRESS_CLANG(_WARNING)
-#  define THRUST_DIAG_SUPPRESS_MSVC(_WARNING)  _CCCL_DIAG_SUPPRESS_MSVC(_WARNING)
-#  define THRUST_SUPPRESS_DEPRECATED_PUSH      _CCCL_SUPPRESS_DEPRECATED_PUSH
-#  define THRUST_SUPPRESS_DEPRECATED_POP       _CCCL_SUPPRESS_DEPRECATED_POP
-
-#else // !_THRUST_HAS_DEVICE_SYSTEM_STD || _LIBCUDACXX_CUDA_API_VERSION_PATCH < 1
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h>
-
-#  if THRUST_COMPILER(CLANG)
-#    define THRUST_DIAG_PUSH                     THRUST_PRAGMA(clang diagnostic push)
-#    define THRUST_DIAG_POP                      THRUST_PRAGMA(clang diagnostic pop)
-#    define THRUST_DIAG_SUPPRESS_CLANG(_WARNING) THRUST_PRAGMA(clang diagnostic ignored _WARNING)
-#    define THRUST_DIAG_SUPPRESS_GCC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_NVHPC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_MSVC(_WARNING)
-#  elif THRUST_COMPILER(GCC)
-#    define THRUST_DIAG_PUSH THRUST_PRAGMA(GCC diagnostic push)
-#    define THRUST_DIAG_POP  THRUST_PRAGMA(GCC diagnostic pop)
-#    define THRUST_DIAG_SUPPRESS_CLANG(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_GCC(_WARNING) THRUST_PRAGMA(GCC diagnostic ignored _WARNING)
-#    define THRUST_DIAG_SUPPRESS_NVHPC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_MSVC(_WARNING)
-#  elif THRUST_COMPILER(NVHPC)
-#    define THRUST_DIAG_PUSH THRUST_PRAGMA(diagnostic push)
-#    define THRUST_DIAG_POP  THRUST_PRAGMA(diagnostic pop)
-#    define THRUST_DIAG_SUPPRESS_CLANG(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_GCC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_NVHPC(_WARNING) THRUST_PRAGMA(diag_suppress _WARNING)
-#    define THRUST_DIAG_SUPPRESS_MSVC(_WARNING)
-#  elif THRUST_COMPILER(MSVC)
-#    define THRUST_DIAG_PUSH THRUST_PRAGMA(warning(push))
-#    define THRUST_DIAG_POP  THRUST_PRAGMA(warning(pop))
-#    define THRUST_DIAG_SUPPRESS_CLANG(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_GCC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_NVHPC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_MSVC(_WARNING) THRUST_PRAGMA(warning(disable : _WARNING))
-#  else
-#    define THRUST_DIAG_PUSH
-#    define THRUST_DIAG_POP
-#    define THRUST_DIAG_SUPPRESS_CLANG(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_GCC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_NVHPC(_WARNING)
-#    define THRUST_DIAG_SUPPRESS_MSVC(_WARNING)
-#  endif
-
-#  if THRUST_CUDA_COMPILER(NVCC) || THRUST_COMPILER(NVRTC)
-#    if defined(__NVCC_DIAG_PRAGMA_SUPPORT__)
-#      define THRUST_NV_DIAG_PUSH()               THRUST_PRAGMA(nv_diagnostic push)
-#      define THRUST_NV_DIAG_POP()                THRUST_PRAGMA(nv_diagnostic pop)
-#      define THRUST_DIAG_SUPPRESS_NVCC(_WARNING) THRUST_PRAGMA(nv_diag_suppress _WARNING)
-#      define THRUST_BEGIN_NV_DIAG_SUPPRESS(...) \
-        THRUST_NV_DIAG_PUSH() THRUST_PP_FOR_EACH(THRUST_DIAG_SUPPRESS_NVCC, __VA_ARGS__)
-#      define THRUST_END_NV_DIAG_SUPPRESS() THRUST_NV_DIAG_POP()
-#    else // ^^^ __NVCC_DIAG_PRAGMA_SUPPORT__ ^^^ / vvv !__NVCC_DIAG_PRAGMA_SUPPORT__ vvv
-#      define THRUST_NV_DIAG_PUSH()               THRUST_PRAGMA(diagnostic push)
-#      define THRUST_NV_DIAG_POP()                THRUST_PRAGMA(diagnostic pop)
-#      define THRUST_DIAG_SUPPRESS_NVCC(_WARNING) THRUST_PRAGMA(diag_suppress _WARNING)
-#      define THRUST_BEGIN_NV_DIAG_SUPPRESS(...) \
-        THRUST_NV_DIAG_PUSH() THRUST_PP_FOR_EACH(THRUST_DIAG_SUPPRESS_NVCC, __VA_ARGS__)
-#      define THRUST_END_NV_DIAG_SUPPRESS() THRUST_NV_DIAG_POP()
-#    endif // !__NVCC_DIAG_PRAGMA_SUPPORT__
-#  else // ^^^ THRUST_CUDA_COMPILER(NVCC) ^^^ / vvv !THRUST_CUDA_COMPILER(NVCC) vvv
-#    define THRUST_NV_DIAG_PUSH()
-#    define THRUST_NV_DIAG_POP()
-#    define THRUST_DIAG_SUPPRESS_NVCC(_WARNING)
-#    define THRUST_BEGIN_NV_DIAG_SUPPRESS(...)
-#    define THRUST_END_NV_DIAG_SUPPRESS()
-#  endif // !THRUST_CUDA_COMPILER(NVCC)
-
-#  if THRUST_COMPILER(CLANG)
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH                   \
-      THRUST_DIAG_PUSH                                        \
-      THRUST_DIAG_SUPPRESS_CLANG("-Wdeprecated")              \
-      THRUST_DIAG_SUPPRESS_CLANG("-Wdeprecated-declarations") \
-      THRUST_BEGIN_NV_DIAG_SUPPRESS(1444, 20199)
-#    define THRUST_SUPPRESS_DEPRECATED_POP THRUST_NV_DIAG_POP() THRUST_DIAG_POP
-#  elif THRUST_COMPILER(GCC)
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH                 \
-      THRUST_DIAG_PUSH                                      \
-      THRUST_DIAG_SUPPRESS_GCC("-Wdeprecated")              \
-      THRUST_DIAG_SUPPRESS_GCC("-Wdeprecated-declarations") \
-      THRUST_BEGIN_NV_DIAG_SUPPRESS(1444, 20199)
-#    define THRUST_SUPPRESS_DEPRECATED_POP THRUST_NV_DIAG_POP() THRUST_DIAG_POP
-#  elif THRUST_COMPILER(NVHPC)
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH                             \
-      THRUST_DIAG_PUSH                                                  \
-      THRUST_DIAG_SUPPRESS_NVHPC(deprecated_entity)                     \
-      THRUST_DIAG_SUPPRESS_NVHPC(deprecated_entity_with_custom_message) \
-      THRUST_BEGIN_NV_DIAG_SUPPRESS(1444, 20199)
-#    define THRUST_SUPPRESS_DEPRECATED_POP THRUST_NV_DIAG_POP() THRUST_DIAG_POP
-#  elif THRUST_COMPILER(MSVC)
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH \
-      THRUST_DIAG_PUSH                      \
-      THRUST_DIAG_SUPPRESS_MSVC(4996)       \
-      THRUST_BEGIN_NV_DIAG_SUPPRESS(1444)
-#    define THRUST_SUPPRESS_DEPRECATED_POP THRUST_NV_DIAG_POP() THRUST_DIAG_POP
-#  elif THRUST_COMPILER(NVRTC)
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH THRUST_BEGIN_NV_DIAG_SUPPRESS(1444, 20199)
-#    define THRUST_SUPPRESS_DEPRECATED_POP  THRUST_NV_DIAG_POP()
-#  else // unknown compiler
-#    define THRUST_SUPPRESS_DEPRECATED_PUSH
-#    define THRUST_SUPPRESS_DEPRECATED_POP
-#  endif // unknown compiler
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_DIAGNOSTIC_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/dialect.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/dialect.h
deleted file mode 100644
index c8707d8d327e..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/dialect.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_DIALECT_H
-#define LIBCXX_WRAPPER_STD__CCCL_DIALECT_H
-
-// TODO(libhipcxx): remove this file and replace THRUST* with _CCCL* in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/dialect.h)
-
-#  define THRUST_STD_VER             _CCCL_STD_VER
-#  define THRUST_CONSTEXPR_CXX20     _CCCL_CONSTEXPR_CXX20
-#  define THRUST_CONSTEXPR_CXX23     _CCCL_CONSTEXPR_CXX23
-#  define THRUST_TRAIT(__TRAIT, ...) _CCCL_TRAIT(__TRAIT, __VA_ARGS__)
-#  define THRUST_GLOBAL_CONSTANT     _CCCL_GLOBAL_CONSTANT
-
-#else
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-
-#  if THRUST_COMPILER(MSVC)
-#    if _MSVC_LANG <= 201103L
-#      define THRUST_STD_VER 2011
-#    elif _MSVC_LANG <= 201402L
-#      define THRUST_STD_VER 2014
-#    elif _MSVC_LANG <= 201703L
-#      define THRUST_STD_VER 2017
-#    elif _MSVC_LANG <= 202002L
-#      define THRUST_STD_VER 2020
-#    else
-#      define THRUST_STD_VER 2023 // current year, or date of c++2b ratification
-#    endif
-#  else // ^^^ THRUST_COMPILER(MSVC) ^^^ / vvv !THRUST_COMPILER(MSVC) vvv
-#    if __cplusplus <= 199711L
-#      define THRUST_STD_VER 2003
-#    elif __cplusplus <= 201103L
-#      define THRUST_STD_VER 2011
-#    elif __cplusplus <= 201402L
-#      define THRUST_STD_VER 2014
-#    elif __cplusplus <= 201703L
-#      define THRUST_STD_VER 2017
-#    elif __cplusplus <= 202002L
-#      define THRUST_STD_VER 2020
-#    elif __cplusplus <= 202302L
-#      define THRUST_STD_VER 2023
-#    else
-#      define THRUST_STD_VER 2024 // current year, or date of c++2c ratification
-#    endif
-#  endif // !THRUST_COMPILER(MSVC)
-
-#  if THRUST_STD_VER >= 2020
-#    define THRUST_CONSTEXPR_CXX20 constexpr
-#  else // ^^^ C++20 ^^^ / vvv C++17 vvv
-#    define THRUST_CONSTEXPR_CXX20
-#  endif // THRUST_STD_VER <= 2017
-
-#  if THRUST_STD_VER >= 2023
-#    define THRUST_CONSTEXPR_CXX23 constexpr
-#  else // ^^^ C++23 ^^^ / vvv C++20 vvv
-#    define THRUST_CONSTEXPR_CXX23
-#  endif // THRUST_STD_VER <= 2020
-
-#  define THRUST_TRAIT(__TRAIT, ...) __TRAIT##_v<__VA_ARGS__>
-
-#  if defined(__CUDA_ARCH__)
-#    define THRUST_GLOBAL_CONSTANT THRUST_DEVICE constexpr
-#  else // ^^^ __CUDA_ARCH__ ^^^ / vvv !__CUDA_ARCH__ vvv
-#    define THRUST_GLOBAL_CONSTANT inline constexpr
-#  endif // __CUDA_ARCH__
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_DIALECT_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/exceptions.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/exceptions.h
deleted file mode 100644
index c5789c0edbcc..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/exceptions.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_EXCEPTIONS_H
-#define LIBCXX_WRAPPER_STD__CCCL_EXCEPTIONS_H
-
-// TODO(libhipcxx): remove this file and replace THRUST_NO_EXCEPTIONS with _CCCL_NO_EXCEPTIONS in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/exceptions.h)
-
-#  ifdef _CCCL_NO_EXCEPTIONS
-#    define THRUST_NO_EXCEPTIONS
-#  endif
-
-#else
-
-#  ifndef THRUST_NO_EXCEPTIONS
-#    if defined(THRUST_DISABLE_EXCEPTIONS) // Escape hatch for users to manually disable exceptions
-#      define THRUST_NO_EXCEPTIONS
-#    elif THRUST_COMPILER(NVRTC) || (THRUST_COMPILER(MSVC) && _CPPUNWIND == 0) \
-      || (!THRUST_COMPILER(MSVC) && !__EXCEPTIONS) // Catches all non msvc based compilers
-#      define THRUST_NO_EXCEPTIONS
-#    endif
-#  endif // !THRUST_NO_EXCEPTIONS
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_EXCEPTIONS_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h
deleted file mode 100644
index 071610457e85..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_EXECUTION_SPACE_H
-#define LIBCXX_WRAPPER_STD__CCCL_EXECUTION_SPACE_H
-
-// TODO(libhipcxx): remove this file and replace _CCCL* with THRUST* once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/execution_space.h)
-
-#  if THRUST_HAS_HIP_COMPILER()
-#    undef _CCCL_HOST
-#    undef _CCCL_DEVICE
-#    undef _CCCL_HOST_DEVICE
-#    define _CCCL_HOST        __host__
-#    define _CCCL_DEVICE      __device__
-#    define _CCCL_HOST_DEVICE __host__ __device__
-#  endif
-#  define THRUST_HOST        _CCCL_HOST
-#  define THRUST_DEVICE      _CCCL_DEVICE
-#  define THRUST_HOST_DEVICE _CCCL_HOST_DEVICE
-
-#  define THRUST_EXEC_CHECK_DISABLE _CCCL_EXEC_CHECK_DISABLE
-
-#else
-
-#  if THRUST_CUDA_COMPILATION() || THRUST_HAS_HIP_COMPILER()
-#    define THRUST_HOST        __host__
-#    define THRUST_DEVICE      __device__
-#    define THRUST_HOST_DEVICE __host__ __device__
-#  else // ^^^ (CUDA_COMPILATION || HIP_COMPILATION) ^^^ / vvv !(CUDA_COMPILATION || HIP_COMPILATION) vvv
-#    define THRUST_HOST
-#    define THRUST_DEVICE
-#    define THRUST_HOST_DEVICE
-#  endif // !(CUDA_COMPILATION || HIP_COMPILATION)
-
-#  if !defined(THRUST_EXEC_CHECK_DISABLE)
-#    if THRUST_CUDA_COMPILER(NVCC)
-#      define THRUST_EXEC_CHECK_DISABLE THRUST_PRAGMA(nv_exec_check_disable)
-#    else
-#      define THRUST_EXEC_CHECK_DISABLE
-#    endif // THRUST_CUDA_COMPILER(NVCC)
-#  endif // !THRUST_EXEC_CHECK_DISABLE
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_EXECUTION_SPACE_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h
deleted file mode 100644
index ebc8b75c29d6..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h
+++ /dev/null
@@ -1,736 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_PREPROCESSOR_H
-#define LIBCXX_WRAPPER_STD__CCCL_PREPROCESSOR_H
-
-// TODO(libhipcxx): remove this file and replace THRUST* with _CCCL* in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/preprocessor.h)
-
-#  define THRUST_HAS_INCLUDE(_X)          _CCCL_HAS_INCLUDE(_X)
-#  define THRUST_TO_STRING(_STR)          _CCCL_TO_STRING(_STR)
-#  define THRUST_PP_EXPAND(...)           _CCCL_PP_EXPAND(__VA_ARGS__)
-#  define THRUST_PP_INC(_X)               _CCCL_PP_INC(_X)
-#  define THRUST_PP_DEC(_X)               _CCCL_PP_DEC(_X)
-#  define THRUST_PP_SPLICE_WITH(SEP, ...) _CCCL_PP_SPLICE_WITH(SEP, __VA_ARGS__)
-
-#else
-
-#  ifdef __has_include
-#    define THRUST_HAS_INCLUDE(_X) __has_include(_X)
-#  else
-#    define THRUST_HAS_INCLUDE(_X) 0
-#  endif
-
-#  define THRUST_TO_STRING2(_STR) #_STR
-#  define THRUST_TO_STRING(_STR)  THRUST_TO_STRING2(_STR)
-
-#  define THRUST_PP_EXPAND(...) __VA_ARGS__
-
-#  define THRUST_PP_CAT_(_Xp, ...) _Xp##__VA_ARGS__
-#  define THRUST_PP_CAT(_Xp, ...)  THRUST_PP_CAT_(_Xp, __VA_ARGS__)
-
-#  define THRUST_PP_EVAL_(_Xp, _ARGS) _Xp _ARGS
-#  define THRUST_PP_EVAL(_Xp, ...)    THRUST_PP_EVAL_(_Xp, (__VA_ARGS__))
-
-#  define THRUST_PP_FOR_EACH(_Mp, ...)                          THRUST_PP_FOR_EACH_N(THRUST_PP_COUNT(__VA_ARGS__), _Mp, __VA_ARGS__)
-#  define THRUST_PP_FOR_EACH_N(_Np, _Mp, ...)                   THRUST_PP_CAT(THRUST_PP_FOR_EACH_, _Np)(_Mp, __VA_ARGS__)
-#  define THRUST_PP_FOR_EACH_1(_Mp, _1)                         _Mp(_1)
-#  define THRUST_PP_FOR_EACH_2(_Mp, _1, _2)                     _Mp(_1) _Mp(_2)
-#  define THRUST_PP_FOR_EACH_3(_Mp, _1, _2, _3)                 _Mp(_1) _Mp(_2) _Mp(_3)
-#  define THRUST_PP_FOR_EACH_4(_Mp, _1, _2, _3, _4)             _Mp(_1) _Mp(_2) _Mp(_3) _Mp(_4)
-#  define THRUST_PP_FOR_EACH_5(_Mp, _1, _2, _3, _4, _5)         _Mp(_1) _Mp(_2) _Mp(_3) _Mp(_4) _Mp(_5)
-#  define THRUST_PP_FOR_EACH_6(_Mp, _1, _2, _3, _4, _5, _6)     _Mp(_1) _Mp(_2) _Mp(_3) _Mp(_4) _Mp(_5) _Mp(_6)
-#  define THRUST_PP_FOR_EACH_7(_Mp, _1, _2, _3, _4, _5, _6, _7) _Mp(_1) _Mp(_2) _Mp(_3) _Mp(_4) _Mp(_5) _Mp(_6) _Mp(_7)
-#  define THRUST_PP_FOR_EACH_8(_Mp, _1, _2, _3, _4, _5, _6, _7, _8) \
-    _Mp(_1) _Mp(_2) _Mp(_3) _Mp(_4) _Mp(_5) _Mp(_6) _Mp(_7) _Mp(_8)
-
-// clang-format off
-#  define THRUST_PP_COUNT_IMPL(                                                                     \
-    _125, _124, _123, _122, _121, _120, _119, _118, _117, _116, _115, _114, _113, _112, _111, _110, \
-    _109, _108, _107, _106, _105, _104, _103, _102, _101, _100, _99, _98, _97, _96, _95, _94,       \
-    _93, _92, _91, _90, _89, _88, _87, _86, _85, _84, _83, _82, _81, _80, _79, _78,                 \
-    _77, _76, _75, _74, _73, _72, _71, _70, _69, _68, _67, _66, _65, _64, _63, _62,                 \
-    _61, _60, _59, _58, _57, _56, _55, _54, _53, _52, _51, _50, _49, _48, _47, _46,                 \
-    _45, _44, _43, _42, _41, _40, _39, _38, _37, _36, _35, _34, _33, _32, _31, _30,                 \
-    _29, _28, _27, _26, _25, _24, _23, _22, _21, _20, _19, _18, _17, _16, _15, _14,                 \
-    _13, _12, _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, _0, ...) _0
-
-#  define THRUST_PP_COUNT(...)                                                        \
-    THRUST_PP_EXPAND(THRUST_PP_COUNT_IMPL( __VA_ARGS__,                               \
-      125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, \
-      109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94,       \
-      93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78,                 \
-      77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62,                 \
-      61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46,                 \
-      45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30,                 \
-      29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14,                 \
-      13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
-// clang-format on
-
-#  define THRUST_PP_INC(_X) THRUST_PP_INC_IMPL0(_X)
-
-#  define THRUST_PP_INC_IMPL0(_X) THRUST_PP_CAT(THRUST_PP_INC_IMPL_TAG, _X)
-
-#  define THRUST_PP_INC_IMPL_TAG0   1
-#  define THRUST_PP_INC_IMPL_TAG1   2
-#  define THRUST_PP_INC_IMPL_TAG2   3
-#  define THRUST_PP_INC_IMPL_TAG3   4
-#  define THRUST_PP_INC_IMPL_TAG4   5
-#  define THRUST_PP_INC_IMPL_TAG5   6
-#  define THRUST_PP_INC_IMPL_TAG6   7
-#  define THRUST_PP_INC_IMPL_TAG7   8
-#  define THRUST_PP_INC_IMPL_TAG8   9
-#  define THRUST_PP_INC_IMPL_TAG9   10
-#  define THRUST_PP_INC_IMPL_TAG10  11
-#  define THRUST_PP_INC_IMPL_TAG11  12
-#  define THRUST_PP_INC_IMPL_TAG12  13
-#  define THRUST_PP_INC_IMPL_TAG13  14
-#  define THRUST_PP_INC_IMPL_TAG14  15
-#  define THRUST_PP_INC_IMPL_TAG15  16
-#  define THRUST_PP_INC_IMPL_TAG16  17
-#  define THRUST_PP_INC_IMPL_TAG17  18
-#  define THRUST_PP_INC_IMPL_TAG18  19
-#  define THRUST_PP_INC_IMPL_TAG19  20
-#  define THRUST_PP_INC_IMPL_TAG20  21
-#  define THRUST_PP_INC_IMPL_TAG21  22
-#  define THRUST_PP_INC_IMPL_TAG22  23
-#  define THRUST_PP_INC_IMPL_TAG23  24
-#  define THRUST_PP_INC_IMPL_TAG24  25
-#  define THRUST_PP_INC_IMPL_TAG25  26
-#  define THRUST_PP_INC_IMPL_TAG26  27
-#  define THRUST_PP_INC_IMPL_TAG27  28
-#  define THRUST_PP_INC_IMPL_TAG28  29
-#  define THRUST_PP_INC_IMPL_TAG29  30
-#  define THRUST_PP_INC_IMPL_TAG30  31
-#  define THRUST_PP_INC_IMPL_TAG31  32
-#  define THRUST_PP_INC_IMPL_TAG32  33
-#  define THRUST_PP_INC_IMPL_TAG33  34
-#  define THRUST_PP_INC_IMPL_TAG34  35
-#  define THRUST_PP_INC_IMPL_TAG35  36
-#  define THRUST_PP_INC_IMPL_TAG36  37
-#  define THRUST_PP_INC_IMPL_TAG37  38
-#  define THRUST_PP_INC_IMPL_TAG38  39
-#  define THRUST_PP_INC_IMPL_TAG39  40
-#  define THRUST_PP_INC_IMPL_TAG40  41
-#  define THRUST_PP_INC_IMPL_TAG41  42
-#  define THRUST_PP_INC_IMPL_TAG42  43
-#  define THRUST_PP_INC_IMPL_TAG43  44
-#  define THRUST_PP_INC_IMPL_TAG44  45
-#  define THRUST_PP_INC_IMPL_TAG45  46
-#  define THRUST_PP_INC_IMPL_TAG46  47
-#  define THRUST_PP_INC_IMPL_TAG47  48
-#  define THRUST_PP_INC_IMPL_TAG48  49
-#  define THRUST_PP_INC_IMPL_TAG49  50
-#  define THRUST_PP_INC_IMPL_TAG50  51
-#  define THRUST_PP_INC_IMPL_TAG51  52
-#  define THRUST_PP_INC_IMPL_TAG52  53
-#  define THRUST_PP_INC_IMPL_TAG53  54
-#  define THRUST_PP_INC_IMPL_TAG54  55
-#  define THRUST_PP_INC_IMPL_TAG55  56
-#  define THRUST_PP_INC_IMPL_TAG56  57
-#  define THRUST_PP_INC_IMPL_TAG57  58
-#  define THRUST_PP_INC_IMPL_TAG58  59
-#  define THRUST_PP_INC_IMPL_TAG59  60
-#  define THRUST_PP_INC_IMPL_TAG60  61
-#  define THRUST_PP_INC_IMPL_TAG61  62
-#  define THRUST_PP_INC_IMPL_TAG62  63
-#  define THRUST_PP_INC_IMPL_TAG63  64
-#  define THRUST_PP_INC_IMPL_TAG64  65
-#  define THRUST_PP_INC_IMPL_TAG65  66
-#  define THRUST_PP_INC_IMPL_TAG66  67
-#  define THRUST_PP_INC_IMPL_TAG67  68
-#  define THRUST_PP_INC_IMPL_TAG68  69
-#  define THRUST_PP_INC_IMPL_TAG69  70
-#  define THRUST_PP_INC_IMPL_TAG70  71
-#  define THRUST_PP_INC_IMPL_TAG71  72
-#  define THRUST_PP_INC_IMPL_TAG72  73
-#  define THRUST_PP_INC_IMPL_TAG73  74
-#  define THRUST_PP_INC_IMPL_TAG74  75
-#  define THRUST_PP_INC_IMPL_TAG75  76
-#  define THRUST_PP_INC_IMPL_TAG76  77
-#  define THRUST_PP_INC_IMPL_TAG77  78
-#  define THRUST_PP_INC_IMPL_TAG78  79
-#  define THRUST_PP_INC_IMPL_TAG79  80
-#  define THRUST_PP_INC_IMPL_TAG80  81
-#  define THRUST_PP_INC_IMPL_TAG81  82
-#  define THRUST_PP_INC_IMPL_TAG82  83
-#  define THRUST_PP_INC_IMPL_TAG83  84
-#  define THRUST_PP_INC_IMPL_TAG84  85
-#  define THRUST_PP_INC_IMPL_TAG85  86
-#  define THRUST_PP_INC_IMPL_TAG86  87
-#  define THRUST_PP_INC_IMPL_TAG87  88
-#  define THRUST_PP_INC_IMPL_TAG88  89
-#  define THRUST_PP_INC_IMPL_TAG89  90
-#  define THRUST_PP_INC_IMPL_TAG90  91
-#  define THRUST_PP_INC_IMPL_TAG91  92
-#  define THRUST_PP_INC_IMPL_TAG92  93
-#  define THRUST_PP_INC_IMPL_TAG93  94
-#  define THRUST_PP_INC_IMPL_TAG94  95
-#  define THRUST_PP_INC_IMPL_TAG95  96
-#  define THRUST_PP_INC_IMPL_TAG96  97
-#  define THRUST_PP_INC_IMPL_TAG97  98
-#  define THRUST_PP_INC_IMPL_TAG98  99
-#  define THRUST_PP_INC_IMPL_TAG99  100
-#  define THRUST_PP_INC_IMPL_TAG100 101
-#  define THRUST_PP_INC_IMPL_TAG101 102
-#  define THRUST_PP_INC_IMPL_TAG102 103
-#  define THRUST_PP_INC_IMPL_TAG103 104
-#  define THRUST_PP_INC_IMPL_TAG104 105
-#  define THRUST_PP_INC_IMPL_TAG105 106
-#  define THRUST_PP_INC_IMPL_TAG106 107
-#  define THRUST_PP_INC_IMPL_TAG107 108
-#  define THRUST_PP_INC_IMPL_TAG108 109
-#  define THRUST_PP_INC_IMPL_TAG109 110
-#  define THRUST_PP_INC_IMPL_TAG110 111
-#  define THRUST_PP_INC_IMPL_TAG111 112
-#  define THRUST_PP_INC_IMPL_TAG112 113
-#  define THRUST_PP_INC_IMPL_TAG113 114
-#  define THRUST_PP_INC_IMPL_TAG114 115
-#  define THRUST_PP_INC_IMPL_TAG115 116
-#  define THRUST_PP_INC_IMPL_TAG116 117
-#  define THRUST_PP_INC_IMPL_TAG117 118
-#  define THRUST_PP_INC_IMPL_TAG118 119
-#  define THRUST_PP_INC_IMPL_TAG119 120
-#  define THRUST_PP_INC_IMPL_TAG120 121
-#  define THRUST_PP_INC_IMPL_TAG121 122
-#  define THRUST_PP_INC_IMPL_TAG122 123
-#  define THRUST_PP_INC_IMPL_TAG123 124
-#  define THRUST_PP_INC_IMPL_TAG124 125
-#  define THRUST_PP_INC_IMPL_TAG125 126
-#  define THRUST_PP_INC_IMPL_TAG126 127
-#  define THRUST_PP_INC_IMPL_TAG127 128
-#  define THRUST_PP_INC_IMPL_TAG128 129
-#  define THRUST_PP_INC_IMPL_TAG129 130
-#  define THRUST_PP_INC_IMPL_TAG130 131
-#  define THRUST_PP_INC_IMPL_TAG131 132
-#  define THRUST_PP_INC_IMPL_TAG132 133
-#  define THRUST_PP_INC_IMPL_TAG133 134
-#  define THRUST_PP_INC_IMPL_TAG134 135
-#  define THRUST_PP_INC_IMPL_TAG135 136
-#  define THRUST_PP_INC_IMPL_TAG136 137
-#  define THRUST_PP_INC_IMPL_TAG137 138
-#  define THRUST_PP_INC_IMPL_TAG138 139
-#  define THRUST_PP_INC_IMPL_TAG139 140
-#  define THRUST_PP_INC_IMPL_TAG140 141
-#  define THRUST_PP_INC_IMPL_TAG141 142
-#  define THRUST_PP_INC_IMPL_TAG142 143
-#  define THRUST_PP_INC_IMPL_TAG143 144
-#  define THRUST_PP_INC_IMPL_TAG144 145
-#  define THRUST_PP_INC_IMPL_TAG145 146
-#  define THRUST_PP_INC_IMPL_TAG146 147
-#  define THRUST_PP_INC_IMPL_TAG147 148
-#  define THRUST_PP_INC_IMPL_TAG148 149
-#  define THRUST_PP_INC_IMPL_TAG149 150
-#  define THRUST_PP_INC_IMPL_TAG150 151
-#  define THRUST_PP_INC_IMPL_TAG151 152
-#  define THRUST_PP_INC_IMPL_TAG152 153
-#  define THRUST_PP_INC_IMPL_TAG153 154
-#  define THRUST_PP_INC_IMPL_TAG154 155
-#  define THRUST_PP_INC_IMPL_TAG155 156
-#  define THRUST_PP_INC_IMPL_TAG156 157
-#  define THRUST_PP_INC_IMPL_TAG157 158
-#  define THRUST_PP_INC_IMPL_TAG158 159
-#  define THRUST_PP_INC_IMPL_TAG159 160
-#  define THRUST_PP_INC_IMPL_TAG160 161
-#  define THRUST_PP_INC_IMPL_TAG161 162
-#  define THRUST_PP_INC_IMPL_TAG162 163
-#  define THRUST_PP_INC_IMPL_TAG163 164
-#  define THRUST_PP_INC_IMPL_TAG164 165
-#  define THRUST_PP_INC_IMPL_TAG165 166
-#  define THRUST_PP_INC_IMPL_TAG166 167
-#  define THRUST_PP_INC_IMPL_TAG167 168
-#  define THRUST_PP_INC_IMPL_TAG168 169
-#  define THRUST_PP_INC_IMPL_TAG169 170
-#  define THRUST_PP_INC_IMPL_TAG170 171
-#  define THRUST_PP_INC_IMPL_TAG171 172
-#  define THRUST_PP_INC_IMPL_TAG172 173
-#  define THRUST_PP_INC_IMPL_TAG173 174
-#  define THRUST_PP_INC_IMPL_TAG174 175
-#  define THRUST_PP_INC_IMPL_TAG175 176
-#  define THRUST_PP_INC_IMPL_TAG176 177
-#  define THRUST_PP_INC_IMPL_TAG177 178
-#  define THRUST_PP_INC_IMPL_TAG178 179
-#  define THRUST_PP_INC_IMPL_TAG179 180
-#  define THRUST_PP_INC_IMPL_TAG180 181
-#  define THRUST_PP_INC_IMPL_TAG181 182
-#  define THRUST_PP_INC_IMPL_TAG182 183
-#  define THRUST_PP_INC_IMPL_TAG183 184
-#  define THRUST_PP_INC_IMPL_TAG184 185
-#  define THRUST_PP_INC_IMPL_TAG185 186
-#  define THRUST_PP_INC_IMPL_TAG186 187
-#  define THRUST_PP_INC_IMPL_TAG187 188
-#  define THRUST_PP_INC_IMPL_TAG188 189
-#  define THRUST_PP_INC_IMPL_TAG189 190
-#  define THRUST_PP_INC_IMPL_TAG190 191
-#  define THRUST_PP_INC_IMPL_TAG191 192
-#  define THRUST_PP_INC_IMPL_TAG192 193
-#  define THRUST_PP_INC_IMPL_TAG193 194
-#  define THRUST_PP_INC_IMPL_TAG194 195
-#  define THRUST_PP_INC_IMPL_TAG195 196
-#  define THRUST_PP_INC_IMPL_TAG196 197
-#  define THRUST_PP_INC_IMPL_TAG197 198
-#  define THRUST_PP_INC_IMPL_TAG198 199
-#  define THRUST_PP_INC_IMPL_TAG199 200
-#  define THRUST_PP_INC_IMPL_TAG200 201
-#  define THRUST_PP_INC_IMPL_TAG201 202
-#  define THRUST_PP_INC_IMPL_TAG202 203
-#  define THRUST_PP_INC_IMPL_TAG203 204
-#  define THRUST_PP_INC_IMPL_TAG204 205
-#  define THRUST_PP_INC_IMPL_TAG205 206
-#  define THRUST_PP_INC_IMPL_TAG206 207
-#  define THRUST_PP_INC_IMPL_TAG207 208
-#  define THRUST_PP_INC_IMPL_TAG208 209
-#  define THRUST_PP_INC_IMPL_TAG209 210
-#  define THRUST_PP_INC_IMPL_TAG210 211
-#  define THRUST_PP_INC_IMPL_TAG211 212
-#  define THRUST_PP_INC_IMPL_TAG212 213
-#  define THRUST_PP_INC_IMPL_TAG213 214
-#  define THRUST_PP_INC_IMPL_TAG214 215
-#  define THRUST_PP_INC_IMPL_TAG215 216
-#  define THRUST_PP_INC_IMPL_TAG216 217
-#  define THRUST_PP_INC_IMPL_TAG217 218
-#  define THRUST_PP_INC_IMPL_TAG218 219
-#  define THRUST_PP_INC_IMPL_TAG219 220
-#  define THRUST_PP_INC_IMPL_TAG220 221
-#  define THRUST_PP_INC_IMPL_TAG221 222
-#  define THRUST_PP_INC_IMPL_TAG222 223
-#  define THRUST_PP_INC_IMPL_TAG223 224
-#  define THRUST_PP_INC_IMPL_TAG224 225
-#  define THRUST_PP_INC_IMPL_TAG225 226
-#  define THRUST_PP_INC_IMPL_TAG226 227
-#  define THRUST_PP_INC_IMPL_TAG227 228
-#  define THRUST_PP_INC_IMPL_TAG228 229
-#  define THRUST_PP_INC_IMPL_TAG229 230
-#  define THRUST_PP_INC_IMPL_TAG230 231
-#  define THRUST_PP_INC_IMPL_TAG231 232
-#  define THRUST_PP_INC_IMPL_TAG232 233
-#  define THRUST_PP_INC_IMPL_TAG233 234
-#  define THRUST_PP_INC_IMPL_TAG234 235
-#  define THRUST_PP_INC_IMPL_TAG235 236
-#  define THRUST_PP_INC_IMPL_TAG236 237
-#  define THRUST_PP_INC_IMPL_TAG237 238
-#  define THRUST_PP_INC_IMPL_TAG238 239
-#  define THRUST_PP_INC_IMPL_TAG239 240
-#  define THRUST_PP_INC_IMPL_TAG240 241
-#  define THRUST_PP_INC_IMPL_TAG241 242
-#  define THRUST_PP_INC_IMPL_TAG242 243
-#  define THRUST_PP_INC_IMPL_TAG243 244
-#  define THRUST_PP_INC_IMPL_TAG244 245
-#  define THRUST_PP_INC_IMPL_TAG245 246
-#  define THRUST_PP_INC_IMPL_TAG246 247
-#  define THRUST_PP_INC_IMPL_TAG247 248
-#  define THRUST_PP_INC_IMPL_TAG248 249
-#  define THRUST_PP_INC_IMPL_TAG249 250
-#  define THRUST_PP_INC_IMPL_TAG250 251
-#  define THRUST_PP_INC_IMPL_TAG251 252
-#  define THRUST_PP_INC_IMPL_TAG252 253
-#  define THRUST_PP_INC_IMPL_TAG253 254
-#  define THRUST_PP_INC_IMPL_TAG254 255
-#  define THRUST_PP_INC_IMPL_TAG255 256
-#  define THRUST_PP_INC_IMPL_TAG256 257
-
-#  define THRUST_PP_DEC(_X) THRUST_PP_DEC_IMPL0(_X)
-
-#  define THRUST_PP_DEC_IMPL0(_X) THRUST_PP_CAT(THRUST_PP_DEC_IMPL_TAG, _X)
-
-#  define THRUST_PP_DEC_IMPL_TAG0   ~##~ // This will generate a syntax error
-#  define THRUST_PP_DEC_IMPL_TAG1   0
-#  define THRUST_PP_DEC_IMPL_TAG2   1
-#  define THRUST_PP_DEC_IMPL_TAG3   2
-#  define THRUST_PP_DEC_IMPL_TAG4   3
-#  define THRUST_PP_DEC_IMPL_TAG5   4
-#  define THRUST_PP_DEC_IMPL_TAG6   5
-#  define THRUST_PP_DEC_IMPL_TAG7   6
-#  define THRUST_PP_DEC_IMPL_TAG8   7
-#  define THRUST_PP_DEC_IMPL_TAG9   8
-#  define THRUST_PP_DEC_IMPL_TAG10  9
-#  define THRUST_PP_DEC_IMPL_TAG11  10
-#  define THRUST_PP_DEC_IMPL_TAG12  11
-#  define THRUST_PP_DEC_IMPL_TAG13  12
-#  define THRUST_PP_DEC_IMPL_TAG14  13
-#  define THRUST_PP_DEC_IMPL_TAG15  14
-#  define THRUST_PP_DEC_IMPL_TAG16  15
-#  define THRUST_PP_DEC_IMPL_TAG17  16
-#  define THRUST_PP_DEC_IMPL_TAG18  17
-#  define THRUST_PP_DEC_IMPL_TAG19  18
-#  define THRUST_PP_DEC_IMPL_TAG20  19
-#  define THRUST_PP_DEC_IMPL_TAG21  20
-#  define THRUST_PP_DEC_IMPL_TAG22  21
-#  define THRUST_PP_DEC_IMPL_TAG23  22
-#  define THRUST_PP_DEC_IMPL_TAG24  23
-#  define THRUST_PP_DEC_IMPL_TAG25  24
-#  define THRUST_PP_DEC_IMPL_TAG26  25
-#  define THRUST_PP_DEC_IMPL_TAG27  26
-#  define THRUST_PP_DEC_IMPL_TAG28  27
-#  define THRUST_PP_DEC_IMPL_TAG29  28
-#  define THRUST_PP_DEC_IMPL_TAG30  29
-#  define THRUST_PP_DEC_IMPL_TAG31  30
-#  define THRUST_PP_DEC_IMPL_TAG32  31
-#  define THRUST_PP_DEC_IMPL_TAG33  32
-#  define THRUST_PP_DEC_IMPL_TAG34  33
-#  define THRUST_PP_DEC_IMPL_TAG35  34
-#  define THRUST_PP_DEC_IMPL_TAG36  35
-#  define THRUST_PP_DEC_IMPL_TAG37  36
-#  define THRUST_PP_DEC_IMPL_TAG38  37
-#  define THRUST_PP_DEC_IMPL_TAG39  38
-#  define THRUST_PP_DEC_IMPL_TAG40  39
-#  define THRUST_PP_DEC_IMPL_TAG41  40
-#  define THRUST_PP_DEC_IMPL_TAG42  41
-#  define THRUST_PP_DEC_IMPL_TAG43  42
-#  define THRUST_PP_DEC_IMPL_TAG44  43
-#  define THRUST_PP_DEC_IMPL_TAG45  44
-#  define THRUST_PP_DEC_IMPL_TAG46  45
-#  define THRUST_PP_DEC_IMPL_TAG47  46
-#  define THRUST_PP_DEC_IMPL_TAG48  47
-#  define THRUST_PP_DEC_IMPL_TAG49  48
-#  define THRUST_PP_DEC_IMPL_TAG50  49
-#  define THRUST_PP_DEC_IMPL_TAG51  50
-#  define THRUST_PP_DEC_IMPL_TAG52  51
-#  define THRUST_PP_DEC_IMPL_TAG53  52
-#  define THRUST_PP_DEC_IMPL_TAG54  53
-#  define THRUST_PP_DEC_IMPL_TAG55  54
-#  define THRUST_PP_DEC_IMPL_TAG56  55
-#  define THRUST_PP_DEC_IMPL_TAG57  56
-#  define THRUST_PP_DEC_IMPL_TAG58  57
-#  define THRUST_PP_DEC_IMPL_TAG59  58
-#  define THRUST_PP_DEC_IMPL_TAG60  59
-#  define THRUST_PP_DEC_IMPL_TAG61  60
-#  define THRUST_PP_DEC_IMPL_TAG62  61
-#  define THRUST_PP_DEC_IMPL_TAG63  62
-#  define THRUST_PP_DEC_IMPL_TAG64  63
-#  define THRUST_PP_DEC_IMPL_TAG65  64
-#  define THRUST_PP_DEC_IMPL_TAG66  65
-#  define THRUST_PP_DEC_IMPL_TAG67  66
-#  define THRUST_PP_DEC_IMPL_TAG68  67
-#  define THRUST_PP_DEC_IMPL_TAG69  68
-#  define THRUST_PP_DEC_IMPL_TAG70  69
-#  define THRUST_PP_DEC_IMPL_TAG71  70
-#  define THRUST_PP_DEC_IMPL_TAG72  71
-#  define THRUST_PP_DEC_IMPL_TAG73  72
-#  define THRUST_PP_DEC_IMPL_TAG74  73
-#  define THRUST_PP_DEC_IMPL_TAG75  74
-#  define THRUST_PP_DEC_IMPL_TAG76  75
-#  define THRUST_PP_DEC_IMPL_TAG77  76
-#  define THRUST_PP_DEC_IMPL_TAG78  77
-#  define THRUST_PP_DEC_IMPL_TAG79  78
-#  define THRUST_PP_DEC_IMPL_TAG80  79
-#  define THRUST_PP_DEC_IMPL_TAG81  80
-#  define THRUST_PP_DEC_IMPL_TAG82  81
-#  define THRUST_PP_DEC_IMPL_TAG83  82
-#  define THRUST_PP_DEC_IMPL_TAG84  83
-#  define THRUST_PP_DEC_IMPL_TAG85  84
-#  define THRUST_PP_DEC_IMPL_TAG86  85
-#  define THRUST_PP_DEC_IMPL_TAG87  86
-#  define THRUST_PP_DEC_IMPL_TAG88  87
-#  define THRUST_PP_DEC_IMPL_TAG89  88
-#  define THRUST_PP_DEC_IMPL_TAG90  89
-#  define THRUST_PP_DEC_IMPL_TAG91  90
-#  define THRUST_PP_DEC_IMPL_TAG92  91
-#  define THRUST_PP_DEC_IMPL_TAG93  92
-#  define THRUST_PP_DEC_IMPL_TAG94  93
-#  define THRUST_PP_DEC_IMPL_TAG95  94
-#  define THRUST_PP_DEC_IMPL_TAG96  95
-#  define THRUST_PP_DEC_IMPL_TAG97  96
-#  define THRUST_PP_DEC_IMPL_TAG98  97
-#  define THRUST_PP_DEC_IMPL_TAG99  98
-#  define THRUST_PP_DEC_IMPL_TAG100 99
-#  define THRUST_PP_DEC_IMPL_TAG101 100
-#  define THRUST_PP_DEC_IMPL_TAG102 101
-#  define THRUST_PP_DEC_IMPL_TAG103 102
-#  define THRUST_PP_DEC_IMPL_TAG104 103
-#  define THRUST_PP_DEC_IMPL_TAG105 104
-#  define THRUST_PP_DEC_IMPL_TAG106 105
-#  define THRUST_PP_DEC_IMPL_TAG107 106
-#  define THRUST_PP_DEC_IMPL_TAG108 107
-#  define THRUST_PP_DEC_IMPL_TAG109 108
-#  define THRUST_PP_DEC_IMPL_TAG110 109
-#  define THRUST_PP_DEC_IMPL_TAG111 110
-#  define THRUST_PP_DEC_IMPL_TAG112 111
-#  define THRUST_PP_DEC_IMPL_TAG113 112
-#  define THRUST_PP_DEC_IMPL_TAG114 113
-#  define THRUST_PP_DEC_IMPL_TAG115 114
-#  define THRUST_PP_DEC_IMPL_TAG116 115
-#  define THRUST_PP_DEC_IMPL_TAG117 116
-#  define THRUST_PP_DEC_IMPL_TAG118 117
-#  define THRUST_PP_DEC_IMPL_TAG119 118
-#  define THRUST_PP_DEC_IMPL_TAG120 119
-#  define THRUST_PP_DEC_IMPL_TAG121 120
-#  define THRUST_PP_DEC_IMPL_TAG122 121
-#  define THRUST_PP_DEC_IMPL_TAG123 122
-#  define THRUST_PP_DEC_IMPL_TAG124 123
-#  define THRUST_PP_DEC_IMPL_TAG125 124
-#  define THRUST_PP_DEC_IMPL_TAG126 125
-#  define THRUST_PP_DEC_IMPL_TAG127 126
-#  define THRUST_PP_DEC_IMPL_TAG128 127
-#  define THRUST_PP_DEC_IMPL_TAG129 128
-#  define THRUST_PP_DEC_IMPL_TAG130 129
-#  define THRUST_PP_DEC_IMPL_TAG131 130
-#  define THRUST_PP_DEC_IMPL_TAG132 131
-#  define THRUST_PP_DEC_IMPL_TAG133 132
-#  define THRUST_PP_DEC_IMPL_TAG134 133
-#  define THRUST_PP_DEC_IMPL_TAG135 134
-#  define THRUST_PP_DEC_IMPL_TAG136 135
-#  define THRUST_PP_DEC_IMPL_TAG137 136
-#  define THRUST_PP_DEC_IMPL_TAG138 137
-#  define THRUST_PP_DEC_IMPL_TAG139 138
-#  define THRUST_PP_DEC_IMPL_TAG140 139
-#  define THRUST_PP_DEC_IMPL_TAG141 140
-#  define THRUST_PP_DEC_IMPL_TAG142 141
-#  define THRUST_PP_DEC_IMPL_TAG143 142
-#  define THRUST_PP_DEC_IMPL_TAG144 143
-#  define THRUST_PP_DEC_IMPL_TAG145 144
-#  define THRUST_PP_DEC_IMPL_TAG146 145
-#  define THRUST_PP_DEC_IMPL_TAG147 146
-#  define THRUST_PP_DEC_IMPL_TAG148 147
-#  define THRUST_PP_DEC_IMPL_TAG149 148
-#  define THRUST_PP_DEC_IMPL_TAG150 149
-#  define THRUST_PP_DEC_IMPL_TAG151 150
-#  define THRUST_PP_DEC_IMPL_TAG152 151
-#  define THRUST_PP_DEC_IMPL_TAG153 152
-#  define THRUST_PP_DEC_IMPL_TAG154 153
-#  define THRUST_PP_DEC_IMPL_TAG155 154
-#  define THRUST_PP_DEC_IMPL_TAG156 155
-#  define THRUST_PP_DEC_IMPL_TAG157 156
-#  define THRUST_PP_DEC_IMPL_TAG158 157
-#  define THRUST_PP_DEC_IMPL_TAG159 158
-#  define THRUST_PP_DEC_IMPL_TAG160 159
-#  define THRUST_PP_DEC_IMPL_TAG161 160
-#  define THRUST_PP_DEC_IMPL_TAG162 161
-#  define THRUST_PP_DEC_IMPL_TAG163 162
-#  define THRUST_PP_DEC_IMPL_TAG164 163
-#  define THRUST_PP_DEC_IMPL_TAG165 164
-#  define THRUST_PP_DEC_IMPL_TAG166 165
-#  define THRUST_PP_DEC_IMPL_TAG167 166
-#  define THRUST_PP_DEC_IMPL_TAG168 167
-#  define THRUST_PP_DEC_IMPL_TAG169 168
-#  define THRUST_PP_DEC_IMPL_TAG170 169
-#  define THRUST_PP_DEC_IMPL_TAG171 170
-#  define THRUST_PP_DEC_IMPL_TAG172 171
-#  define THRUST_PP_DEC_IMPL_TAG173 172
-#  define THRUST_PP_DEC_IMPL_TAG174 173
-#  define THRUST_PP_DEC_IMPL_TAG175 174
-#  define THRUST_PP_DEC_IMPL_TAG176 175
-#  define THRUST_PP_DEC_IMPL_TAG177 176
-#  define THRUST_PP_DEC_IMPL_TAG178 177
-#  define THRUST_PP_DEC_IMPL_TAG179 178
-#  define THRUST_PP_DEC_IMPL_TAG180 179
-#  define THRUST_PP_DEC_IMPL_TAG181 180
-#  define THRUST_PP_DEC_IMPL_TAG182 181
-#  define THRUST_PP_DEC_IMPL_TAG183 182
-#  define THRUST_PP_DEC_IMPL_TAG184 183
-#  define THRUST_PP_DEC_IMPL_TAG185 184
-#  define THRUST_PP_DEC_IMPL_TAG186 185
-#  define THRUST_PP_DEC_IMPL_TAG187 186
-#  define THRUST_PP_DEC_IMPL_TAG188 187
-#  define THRUST_PP_DEC_IMPL_TAG189 188
-#  define THRUST_PP_DEC_IMPL_TAG190 189
-#  define THRUST_PP_DEC_IMPL_TAG191 190
-#  define THRUST_PP_DEC_IMPL_TAG192 191
-#  define THRUST_PP_DEC_IMPL_TAG193 192
-#  define THRUST_PP_DEC_IMPL_TAG194 193
-#  define THRUST_PP_DEC_IMPL_TAG195 194
-#  define THRUST_PP_DEC_IMPL_TAG196 195
-#  define THRUST_PP_DEC_IMPL_TAG197 196
-#  define THRUST_PP_DEC_IMPL_TAG198 197
-#  define THRUST_PP_DEC_IMPL_TAG199 198
-#  define THRUST_PP_DEC_IMPL_TAG200 199
-#  define THRUST_PP_DEC_IMPL_TAG201 200
-#  define THRUST_PP_DEC_IMPL_TAG202 201
-#  define THRUST_PP_DEC_IMPL_TAG203 202
-#  define THRUST_PP_DEC_IMPL_TAG204 203
-#  define THRUST_PP_DEC_IMPL_TAG205 204
-#  define THRUST_PP_DEC_IMPL_TAG206 205
-#  define THRUST_PP_DEC_IMPL_TAG207 206
-#  define THRUST_PP_DEC_IMPL_TAG208 207
-#  define THRUST_PP_DEC_IMPL_TAG209 208
-#  define THRUST_PP_DEC_IMPL_TAG210 209
-#  define THRUST_PP_DEC_IMPL_TAG211 210
-#  define THRUST_PP_DEC_IMPL_TAG212 211
-#  define THRUST_PP_DEC_IMPL_TAG213 212
-#  define THRUST_PP_DEC_IMPL_TAG214 213
-#  define THRUST_PP_DEC_IMPL_TAG215 214
-#  define THRUST_PP_DEC_IMPL_TAG216 215
-#  define THRUST_PP_DEC_IMPL_TAG217 216
-#  define THRUST_PP_DEC_IMPL_TAG218 217
-#  define THRUST_PP_DEC_IMPL_TAG219 218
-#  define THRUST_PP_DEC_IMPL_TAG220 219
-#  define THRUST_PP_DEC_IMPL_TAG221 220
-#  define THRUST_PP_DEC_IMPL_TAG222 221
-#  define THRUST_PP_DEC_IMPL_TAG223 222
-#  define THRUST_PP_DEC_IMPL_TAG224 223
-#  define THRUST_PP_DEC_IMPL_TAG225 224
-#  define THRUST_PP_DEC_IMPL_TAG226 225
-#  define THRUST_PP_DEC_IMPL_TAG227 226
-#  define THRUST_PP_DEC_IMPL_TAG228 227
-#  define THRUST_PP_DEC_IMPL_TAG229 228
-#  define THRUST_PP_DEC_IMPL_TAG230 229
-#  define THRUST_PP_DEC_IMPL_TAG231 230
-#  define THRUST_PP_DEC_IMPL_TAG232 231
-#  define THRUST_PP_DEC_IMPL_TAG233 232
-#  define THRUST_PP_DEC_IMPL_TAG234 233
-#  define THRUST_PP_DEC_IMPL_TAG235 234
-#  define THRUST_PP_DEC_IMPL_TAG236 235
-#  define THRUST_PP_DEC_IMPL_TAG237 236
-#  define THRUST_PP_DEC_IMPL_TAG238 237
-#  define THRUST_PP_DEC_IMPL_TAG239 238
-#  define THRUST_PP_DEC_IMPL_TAG240 239
-#  define THRUST_PP_DEC_IMPL_TAG241 240
-#  define THRUST_PP_DEC_IMPL_TAG242 241
-#  define THRUST_PP_DEC_IMPL_TAG243 242
-#  define THRUST_PP_DEC_IMPL_TAG244 243
-#  define THRUST_PP_DEC_IMPL_TAG245 244
-#  define THRUST_PP_DEC_IMPL_TAG246 245
-#  define THRUST_PP_DEC_IMPL_TAG247 246
-#  define THRUST_PP_DEC_IMPL_TAG248 247
-#  define THRUST_PP_DEC_IMPL_TAG249 248
-#  define THRUST_PP_DEC_IMPL_TAG250 249
-#  define THRUST_PP_DEC_IMPL_TAG251 250
-#  define THRUST_PP_DEC_IMPL_TAG252 251
-#  define THRUST_PP_DEC_IMPL_TAG253 252
-#  define THRUST_PP_DEC_IMPL_TAG254 253
-#  define THRUST_PP_DEC_IMPL_TAG255 254
-#  define THRUST_PP_DEC_IMPL_TAG256 255
-#  define THRUST_PP_DEC_IMPL_TAG257 256
-
-#  define THRUST_PP_SPLICE_WITH_IMPL1(SEP, P1) P1
-#  define THRUST_PP_SPLICE_WITH_IMPL2(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL1(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL3(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL2(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL4(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL3(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL5(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL4(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL6(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL5(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL7(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL6(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL8(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL7(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL9(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL8(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL10(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL9(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL11(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL10(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL12(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL11(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL13(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL12(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL14(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL13(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL15(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL14(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL16(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL15(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL17(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL16(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL18(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL17(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL19(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL18(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL21(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL19(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL22(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL21(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL23(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL22(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL24(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL23(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL25(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL24(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL26(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL25(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL27(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL26(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL28(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL27(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL29(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL28(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL30(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL29(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL31(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL30(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL32(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL31(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL33(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL32(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL34(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL33(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL35(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL34(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL36(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL35(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL37(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL36(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL38(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL37(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL39(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL38(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL40(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL39(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL41(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL40(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL42(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL41(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL43(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL42(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL44(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL43(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL45(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL44(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL46(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL45(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL47(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL46(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL48(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL47(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL49(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL48(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL50(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL49(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL51(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL50(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL52(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL51(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL53(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL52(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL54(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL53(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL55(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL54(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL56(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL55(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL57(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL56(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL58(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL57(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL59(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL58(SEP, __VA_ARGS__))
-#  define THRUST_PP_SPLICE_WITH_IMPL60(SEP, P1, ...) \
-    THRUST_PP_CAT(P1##SEP, THRUST_PP_SPLICE_WITH_IMPL59(SEP, __VA_ARGS__))
-
-#  define THRUST_PP_SPLICE_WITH_IMPL_DISPATCH(N) THRUST_PP_SPLICE_WITH_IMPL##N
-
-#  define THRUST_PP_SPLICE_WITH(SEP, ...) \
-    THRUST_PP_EXPAND(                     \
-      THRUST_PP_EVAL(THRUST_PP_SPLICE_WITH_IMPL_DISPATCH, THRUST_PP_COUNT(__VA_ARGS__))(SEP, __VA_ARGS__))
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_PREPROCESSOR_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/sequence_access.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/sequence_access.h
deleted file mode 100644
index 05c7c7197d9c..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/sequence_access.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_SEQUENCE_ACCESS_H
-#define LIBCXX_WRAPPER_STD__CCCL_SEQUENCE_ACCESS_H
-
-// TODO(libhipcxx): remove this file and replace THRUST* with _CCCL* in rocThrust once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/sequence_access.h)
-
-#  define THRUST_SYNTHESIZE_SEQUENCE_ACCESS(_ClassName, _ConstIter) \
-    _CCCL_SYNTHESIZE_SEQUENCE_ACCESS(_ClassName, _ConstIter)
-#  define THRUST_SYNTHESIZE_SEQUENCE_REVERSE_ACCESS(_ClassName, _ConstRevIter) \
-    _CCCL_SYNTHESIZE_SEQUENCE_REVERSE_ACCESS(_ClassName, _ConstRevIter)
-
-#else
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-
-#  define THRUST_SYNTHESIZE_SEQUENCE_ACCESS(_ClassName, _ConstIter)                                      \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE iterator begin(_ClassName& __sequence) noexcept(          \
-      noexcept(__sequence.begin()))                                                                      \
-    {                                                                                                    \
-      return __sequence.begin();                                                                         \
-    }                                                                                                    \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter begin(const _ClassName& __sequence) noexcept(  \
-      noexcept(__sequence.begin()))                                                                      \
-    {                                                                                                    \
-      return __sequence.begin();                                                                         \
-    }                                                                                                    \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE iterator end(_ClassName& __sequence) noexcept(            \
-      noexcept(__sequence.end()))                                                                        \
-    {                                                                                                    \
-      return __sequence.end();                                                                           \
-    }                                                                                                    \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter end(const _ClassName& __sequence) noexcept(    \
-      noexcept(__sequence.end()))                                                                        \
-    {                                                                                                    \
-      return __sequence.end();                                                                           \
-    }                                                                                                    \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter cbegin(const _ClassName& __sequence) noexcept( \
-      noexcept(__sequence.begin()))                                                                      \
-    {                                                                                                    \
-      return __sequence.begin();                                                                         \
-    }                                                                                                    \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter cend(const _ClassName& __sequence) noexcept(   \
-      noexcept(__sequence.end()))                                                                        \
-    {                                                                                                    \
-      return __sequence.end();                                                                           \
-    }
-#  define THRUST_SYNTHESIZE_SEQUENCE_REVERSE_ACCESS(_ClassName, _ConstRevIter)                               \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE reverse_iterator rbegin(_ClassName& __sequence) noexcept(     \
-      noexcept(__sequence.rbegin()))                                                                         \
-    {                                                                                                        \
-      return __sequence.rbegin();                                                                            \
-    }                                                                                                        \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter rbegin(const _ClassName& __sequence) noexcept(  \
-      noexcept(__sequence.rbegin()))                                                                         \
-    {                                                                                                        \
-      return __sequence.rbegin();                                                                            \
-    }                                                                                                        \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE reverse_iterator rend(_ClassName& __sequence) noexcept(       \
-      noexcept(__sequence.rend()))                                                                           \
-    {                                                                                                        \
-      return __sequence.rend();                                                                              \
-    }                                                                                                        \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter rend(const _ClassName& __sequence) noexcept(    \
-      noexcept(__sequence.rend()))                                                                           \
-    {                                                                                                        \
-      return __sequence.rend();                                                                              \
-    }                                                                                                        \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter crbegin(const _ClassName& __sequence) noexcept( \
-      noexcept(__sequence.rbegin()))                                                                         \
-    {                                                                                                        \
-      return __sequence.rbegin();                                                                            \
-    }                                                                                                        \
-    THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter crend(const _ClassName& __sequence) noexcept(   \
-      noexcept(__sequence.rend()))                                                                           \
-    {                                                                                                        \
-      return __sequence.rend();                                                                              \
-    }
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_SEQUENCE_ACCESS_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/unreachable.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/unreachable.h
deleted file mode 100644
index b80840d2261a..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/unreachable.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_UNREACHABLE_H
-#define LIBCXX_WRAPPER_STD__CCCL_UNREACHABLE_H
-
-// TODO(libhipcxx): remove this file and replace THRUST* with _CCCL* in rocThrust once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(__cccl/unreachable.h)
-
-#  define THRUST_UNREACHABLE() _CCCL_UNREACHABLE()
-
-#else
-
-#  if THRUST_CUDA_COMPILER(CLANG)
-#    define THRUST_UNREACHABLE() __builtin_unreachable()
-#  elif defined(__CUDA_ARCH__)
-#    define THRUST_UNREACHABLE() __builtin_unreachable()
-#  else // ^^^ __CUDA_ARCH__ ^^^ / vvv !__CUDA_ARCH__ vvv
-#    if THRUST_COMPILER(MSVC)
-#      define THRUST_UNREACHABLE() __assume(0)
-#    else // ^^^ THRUST_COMPILER(MSVC) ^^^ / vvv !THRUST_COMPILER(MSVC) vvv
-#      define THRUST_UNREACHABLE() __builtin_unreachable()
-#    endif // !THRUST_COMPILER(MSVC)
-#  endif // !__CUDA_ARCH__
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_UNREACHABLE_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/visibility.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/visibility.h
deleted file mode 100644
index c4c342a0a883..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__cccl/visibility.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__CCCL_VISIBILITY_H
-#define LIBCXX_WRAPPER_STD__CCCL_VISIBILITY_H
-
-// TODO(libhipcxx): remove this file and replace THRUST_FORCEINLINE with _CCCL_FORCEINLINE in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include <thrust/detail/libcxx_wrapper/__cccl_config.h> // _THRUST_STD_INCLUDE(__cccl/visibility.h)
-
-#  define THRUST_FORCEINLINE _CCCL_FORCEINLINE
-
-#else
-
-#  if THRUST_COMPILER(MSVC)
-#    define THRUST_FORCEINLINE __forceinline
-#  else // ^^^ THRUST_COMPILER(MSVC) ^^^ / vvv THRUST_COMPILER(MSVC) vvv
-#    define THRUST_FORCEINLINE __inline__ __attribute__((__always_inline__))
-#  endif // !THRUST_COMPILER(MSVC)
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__CCCL_VISIBILITY_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__exception/terminate.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__exception/terminate.h
deleted file mode 100644
index ac606f6558c0..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__exception/terminate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__EXCEPTION_TERMINATE_H
-#define LIBCXX_WRAPPER_STD__EXCEPTION_TERMINATE_H
-
-// TODO(libhipcxx): remove this file and replace ::internal with _THRUST_STD in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__exception/terminate.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/diagnostic.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/unreachable.h>
-
-#  include <cstdlib>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_STD_NOVERSION::terminate;
-
-#else
-
-THRUST_DIAG_PUSH
-THRUST_DIAG_SUPPRESS_MSVC(4702) // unreachable code
-
-namespace detail
-{
-
-THRUST_NORETURN inline THRUST_HOST_DEVICE void cccl_terminate() noexcept
-{
-  _THRUST_IF_ELSE_TARGET(_THRUST_IS_HOST, (::std::exit(-1);), (__builtin_trap();))
-  THRUST_UNREACHABLE();
-}
-
-} // namespace detail
-
-THRUST_NORETURN inline THRUST_HOST_DEVICE void terminate() noexcept
-{
-  detail::cccl_terminate();
-  THRUST_UNREACHABLE();
-}
-
-THRUST_DIAG_POP
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__EXCEPTION_TERMINATE_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/identity.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/identity.h
deleted file mode 100644
index 207f966f53dc..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/identity.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023-24 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__FUNCTIONAL_IDENTITY_H
-#define LIBCXX_WRAPPER_STD__FUNCTIONAL_IDENTITY_H
-
-// TODO(libhipcxx): remove this file and replace ::internal with _THRUST_STD in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__functional/identity.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-
-#  include <utility>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using identity = _THRUST_STD::__identity;
-
-#else
-
-struct identity
-{
-  template <typename Tp>
-  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr Tp&& operator()(Tp&& t) const noexcept
-  {
-    return ::std::forward<Tp>(t);
-  }
-
-  using is_transparent = void;
-};
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__FUNCTIONAL_IDENTITY_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/invoke.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/invoke.h
deleted file mode 100644
index 4f72f6549ee8..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/invoke.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__FUNCTIONAL_INVOKE_H
-#define LIBCXX_WRAPPER_STD__FUNCTIONAL_INVOKE_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__functional/invoke.h)
-#else
-#  include <rocprim/type_traits_functions.hpp>
-
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__type_traits/is_reference_wrapper.h>
-#  include <thrust/detail/libcxx_wrapper/std/__type_traits/nat.h>
-#  include <thrust/detail/type_traits.h>
-
-#  include <any>
-#  include <type_traits>
-#  include <utility>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-template <typename Invokable, typename InputT, typename InitT = InputT>
-using accumulator_t = _THRUST_STD::__accumulator_t<Invokable, InputT, InitT>;
-
-#else
-namespace detail
-{
-template <typename DecayedFp>
-struct member_pointer_class_type
-{};
-
-template <typename Ret, typename ClassType>
-struct member_pointer_class_type<Ret ClassType::*>
-{
-  using type = ClassType;
-};
-
-template <typename Fp,
-          typename A0,
-          typename DecayFp = ::internal::decay_t<Fp>,
-          typename DecayA0 = ::internal::decay_t<A0>,
-          typename ClassT  = typename member_pointer_class_type<DecayFp>::type>
-using enable_if_bullet1 =
-  ::std::enable_if_t<::std::is_member_function_pointer<DecayFp>::value&& ::std::is_base_of<ClassT, DecayA0>::value>;
-
-template <typename Fp, typename A0, typename DecayFp = ::internal::decay_t<Fp>, typename DecayA0 = ::internal::decay_t<A0>>
-using enable_if_bullet2 =
-  ::std::enable_if_t<::std::is_member_function_pointer<DecayFp>::value && is_reference_wrapper<DecayA0>::value>;
-
-template <typename Fp,
-          typename A0,
-          typename DecayFp = ::internal::decay_t<Fp>,
-          typename DecayA0 = ::internal::decay_t<A0>,
-          typename ClassT  = typename member_pointer_class_type<DecayFp>::type>
-using enable_if_bullet3 =
-  ::std::enable_if_t<::std::is_member_function_pointer<DecayFp>::value && !::std::is_base_of<ClassT, DecayA0>::value
-                     && !is_reference_wrapper<DecayA0>::value>;
-
-template <typename Fp,
-          typename A0,
-          typename DecayFp = ::internal::decay_t<Fp>,
-          typename DecayA0 = ::internal::decay_t<A0>,
-          typename ClassT  = typename member_pointer_class_type<DecayFp>::type>
-using enable_if_bullet4 =
-  ::std::enable_if_t<::std::is_member_object_pointer<DecayFp>::value&& ::std::is_base_of<ClassT, DecayA0>::value>;
-
-template <typename Fp, typename A0, typename DecayFp = ::internal::decay_t<Fp>, typename DecayA0 = ::internal::decay_t<A0>>
-using enable_if_bullet5 =
-  ::std::enable_if_t<::std::is_member_object_pointer<DecayFp>::value && is_reference_wrapper<DecayA0>::value>;
-
-template <typename Fp,
-          typename A0,
-          typename DecayFp = ::internal::decay_t<Fp>,
-          typename DecayA0 = ::internal::decay_t<A0>,
-          typename ClassT  = typename member_pointer_class_type<DecayFp>::type>
-using enable_if_bullet6 =
-  ::std::enable_if_t<::std::is_member_object_pointer<DecayFp>::value && !::std::is_base_of<ClassT, DecayA0>::value
-                     && !is_reference_wrapper<DecayA0>::value>;
-
-template <typename... Args>
-inline THRUST_HOST_DEVICE nat __invoke(::std::any, Args&&... args);
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename... Args, typename = enable_if_bullet1<Fp, A0>>
-inline THRUST_HOST_DEVICE constexpr decltype((::std::declval<A0>().*::std::declval<Fp>())(::std::declval<Args>()...))
-__invoke(Fp&& f, A0&& a0, Args&&... args) noexcept(noexcept((static_cast<A0&&>(a0).*f)(static_cast<Args&&>(args)...)))
-{
-  return (static_cast<A0&&>(a0).*f)(static_cast<Args&&>(args)...);
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename... Args, typename = enable_if_bullet2<Fp, A0>>
-inline
-  THRUST_HOST_DEVICE constexpr decltype((::std::declval<A0>().get().*::std::declval<Fp>())(::std::declval<Args>()...))
-  __invoke(Fp&& f, A0&& a0, Args&&... args) noexcept(noexcept((a0.get().*f)(static_cast<Args&&>(args)...)))
-{
-  return (a0.get().*f)(static_cast<Args&&>(args)...);
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename... Args, typename = enable_if_bullet3<Fp, A0>>
-inline THRUST_HOST_DEVICE constexpr decltype(((*::std::declval<A0>()).*::std::declval<Fp>())(::std::declval<Args>()...))
-__invoke(Fp&& f, A0&& a0, Args&&... args) noexcept(noexcept(((*static_cast<A0&&>(a0)).*f)(static_cast<Args&&>(args)...)))
-{
-  return ((*static_cast<A0&&>(a0)).*f)(static_cast<Args&&>(args)...);
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename = enable_if_bullet4<Fp, A0>>
-inline THRUST_HOST_DEVICE constexpr decltype(::std::declval<A0>().*::std::declval<Fp>())
-__invoke(Fp&& f, A0&& a0) noexcept(noexcept(static_cast<A0&&>(a0).*f))
-{
-  return static_cast<A0&&>(a0).*f;
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename = enable_if_bullet5<Fp, A0>>
-inline THRUST_HOST_DEVICE constexpr decltype(::std::declval<A0>().get().*::std::declval<Fp>())
-__invoke(Fp&& f, A0&& a0) noexcept(noexcept(a0.get().*f))
-{
-  return a0.get().*f;
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename A0, typename = enable_if_bullet6<Fp, A0>>
-inline THRUST_HOST_DEVICE constexpr decltype((*::std::declval<A0>()).*::std::declval<Fp>())
-__invoke(Fp&& f, A0&& a0) noexcept(noexcept((*static_cast<A0&&>(a0)).*f))
-{
-  return (*static_cast<A0&&>(a0)).*f;
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Fp, typename... Args>
-inline THRUST_HOST_DEVICE constexpr decltype(::std::declval<Fp>()(::std::declval<Args>()...))
-__invoke(Fp&& f, Args&&... args) noexcept(noexcept(static_cast<Fp&&>(f)(static_cast<Args&&>(args)...)))
-{
-  return static_cast<Fp&&>(f)(static_cast<Args&&>(args)...);
-}
-
-template <typename Fn, typename... Args>
-inline THRUST_HOST_DEVICE constexpr ::rocprim::invoke_result_t<Fn, Args...>
-invoke(Fn&& f, Args&&... args) noexcept(THRUST_TRAIT(::std::is_nothrow_invocable, Fn, Args...))
-{
-  return ::internal::detail::__invoke(::std::forward<Fn>(f), ::std::forward<Args>(args)...);
-}
-} // namespace detail
-
-template <typename Invokable, typename InputT, typename InitT = InputT>
-#  if _THRUST_USE_ROCPRIM
-using accumulator_t = ::rocprim::accumulator_t<Invokable, InputT, InitT>;
-#  else
-using accumulator_t = decay_t<::std::invoke_result_t<Invokable, InitT, InputT>>;
-#  endif
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__FUNCTIONAL_INVOKE_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/not_fn.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/not_fn.h
deleted file mode 100644
index 74e4624495be..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__functional/not_fn.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__FUNCTIONAL_NOT_FN_H
-#define LIBCXX_WRAPPER_STD__FUNCTIONAL_NOT_FN_H
-
-// TODO(libhipcxx): remove this file and replace ::internal with _THRUST_STD in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__functional/not_fn.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__functional/invoke.h>
-#  include <thrust/detail/type_traits.h>
-
-#  include <type_traits>
-#  include <utility>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-template <typename Fn>
-using not_fn_t = _THRUST_STD::__not_fn_t<Fn>;
-using _THRUST_STD::not_fn;
-
-#else
-
-namespace detail
-{
-template <typename Fn, typename... Args>
-auto can_invoke_and_negate_test(int)
-  -> decltype((void) (!::internal::detail::invoke(::std::declval<Fn>(), ::std::declval<Args>()...)),
-              ::std::true_type{});
-
-template <typename Fn, typename... Args>
-auto can_invoke_and_negate_test(...) -> ::std::false_type;
-
-template <typename Fn, typename... Args>
-inline constexpr bool can_invoke_and_negate = decltype(can_invoke_and_negate_test<Fn, Args...>(0))::value;
-} // namespace detail
-
-template <typename Fn>
-struct not_fn_t
-{
-  Fn f;
-
-  template <typename... Args,
-            bool cccl_true                                                                 = true,
-            ::std::enable_if_t<::std::is_constructible_v<Fn, Args&&...> && cccl_true, int> = 0>
-  inline THRUST_HOST_DEVICE explicit constexpr not_fn_t(Args&&... args) noexcept(
-    ::std::is_nothrow_constructible_v<Fn, Args&&...>)
-      : f(::std::forward<Args>(args)...)
-  {}
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename... Args,
-            bool cccl_true                                                                    = true,
-            ::std::enable_if_t<detail::can_invoke_and_negate<Fn&, Args...> && cccl_true, int> = 0>
-  inline THRUST_HOST_DEVICE constexpr auto operator()(Args&&... args) & noexcept(noexcept(
-    !detail::invoke(f, ::std::forward<Args>(args)...))) -> decltype(!detail::invoke(f, ::std::forward<Args>(args)...))
-  {
-    return !detail::invoke(f, ::std::forward<Args>(args)...);
-  }
-
-  template <typename... Args,
-            bool cccl_true                                                                     = true,
-            ::std::enable_if_t<!detail::can_invoke_and_negate<Fn&, Args...> && cccl_true, int> = 0>
-  void operator()(Args&&...) & = delete;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename... Args,
-            bool cccl_true                                                                          = true,
-            ::std::enable_if_t<detail::can_invoke_and_negate<const Fn&, Args...> && cccl_true, int> = 0>
-  inline THRUST_HOST_DEVICE constexpr auto operator()(Args&&... args) const& noexcept(noexcept(
-    !detail::invoke(f, ::std::forward<Args>(args)...))) -> decltype(!detail::invoke(f, ::std::forward<Args>(args)...))
-  {
-    return !detail::invoke(f, ::std::forward<Args>(args)...);
-  }
-
-  template <typename... Args,
-            bool cccl_true                                                                           = true,
-            ::std::enable_if_t<!detail::can_invoke_and_negate<const Fn&, Args...> && cccl_true, int> = 0>
-  void operator()(Args&&...) const& = delete;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename... Args,
-            bool cccl_true                                                                   = true,
-            ::std::enable_if_t<detail::can_invoke_and_negate<Fn, Args...> && cccl_true, int> = 0>
-  inline THRUST_HOST_DEVICE constexpr auto
-  operator()(Args&&... args) && noexcept(noexcept(!detail::invoke(::std::move(f), ::std::forward<Args>(args)...)))
-    -> decltype(!detail::invoke(::std::move(f), ::std::forward<Args>(args)...))
-  {
-    return !detail::invoke(::std::move(f), ::std::forward<Args>(args)...);
-  }
-
-  template <typename... Args,
-            bool cccl_true                                                                    = true,
-            ::std::enable_if_t<!detail::can_invoke_and_negate<Fn, Args...> && cccl_true, int> = 0>
-  void operator()(Args&&...) && = delete;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename... Args,
-            bool cccl_true                                                                         = true,
-            ::std::enable_if_t<detail::can_invoke_and_negate<const Fn, Args...> && cccl_true, int> = 0>
-  inline THRUST_HOST_DEVICE constexpr auto
-  operator()(Args&&... args) const&& noexcept(noexcept(!detail::invoke(::std::move(f), ::std::forward<Args>(args)...)))
-    -> decltype(!detail::invoke(::std::move(f), ::std::forward<Args>(args)...))
-  {
-    return !detail::invoke(::std::move(f), ::std::forward<Args>(args)...);
-  }
-
-  template <typename... Args,
-            bool cccl_true                                                                          = true,
-            ::std::enable_if_t<!detail::can_invoke_and_negate<const Fn, Args...> && cccl_true, int> = 0>
-  void operator()(Args&&...) const&& = delete;
-};
-
-template <typename Fn,
-          bool cccl_true                                                                    = true,
-          ::std::enable_if_t<::std::is_constructible_v<decay_t<Fn>, Fn> && cccl_true, int>  = 0,
-          ::std::enable_if_t<::std::is_move_constructible_v<decay_t<Fn>> && cccl_true, int> = 0>
-THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr auto not_fn(Fn&& f)
-{
-  return not_fn_t<decay_t<Fn>>(::std::forward<Fn>(f));
-}
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__FUNCTIONAL_NOT_FN_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/concepts.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/concepts.h
deleted file mode 100644
index ddb546fbc1e9..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/concepts.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__ITERATOR_CONCEPTS_H
-#define LIBCXX_WRAPPER_STD__ITERATOR_CONCEPTS_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__iterator/concepts.h)
-#elif THRUST_STD_VER >= 2020
-#  include <iterator>
-#else
-#  include <type_traits>
-#  include <utility>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-
-using _THRUST_STD::indirectly_readable;
-
-#else
-
-namespace detail
-{
-
-template <typename, typename = void>
-struct is_indirectly_readable : ::std::false_type
-{};
-
-template <typename T>
-struct is_indirectly_readable<T, ::std::void_t<decltype(*::std::declval<T&>()), typename T::value_type>>
-    : ::std::true_type
-{};
-
-template <typename T>
-struct is_indirectly_readable<T*, void> : ::std::true_type
-{};
-
-} // namespace detail
-
-template <typename T>
-inline constexpr bool indirectly_readable = detail::is_indirectly_readable<T>::value;
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__ITERATOR_CONCEPTS_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h
deleted file mode 100644
index 2d4182b15a3d..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__ITERATOR_ITERATOR_TRAITS_H
-#define LIBCXX_WRAPPER_STD__ITERATOR_ITERATOR_TRAITS_H
-
-// TODO(libhipcxx): remove this file and replace THRUST_NS_QUALIFIER::detail::is* with _THRUST_STD::__is*
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/config/namespace.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-
-#  if !THRUST_COMPILER(NVRTC)
-#    if THRUST_COMPILER(MSVC)
-#      include <xutility> // for ::std::input_iterator_tag
-#    else // ^^^ THRUST_COMPILER(MSVC) ^^^ / vvv !THRUST_COMPILER(MSVC) vvv
-#      include <iterator> // for ::std::input_iterator_tag
-#    endif // !THRUST_COMPILER(MSVC)
-#  endif // !THRUST_COMPILER(NVRTC)
-
-#  include <type_traits>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-template <typename Tp>
-using is_cpp17_input_iterator = _THRUST_STD::__is_cpp17_input_iterator<Tp>;
-template <typename Tp>
-using is_cpp17_random_access_iterator = _THRUST_STD::__is_cpp17_random_access_iterator<Tp>;
-
-#else
-
-namespace detail
-{
-using input_iterator_tag         = ::std::input_iterator_tag;
-using random_access_iterator_tag = ::std::random_access_iterator_tag;
-
-template <typename Tp>
-struct has_iterator_category
-{
-private:
-  template <typename Up>
-  inline THRUST_HOST_DEVICE static ::std::false_type test(...);
-  template <typename Up>
-  inline THRUST_HOST_DEVICE static ::std::true_type test(typename Up::iterator_category* = nullptr);
-
-public:
-  static const bool value = decltype(test<Tp>(nullptr))::value;
-};
-
-template <typename Tp, typename Up, bool = has_iterator_category<::std::iterator_traits<Tp>>::value>
-struct has_iterator_category_convertible_to
-    : ::std::is_convertible<typename ::std::iterator_traits<Tp>::iterator_category, Up>
-{};
-
-template <typename Tp, typename Up>
-struct has_iterator_category_convertible_to<Tp, Up, false> : ::std::false_type
-{};
-} // namespace detail
-
-template <typename Tp>
-struct is_cpp17_input_iterator : public detail::has_iterator_category_convertible_to<Tp, detail::input_iterator_tag>
-{};
-
-template <typename Tp>
-struct is_cpp17_random_access_iterator
-    : public detail::has_iterator_category_convertible_to<Tp, detail::random_access_iterator_tag>
-{};
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__ITERATOR_ITERATOR_TRAITS_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h
deleted file mode 100644
index 67f816cb37a2..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__memory/construct_at.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__MEMORY_CONSTRUCT_AT_H
-#define LIBCXX_WRAPPER_STD__MEMORY_CONSTRUCT_AT_H
-
-// TODO(libhipcxx): remove this file and replace ::internal* with _THRUST_STD* once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__memory/construct_at.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
-#  include <thrust/detail/memory_wrapper.h>
-
-#  include <iterator>
-#  include <type_traits>
-#  include <utility>
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_STD::__construct_at;
-using _THRUST_STD::__destroy_at;
-
-#else
-
-namespace detail
-{
-template <typename To, typename...>
-struct is_narrowing_impl : ::std::false_type
-{};
-
-template <typename To, typename From>
-struct is_narrowing_impl<To, From> : ::std::true_type
-{};
-
-template <typename To, typename From>
-struct is_narrowing_impl<To, From, ::std::void_t<decltype(To{::std::declval<From>()})>> : ::std::false_type
-{};
-
-template <typename Tp, typename... Args>
-using is_narrowing = If<THRUST_TRAIT(::std::is_arithmetic, Tp), is_narrowing_impl<Tp, Args...>, ::std::false_type>;
-
-template <typename Tp, typename... Args>
-struct can_optimize_construct_at
-    : ::std::integral_constant<
-        bool,
-        THRUST_TRAIT(::std::is_trivially_constructible, Tp, Args...)
-          && THRUST_TRAIT(::std::is_trivially_move_assignable, Tp) && !is_narrowing<Tp, Args...>::value>
-{};
-} // namespace detail
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Tp, typename... Args>
-inline THRUST_HOST_DEVICE
-THRUST_CONSTEXPR_CXX20 ::std::enable_if_t<!detail::can_optimize_construct_at<Tp, Args...>::value, Tp*>
-__construct_at(Tp* location, Args&&... args)
-{
-  assert(location != nullptr && "null pointer given to construct_at");
-#  if THRUST_STD_VER >= 2020
-  // Need to go through `std::construct_at` as that is the explicitly blessed function
-  if (::std::is_constant_evaluated())
-  {
-    return ::std::construct_at(location, ::std::forward<Args>(args)...);
-  }
-#  endif // THRUST_STD_VER >= 2020
-  return ::new (::std::addressof(*location)) Tp(::std::forward<Args>(args)...);
-}
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Tp, typename... Args>
-inline THRUST_HOST_DEVICE
-THRUST_CONSTEXPR_CXX20 ::std::enable_if_t<detail::can_optimize_construct_at<Tp, Args...>::value, Tp*>
-__construct_at(Tp* location, Args&&... args)
-{
-  assert(location != nullptr && "null pointer given to construct_at");
-#  if THRUST_STD_VER >= 2020
-  // Need to go through `std::construct_at` as that is the explicitly blessed function
-  if (::std::is_constant_evaluated())
-  {
-    return ::std::construct_at(location, ::std::forward<Args>(args)...);
-  }
-#  endif // THRUST_STD_VER >= 2020
-  *location = Tp{::std::forward<Args>(args)...};
-  return location;
-}
-
-namespace detail
-{
-template <typename ForwardIterator>
-inline THRUST_HOST_DEVICE constexpr ForwardIterator __destroy(ForwardIterator, ForwardIterator);
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Tp,
-          ::std::enable_if_t<!THRUST_TRAIT(::std::is_array, Tp), int>                  = 0,
-          ::std::enable_if_t<!THRUST_TRAIT(::std::is_trivially_destructible, Tp), int> = 0>
-inline THRUST_HOST_DEVICE constexpr void __destroy_at(Tp* loc)
-{
-  assert(loc != nullptr && "null pointer given to destroy_at");
-  loc->~Tp();
-}
-} // namespace detail
-
-THRUST_EXEC_CHECK_DISABLE
-template <typename Tp,
-          ::std::enable_if_t<!THRUST_TRAIT(::std::is_array, Tp), int>                 = 0,
-          ::std::enable_if_t<THRUST_TRAIT(::std::is_trivially_destructible, Tp), int> = 0>
-inline THRUST_HOST_DEVICE constexpr void __destroy_at(Tp* loc)
-{
-  assert(loc != nullptr && "null pointer given to destroy_at");
-  (void) loc;
-}
-
-template <typename Tp, ::std::enable_if_t<THRUST_TRAIT(::std::is_array, Tp), int> = 0>
-inline THRUST_HOST_DEVICE constexpr void __destroy_at(Tp* loc)
-{
-  assert(loc != nullptr && "null pointer given to destroy_at");
-  detail::__destroy(::std::begin(*loc), ::std::end(*loc));
-}
-
-namespace detail
-{
-template <typename ForwardIterator>
-inline THRUST_HOST_DEVICE constexpr ForwardIterator __destroy(ForwardIterator first, ForwardIterator last)
-{
-  for (; first != last; ++first)
-  {
-    __destroy_at(::std::addressof(*first));
-  }
-  return first;
-}
-} // namespace detail
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__MEMORY_CONSTRUCT_AT_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h
deleted file mode 100644
index 7cabe2894b3c..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONDITIONAL_H
-#define LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONDITIONAL_H
-
-// TODO(libhipcxx): remove this file and replace ::internal::If with _THRUST_STD::_If in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__type_traits/conditional.h)
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-template <bool Cond, typename IfRes, typename ElseRes>
-using If = _THRUST_STD::_If<Cond, IfRes, ElseRes>;
-
-#else
-
-namespace detail
-{
-template <bool>
-struct IfImpl;
-
-template <>
-struct IfImpl<true>
-{
-  template <typename IfRes, typename ElseRes>
-  using Select = IfRes;
-};
-
-template <>
-struct IfImpl<false>
-{
-  template <typename IfRes, typename ElseRes>
-  using Select = ElseRes;
-};
-} // namespace detail
-
-template <bool Cond, typename IfRes, typename ElseRes>
-using If = typename detail::IfImpl<Cond>::template Select<IfRes, ElseRes>;
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONDITIONAL_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h
deleted file mode 100644
index 71b4478f8296..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONJUNCTION_H
-#define LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONJUNCTION_H
-
-// TODO(libhipcxx): remove this file and replace ::internal* with _THRUST_STD* in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-
-#  include <type_traits>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-template <typename... Pred>
-using _And = _THRUST_STD::_And<Pred...>;
-
-#else
-
-namespace detail
-{
-template <typename...>
-using expand_to_true = ::std::true_type;
-
-template <typename... Pred>
-THRUST_HOST_DEVICE expand_to_true<::std::enable_if_t<Pred::value>...> and_helper(int);
-
-template <typename...>
-THRUST_HOST_DEVICE ::std::false_type and_helper(...);
-} // namespace detail
-
-template <typename... Pred>
-using _And = decltype(detail::and_helper<Pred...>(0));
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__TYPE_TRAITS_CONJUNCTION_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/is_reference_wrapper.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/is_reference_wrapper.h
deleted file mode 100644
index 7804d907600a..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/is_reference_wrapper.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
-#define LIBCXX_WRAPPER_STD__TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include <functional>
-#  include <type_traits>
-
-namespace internal
-{
-namespace detail
-{
-template <typename Tp>
-struct is_reference_wrapper_impl : public ::std::false_type
-{};
-template <typename Tp>
-struct is_reference_wrapper_impl<::std::reference_wrapper<Tp>> : public ::std::true_type
-{};
-template <typename Tp>
-struct is_reference_wrapper : public is_reference_wrapper_impl<::std::remove_cv_t<Tp>>
-{};
-} // namespace detail
-} // namespace internal
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/nat.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/nat.h
deleted file mode 100644
index 2b5e2668670c..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/nat.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__TYPE_TRAITS_NAT_H
-#define LIBCXX_WRAPPER_STD__TYPE_TRAITS_NAT_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-
-namespace internal
-{
-namespace detail
-{
-struct nat
-{
-  nat()                      = delete;
-  nat(const nat&)            = delete;
-  nat& operator=(const nat&) = delete;
-  ~nat()                     = delete;
-};
-} // namespace detail
-} // namespace internal
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD__TYPE_TRAITS_NAT_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/type_identity.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/type_identity.h
deleted file mode 100644
index 32cfba72afd6..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/__type_traits/type_identity.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD__TYPE_TRAITS_TYPE_IDENTITY_H
-#define LIBCXX_WRAPPER_STD__TYPE_TRAITS_TYPE_IDENTITY_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/dialect.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__type_traits/type_identity.h)
-#elif THRUST_STD_VER >= 2020
-#  include <type_traits>
-#endif
-
-namespace internal
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER >= 2020
-
-using _THRUST_STD::type_identity;
-
-#else
-
-template <typename Tp>
-struct type_identity
-{
-  using type = Tp;
-};
-
-#endif
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD__TYPE_TRAITS_TYPE_IDENTITY_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/__config.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/__config.h
deleted file mode 100644
index 92c6b58886b8..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/__config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE__CONFIG_H
-#define LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE__CONFIG_H
-
-#include <thrust/detail/config/libcxx.h>
-#include <thrust/detail/libcxx_wrapper/std/__cccl/compiler.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-#  include _THRUST_STD_INCLUDE(detail/libcxx/include/__config)
-
-#  define THRUST_CTAD_SUPPORTED_FOR_TYPE(_ClassName) _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(_ClassName)
-
-#else
-
-#  if (!THRUST_COMPILER(GCC) || THRUST_COMPILER(GCC, >, 6))
-#    define THRUST_CTAD_SUPPORTED_FOR_TYPE(_ClassName) \
-      template <typename... Tag>                       \
-      _ClassName(typename Tag::__allow_ctad...)->_ClassName<Tag...>
-#  else
-#    define THRUST_CTAD_SUPPORTED_FOR_TYPE(_ClassName) static_assert(true, "")
-#  endif
-
-#endif
-
-#endif // LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE__CONFIG_H
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/stdexcept.h b/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/stdexcept.h
deleted file mode 100644
index 828b7d81d25a..000000000000
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/std/detail/libcxx/include/stdexcept.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of libcu++, the C++ Standard Library for your entire system,
-// under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE_STDEXCEPT_H
-#define LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE_STDEXCEPT_H
-
-// TODO(libhipcxx): remove this file and replace ::internal* with _THRUST_STD* in rocThrust
-// once libhipcxx gets ready
-
-#include <thrust/detail/config/libcxx.h>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(detail/libcxx/include/stdexcept)
-#else
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/attributes.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/exceptions.h>
-#  include <thrust/detail/libcxx_wrapper/std/__cccl/execution_space.h>
-#  include <thrust/detail/libcxx_wrapper/std/__exception/terminate.h>
-
-#  ifndef THRUST_NO_EXCEPTIONS
-#    include <stdexcept>
-#  endif // THRUST_NO_EXCEPTIONS
-#endif
-
-namespace internal
-{
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-
-using _THRUST_STD::__throw_runtime_error;
-
-#else
-
-THRUST_NORETURN inline THRUST_HOST_DEVICE void __throw_runtime_error(const char* msg)
-{
-#  ifndef THRUST_NO_EXCEPTIONS
-  _THRUST_IF_ELSE_TARGET(_THRUST_IS_HOST, (throw ::std::runtime_error(msg);), ((void) msg; terminate();))
-#  else // ^^^ !THRUST_NO_EXCEPTIONS ^^^ / vvv THRUST_NO_EXCEPTIONS vvv
-  (void) msg;
-  terminate();
-#  endif // THRUST_NO_EXCEPTIONS
-}
-
-#endif
-
-} // namespace internal
-
-#endif // LIBCXX_WRAPPER_STD_DETAIL_LIBCXX_INCLUDE_STDEXCEPT_H
diff --git a/projects/rocthrust/thrust/detail/logical.inl b/projects/rocthrust/thrust/detail/logical.inl
index 96bb32861ed5..0e635c232ac2 100644
--- a/projects/rocthrust/thrust/detail/logical.inl
+++ b/projects/rocthrust/thrust/detail/logical.inl
@@ -17,58 +17,44 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/logical.h>
-#include <thrust/system/detail/generic/logical.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/logical.h>
+#include <thrust/system/detail/adl/logical.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE bool
-all_of(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-       InputIterator first,
-       InputIterator last,
-       Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+bool all_of(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::all_of;
   return all_of(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end all_of()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE bool
-any_of(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-       InputIterator first,
-       InputIterator last,
-       Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+bool any_of(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::any_of;
   return any_of(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end any_of()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE bool
-none_of(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-        InputIterator first,
-        InputIterator last,
-        Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+bool none_of(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::none_of;
   return none_of(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end none_of()
 
-template <typename InputIterator, typename Predicate>
+
+template<typename InputIterator, typename Predicate>
 bool all_of(InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
@@ -80,7 +66,8 @@ bool all_of(InputIterator first, InputIterator last, Predicate pred)
   return thrust::all_of(select_system(system), first, last, pred);
 }
 
-template <typename InputIterator, typename Predicate>
+
+template<typename InputIterator, typename Predicate>
 bool any_of(InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
@@ -92,7 +79,8 @@ bool any_of(InputIterator first, InputIterator last, Predicate pred)
   return thrust::any_of(select_system(system), first, last, pred);
 }
 
-template <typename InputIterator, typename Predicate>
+
+template<typename InputIterator, typename Predicate>
 bool none_of(InputIterator first, InputIterator last, Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
diff --git a/projects/rocthrust/thrust/detail/malloc_and_free.h b/projects/rocthrust/thrust/detail/malloc_and_free.h
index 596fd65f31ed..6d8e195e8f3f 100644
--- a/projects/rocthrust/thrust/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/detail/malloc_and_free.h
@@ -63,7 +63,9 @@ malloc(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, std::si
 }
 
 // XXX WAR nvbug 992955
-#if THRUST_HAS_CUDA_COMPILER()
+#if defined(__NVCC__) || defined(_NVHPC_CUDA)                                  \
+  || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+  || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
 #  if CUDART_VERSION < 5000
 
 // cudafe generates unqualified calls to free(int *volatile)
@@ -75,7 +77,7 @@ inline THRUST_HOST_DEVICE void free(int* volatile ptr)
 }
 
 #  endif // CUDART_VERSION
-#endif // THRUST_CUDA_COMPILER
+#endif // _CCCL_CUDA_COMPILER
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename Pointer>
diff --git a/projects/rocthrust/thrust/detail/memory_algorithms.h b/projects/rocthrust/thrust/detail/memory_algorithms.h
index cc2f50cab634..671f500701aa 100644
--- a/projects/rocthrust/thrust/detail/memory_algorithms.h
+++ b/projects/rocthrust/thrust/detail/memory_algorithms.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2018 NVIDIA Corporation
-// Modifications Copyright© 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Modifications Copyright© 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
 // Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
 //
 // Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
@@ -18,15 +18,13 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+#include <thrust/addressof.h>
 #include <thrust/detail/allocator/allocator_traits.h>
 #include <thrust/detail/memory_wrapper.h>
+#include <thrust/detail/nv_target.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__memory/addressof.h)
-#endif
-
 #include <new>
 #include <utility>
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
@@ -59,7 +57,7 @@ THRUST_HOST_DEVICE ForwardIt destroy(ForwardIt first, ForwardIt last) noexcept
 {
   for (; first != last; ++first)
   {
-    destroy_at(_THRUST_STD::addressof(*first));
+    destroy_at(addressof(*first));
   }
 
   return first;
@@ -68,7 +66,7 @@ THRUST_HOST_DEVICE ForwardIt destroy(ForwardIt first, ForwardIt last) noexcept
 template <typename Allocator, typename ForwardIt>
 THRUST_HOST_DEVICE ForwardIt destroy(Allocator const& alloc, ForwardIt first, ForwardIt last) noexcept
 {
-  using T      = detail::it_value_t<ForwardIt>;
+  using T      = typename iterator_traits<ForwardIt>::value_type;
   using traits = typename detail::allocator_traits<
     _THRUST_STD::remove_cv_t<_THRUST_STD::remove_reference_t<Allocator>>>::template rebind_traits<T>::other;
 
@@ -76,7 +74,7 @@ THRUST_HOST_DEVICE ForwardIt destroy(Allocator const& alloc, ForwardIt first, Fo
 
   for (; first != last; ++first)
   {
-    destroy_at(alloc_T, _THRUST_STD::addressof(*first));
+    destroy_at(alloc_T, addressof(*first));
   }
 
   return first;
@@ -87,7 +85,7 @@ THRUST_HOST_DEVICE ForwardIt destroy_n(ForwardIt first, Size n) noexcept
 {
   for (; n > 0; (void) ++first, --n)
   {
-    destroy_at(_THRUST_STD::addressof(*first));
+    destroy_at(addressof(*first));
   }
 
   return first;
@@ -96,7 +94,7 @@ THRUST_HOST_DEVICE ForwardIt destroy_n(ForwardIt first, Size n) noexcept
 template <typename Allocator, typename ForwardIt, typename Size>
 THRUST_HOST_DEVICE ForwardIt destroy_n(Allocator const& alloc, ForwardIt first, Size n) noexcept
 {
-  using T      = detail::it_value_t<ForwardIt>;
+  using T      = typename iterator_traits<ForwardIt>::value_type;
   using traits = typename detail::allocator_traits<
     _THRUST_STD::remove_cv_t<_THRUST_STD::remove_reference_t<Allocator>>>::template rebind_traits<T>::other;
 
@@ -104,7 +102,7 @@ THRUST_HOST_DEVICE ForwardIt destroy_n(Allocator const& alloc, ForwardIt first,
 
   for (; n > 0; (void) ++first, --n)
   {
-    destroy_at(alloc_T, _THRUST_STD::addressof(*first));
+    destroy_at(alloc_T, addressof(*first));
   }
 
   return first;
@@ -113,30 +111,30 @@ THRUST_HOST_DEVICE ForwardIt destroy_n(Allocator const& alloc, ForwardIt first,
 template <typename ForwardIt, typename... Args>
 THRUST_HOST_DEVICE void uninitialized_construct(ForwardIt first, ForwardIt last, Args const&... args)
 {
-  using T = detail::it_value_t<ForwardIt>;
+  using T = typename iterator_traits<ForwardIt>::value_type;
 
   ForwardIt current = first;
 
   // No exceptions in CUDA.
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (
       try {
         for (; current != last; ++current)
         {
-          ::new (static_cast<void*>(_THRUST_STD::addressof(*current))) T(args...);
+          ::new (static_cast<void*>(addressof(*current))) T(args...);
         }
       } catch (...) {
         destroy(first, current);
         throw;
       }),
-    (for (; current != last; ++current) { ::new (static_cast<void*>(_THRUST_STD::addressof(*current))) T(args...); }));
+    (for (; current != last; ++current) { ::new (static_cast<void*>(addressof(*current))) T(args...); }));
 }
 
 template <typename Allocator, typename ForwardIt, typename... Args>
 void uninitialized_construct_with_allocator(Allocator const& alloc, ForwardIt first, ForwardIt last, Args const&... args)
 {
-  using T      = detail::it_value_t<ForwardIt>;
+  using T      = typename iterator_traits<ForwardIt>::value_type;
   using traits = typename detail::allocator_traits<
     typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
@@ -145,48 +143,48 @@ void uninitialized_construct_with_allocator(Allocator const& alloc, ForwardIt fi
   ForwardIt current = first;
 
   // No exceptions in CUDA.
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (
       try {
         for (; current != last; ++current)
         {
-          traits::construct(alloc_T, _THRUST_STD::addressof(*current), args...);
+          traits::construct(alloc_T, addressof(*current), args...);
         }
       } catch (...) {
         destroy(alloc_T, first, current);
         throw;
       }),
-    (for (; current != last; ++current) { traits::construct(alloc_T, _THRUST_STD::addressof(*current), args...); }));
+    (for (; current != last; ++current) { traits::construct(alloc_T, addressof(*current), args...); }));
 }
 
 template <typename ForwardIt, typename Size, typename... Args>
 void uninitialized_construct_n(ForwardIt first, Size n, Args const&... args)
 {
-  using T = detail::it_value_t<ForwardIt>;
+  using T = typename iterator_traits<ForwardIt>::value_type;
 
   ForwardIt current = first;
 
   // No exceptions in CUDA.
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (
       try {
         for (; n > 0; ++current, --n)
         {
-          ::new (static_cast<void*>(_THRUST_STD::addressof(*current))) T(args...);
+          ::new (static_cast<void*>(addressof(*current))) T(args...);
         }
       } catch (...) {
         destroy(first, current);
         throw;
       }),
-    (for (; n > 0; ++current, --n) { ::new (static_cast<void*>(_THRUST_STD::addressof(*current))) T(args...); }));
+    (for (; n > 0; ++current, --n) { ::new (static_cast<void*>(addressof(*current))) T(args...); }));
 }
 
 template <typename Allocator, typename ForwardIt, typename Size, typename... Args>
 void uninitialized_construct_n_with_allocator(Allocator const& alloc, ForwardIt first, Size n, Args const&... args)
 {
-  using T      = detail::it_value_t<ForwardIt>;
+  using T      = typename iterator_traits<ForwardIt>::value_type;
   using traits = typename detail::allocator_traits<
     typename std::remove_cv<typename std::remove_reference<Allocator>::type>::type>::template rebind_traits<T>;
 
@@ -195,19 +193,19 @@ void uninitialized_construct_n_with_allocator(Allocator const& alloc, ForwardIt
   ForwardIt current = first;
 
   // No exceptions in CUDA.
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (
       try {
         for (; n > 0; (void) ++current, --n)
         {
-          traits::construct(alloc_T, _THRUST_STD::addressof(*current), args...);
+          traits::construct(alloc_T, addressof(*current), args...);
         }
       } catch (...) {
         destroy(alloc_T, first, current);
         throw;
       }),
-    (for (; n > 0; (void) ++current, --n) { traits::construct(alloc_T, _THRUST_STD::addressof(*current), args...); }));
+    (for (; n > 0; (void) ++current, --n) { traits::construct(alloc_T, addressof(*current), args...); }));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/projects/rocthrust/thrust/detail/memory_wrapper.h b/projects/rocthrust/thrust/detail/memory_wrapper.h
index 831038a98e74..c4d3c166368c 100644
--- a/projects/rocthrust/thrust/detail/memory_wrapper.h
+++ b/projects/rocthrust/thrust/detail/memory_wrapper.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // When a compiler uses Thrust as part of its implementation of Standard C++
 // algorithms, a cycle of included files may result when Thrust code tries to
 // use a standard algorithm.  Having a macro that is defined only when Thrust
diff --git a/projects/rocthrust/thrust/detail/merge.inl b/projects/rocthrust/thrust/detail/merge.inl
index 44cfb270c542..a07f46a41377 100644
--- a/projects/rocthrust/thrust/detail/merge.inl
+++ b/projects/rocthrust/thrust/detail/merge.inl
@@ -18,131 +18,95 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/merge.h>
-#include <thrust/system/detail/adl/merge.h>
-#include <thrust/system/detail/generic/merge.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/merge.h>
+#include <thrust/system/detail/adl/merge.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator merge(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator merge(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                       InputIterator1 first1,
+                       InputIterator1 last1,
+                       InputIterator2 first2,
+                       InputIterator2 last2,
+                       OutputIterator result)
 {
   using thrust::system::detail::generic::merge;
   return merge(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
 } // end merge()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE OutputIterator merge(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+  OutputIterator merge(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                       InputIterator1 first1,
+                       InputIterator1 last1,
+                       InputIterator2 first2,
+                       InputIterator2 last2,
+                       OutputIterator result,
+                       StrictWeakCompare comp)
 {
   using thrust::system::detail::generic::merge;
-  return merge(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
+  return merge(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
 } // end merge()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename InputIterator3, typename InputIterator4, typename OutputIterator1, typename OutputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 InputIterator1 keys_first1, InputIterator1 keys_last1,
+                 InputIterator2 keys_first2, InputIterator2 keys_last2,
+                 InputIterator3 values_first1, InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::merge_by_key;
-  return merge_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return merge_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end merge_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  Compare comp)
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename InputIterator3, typename InputIterator4, typename OutputIterator1, typename OutputIterator2, typename Compare>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 InputIterator1 keys_first1, InputIterator1 keys_last1,
+                 InputIterator2 keys_first2, InputIterator2 keys_last2,
+                 InputIterator3 values_first1, InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result,
+                 Compare comp)
 {
   using thrust::system::detail::generic::merge_by_key;
-  return merge_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return merge_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end merge_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator
-merge(InputIterator1 first1,
-      InputIterator1 last1,
-      InputIterator2 first2,
-      InputIterator2 last2,
-      OutputIterator result,
-      StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+  OutputIterator merge(InputIterator1 first1,
+                       InputIterator1 last1,
+                       InputIterator2 first2,
+                       InputIterator2 last2,
+                       OutputIterator result,
+                       StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -154,12 +118,18 @@ merge(InputIterator1 first1,
   System2 system2;
   System3 system3;
 
-  return thrust::merge(select_system(system1, system2, system3), first1, last1, first2, last2, result, comp);
+  return thrust::merge(select_system(system1,system2,system3), first1, last1, first2, last2, result, comp);
 } // end merge()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator
-merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator merge(InputIterator1 first1,
+                       InputIterator1 last1,
+                       InputIterator2 first2,
+                       InputIterator2 last2,
+                       OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -171,26 +141,27 @@ merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputI
   System2 system2;
   System3 system3;
 
-  return thrust::merge(select_system(system1, system2, system3), first1, last1, first2, last2, result);
+  return thrust::merge(select_system(system1,system2,system3), first1, last1, first2, last2, result);
 } // end merge()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(InputIterator1 keys_first1,
+                 InputIterator1 keys_last1,
+                 InputIterator2 keys_first2,
+                 InputIterator2 keys_last2,
+                 InputIterator3 values_first1,
+                 InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result,
+                 StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -208,34 +179,25 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::merge_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return thrust::merge_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end merge_by_key()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(InputIterator1 keys_first1,
+                 InputIterator1 keys_last1,
+                 InputIterator2 keys_first2,
+                 InputIterator2 keys_last2,
+                 InputIterator3 values_first1,
+                 InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -253,16 +215,7 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::merge_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return thrust::merge_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end merge_by_key()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/minmax.h b/projects/rocthrust/thrust/detail/minmax.h
new file mode 100644
index 000000000000..d5a978ca1e89
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/minmax.h
@@ -0,0 +1,47 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE T min THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs, BinaryPredicate comp)
+{
+  return comp(rhs, lhs) ? rhs : lhs;
+} // end min()
+
+template <typename T>
+THRUST_HOST_DEVICE T min THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs)
+{
+  return rhs < lhs ? rhs : lhs;
+} // end min()
+
+template <typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE T max THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs, BinaryPredicate comp)
+{
+  return comp(lhs, rhs) ? rhs : lhs;
+} // end max()
+
+template <typename T>
+THRUST_HOST_DEVICE T max THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs)
+{
+  return lhs < rhs ? rhs : lhs;
+} // end max()
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/mismatch.inl b/projects/rocthrust/thrust/detail/mismatch.inl
index f4ac2842fac0..de4af680283a 100644
--- a/projects/rocthrust/thrust/detail/mismatch.inl
+++ b/projects/rocthrust/thrust/detail/mismatch.inl
@@ -17,49 +17,45 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/mismatch.h>
-#include <thrust/system/detail/adl/mismatch.h>
-#include <thrust/system/detail/generic/mismatch.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/mismatch.h>
+#include <thrust/system/detail/adl/mismatch.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2>
-mismatch(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-         InputIterator1 first1,
-         InputIterator1 last1,
-         InputIterator2 first2)
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<InputIterator1, InputIterator2> mismatch(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                                      InputIterator1 first1,
+                                                      InputIterator1 last1,
+                                                      InputIterator2 first2)
 {
   using thrust::system::detail::generic::mismatch;
   return mismatch(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2);
 } // end mismatch()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  BinaryPredicate pred)
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+thrust::pair<InputIterator1, InputIterator2> mismatch(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                                      InputIterator1 first1,
+                                                      InputIterator1 last1,
+                                                      InputIterator2 first2,
+                                                      BinaryPredicate pred)
 {
   using thrust::system::detail::generic::mismatch;
   return mismatch(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, pred);
 } // end mismatch()
 
-template <typename InputIterator1, typename InputIterator2>
-thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
+
+template<typename InputIterator1, typename InputIterator2>
+thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1,
+                                                      InputIterator1 last1,
+                                                      InputIterator2 first2)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -69,12 +65,15 @@ thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1, Inp
   System1 system1;
   System2 system2;
 
-  return thrust::mismatch(select_system(system1, system2), first1, last1, first2);
+  return thrust::mismatch(select_system(system1,system2), first1, last1, first2);
 } // end mismatch()
 
-template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-thrust::pair<InputIterator1, InputIterator2>
-mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, BinaryPredicate pred)
+
+template<typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
+thrust::pair<InputIterator1, InputIterator2> mismatch(InputIterator1 first1,
+                                                      InputIterator1 last1,
+                                                      InputIterator2 first2,
+                                                      BinaryPredicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -84,7 +83,7 @@ mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Bin
   System1 system1;
   System2 system2;
 
-  return thrust::mismatch(select_system(system1, system2), first1, last1, first2, pred);
+  return thrust::mismatch(select_system(system1,system2), first1, last1, first2, pred);
 } // end mismatch()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/modern_gcc_required.h b/projects/rocthrust/thrust/detail/modern_gcc_required.h
new file mode 100644
index 000000000000..ef1308e68e6f
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/modern_gcc_required.h
@@ -0,0 +1,25 @@
+/*
+ *  Copyright 2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config/cpp_dialect.h>
+
+#ifndef THRUST_MODERN_GCC_REQUIRED_NO_ERROR
+#  if defined(THRUST_GCC_VERSION) && !defined(THRUST_MODERN_GCC)
+#    error GCC 5 or later is required for this Thrust feature; please upgrade your compiler.
+#  endif
+#endif
diff --git a/projects/rocthrust/thrust/detail/mpl/math.h b/projects/rocthrust/thrust/detail/mpl/math.h
index c3c35d38f477..f5136db8ec59 100644
--- a/projects/rocthrust/thrust/detail/mpl/math.h
+++ b/projects/rocthrust/thrust/detail/mpl/math.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 namespace detail
diff --git a/projects/rocthrust/thrust/detail/numeric_traits.h b/projects/rocthrust/thrust/detail/numeric_traits.h
new file mode 100644
index 000000000000..5d22dcee4119
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/numeric_traits.h
@@ -0,0 +1,114 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_traits.h>
+
+// Use rocprim::numeric_limits if thrust/detail/type_traits.h uses rocprim::arithmetic
+#include _THRUST_STD_INCLUDE(limits)
+
+// #include <stdint.h> // for intmax_t (not provided on MSVS 2005)
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+// XXX good enough for the platforms we care about
+using intmax_t = long long;
+
+template <typename Number>
+struct is_signed : integral_constant<bool, _THRUST_STD::numeric_limits<Number>::is_signed>
+{}; // end is_signed
+
+template <typename T>
+struct num_digits
+    : eval_if<_THRUST_STD::numeric_limits<T>::is_specialized,
+              integral_constant<int, _THRUST_STD::numeric_limits<T>::digits>,
+              integral_constant<int,
+                                sizeof(T) * _THRUST_STD::numeric_limits<unsigned char>::digits
+                                  - (is_signed<T>::value ? 1 : 0)>>::type
+{}; // end num_digits
+
+template <typename Integer>
+struct integer_difference
+//: eval_if<
+//    sizeof(Integer) >= sizeof(intmax_t),
+//    eval_if<
+//      is_signed<Integer>::value,
+//      identity_<Integer>,
+//      identity_<intmax_t>
+//    >,
+//    eval_if<
+//      sizeof(Integer) < sizeof(std::ptrdiff_t),
+//      identity_<std::ptrdiff_t>,
+//      identity_<intmax_t>
+//    >
+//  >
+{
+private:
+  // XXX workaround a pedantic warning in old versions of g++
+  //     which complains about &&ing with a constant value
+  template <bool x, bool y>
+  struct and_
+  {
+    static const bool value = false;
+  };
+
+  template <bool y>
+  struct and_<true, y>
+  {
+    static const bool value = y;
+  };
+
+public:
+  using type = typename eval_if<
+    and_<_THRUST_STD::numeric_limits<Integer>::is_signed,
+         (!_THRUST_STD::numeric_limits<Integer>::is_bounded
+          || (int(_THRUST_STD::numeric_limits<Integer>::digits) + 1 >= num_digits<intmax_t>::value))>::value,
+    identity_<Integer>,
+    eval_if<int(_THRUST_STD::numeric_limits<Integer>::digits) + 1 < num_digits<int>::value,
+            identity_<int>,
+            eval_if<int(_THRUST_STD::numeric_limits<Integer>::digits) + 1 < num_digits<long>::value,
+                    identity_<long>,
+                    identity_<intmax_t>>>>::type;
+}; // end integer_difference
+
+template <typename Number>
+struct numeric_difference
+    : eval_if<::internal::is_integral<Number>::value, integer_difference<Number>, identity_<Number>>
+{}; // end numeric_difference
+
+template <typename Number>
+THRUST_HOST_DEVICE typename numeric_difference<Number>::type numeric_distance(Number x, Number y)
+{
+  using difference_type = typename numeric_difference<Number>::type;
+  return difference_type(y) - difference_type(x);
+} // end numeric_distance
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/numeric_wrapper.h b/projects/rocthrust/thrust/detail/numeric_wrapper.h
index 24a5202b5204..c0539948fd45 100644
--- a/projects/rocthrust/thrust/detail/numeric_wrapper.h
+++ b/projects/rocthrust/thrust/detail/numeric_wrapper.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // When a compiler uses Thrust as part of its implementation of Standard C++
 // algorithms, a cycle of included files may result when Thrust code tries to
 // use a standard algorithm.  Having a macro that is defined only when Thrust
diff --git a/projects/rocthrust/thrust/detail/nv_target.h b/projects/rocthrust/thrust/detail/nv_target.h
new file mode 100644
index 000000000000..5e2122309735
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/nv_target.h
@@ -0,0 +1,32 @@
+// MIT License
+// Copyright (c) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+/*! \file nv_target.h
+ *  \brief Includes nv macros depending on the backend.
+ */
+
+#include <thrust/detail/config.h>
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <nv/target>
+#else
+#  include <thrust/system/hip/detail/nv/target.h>
+#endif
diff --git a/projects/rocthrust/thrust/detail/overlapped_copy.h b/projects/rocthrust/thrust/detail/overlapped_copy.h
index 98e499952153..caadeabe1f14 100644
--- a/projects/rocthrust/thrust/detail/overlapped_copy.h
+++ b/projects/rocthrust/thrust/detail/overlapped_copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/copy.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/detail/minimum_system.h>
@@ -95,7 +88,7 @@ RandomAccessIterator2 overlapped_copy(
   RandomAccessIterator1 last,
   RandomAccessIterator2 result)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator1>::type;
 
   // make a temporary copy of [first,last), and copy into it first
   thrust::detail::temporary_array<value_type, DerivedPolicy> temp(exec, first, last);
diff --git a/projects/rocthrust/thrust/detail/pair.inl b/projects/rocthrust/thrust/detail/pair.inl
index 9faa2e2429aa..9b6f90603338 100644
--- a/projects/rocthrust/thrust/detail/pair.inl
+++ b/projects/rocthrust/thrust/detail/pair.inl
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
 #include <thrust/detail/config.h>
 
 #include <thrust/pair.h>
diff --git a/projects/rocthrust/thrust/detail/partition.inl b/projects/rocthrust/thrust/detail/partition.inl
index fdf774c63a89..61b4d7123b1b 100644
--- a/projects/rocthrust/thrust/detail/partition.inl
+++ b/projects/rocthrust/thrust/detail/partition.inl
@@ -17,178 +17,193 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/partition.h>
-#include <thrust/system/detail/adl/partition.h>
-#include <thrust/system/detail/generic/partition.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/partition.h>
+#include <thrust/system/detail/adl/partition.h>
 
 THRUST_NAMESPACE_BEGIN
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator partition(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::partition;
   return partition(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end partition()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator partition(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::partition;
   return partition(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, pred);
 } // end partition()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   InputIterator first,
+                   InputIterator last,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
   using thrust::system::detail::generic::partition_copy;
-  return partition_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, out_true, out_false, pred);
+  return partition_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, out_true, out_false, pred);
 } // end partition_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   InputIterator1 first,
+                   InputIterator1 last,
+                   InputIterator2 stencil,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
   using thrust::system::detail::generic::partition_copy;
-  return partition_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, out_true, out_false, pred);
+  return partition_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, out_true, out_false, pred);
 } // end partition_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator stable_partition(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator stable_partition(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   Predicate pred)
 {
   using thrust::system::detail::generic::stable_partition;
   return stable_partition(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end stable_partition()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator stable_partition(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator stable_partition(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   InputIterator stencil,
+                                   Predicate pred)
 {
   using thrust::system::detail::generic::stable_partition;
   return stable_partition(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, pred);
 } // end stable_partition()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::stable_partition_copy;
-  return stable_partition_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, out_true, out_false, pred);
+  return stable_partition_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, out_true, out_false, pred);
 } // end stable_partition_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          InputIterator1 first,
+                          InputIterator1 last,
+                          InputIterator2 stencil,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::stable_partition_copy;
-  return stable_partition_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, out_true, out_false, pred);
+  return stable_partition_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, out_true, out_false, pred);
 } // end stable_partition_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator partition_point(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred)
+template<typename DerivedPolicy, typename ForwardIterator, typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition_point(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last,
+                                  Predicate pred)
 {
   using thrust::system::detail::generic::partition_point;
   return partition_point(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end partition_point()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE bool is_partitioned(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  Predicate pred)
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+  bool is_partitioned(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
   using thrust::system::detail::generic::is_partitioned;
   return is_partitioned(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end is_partitioned()
 
-template <typename ForwardIterator, typename Predicate>
-ForwardIterator partition(ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator partition(ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -199,8 +214,14 @@ ForwardIterator partition(ForwardIterator first, ForwardIterator last, Predicate
   return thrust::partition(select_system(system), first, last, pred);
 } // end partition()
 
-template <typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator partition(ForwardIterator first, ForwardIterator last, InputIterator stencil, Predicate pred)
+
+template<typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator partition(ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -210,11 +231,15 @@ ForwardIterator partition(ForwardIterator first, ForwardIterator last, InputIter
   System1 system1;
   System2 system2;
 
-  return thrust::partition(select_system(system1, system2), first, last, stencil, pred);
+  return thrust::partition(select_system(system1,system2), first, last, stencil, pred);
 } // end partition()
 
-template <typename ForwardIterator, typename Predicate>
-ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(ForwardIterator first,
+                                   ForwardIterator last,
+                                   Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -225,8 +250,14 @@ ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, Pr
   return thrust::stable_partition(select_system(system), first, last, pred);
 } // end stable_partition()
 
-template <typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, InputIterator stencil, Predicate pred)
+
+template<typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(ForwardIterator first,
+                                   ForwardIterator last,
+                                   InputIterator stencil,
+                                   Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -236,12 +267,20 @@ ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, In
   System1 system1;
   System2 system2;
 
-  return thrust::stable_partition(select_system(system1, system2), first, last, stencil, pred);
+  return thrust::stable_partition(select_system(system1,system2), first, last, stencil, pred);
 } // end stable_partition()
 
-template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred)
+
+template<typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(InputIterator first,
+                   InputIterator last,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -253,21 +292,22 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
   System2 system2;
   System3 system3;
 
-  return thrust::partition_copy(select_system(system1, system2, system3), first, last, out_true, out_false, pred);
+  return thrust::partition_copy(select_system(system1,system2,system3), first, last, out_true, out_false, pred);
 } // end partition_copy()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(InputIterator1 first,
+                   InputIterator1 last,
+                   InputIterator2 stencil,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -281,13 +321,20 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
   System3 system3;
   System4 system4;
 
-  return thrust::partition_copy(
-    select_system(system1, system2, system3, system4), first, last, stencil, out_true, out_false, pred);
+  return thrust::partition_copy(select_system(system1,system2,system3,system4), first, last, stencil, out_true, out_false, pred);
 } // end partition_copy()
 
-template <typename InputIterator, typename OutputIterator1, typename OutputIterator2, typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  InputIterator first, InputIterator last, OutputIterator1 out_true, OutputIterator2 out_false, Predicate pred)
+
+template<typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(InputIterator first,
+                          InputIterator last,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -299,21 +346,22 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   System2 system2;
   System3 system3;
 
-  return thrust::stable_partition_copy(select_system(system1, system2, system3), first, last, out_true, out_false, pred);
+  return thrust::stable_partition_copy(select_system(system1,system2,system3), first, last, out_true, out_false, pred);
 } // end stable_partition_copy()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(InputIterator1 first,
+                          InputIterator1 last,
+                          InputIterator2 stencil,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -327,12 +375,14 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
   System3 system3;
   System4 system4;
 
-  return thrust::stable_partition_copy(
-    select_system(system1, system2, system3, system4), first, last, stencil, out_true, out_false, pred);
+  return thrust::stable_partition_copy(select_system(system1,system2,system3,system4), first, last, stencil, out_true, out_false, pred);
 } // end stable_partition_copy()
 
-template <typename ForwardIterator, typename Predicate>
-ForwardIterator partition_point(ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename ForwardIterator, typename Predicate>
+  ForwardIterator partition_point(ForwardIterator first,
+                                  ForwardIterator last,
+                                  Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -343,8 +393,11 @@ ForwardIterator partition_point(ForwardIterator first, ForwardIterator last, Pre
   return thrust::partition_point(select_system(system), first, last, pred);
 } // end partition_point()
 
-template <typename InputIterator, typename Predicate>
-bool is_partitioned(InputIterator first, InputIterator last, Predicate pred)
+
+template<typename InputIterator, typename Predicate>
+  bool is_partitioned(InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/pointer.h b/projects/rocthrust/thrust/detail/pointer.h
index 747b4234f3d8..f9038158e60c 100644
--- a/projects/rocthrust/thrust/detail/pointer.h
+++ b/projects/rocthrust/thrust/detail/pointer.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -44,15 +44,29 @@
 #include <ostream>
 
 THRUST_NAMESPACE_BEGIN
+
 template <typename Element, typename Tag, typename Reference = use_default, typename Derived = use_default>
 class pointer;
+
+// Specialize `thrust::iterator_traits` to avoid problems with the name of
+// pointer's constructor shadowing its nested pointer type. We do this before
+// pointer is defined so the specialization is correctly used inside the
+// definition.
+template <typename Element, typename Tag, typename Reference, typename Derived>
+struct iterator_traits<thrust::pointer<Element, Tag, Reference, Derived>>
+{
+  using pointer           = thrust::pointer<Element, Tag, Reference, Derived>;
+  using iterator_category = typename pointer::iterator_category;
+  using value_type        = typename pointer::value_type;
+  using difference_type   = typename pointer::difference_type;
+  using reference         = typename pointer::reference;
+};
+
 THRUST_NAMESPACE_END
 
-// Specialize `std::iterator_traits` (picked up by _THRUST_STD::iterator_traits) to avoid problems with the name of
-// pointer's constructor shadowing its nested pointer type. We do this before pointer is defined so the specialization
-// is correctly used inside the definition.
 namespace std
 {
+
 template <typename Element, typename Tag, typename Reference, typename Derived>
 struct iterator_traits<THRUST_NS_QUALIFIER::pointer<Element, Tag, Reference, Derived>>
 {
@@ -62,6 +76,7 @@ struct iterator_traits<THRUST_NS_QUALIFIER::pointer<Element, Tag, Reference, Der
   using difference_type   = typename pointer::difference_type;
   using reference         = typename pointer::reference;
 };
+
 } // namespace std
 
 THRUST_NAMESPACE_BEGIN
@@ -147,9 +162,8 @@ class pointer : public thrust::detail::pointer_base<Element, Tag, Reference, Der
   template <typename OtherElement>
   THRUST_HOST_DEVICE explicit pointer(OtherElement* ptr);
 
-#if THRUST_HAS_HIP_COMPILER() // Fixes hipcc linkage error
+  // Fixes hipcc linkage error
   THRUST_HOST_DEVICE explicit pointer(Element* ptr);
-#endif
 
   // OtherPointer's element_type shall be convertible to Element
   // OtherPointer's system shall be convertible to Tag
diff --git a/projects/rocthrust/thrust/detail/pointer.inl b/projects/rocthrust/thrust/detail/pointer.inl
index b1cdd6e28f4b..9756e0d67b90 100644
--- a/projects/rocthrust/thrust/detail/pointer.inl
+++ b/projects/rocthrust/thrust/detail/pointer.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -52,12 +52,11 @@ THRUST_HOST_DEVICE pointer<Element, Tag, Reference, Derived>::pointer(OtherEleme
     : super_t(other)
 {} // end pointer::pointer
 
-#if THRUST_HAS_HIP_COMPILER() // Fixes hipcc linkage error
+// Fixes hipcc linkage error
 template <typename Element, typename Tag, typename Reference, typename Derived>
 THRUST_HOST_DEVICE pointer<Element, Tag, Reference, Derived>::pointer(Element* ptr)
     : super_t(ptr)
 {} // end pointer::pointer
-#endif
 
 template <typename Element, typename Tag, typename Reference, typename Derived>
 template <typename OtherPointer>
diff --git a/projects/rocthrust/thrust/detail/preprocessor.h b/projects/rocthrust/thrust/detail/preprocessor.h
index 101bffa4d5d7..88e4cfe5bc75 100644
--- a/projects/rocthrust/thrust/detail/preprocessor.h
+++ b/projects/rocthrust/thrust/detail/preprocessor.h
@@ -19,7 +19,11 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__cccl/preprocessor.h>
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__cccl/preprocessor.h)
+// clang-format on
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -136,10 +140,8 @@
 /// }
 /// \endcode
 ///
-/* due to redefinition in thrust/detail/config/preprocessor.h */
-// TODO(libhipcxx): uncomment these two macros once libhipcxx gets ready
-// #define THRUST_PP_EXPAND(x)       THRUST_PP_EXPAND_IMPL0(x)
-// #define THRUST_PP_EXPAND_IMPL0(x) x
+#define THRUST_PP_EXPAND(x)       THRUST_PP_EXPAND_IMPL0(x)
+#define THRUST_PP_EXPAND_IMPL0(x) x
 
 #define THRUST_PP_EXPAND_ARGS(...)       THRUST_PP_EXPAND_ARGS_IMPL0(__VA_ARGS__)
 #define THRUST_PP_EXPAND_ARGS_IMPL0(...) __VA_ARGS__
@@ -154,10 +156,530 @@
 
 #define THRUST_PP_COMMA() ,
 
-/* defined in thrust/detail/config/preprocessor.h */
-// TODO(libhipcxx): uncomment these two macros once libhipcxx gets ready
-// #define THRUST_PP_INC _CCCL_PP_INC
-// #define THRUST_PP_DEC _CCCL_PP_DEC
+#define THRUST_PP_INC(x) THRUST_PP_INC_IMPL0(x)
+
+#define THRUST_PP_INC_IMPL0(x) THRUST_PP_CAT2(THRUST_PP_INC_IMPL_TAG, x)
+
+#define THRUST_PP_INC_IMPL_TAG0   1
+#define THRUST_PP_INC_IMPL_TAG1   2
+#define THRUST_PP_INC_IMPL_TAG2   3
+#define THRUST_PP_INC_IMPL_TAG3   4
+#define THRUST_PP_INC_IMPL_TAG4   5
+#define THRUST_PP_INC_IMPL_TAG5   6
+#define THRUST_PP_INC_IMPL_TAG6   7
+#define THRUST_PP_INC_IMPL_TAG7   8
+#define THRUST_PP_INC_IMPL_TAG8   9
+#define THRUST_PP_INC_IMPL_TAG9   10
+#define THRUST_PP_INC_IMPL_TAG10  11
+#define THRUST_PP_INC_IMPL_TAG11  12
+#define THRUST_PP_INC_IMPL_TAG12  13
+#define THRUST_PP_INC_IMPL_TAG13  14
+#define THRUST_PP_INC_IMPL_TAG14  15
+#define THRUST_PP_INC_IMPL_TAG15  16
+#define THRUST_PP_INC_IMPL_TAG16  17
+#define THRUST_PP_INC_IMPL_TAG17  18
+#define THRUST_PP_INC_IMPL_TAG18  19
+#define THRUST_PP_INC_IMPL_TAG19  20
+#define THRUST_PP_INC_IMPL_TAG20  21
+#define THRUST_PP_INC_IMPL_TAG21  22
+#define THRUST_PP_INC_IMPL_TAG22  23
+#define THRUST_PP_INC_IMPL_TAG23  24
+#define THRUST_PP_INC_IMPL_TAG24  25
+#define THRUST_PP_INC_IMPL_TAG25  26
+#define THRUST_PP_INC_IMPL_TAG26  27
+#define THRUST_PP_INC_IMPL_TAG27  28
+#define THRUST_PP_INC_IMPL_TAG28  29
+#define THRUST_PP_INC_IMPL_TAG29  30
+#define THRUST_PP_INC_IMPL_TAG30  31
+#define THRUST_PP_INC_IMPL_TAG31  32
+#define THRUST_PP_INC_IMPL_TAG32  33
+#define THRUST_PP_INC_IMPL_TAG33  34
+#define THRUST_PP_INC_IMPL_TAG34  35
+#define THRUST_PP_INC_IMPL_TAG35  36
+#define THRUST_PP_INC_IMPL_TAG36  37
+#define THRUST_PP_INC_IMPL_TAG37  38
+#define THRUST_PP_INC_IMPL_TAG38  39
+#define THRUST_PP_INC_IMPL_TAG39  40
+#define THRUST_PP_INC_IMPL_TAG40  41
+#define THRUST_PP_INC_IMPL_TAG41  42
+#define THRUST_PP_INC_IMPL_TAG42  43
+#define THRUST_PP_INC_IMPL_TAG43  44
+#define THRUST_PP_INC_IMPL_TAG44  45
+#define THRUST_PP_INC_IMPL_TAG45  46
+#define THRUST_PP_INC_IMPL_TAG46  47
+#define THRUST_PP_INC_IMPL_TAG47  48
+#define THRUST_PP_INC_IMPL_TAG48  49
+#define THRUST_PP_INC_IMPL_TAG49  50
+#define THRUST_PP_INC_IMPL_TAG50  51
+#define THRUST_PP_INC_IMPL_TAG51  52
+#define THRUST_PP_INC_IMPL_TAG52  53
+#define THRUST_PP_INC_IMPL_TAG53  54
+#define THRUST_PP_INC_IMPL_TAG54  55
+#define THRUST_PP_INC_IMPL_TAG55  56
+#define THRUST_PP_INC_IMPL_TAG56  57
+#define THRUST_PP_INC_IMPL_TAG57  58
+#define THRUST_PP_INC_IMPL_TAG58  59
+#define THRUST_PP_INC_IMPL_TAG59  60
+#define THRUST_PP_INC_IMPL_TAG60  61
+#define THRUST_PP_INC_IMPL_TAG61  62
+#define THRUST_PP_INC_IMPL_TAG62  63
+#define THRUST_PP_INC_IMPL_TAG63  64
+#define THRUST_PP_INC_IMPL_TAG64  65
+#define THRUST_PP_INC_IMPL_TAG65  66
+#define THRUST_PP_INC_IMPL_TAG66  67
+#define THRUST_PP_INC_IMPL_TAG67  68
+#define THRUST_PP_INC_IMPL_TAG68  69
+#define THRUST_PP_INC_IMPL_TAG69  70
+#define THRUST_PP_INC_IMPL_TAG70  71
+#define THRUST_PP_INC_IMPL_TAG71  72
+#define THRUST_PP_INC_IMPL_TAG72  73
+#define THRUST_PP_INC_IMPL_TAG73  74
+#define THRUST_PP_INC_IMPL_TAG74  75
+#define THRUST_PP_INC_IMPL_TAG75  76
+#define THRUST_PP_INC_IMPL_TAG76  77
+#define THRUST_PP_INC_IMPL_TAG77  78
+#define THRUST_PP_INC_IMPL_TAG78  79
+#define THRUST_PP_INC_IMPL_TAG79  80
+#define THRUST_PP_INC_IMPL_TAG80  81
+#define THRUST_PP_INC_IMPL_TAG81  82
+#define THRUST_PP_INC_IMPL_TAG82  83
+#define THRUST_PP_INC_IMPL_TAG83  84
+#define THRUST_PP_INC_IMPL_TAG84  85
+#define THRUST_PP_INC_IMPL_TAG85  86
+#define THRUST_PP_INC_IMPL_TAG86  87
+#define THRUST_PP_INC_IMPL_TAG87  88
+#define THRUST_PP_INC_IMPL_TAG88  89
+#define THRUST_PP_INC_IMPL_TAG89  90
+#define THRUST_PP_INC_IMPL_TAG90  91
+#define THRUST_PP_INC_IMPL_TAG91  92
+#define THRUST_PP_INC_IMPL_TAG92  93
+#define THRUST_PP_INC_IMPL_TAG93  94
+#define THRUST_PP_INC_IMPL_TAG94  95
+#define THRUST_PP_INC_IMPL_TAG95  96
+#define THRUST_PP_INC_IMPL_TAG96  97
+#define THRUST_PP_INC_IMPL_TAG97  98
+#define THRUST_PP_INC_IMPL_TAG98  99
+#define THRUST_PP_INC_IMPL_TAG99  100
+#define THRUST_PP_INC_IMPL_TAG100 101
+#define THRUST_PP_INC_IMPL_TAG101 102
+#define THRUST_PP_INC_IMPL_TAG102 103
+#define THRUST_PP_INC_IMPL_TAG103 104
+#define THRUST_PP_INC_IMPL_TAG104 105
+#define THRUST_PP_INC_IMPL_TAG105 106
+#define THRUST_PP_INC_IMPL_TAG106 107
+#define THRUST_PP_INC_IMPL_TAG107 108
+#define THRUST_PP_INC_IMPL_TAG108 109
+#define THRUST_PP_INC_IMPL_TAG109 110
+#define THRUST_PP_INC_IMPL_TAG110 111
+#define THRUST_PP_INC_IMPL_TAG111 112
+#define THRUST_PP_INC_IMPL_TAG112 113
+#define THRUST_PP_INC_IMPL_TAG113 114
+#define THRUST_PP_INC_IMPL_TAG114 115
+#define THRUST_PP_INC_IMPL_TAG115 116
+#define THRUST_PP_INC_IMPL_TAG116 117
+#define THRUST_PP_INC_IMPL_TAG117 118
+#define THRUST_PP_INC_IMPL_TAG118 119
+#define THRUST_PP_INC_IMPL_TAG119 120
+#define THRUST_PP_INC_IMPL_TAG120 121
+#define THRUST_PP_INC_IMPL_TAG121 122
+#define THRUST_PP_INC_IMPL_TAG122 123
+#define THRUST_PP_INC_IMPL_TAG123 124
+#define THRUST_PP_INC_IMPL_TAG124 125
+#define THRUST_PP_INC_IMPL_TAG125 126
+#define THRUST_PP_INC_IMPL_TAG126 127
+#define THRUST_PP_INC_IMPL_TAG127 128
+#define THRUST_PP_INC_IMPL_TAG128 129
+#define THRUST_PP_INC_IMPL_TAG129 130
+#define THRUST_PP_INC_IMPL_TAG130 131
+#define THRUST_PP_INC_IMPL_TAG131 132
+#define THRUST_PP_INC_IMPL_TAG132 133
+#define THRUST_PP_INC_IMPL_TAG133 134
+#define THRUST_PP_INC_IMPL_TAG134 135
+#define THRUST_PP_INC_IMPL_TAG135 136
+#define THRUST_PP_INC_IMPL_TAG136 137
+#define THRUST_PP_INC_IMPL_TAG137 138
+#define THRUST_PP_INC_IMPL_TAG138 139
+#define THRUST_PP_INC_IMPL_TAG139 140
+#define THRUST_PP_INC_IMPL_TAG140 141
+#define THRUST_PP_INC_IMPL_TAG141 142
+#define THRUST_PP_INC_IMPL_TAG142 143
+#define THRUST_PP_INC_IMPL_TAG143 144
+#define THRUST_PP_INC_IMPL_TAG144 145
+#define THRUST_PP_INC_IMPL_TAG145 146
+#define THRUST_PP_INC_IMPL_TAG146 147
+#define THRUST_PP_INC_IMPL_TAG147 148
+#define THRUST_PP_INC_IMPL_TAG148 149
+#define THRUST_PP_INC_IMPL_TAG149 150
+#define THRUST_PP_INC_IMPL_TAG150 151
+#define THRUST_PP_INC_IMPL_TAG151 152
+#define THRUST_PP_INC_IMPL_TAG152 153
+#define THRUST_PP_INC_IMPL_TAG153 154
+#define THRUST_PP_INC_IMPL_TAG154 155
+#define THRUST_PP_INC_IMPL_TAG155 156
+#define THRUST_PP_INC_IMPL_TAG156 157
+#define THRUST_PP_INC_IMPL_TAG157 158
+#define THRUST_PP_INC_IMPL_TAG158 159
+#define THRUST_PP_INC_IMPL_TAG159 160
+#define THRUST_PP_INC_IMPL_TAG160 161
+#define THRUST_PP_INC_IMPL_TAG161 162
+#define THRUST_PP_INC_IMPL_TAG162 163
+#define THRUST_PP_INC_IMPL_TAG163 164
+#define THRUST_PP_INC_IMPL_TAG164 165
+#define THRUST_PP_INC_IMPL_TAG165 166
+#define THRUST_PP_INC_IMPL_TAG166 167
+#define THRUST_PP_INC_IMPL_TAG167 168
+#define THRUST_PP_INC_IMPL_TAG168 169
+#define THRUST_PP_INC_IMPL_TAG169 170
+#define THRUST_PP_INC_IMPL_TAG170 171
+#define THRUST_PP_INC_IMPL_TAG171 172
+#define THRUST_PP_INC_IMPL_TAG172 173
+#define THRUST_PP_INC_IMPL_TAG173 174
+#define THRUST_PP_INC_IMPL_TAG174 175
+#define THRUST_PP_INC_IMPL_TAG175 176
+#define THRUST_PP_INC_IMPL_TAG176 177
+#define THRUST_PP_INC_IMPL_TAG177 178
+#define THRUST_PP_INC_IMPL_TAG178 179
+#define THRUST_PP_INC_IMPL_TAG179 180
+#define THRUST_PP_INC_IMPL_TAG180 181
+#define THRUST_PP_INC_IMPL_TAG181 182
+#define THRUST_PP_INC_IMPL_TAG182 183
+#define THRUST_PP_INC_IMPL_TAG183 184
+#define THRUST_PP_INC_IMPL_TAG184 185
+#define THRUST_PP_INC_IMPL_TAG185 186
+#define THRUST_PP_INC_IMPL_TAG186 187
+#define THRUST_PP_INC_IMPL_TAG187 188
+#define THRUST_PP_INC_IMPL_TAG188 189
+#define THRUST_PP_INC_IMPL_TAG189 190
+#define THRUST_PP_INC_IMPL_TAG190 191
+#define THRUST_PP_INC_IMPL_TAG191 192
+#define THRUST_PP_INC_IMPL_TAG192 193
+#define THRUST_PP_INC_IMPL_TAG193 194
+#define THRUST_PP_INC_IMPL_TAG194 195
+#define THRUST_PP_INC_IMPL_TAG195 196
+#define THRUST_PP_INC_IMPL_TAG196 197
+#define THRUST_PP_INC_IMPL_TAG197 198
+#define THRUST_PP_INC_IMPL_TAG198 199
+#define THRUST_PP_INC_IMPL_TAG199 200
+#define THRUST_PP_INC_IMPL_TAG200 201
+#define THRUST_PP_INC_IMPL_TAG201 202
+#define THRUST_PP_INC_IMPL_TAG202 203
+#define THRUST_PP_INC_IMPL_TAG203 204
+#define THRUST_PP_INC_IMPL_TAG204 205
+#define THRUST_PP_INC_IMPL_TAG205 206
+#define THRUST_PP_INC_IMPL_TAG206 207
+#define THRUST_PP_INC_IMPL_TAG207 208
+#define THRUST_PP_INC_IMPL_TAG208 209
+#define THRUST_PP_INC_IMPL_TAG209 210
+#define THRUST_PP_INC_IMPL_TAG210 211
+#define THRUST_PP_INC_IMPL_TAG211 212
+#define THRUST_PP_INC_IMPL_TAG212 213
+#define THRUST_PP_INC_IMPL_TAG213 214
+#define THRUST_PP_INC_IMPL_TAG214 215
+#define THRUST_PP_INC_IMPL_TAG215 216
+#define THRUST_PP_INC_IMPL_TAG216 217
+#define THRUST_PP_INC_IMPL_TAG217 218
+#define THRUST_PP_INC_IMPL_TAG218 219
+#define THRUST_PP_INC_IMPL_TAG219 220
+#define THRUST_PP_INC_IMPL_TAG220 221
+#define THRUST_PP_INC_IMPL_TAG221 222
+#define THRUST_PP_INC_IMPL_TAG222 223
+#define THRUST_PP_INC_IMPL_TAG223 224
+#define THRUST_PP_INC_IMPL_TAG224 225
+#define THRUST_PP_INC_IMPL_TAG225 226
+#define THRUST_PP_INC_IMPL_TAG226 227
+#define THRUST_PP_INC_IMPL_TAG227 228
+#define THRUST_PP_INC_IMPL_TAG228 229
+#define THRUST_PP_INC_IMPL_TAG229 230
+#define THRUST_PP_INC_IMPL_TAG230 231
+#define THRUST_PP_INC_IMPL_TAG231 232
+#define THRUST_PP_INC_IMPL_TAG232 233
+#define THRUST_PP_INC_IMPL_TAG233 234
+#define THRUST_PP_INC_IMPL_TAG234 235
+#define THRUST_PP_INC_IMPL_TAG235 236
+#define THRUST_PP_INC_IMPL_TAG236 237
+#define THRUST_PP_INC_IMPL_TAG237 238
+#define THRUST_PP_INC_IMPL_TAG238 239
+#define THRUST_PP_INC_IMPL_TAG239 240
+#define THRUST_PP_INC_IMPL_TAG240 241
+#define THRUST_PP_INC_IMPL_TAG241 242
+#define THRUST_PP_INC_IMPL_TAG242 243
+#define THRUST_PP_INC_IMPL_TAG243 244
+#define THRUST_PP_INC_IMPL_TAG244 245
+#define THRUST_PP_INC_IMPL_TAG245 246
+#define THRUST_PP_INC_IMPL_TAG246 247
+#define THRUST_PP_INC_IMPL_TAG247 248
+#define THRUST_PP_INC_IMPL_TAG248 249
+#define THRUST_PP_INC_IMPL_TAG249 250
+#define THRUST_PP_INC_IMPL_TAG250 251
+#define THRUST_PP_INC_IMPL_TAG251 252
+#define THRUST_PP_INC_IMPL_TAG252 253
+#define THRUST_PP_INC_IMPL_TAG253 254
+#define THRUST_PP_INC_IMPL_TAG254 255
+#define THRUST_PP_INC_IMPL_TAG255 256
+#define THRUST_PP_INC_IMPL_TAG256 257
+
+#define THRUST_PP_DEC(x) THRUST_PP_DEC_IMPL0(x)
+
+#define THRUST_PP_DEC_IMPL0(x) THRUST_PP_CAT2(THRUST_PP_DEC_IMPL_TAG, x)
+
+#define THRUST_PP_DEC_IMPL_TAG0   ~##~ // This will generate a syntax error
+#define THRUST_PP_DEC_IMPL_TAG1   0
+#define THRUST_PP_DEC_IMPL_TAG2   1
+#define THRUST_PP_DEC_IMPL_TAG3   2
+#define THRUST_PP_DEC_IMPL_TAG4   3
+#define THRUST_PP_DEC_IMPL_TAG5   4
+#define THRUST_PP_DEC_IMPL_TAG6   5
+#define THRUST_PP_DEC_IMPL_TAG7   6
+#define THRUST_PP_DEC_IMPL_TAG8   7
+#define THRUST_PP_DEC_IMPL_TAG9   8
+#define THRUST_PP_DEC_IMPL_TAG10  9
+#define THRUST_PP_DEC_IMPL_TAG11  10
+#define THRUST_PP_DEC_IMPL_TAG12  11
+#define THRUST_PP_DEC_IMPL_TAG13  12
+#define THRUST_PP_DEC_IMPL_TAG14  13
+#define THRUST_PP_DEC_IMPL_TAG15  14
+#define THRUST_PP_DEC_IMPL_TAG16  15
+#define THRUST_PP_DEC_IMPL_TAG17  16
+#define THRUST_PP_DEC_IMPL_TAG18  17
+#define THRUST_PP_DEC_IMPL_TAG19  18
+#define THRUST_PP_DEC_IMPL_TAG20  19
+#define THRUST_PP_DEC_IMPL_TAG21  20
+#define THRUST_PP_DEC_IMPL_TAG22  21
+#define THRUST_PP_DEC_IMPL_TAG23  22
+#define THRUST_PP_DEC_IMPL_TAG24  23
+#define THRUST_PP_DEC_IMPL_TAG25  24
+#define THRUST_PP_DEC_IMPL_TAG26  25
+#define THRUST_PP_DEC_IMPL_TAG27  26
+#define THRUST_PP_DEC_IMPL_TAG28  27
+#define THRUST_PP_DEC_IMPL_TAG29  28
+#define THRUST_PP_DEC_IMPL_TAG30  29
+#define THRUST_PP_DEC_IMPL_TAG31  30
+#define THRUST_PP_DEC_IMPL_TAG32  31
+#define THRUST_PP_DEC_IMPL_TAG33  32
+#define THRUST_PP_DEC_IMPL_TAG34  33
+#define THRUST_PP_DEC_IMPL_TAG35  34
+#define THRUST_PP_DEC_IMPL_TAG36  35
+#define THRUST_PP_DEC_IMPL_TAG37  36
+#define THRUST_PP_DEC_IMPL_TAG38  37
+#define THRUST_PP_DEC_IMPL_TAG39  38
+#define THRUST_PP_DEC_IMPL_TAG40  39
+#define THRUST_PP_DEC_IMPL_TAG41  40
+#define THRUST_PP_DEC_IMPL_TAG42  41
+#define THRUST_PP_DEC_IMPL_TAG43  42
+#define THRUST_PP_DEC_IMPL_TAG44  43
+#define THRUST_PP_DEC_IMPL_TAG45  44
+#define THRUST_PP_DEC_IMPL_TAG46  45
+#define THRUST_PP_DEC_IMPL_TAG47  46
+#define THRUST_PP_DEC_IMPL_TAG48  47
+#define THRUST_PP_DEC_IMPL_TAG49  48
+#define THRUST_PP_DEC_IMPL_TAG50  49
+#define THRUST_PP_DEC_IMPL_TAG51  50
+#define THRUST_PP_DEC_IMPL_TAG52  51
+#define THRUST_PP_DEC_IMPL_TAG53  52
+#define THRUST_PP_DEC_IMPL_TAG54  53
+#define THRUST_PP_DEC_IMPL_TAG55  54
+#define THRUST_PP_DEC_IMPL_TAG56  55
+#define THRUST_PP_DEC_IMPL_TAG57  56
+#define THRUST_PP_DEC_IMPL_TAG58  57
+#define THRUST_PP_DEC_IMPL_TAG59  58
+#define THRUST_PP_DEC_IMPL_TAG60  59
+#define THRUST_PP_DEC_IMPL_TAG61  60
+#define THRUST_PP_DEC_IMPL_TAG62  61
+#define THRUST_PP_DEC_IMPL_TAG63  62
+#define THRUST_PP_DEC_IMPL_TAG64  63
+#define THRUST_PP_DEC_IMPL_TAG65  64
+#define THRUST_PP_DEC_IMPL_TAG66  65
+#define THRUST_PP_DEC_IMPL_TAG67  66
+#define THRUST_PP_DEC_IMPL_TAG68  67
+#define THRUST_PP_DEC_IMPL_TAG69  68
+#define THRUST_PP_DEC_IMPL_TAG70  69
+#define THRUST_PP_DEC_IMPL_TAG71  70
+#define THRUST_PP_DEC_IMPL_TAG72  71
+#define THRUST_PP_DEC_IMPL_TAG73  72
+#define THRUST_PP_DEC_IMPL_TAG74  73
+#define THRUST_PP_DEC_IMPL_TAG75  74
+#define THRUST_PP_DEC_IMPL_TAG76  75
+#define THRUST_PP_DEC_IMPL_TAG77  76
+#define THRUST_PP_DEC_IMPL_TAG78  77
+#define THRUST_PP_DEC_IMPL_TAG79  78
+#define THRUST_PP_DEC_IMPL_TAG80  79
+#define THRUST_PP_DEC_IMPL_TAG81  80
+#define THRUST_PP_DEC_IMPL_TAG82  81
+#define THRUST_PP_DEC_IMPL_TAG83  82
+#define THRUST_PP_DEC_IMPL_TAG84  83
+#define THRUST_PP_DEC_IMPL_TAG85  84
+#define THRUST_PP_DEC_IMPL_TAG86  85
+#define THRUST_PP_DEC_IMPL_TAG87  86
+#define THRUST_PP_DEC_IMPL_TAG88  87
+#define THRUST_PP_DEC_IMPL_TAG89  88
+#define THRUST_PP_DEC_IMPL_TAG90  89
+#define THRUST_PP_DEC_IMPL_TAG91  90
+#define THRUST_PP_DEC_IMPL_TAG92  91
+#define THRUST_PP_DEC_IMPL_TAG93  92
+#define THRUST_PP_DEC_IMPL_TAG94  93
+#define THRUST_PP_DEC_IMPL_TAG95  94
+#define THRUST_PP_DEC_IMPL_TAG96  95
+#define THRUST_PP_DEC_IMPL_TAG97  96
+#define THRUST_PP_DEC_IMPL_TAG98  97
+#define THRUST_PP_DEC_IMPL_TAG99  98
+#define THRUST_PP_DEC_IMPL_TAG100 99
+#define THRUST_PP_DEC_IMPL_TAG101 100
+#define THRUST_PP_DEC_IMPL_TAG102 101
+#define THRUST_PP_DEC_IMPL_TAG103 102
+#define THRUST_PP_DEC_IMPL_TAG104 103
+#define THRUST_PP_DEC_IMPL_TAG105 104
+#define THRUST_PP_DEC_IMPL_TAG106 105
+#define THRUST_PP_DEC_IMPL_TAG107 106
+#define THRUST_PP_DEC_IMPL_TAG108 107
+#define THRUST_PP_DEC_IMPL_TAG109 108
+#define THRUST_PP_DEC_IMPL_TAG110 109
+#define THRUST_PP_DEC_IMPL_TAG111 110
+#define THRUST_PP_DEC_IMPL_TAG112 111
+#define THRUST_PP_DEC_IMPL_TAG113 112
+#define THRUST_PP_DEC_IMPL_TAG114 113
+#define THRUST_PP_DEC_IMPL_TAG115 114
+#define THRUST_PP_DEC_IMPL_TAG116 115
+#define THRUST_PP_DEC_IMPL_TAG117 116
+#define THRUST_PP_DEC_IMPL_TAG118 117
+#define THRUST_PP_DEC_IMPL_TAG119 118
+#define THRUST_PP_DEC_IMPL_TAG120 119
+#define THRUST_PP_DEC_IMPL_TAG121 120
+#define THRUST_PP_DEC_IMPL_TAG122 121
+#define THRUST_PP_DEC_IMPL_TAG123 122
+#define THRUST_PP_DEC_IMPL_TAG124 123
+#define THRUST_PP_DEC_IMPL_TAG125 124
+#define THRUST_PP_DEC_IMPL_TAG126 125
+#define THRUST_PP_DEC_IMPL_TAG127 126
+#define THRUST_PP_DEC_IMPL_TAG128 127
+#define THRUST_PP_DEC_IMPL_TAG129 128
+#define THRUST_PP_DEC_IMPL_TAG130 129
+#define THRUST_PP_DEC_IMPL_TAG131 130
+#define THRUST_PP_DEC_IMPL_TAG132 131
+#define THRUST_PP_DEC_IMPL_TAG133 132
+#define THRUST_PP_DEC_IMPL_TAG134 133
+#define THRUST_PP_DEC_IMPL_TAG135 134
+#define THRUST_PP_DEC_IMPL_TAG136 135
+#define THRUST_PP_DEC_IMPL_TAG137 136
+#define THRUST_PP_DEC_IMPL_TAG138 137
+#define THRUST_PP_DEC_IMPL_TAG139 138
+#define THRUST_PP_DEC_IMPL_TAG140 139
+#define THRUST_PP_DEC_IMPL_TAG141 140
+#define THRUST_PP_DEC_IMPL_TAG142 141
+#define THRUST_PP_DEC_IMPL_TAG143 142
+#define THRUST_PP_DEC_IMPL_TAG144 143
+#define THRUST_PP_DEC_IMPL_TAG145 144
+#define THRUST_PP_DEC_IMPL_TAG146 145
+#define THRUST_PP_DEC_IMPL_TAG147 146
+#define THRUST_PP_DEC_IMPL_TAG148 147
+#define THRUST_PP_DEC_IMPL_TAG149 148
+#define THRUST_PP_DEC_IMPL_TAG150 149
+#define THRUST_PP_DEC_IMPL_TAG151 150
+#define THRUST_PP_DEC_IMPL_TAG152 151
+#define THRUST_PP_DEC_IMPL_TAG153 152
+#define THRUST_PP_DEC_IMPL_TAG154 153
+#define THRUST_PP_DEC_IMPL_TAG155 154
+#define THRUST_PP_DEC_IMPL_TAG156 155
+#define THRUST_PP_DEC_IMPL_TAG157 156
+#define THRUST_PP_DEC_IMPL_TAG158 157
+#define THRUST_PP_DEC_IMPL_TAG159 158
+#define THRUST_PP_DEC_IMPL_TAG160 159
+#define THRUST_PP_DEC_IMPL_TAG161 160
+#define THRUST_PP_DEC_IMPL_TAG162 161
+#define THRUST_PP_DEC_IMPL_TAG163 162
+#define THRUST_PP_DEC_IMPL_TAG164 163
+#define THRUST_PP_DEC_IMPL_TAG165 164
+#define THRUST_PP_DEC_IMPL_TAG166 165
+#define THRUST_PP_DEC_IMPL_TAG167 166
+#define THRUST_PP_DEC_IMPL_TAG168 167
+#define THRUST_PP_DEC_IMPL_TAG169 168
+#define THRUST_PP_DEC_IMPL_TAG170 169
+#define THRUST_PP_DEC_IMPL_TAG171 170
+#define THRUST_PP_DEC_IMPL_TAG172 171
+#define THRUST_PP_DEC_IMPL_TAG173 172
+#define THRUST_PP_DEC_IMPL_TAG174 173
+#define THRUST_PP_DEC_IMPL_TAG175 174
+#define THRUST_PP_DEC_IMPL_TAG176 175
+#define THRUST_PP_DEC_IMPL_TAG177 176
+#define THRUST_PP_DEC_IMPL_TAG178 177
+#define THRUST_PP_DEC_IMPL_TAG179 178
+#define THRUST_PP_DEC_IMPL_TAG180 179
+#define THRUST_PP_DEC_IMPL_TAG181 180
+#define THRUST_PP_DEC_IMPL_TAG182 181
+#define THRUST_PP_DEC_IMPL_TAG183 182
+#define THRUST_PP_DEC_IMPL_TAG184 183
+#define THRUST_PP_DEC_IMPL_TAG185 184
+#define THRUST_PP_DEC_IMPL_TAG186 185
+#define THRUST_PP_DEC_IMPL_TAG187 186
+#define THRUST_PP_DEC_IMPL_TAG188 187
+#define THRUST_PP_DEC_IMPL_TAG189 188
+#define THRUST_PP_DEC_IMPL_TAG190 189
+#define THRUST_PP_DEC_IMPL_TAG191 190
+#define THRUST_PP_DEC_IMPL_TAG192 191
+#define THRUST_PP_DEC_IMPL_TAG193 192
+#define THRUST_PP_DEC_IMPL_TAG194 193
+#define THRUST_PP_DEC_IMPL_TAG195 194
+#define THRUST_PP_DEC_IMPL_TAG196 195
+#define THRUST_PP_DEC_IMPL_TAG197 196
+#define THRUST_PP_DEC_IMPL_TAG198 197
+#define THRUST_PP_DEC_IMPL_TAG199 198
+#define THRUST_PP_DEC_IMPL_TAG200 199
+#define THRUST_PP_DEC_IMPL_TAG201 200
+#define THRUST_PP_DEC_IMPL_TAG202 201
+#define THRUST_PP_DEC_IMPL_TAG203 202
+#define THRUST_PP_DEC_IMPL_TAG204 203
+#define THRUST_PP_DEC_IMPL_TAG205 204
+#define THRUST_PP_DEC_IMPL_TAG206 205
+#define THRUST_PP_DEC_IMPL_TAG207 206
+#define THRUST_PP_DEC_IMPL_TAG208 207
+#define THRUST_PP_DEC_IMPL_TAG209 208
+#define THRUST_PP_DEC_IMPL_TAG210 209
+#define THRUST_PP_DEC_IMPL_TAG211 210
+#define THRUST_PP_DEC_IMPL_TAG212 211
+#define THRUST_PP_DEC_IMPL_TAG213 212
+#define THRUST_PP_DEC_IMPL_TAG214 213
+#define THRUST_PP_DEC_IMPL_TAG215 214
+#define THRUST_PP_DEC_IMPL_TAG216 215
+#define THRUST_PP_DEC_IMPL_TAG217 216
+#define THRUST_PP_DEC_IMPL_TAG218 217
+#define THRUST_PP_DEC_IMPL_TAG219 218
+#define THRUST_PP_DEC_IMPL_TAG220 219
+#define THRUST_PP_DEC_IMPL_TAG221 220
+#define THRUST_PP_DEC_IMPL_TAG222 221
+#define THRUST_PP_DEC_IMPL_TAG223 222
+#define THRUST_PP_DEC_IMPL_TAG224 223
+#define THRUST_PP_DEC_IMPL_TAG225 224
+#define THRUST_PP_DEC_IMPL_TAG226 225
+#define THRUST_PP_DEC_IMPL_TAG227 226
+#define THRUST_PP_DEC_IMPL_TAG228 227
+#define THRUST_PP_DEC_IMPL_TAG229 228
+#define THRUST_PP_DEC_IMPL_TAG230 229
+#define THRUST_PP_DEC_IMPL_TAG231 230
+#define THRUST_PP_DEC_IMPL_TAG232 231
+#define THRUST_PP_DEC_IMPL_TAG233 232
+#define THRUST_PP_DEC_IMPL_TAG234 233
+#define THRUST_PP_DEC_IMPL_TAG235 234
+#define THRUST_PP_DEC_IMPL_TAG236 235
+#define THRUST_PP_DEC_IMPL_TAG237 236
+#define THRUST_PP_DEC_IMPL_TAG238 237
+#define THRUST_PP_DEC_IMPL_TAG239 238
+#define THRUST_PP_DEC_IMPL_TAG240 239
+#define THRUST_PP_DEC_IMPL_TAG241 240
+#define THRUST_PP_DEC_IMPL_TAG242 241
+#define THRUST_PP_DEC_IMPL_TAG243 242
+#define THRUST_PP_DEC_IMPL_TAG244 243
+#define THRUST_PP_DEC_IMPL_TAG245 244
+#define THRUST_PP_DEC_IMPL_TAG246 245
+#define THRUST_PP_DEC_IMPL_TAG247 246
+#define THRUST_PP_DEC_IMPL_TAG248 247
+#define THRUST_PP_DEC_IMPL_TAG249 248
+#define THRUST_PP_DEC_IMPL_TAG250 249
+#define THRUST_PP_DEC_IMPL_TAG251 250
+#define THRUST_PP_DEC_IMPL_TAG252 251
+#define THRUST_PP_DEC_IMPL_TAG253 252
+#define THRUST_PP_DEC_IMPL_TAG254 253
+#define THRUST_PP_DEC_IMPL_TAG255 254
+#define THRUST_PP_DEC_IMPL_TAG256 255
+#define THRUST_PP_DEC_IMPL_TAG257 256
 
 #define THRUST_PP_BOOL(x) THRUST_PP_BOOL_IMPL0(x)
 
@@ -634,7 +1156,8 @@
 /// \def THRUST_CURRENT_FUNCTION
 /// \brief The name of the current function as a string.
 ///
-#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || defined(__ghs__)
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) \
+  || defined(__ghs__)
 #  define THRUST_CURRENT_FUNCTION __PRETTY_FUNCTION__
 #elif defined(__DMC__) && (__DMC__ >= 0x810)
 #  define THRUST_CURRENT_FUNCTION __PRETTY_FUNCTION__
diff --git a/projects/rocthrust/thrust/detail/range/head_flags.h b/projects/rocthrust/thrust/detail/range/head_flags.h
index dd4907af32ee..c3da9bcdd6fd 100644
--- a/projects/rocthrust/thrust/detail/range/head_flags.h
+++ b/projects/rocthrust/thrust/detail/range/head_flags.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 #include <thrust/functional.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
+#include <thrust/sequence_access.h>
 #include <thrust/tuple.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -37,9 +38,9 @@ namespace detail
 {
 
 template <typename RandomAccessIterator,
-          typename BinaryPredicate = equal_to<it_value_t<RandomAccessIterator>>,
+          typename BinaryPredicate = thrust::equal_to<typename thrust::iterator_value<RandomAccessIterator>::type>,
           typename ValueType       = bool,
-          typename IndexType       = it_difference_t<RandomAccessIterator>>
+          typename IndexType       = typename thrust::iterator_difference<RandomAccessIterator>::type>
 class head_flags
 {
 public:
diff --git a/projects/rocthrust/thrust/detail/range/tail_flags.h b/projects/rocthrust/thrust/detail/range/tail_flags.h
index 88db60726b5c..b0fc88bfdc5e 100644
--- a/projects/rocthrust/thrust/detail/range/tail_flags.h
+++ b/projects/rocthrust/thrust/detail/range/tail_flags.h
@@ -18,17 +18,11 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #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_access.h>
 #include <thrust/tuple.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -36,9 +30,9 @@ namespace detail
 {
 
 template <typename RandomAccessIterator,
-          typename BinaryPredicate = equal_to<detail::it_value_t<RandomAccessIterator>>,
+          typename BinaryPredicate = thrust::equal_to<typename thrust::iterator_value<RandomAccessIterator>::type>,
           typename ValueType       = bool,
-          typename IndexType       = detail::it_difference_t<RandomAccessIterator>>
+          typename IndexType       = typename thrust::iterator_difference<RandomAccessIterator>::type>
 class tail_flags
 {
   // XXX WAR cudafe bug
diff --git a/projects/rocthrust/thrust/detail/raw_pointer_cast.h b/projects/rocthrust/thrust/detail/raw_pointer_cast.h
index 176291b46374..a1483c49cec3 100644
--- a/projects/rocthrust/thrust/detail/raw_pointer_cast.h
+++ b/projects/rocthrust/thrust/detail/raw_pointer_cast.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits/pointer_traits.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/raw_reference_cast.h b/projects/rocthrust/thrust/detail/raw_reference_cast.h
index 774323bf4be8..b0c6c7854bbe 100644
--- a/projects/rocthrust/thrust/detail/raw_reference_cast.h
+++ b/projects/rocthrust/thrust/detail/raw_reference_cast.h
@@ -25,15 +25,13 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
 #include <thrust/detail/raw_pointer_cast.h>
+#include <thrust/detail/tuple_transform.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_nested_type.h>
-#include <thrust/tuple.h>
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
-#  include <utility>
 #endif
 
 // the order of declarations and definitions in this file is totally goofy
@@ -54,37 +52,37 @@ __THRUST_DEFINE_HAS_NESTED_TYPE(is_wrapped_reference, wrapped_reference_hint)
 // wrapped reference-like things which aren't strictly wrapped references
 // (e.g. tuples of wrapped references) are considered unwrappable
 template <typename T>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool can_unwrap = is_wrapped_reference<T>::value;
+struct is_unwrappable : is_wrapped_reference<T>
+{};
 
 // specialize is_unwrappable
 // a tuple is_unwrappable if any of its elements is_unwrappable
 template <typename... Ts>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool can_unwrap<tuple<Ts...>> = (can_unwrap<Ts> || ...);
+struct is_unwrappable<thrust::tuple<Ts...>> : _THRUST_STD::disjunction<is_unwrappable<Ts>...>
+{};
 
 // specialize is_unwrappable
 // a tuple_of_iterator_references is_unwrappable if any of its elements is_unwrappable
 template <typename... Ts>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool can_unwrap<tuple_of_iterator_references<Ts...>> = (can_unwrap<Ts> || ...);
+struct is_unwrappable<thrust::detail::tuple_of_iterator_references<Ts...>>
+    : _THRUST_STD::disjunction<is_unwrappable<Ts>...>
+{};
+
+template <typename T, typename Result = void>
+struct enable_if_unwrappable : _THRUST_STD::enable_if<is_unwrappable<T>::value, Result>
+{};
 
 namespace raw_reference_detail
 {
 
-template <typename T, typename SFINAE = void>
+template <typename T, typename Enable = void>
 struct raw_reference_impl : _THRUST_STD::add_lvalue_reference<T>
 {};
 
 template <typename T>
 struct raw_reference_impl<T, _THRUST_STD::enable_if_t<is_wrapped_reference<_THRUST_STD::remove_cv_t<T>>::value>>
-    : _THRUST_STD::add_lvalue_reference<typename pointer_element<typename T::pointer>::type>
-{};
-
-template <typename T>
-struct raw_reference_impl<T, _THRUST_STD::enable_if_t<is_proxy_reference<_THRUST_STD::remove_cv_t<T>>::value>>
 {
-  using type = T;
+  using type = _THRUST_STD::add_lvalue_reference_t<typename pointer_element<typename T::pointer>::type>;
 };
 
 } // namespace raw_reference_detail
@@ -110,20 +108,21 @@ namespace raw_reference_detail
 
 // wrapped references are unwrapped using raw_reference, otherwise, return T
 template <typename T>
-struct raw_reference_tuple_helper : eval_if<can_unwrap<_THRUST_STD::remove_cv_t<T>>, raw_reference<T>, identity_<T>>
+struct raw_reference_tuple_helper
+    : eval_if<is_unwrappable<_THRUST_STD::remove_cv_t<T>>::value, raw_reference<T>, identity_<T>>
 {};
 
 // recurse on tuples
 template <typename... Ts>
-struct raw_reference_tuple_helper<tuple<Ts...>>
+struct raw_reference_tuple_helper<thrust::tuple<Ts...>>
 {
-  using type = tuple<typename raw_reference_tuple_helper<Ts>::type...>;
+  using type = thrust::tuple<typename raw_reference_tuple_helper<Ts>::type...>;
 };
 
 template <typename... Ts>
-struct raw_reference_tuple_helper<tuple_of_iterator_references<Ts...>>
+struct raw_reference_tuple_helper<thrust::detail::tuple_of_iterator_references<Ts...>>
 {
-  using type = tuple_of_iterator_references<typename raw_reference_tuple_helper<Ts>::type...>;
+  using type = thrust::detail::tuple_of_iterator_references<typename raw_reference_tuple_helper<Ts>::type...>;
 };
 
 } // namespace raw_reference_detail
@@ -134,65 +133,93 @@ struct raw_reference_tuple_helper<tuple_of_iterator_references<Ts...>>
 //   then the raw_reference of tuple_type is a tuple of its members' raw_references
 //   else the raw_reference of tuple_type is tuple_type &
 template <typename... Ts>
-struct raw_reference<tuple<Ts...>>
+struct raw_reference<thrust::tuple<Ts...>>
 {
 private:
-  using tuple_type = tuple<Ts...>;
+  using tuple_type = thrust::tuple<Ts...>;
 
 public:
-  using type = typename eval_if<can_unwrap<tuple_type>,
+  using type = typename eval_if<is_unwrappable<tuple_type>::value,
                                 raw_reference_detail::raw_reference_tuple_helper<tuple_type>,
                                 _THRUST_STD::add_lvalue_reference<tuple_type>>::type;
 };
 
 template <typename... Ts>
-struct raw_reference<tuple_of_iterator_references<Ts...>>
+struct raw_reference<thrust::detail::tuple_of_iterator_references<Ts...>>
 {
-  using type = typename raw_reference_detail::raw_reference_tuple_helper<tuple_of_iterator_references<Ts...>>::type;
+private:
+  using tuple_type = detail::tuple_of_iterator_references<Ts...>;
+
+public:
+  using type = typename raw_reference_detail::raw_reference_tuple_helper<tuple_type>::type;
 };
 
 } // namespace detail
 
 // provide declarations of raw_reference_cast's overloads for raw_reference_caster below
+template <typename T>
+THRUST_HOST_DEVICE typename detail::raw_reference<T>::type raw_reference_cast(T& ref);
+
+template <typename T>
+THRUST_HOST_DEVICE typename detail::raw_reference<const T>::type raw_reference_cast(const T& ref);
+
+template <typename... Ts>
+THRUST_HOST_DEVICE typename detail::enable_if_unwrappable<
+  thrust::detail::tuple_of_iterator_references<Ts...>,
+  typename detail::raw_reference<thrust::detail::tuple_of_iterator_references<Ts...>>::type>::type
+raw_reference_cast(thrust::detail::tuple_of_iterator_references<Ts...> t);
+
+namespace detail
+{
+
+struct raw_reference_caster
+{
+  template <typename T>
+  THRUST_HOST_DEVICE typename detail::raw_reference<T>::type operator()(T& ref)
+  {
+    return thrust::raw_reference_cast(ref);
+  }
+
+  template <typename T>
+  THRUST_HOST_DEVICE typename detail::raw_reference<const T>::type operator()(const T& ref)
+  {
+    return thrust::raw_reference_cast(ref);
+  }
+
+  template <typename... Ts>
+  THRUST_HOST_DEVICE typename detail::raw_reference<thrust::detail::tuple_of_iterator_references<Ts...>>::type
+  operator()(thrust::detail::tuple_of_iterator_references<Ts...> t,
+             _THRUST_STD::enable_if_t<is_unwrappable<thrust::detail::tuple_of_iterator_references<Ts...>>::value>* = 0)
+  {
+    return thrust::raw_reference_cast(t);
+  }
+}; // end raw_reference_caster
+
+} // namespace detail
+
 template <typename T>
 THRUST_HOST_DEVICE typename detail::raw_reference<T>::type raw_reference_cast(T& ref)
 {
   return *thrust::raw_pointer_cast(&ref);
-}
+} // end raw_reference_cast
 
 template <typename T>
 THRUST_HOST_DEVICE typename detail::raw_reference<const T>::type raw_reference_cast(const T& ref)
 {
   return *thrust::raw_pointer_cast(&ref);
-}
-
-template <typename T, _THRUST_STD::enable_if_t<detail::is_proxy_reference<_THRUST_STD::remove_cv_t<T>>::value, int> = 0>
-THRUST_HOST_DEVICE typename detail::raw_reference<T>::type raw_reference_cast(T&& t)
-{
-  return t;
-}
+} // end raw_reference_cast
 
 template <typename... Ts>
-THRUST_HOST_DEVICE auto raw_reference_cast(detail::tuple_of_iterator_references<Ts...> t) ->
-  typename detail::raw_reference<detail::tuple_of_iterator_references<Ts...>>::type
+THRUST_HOST_DEVICE typename detail::enable_if_unwrappable<
+  thrust::detail::tuple_of_iterator_references<Ts...>,
+  typename detail::raw_reference<thrust::detail::tuple_of_iterator_references<Ts...>>::type>::type
+raw_reference_cast(thrust::detail::tuple_of_iterator_references<Ts...> t)
 {
-  if constexpr (detail::can_unwrap<detail::tuple_of_iterator_references<Ts...>>)
-  {
-    using ResultTuple = tuple<typename detail::raw_reference_detail::raw_reference_tuple_helper<Ts>::type...>;
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    return _THRUST_STD::apply(
-#else
-    return THRUST_NS_QUALIFIER::apply(
-#endif
-      [](auto&&... refs) {
-        return ResultTuple{raw_reference_cast(_THRUST_STD::forward<decltype(refs)>(refs))...};
-      },
-      static_cast<tuple<Ts...>&>(t));
-  }
-  else
-  {
-    return t;
-  }
-}
+  thrust::detail::raw_reference_caster f;
+
+  // note that we pass raw_reference_tuple_helper, not raw_reference as the unary metafunction
+  // the different way that raw_reference_tuple_helper unwraps tuples is important
+  return thrust::detail::tuple_host_device_transform<detail::raw_reference_detail::raw_reference_tuple_helper>(t, f);
+} // end raw_reference_cast
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/reduce.inl b/projects/rocthrust/thrust/detail/reduce.inl
index c45cd39fb30b..125c597e9489 100644
--- a/projects/rocthrust/thrust/detail/reduce.inl
+++ b/projects/rocthrust/thrust/detail/reduce.inl
@@ -18,138 +18,128 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/reduce.h>
-#include <thrust/system/detail/adl/reduce.h>
-#include <thrust/system/detail/adl/reduce_by_key.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/reduce.h>
 #include <thrust/system/detail/generic/reduce_by_key.h>
-#include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/adl/reduce.h>
+#include <thrust/system/detail/adl/reduce_by_key.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator>
-THRUST_HOST_DEVICE detail::it_value_t<InputIterator>
-reduce(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, InputIterator last)
+template<typename DerivedPolicy, typename InputIterator>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::value_type
+    reduce(const thrust::detail::execution_policy_base<DerivedPolicy> &exec, InputIterator first, InputIterator last)
 {
   using thrust::system::detail::generic::reduce;
   return reduce(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end reduce()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename T>
-THRUST_HOST_DEVICE T reduce(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, InputIterator last, T init)
+template<typename DerivedPolicy, typename InputIterator, typename T>
+THRUST_HOST_DEVICE
+  T reduce(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+           InputIterator first,
+           InputIterator last,
+           T init)
 {
   using thrust::system::detail::generic::reduce;
   return reduce(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, init);
 } // end reduce()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename T, typename BinaryFunction>
-THRUST_HOST_DEVICE T reduce(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  T init,
-  BinaryFunction binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename T,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  T reduce(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+           InputIterator first,
+           InputIterator last,
+           T init,
+           BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::reduce;
   return reduce(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, init, binary_op);
 } // end reduce()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output)
 {
   using thrust::system::detail::generic::reduce_by_key;
-  return reduce_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output);
+  return reduce_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, keys_output, values_output);
 } // end reduce_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output,
+                BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::reduce_by_key;
-  return reduce_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred);
+  return reduce_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
 } // end reduce_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred,
-  BinaryFunction binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output,
+                BinaryPredicate binary_pred,
+                BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::reduce_by_key;
-  return reduce_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred,
-    binary_op);
+  return reduce_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
 } // end reduce_by_key()
 
-template <typename InputIterator>
-detail::it_value_t<InputIterator> reduce(InputIterator first, InputIterator last)
+
+template<typename InputIterator>
+typename thrust::iterator_traits<InputIterator>::value_type
+  reduce(InputIterator first,
+         InputIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -160,8 +150,12 @@ detail::it_value_t<InputIterator> reduce(InputIterator first, InputIterator last
   return thrust::reduce(select_system(system), first, last);
 }
 
-template <typename InputIterator, typename T>
-T reduce(InputIterator first, InputIterator last, T init)
+
+template<typename InputIterator,
+         typename T>
+   T reduce(InputIterator first,
+            InputIterator last,
+            T init)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -172,8 +166,14 @@ T reduce(InputIterator first, InputIterator last, T init)
   return thrust::reduce(select_system(system), first, last, init);
 }
 
-template <typename InputIterator, typename T, typename BinaryFunction>
-T reduce(InputIterator first, InputIterator last, T init, BinaryFunction binary_op)
+
+template<typename InputIterator,
+         typename T,
+         typename BinaryFunction>
+   T reduce(InputIterator first,
+            InputIterator last,
+            T init,
+            BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -184,13 +184,17 @@ T reduce(InputIterator first, InputIterator last, T init, BinaryFunction binary_
   return thrust::reduce(select_system(system), first, last, init, binary_op);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -204,22 +208,22 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   System3 system3;
   System4 system4;
 
-  return thrust::reduce_by_key(
-    select_system(system1, system2, system3, system4), keys_first, keys_last, values_first, keys_output, values_output);
+  return thrust::reduce_by_key(select_system(system1,system2,system3,system4), keys_first, keys_last, values_first, keys_output, values_output);
 }
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output,
+                BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -233,30 +237,24 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   System3 system3;
   System4 system4;
 
-  return thrust::reduce_by_key(
-    select_system(system1, system2, system3, system4),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred);
+  return thrust::reduce_by_key(select_system(system1,system2,system3,system4), keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
 }
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate,
-          typename BinaryFunction>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred,
-  BinaryFunction binary_op)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate,
+         typename BinaryFunction>
+  thrust::pair<OutputIterator1,OutputIterator2>
+  reduce_by_key(InputIterator1 keys_first,
+                InputIterator1 keys_last,
+                InputIterator2 values_first,
+                OutputIterator1 keys_output,
+                OutputIterator2 values_output,
+                BinaryPredicate binary_pred,
+                BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -270,15 +268,8 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   System3 system3;
   System4 system4;
 
-  return thrust::reduce_by_key(
-    select_system(system1, system2, system3, system4),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred,
-    binary_op);
+  return thrust::reduce_by_key(select_system(system1,system2,system3,system4), keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
 }
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/reference.h b/projects/rocthrust/thrust/detail/reference.h
index 6b5a605f1cdb..16bf27896033 100644
--- a/projects/rocthrust/thrust/detail/reference.h
+++ b/projects/rocthrust/thrust/detail/reference.h
@@ -31,7 +31,7 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/reference_forward_declaration.h>
-#include <thrust/detail/type_traits.h> // for internal::remove_cvref_t
+#include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/adl/assign_value.h>
 #include <thrust/system/detail/adl/get_value.h>
@@ -39,10 +39,6 @@
 #include <thrust/system/detail/generic/memory.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
-
 #include <ostream>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/reference_forward_declaration.h b/projects/rocthrust/thrust/detail/reference_forward_declaration.h
index eeee0aedc442..84fed7ff7111 100644
--- a/projects/rocthrust/thrust/detail/reference_forward_declaration.h
+++ b/projects/rocthrust/thrust/detail/reference_forward_declaration.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/use_default.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/detail/remove.inl b/projects/rocthrust/thrust/detail/remove.inl
index 57d2c27a1b4c..b2638fabf3a4 100644
--- a/projects/rocthrust/thrust/detail/remove.inl
+++ b/projects/rocthrust/thrust/detail/remove.inl
@@ -17,106 +17,120 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/remove.h>
-#include <thrust/system/detail/adl/remove.h>
-#include <thrust/system/detail/generic/remove.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/remove.h>
+#include <thrust/system/detail/adl/remove.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE ForwardIterator remove(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  ForwardIterator remove(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last,
+                         const T &value)
 {
   using thrust::system::detail::generic::remove;
   return remove(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, value);
 } // end remove()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator remove_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  const T& value)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator result,
+                             const T &value)
 {
   using thrust::system::detail::generic::remove_copy;
   return remove_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, value);
 } // end remove_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator remove_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator remove_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::remove_if;
   return remove_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred);
 } // end remove_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate>
-THRUST_HOST_DEVICE OutputIterator remove_copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                Predicate pred)
 {
   using thrust::system::detail::generic::remove_copy_if;
   return remove_copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, pred);
 } // end remove_copy_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator remove_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator remove_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::remove_if;
   return remove_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, pred);
 } // end remove_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-THRUST_HOST_DEVICE OutputIterator remove_copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator1 first,
+                                InputIterator1 last,
+                                InputIterator2 stencil,
+                                OutputIterator result,
+                                Predicate pred)
 {
   using thrust::system::detail::generic::remove_copy_if;
-  return remove_copy_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, pred);
+  return remove_copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, pred);
 } // end remove_copy_if()
 
-template <typename ForwardIterator, typename T>
-ForwardIterator remove(ForwardIterator first, ForwardIterator last, const T& value)
+
+template<typename ForwardIterator,
+         typename T>
+  ForwardIterator remove(ForwardIterator first,
+                         ForwardIterator last,
+                         const T &value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -127,8 +141,14 @@ ForwardIterator remove(ForwardIterator first, ForwardIterator last, const T& val
   return thrust::remove(select_system(system), first, last, value);
 } // end remove()
 
-template <typename InputIterator, typename OutputIterator, typename T>
-OutputIterator remove_copy(InputIterator first, InputIterator last, OutputIterator result, const T& value)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename T>
+  OutputIterator remove_copy(InputIterator first,
+                             InputIterator last,
+                             OutputIterator result,
+                             const T &value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -138,11 +158,15 @@ OutputIterator remove_copy(InputIterator first, InputIterator last, OutputIterat
   System1 system1;
   System2 system2;
 
-  return thrust::remove_copy(select_system(system1, system2), first, last, result, value);
+  return thrust::remove_copy(select_system(system1,system2), first, last, result, value);
 } // end remove_copy()
 
-template <typename ForwardIterator, typename Predicate>
-ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator remove_if(ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -153,8 +177,14 @@ ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, Predicate
   return thrust::remove_if(select_system(system), first, last, pred);
 } // end remove_if()
 
-template <typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, InputIterator stencil, Predicate pred)
+
+template<typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator remove_if(ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -164,11 +194,17 @@ ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, InputIter
   System1 system1;
   System2 system2;
 
-  return thrust::remove_if(select_system(system1, system2), first, last, stencil, pred);
+  return thrust::remove_if(select_system(system1,system2), first, last, stencil, pred);
 } // end remove_if()
 
-template <typename InputIterator, typename OutputIterator, typename Predicate>
-OutputIterator remove_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -178,12 +214,19 @@ OutputIterator remove_copy_if(InputIterator first, InputIterator last, OutputIte
   System1 system1;
   System2 system2;
 
-  return thrust::remove_copy_if(select_system(system1, system2), first, last, result, pred);
+  return thrust::remove_copy_if(select_system(system1,system2), first, last, result, pred);
 } // end remove_copy_if()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate>
-OutputIterator
-remove_copy_if(InputIterator1 first, InputIterator1 last, InputIterator2 stencil, OutputIterator result, Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(InputIterator1 first,
+                                InputIterator1 last,
+                                InputIterator2 stencil,
+                                OutputIterator result,
+                                Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -195,7 +238,8 @@ remove_copy_if(InputIterator1 first, InputIterator1 last, InputIterator2 stencil
   System2 system2;
   System3 system3;
 
-  return thrust::remove_copy_if(select_system(system1, system2, system3), first, last, stencil, result, pred);
+  return thrust::remove_copy_if(select_system(system1,system2,system3), first, last, stencil, result, pred);
 } // end remove_copy_if()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/replace.inl b/projects/rocthrust/thrust/detail/replace.inl
index 96fc4e180f90..8d2d46a39f42 100644
--- a/projects/rocthrust/thrust/detail/replace.inl
+++ b/projects/rocthrust/thrust/detail/replace.inl
@@ -17,117 +17,103 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/replace.h>
-#include <thrust/system/detail/adl/replace.h>
-#include <thrust/system/detail/generic/replace.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/replace.h>
+#include <thrust/system/detail/adl/replace.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void
-replace(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-        ForwardIterator first,
-        ForwardIterator last,
-        const T& old_value,
-        const T& new_value)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void replace(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+               ForwardIterator first, ForwardIterator last,
+               const T &old_value,
+               const T &new_value)
 {
   using thrust::system::detail::generic::replace;
   return replace(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, old_value, new_value);
 } // end replace()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE void replace_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred,
-  const T& new_value)
+template<typename DerivedPolicy, typename ForwardIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  void replace_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                  ForwardIterator first, ForwardIterator last,
+                  Predicate pred,
+                  const T &new_value)
 {
   using thrust::system::detail::generic::replace_if;
   return replace_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, pred, new_value);
 } // end replace_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE void replace_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred,
-  const T& new_value)
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  void replace_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                  ForwardIterator first, ForwardIterator last,
+                  InputIterator stencil,
+                  Predicate pred,
+                  const T &new_value)
 {
   using thrust::system::detail::generic::replace_if;
-  return replace_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, pred, new_value);
+  return replace_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, pred, new_value);
 } // end replace_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  const T& old_value,
-  const T& new_value)
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                              InputIterator first, InputIterator last,
+                              OutputIterator result,
+                              const T &old_value,
+                              const T &new_value)
 {
   using thrust::system::detail::generic::replace_copy;
-  return replace_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, old_value, new_value);
+  return replace_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, old_value, new_value);
 } // end replace_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  Predicate pred,
-  const T& new_value)
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                 InputIterator first, InputIterator last,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
   using thrust::system::detail::generic::replace_copy_if;
-  return replace_copy_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, pred, new_value);
+  return replace_copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, pred, new_value);
 } // end replace_copy_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate,
-          typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred,
-  const T& new_value)
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                 InputIterator1 first, InputIterator1 last,
+                                 InputIterator2 stencil,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
   using thrust::system::detail::generic::replace_copy_if;
-  return replace_copy_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, pred, new_value);
+  return replace_copy_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, pred, new_value);
 } // end replace_copy_if()
 
-template <typename InputIterator, typename OutputIterator, typename Predicate, typename T>
-OutputIterator
-replace_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred, const T& new_value)
+
+template<typename InputIterator, typename OutputIterator, typename Predicate, typename T>
+  OutputIterator replace_copy_if(InputIterator first, InputIterator last,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -137,17 +123,16 @@ replace_copy_if(InputIterator first, InputIterator last, OutputIterator result,
   System1 system1;
   System2 system2;
 
-  return thrust::replace_copy_if(select_system(system1, system2), first, last, result, pred, new_value);
+  return thrust::replace_copy_if(select_system(system1,system2), first, last, result, pred, new_value);
 } // end replace_copy_if()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate, typename T>
-OutputIterator replace_copy_if(
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred,
-  const T& new_value)
+
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate, typename T>
+  OutputIterator replace_copy_if(InputIterator1 first, InputIterator1 last,
+                                 InputIterator2 stencil,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -159,13 +144,15 @@ OutputIterator replace_copy_if(
   System2 system2;
   System3 system3;
 
-  return thrust::replace_copy_if(
-    select_system(system1, system2, system3), first, last, stencil, result, pred, new_value);
+  return thrust::replace_copy_if(select_system(system1,system2,system3), first, last, stencil, result, pred, new_value);
 } // end replace_copy_if()
 
-template <typename InputIterator, typename OutputIterator, typename T>
-OutputIterator
-replace_copy(InputIterator first, InputIterator last, OutputIterator result, const T& old_value, const T& new_value)
+
+template<typename InputIterator, typename OutputIterator, typename T>
+  OutputIterator replace_copy(InputIterator first, InputIterator last,
+                              OutputIterator result,
+                              const T &old_value,
+                              const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -175,11 +162,14 @@ replace_copy(InputIterator first, InputIterator last, OutputIterator result, con
   System1 system1;
   System2 system2;
 
-  return thrust::replace_copy(select_system(system1, system2), first, last, result, old_value, new_value);
+  return thrust::replace_copy(select_system(system1,system2), first, last, result, old_value, new_value);
 } // end replace_copy()
 
-template <typename ForwardIterator, typename Predicate, typename T>
-void replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, const T& new_value)
+
+template<typename ForwardIterator, typename Predicate, typename T>
+  void replace_if(ForwardIterator first, ForwardIterator last,
+                  Predicate pred,
+                  const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -190,8 +180,12 @@ void replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, con
   return thrust::replace_if(select_system(system), first, last, pred, new_value);
 } // end replace_if()
 
-template <typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
-void replace_if(ForwardIterator first, ForwardIterator last, InputIterator stencil, Predicate pred, const T& new_value)
+
+template<typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
+  void replace_if(ForwardIterator first, ForwardIterator last,
+                  InputIterator stencil,
+                  Predicate pred,
+                  const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -201,11 +195,14 @@ void replace_if(ForwardIterator first, ForwardIterator last, InputIterator stenc
   System1 system1;
   System2 system2;
 
-  return thrust::replace_if(select_system(system1, system2), first, last, stencil, pred, new_value);
+  return thrust::replace_if(select_system(system1,system2), first, last, stencil, pred, new_value);
 } // end replace_if()
 
-template <typename ForwardIterator, typename T>
-void replace(ForwardIterator first, ForwardIterator last, const T& old_value, const T& new_value)
+
+template<typename ForwardIterator, typename T>
+  void replace(ForwardIterator first, ForwardIterator last,
+               const T &old_value,
+               const T &new_value)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -216,4 +213,5 @@ void replace(ForwardIterator first, ForwardIterator last, const T& old_value, co
   return thrust::replace(select_system(system), first, last, old_value, new_value);
 } // end replace()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/reverse.inl b/projects/rocthrust/thrust/detail/reverse.inl
index f17ccdecedb7..600fcf700294 100644
--- a/projects/rocthrust/thrust/detail/reverse.inl
+++ b/projects/rocthrust/thrust/detail/reverse.inl
@@ -17,46 +17,43 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/reverse.h>
-#include <thrust/system/detail/adl/reverse.h>
-#include <thrust/system/detail/generic/reverse.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/reverse.h>
+#include <thrust/system/detail/adl/reverse.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename BidirectionalIterator>
-THRUST_HOST_DEVICE void reverse(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-                                BidirectionalIterator first,
-                                BidirectionalIterator last)
+template<typename DerivedPolicy, typename BidirectionalIterator>
+THRUST_HOST_DEVICE
+  void reverse(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+               BidirectionalIterator first,
+               BidirectionalIterator last)
 {
   using thrust::system::detail::generic::reverse;
   return reverse(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end reverse()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename BidirectionalIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator reverse_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  BidirectionalIterator first,
-  BidirectionalIterator last,
-  OutputIterator result)
+template<typename DerivedPolicy, typename BidirectionalIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator reverse_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                              BidirectionalIterator first,
+                              BidirectionalIterator last,
+                              OutputIterator result)
 {
   using thrust::system::detail::generic::reverse_copy;
   return reverse_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end reverse_copy()
 
-template <typename BidirectionalIterator>
-void reverse(BidirectionalIterator first, BidirectionalIterator last)
+
+template<typename BidirectionalIterator>
+  void reverse(BidirectionalIterator first,
+               BidirectionalIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -67,8 +64,12 @@ void reverse(BidirectionalIterator first, BidirectionalIterator last)
   return thrust::reverse(select_system(system), first, last);
 } // end reverse()
 
-template <typename BidirectionalIterator, typename OutputIterator>
-OutputIterator reverse_copy(BidirectionalIterator first, BidirectionalIterator last, OutputIterator result)
+
+template<typename BidirectionalIterator,
+         typename OutputIterator>
+  OutputIterator reverse_copy(BidirectionalIterator first,
+                              BidirectionalIterator last,
+                              OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -78,7 +79,8 @@ OutputIterator reverse_copy(BidirectionalIterator first, BidirectionalIterator l
   System1 system1;
   System2 system2;
 
-  return thrust::reverse_copy(select_system(system1, system2), first, last, result);
+  return thrust::reverse_copy(select_system(system1,system2), first, last, result);
 } // end reverse_copy()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/scan.inl b/projects/rocthrust/thrust/detail/scan.inl
index 881063d1f36b..1af149d9b997 100644
--- a/projects/rocthrust/thrust/detail/scan.inl
+++ b/projects/rocthrust/thrust/detail/scan.inl
@@ -17,49 +17,49 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/scan.h>
-#include <thrust/system/detail/adl/scan.h>
-#include <thrust/system/detail/adl/scan_by_key.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/scan.h>
 #include <thrust/system/detail/generic/scan_by_key.h>
-#include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/adl/scan.h>
+#include <thrust/system/detail/adl/scan_by_key.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   using thrust::system::detail::generic::inclusive_scan;
   return inclusive_scan(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end inclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  AssociativeOperator binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::inclusive_scan;
   return inclusive_scan(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, binary_op);
 } // end inclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T, typename AssociativeOperator>
 THRUST_HOST_DEVICE OutputIterator inclusive_scan(
@@ -75,188 +75,200 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan(
     thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, init, binary_op);
 } // end inclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   using thrust::system::detail::generic::exclusive_scan;
   return exclusive_scan(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end exclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  T init)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                T init)
 {
   using thrust::system::detail::generic::exclusive_scan;
   return exclusive_scan(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, init);
 } // end exclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T, typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  T init,
-  AssociativeOperator binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                T init,
+                                AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::exclusive_scan;
-  return exclusive_scan(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, init, binary_op);
+  return exclusive_scan(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, init, binary_op);
 } // end exclusive_scan()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
   using thrust::system::detail::generic::inclusive_scan_by_key;
-  return inclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result);
+  return inclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result);
 } // end inclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::inclusive_scan_by_key;
-  return inclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, binary_pred);
+  return inclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, binary_pred);
 } // end inclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::inclusive_scan_by_key;
-  return inclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first1,
-    last1,
-    first2,
-    result,
-    binary_pred,
-    binary_op);
+  return inclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, binary_pred, binary_op);
 } // end inclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
   using thrust::system::detail::generic::exclusive_scan_by_key;
-  return exclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result);
+  return exclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result);
 } // end exclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init)
 {
   using thrust::system::detail::generic::exclusive_scan_by_key;
-  return exclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, init);
+  return exclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, init);
 } // end exclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename T,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::exclusive_scan_by_key;
-  return exclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, init, binary_pred);
+  return exclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, init, binary_pred);
 } // end exclusive_scan_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename T,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::exclusive_scan_by_key;
-  return exclusive_scan_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first1,
-    last1,
-    first2,
-    result,
-    init,
-    binary_pred,
-    binary_op);
+  return exclusive_scan_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, init, binary_pred, binary_op);
 } // end exclusive_scan_by_key()
 
-template <typename InputIterator, typename OutputIterator>
-OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIterator result)
+
+template<typename InputIterator,
+         typename OutputIterator>
+  OutputIterator inclusive_scan(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -266,11 +278,17 @@ OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIte
   System1 system1;
   System2 system2;
 
-  return thrust::inclusive_scan(select_system(system1, system2), first, last, result);
+  return thrust::inclusive_scan(select_system(system1,system2), first, last, result);
 } // end inclusive_scan()
 
-template <typename InputIterator, typename OutputIterator, typename BinaryFunction>
-OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIterator result, BinaryFunction binary_op)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename BinaryFunction>
+  OutputIterator inclusive_scan(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -280,9 +298,10 @@ OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIte
   System1 system1;
   System2 system2;
 
-  return thrust::inclusive_scan(select_system(system1, system2), first, last, result, binary_op);
+  return thrust::inclusive_scan(select_system(system1,system2), first, last, result, binary_op);
 } // end inclusive_scan()
 
+
 template <typename InputIterator, typename OutputIterator, typename T, typename BinaryFunction>
 OutputIterator
 inclusive_scan(InputIterator first, InputIterator last, OutputIterator result, T init, BinaryFunction binary_op)
@@ -298,8 +317,12 @@ inclusive_scan(InputIterator first, InputIterator last, OutputIterator result, T
   return thrust::inclusive_scan(select_system(system1, system2), first, last, result, init, binary_op);
 } // end inclusive_scan()
 
-template <typename InputIterator, typename OutputIterator>
-OutputIterator exclusive_scan(InputIterator first, InputIterator last, OutputIterator result)
+
+template<typename InputIterator,
+         typename OutputIterator>
+  OutputIterator exclusive_scan(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -309,11 +332,17 @@ OutputIterator exclusive_scan(InputIterator first, InputIterator last, OutputIte
   System1 system1;
   System2 system2;
 
-  return thrust::exclusive_scan(select_system(system1, system2), first, last, result);
+  return thrust::exclusive_scan(select_system(system1,system2), first, last, result);
 } // end exclusive_scan()
 
-template <typename InputIterator, typename OutputIterator, typename T>
-OutputIterator exclusive_scan(InputIterator first, InputIterator last, OutputIterator result, T init)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename T>
+  OutputIterator exclusive_scan(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                T init)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -323,12 +352,19 @@ OutputIterator exclusive_scan(InputIterator first, InputIterator last, OutputIte
   System1 system1;
   System2 system2;
 
-  return thrust::exclusive_scan(select_system(system1, system2), first, last, result, init);
+  return thrust::exclusive_scan(select_system(system1,system2), first, last, result, init);
 } // end exclusive_scan()
 
-template <typename InputIterator, typename OutputIterator, typename T, typename BinaryFunction>
-OutputIterator
-exclusive_scan(InputIterator first, InputIterator last, OutputIterator result, T init, BinaryFunction binary_op)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename T,
+         typename BinaryFunction>
+  OutputIterator exclusive_scan(InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                T init,
+                                BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -338,12 +374,17 @@ exclusive_scan(InputIterator first, InputIterator last, OutputIterator result, T
   System1 system1;
   System2 system2;
 
-  return thrust::exclusive_scan(select_system(system1, system2), first, last, result, init, binary_op);
+  return thrust::exclusive_scan(select_system(system1,system2), first, last, result, init, binary_op);
 } // end exclusive_scan()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator
-inclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator inclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -355,12 +396,19 @@ inclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator
   System2 system2;
   System3 system3;
 
-  return thrust::inclusive_scan_by_key(select_system(system1, system2, system3), first1, last1, first2, result);
+  return thrust::inclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename BinaryPredicate>
-OutputIterator inclusive_scan_by_key(
-  InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator result, BinaryPredicate binary_pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate>
+  OutputIterator inclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -372,22 +420,21 @@ OutputIterator inclusive_scan_by_key(
   System2 system2;
   System3 system3;
 
-  return thrust::inclusive_scan_by_key(
-    select_system(system1, system2, system3), first1, last1, first2, result, binary_pred);
+  return thrust::inclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result, binary_pred);
 }
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-OutputIterator inclusive_scan_by_key(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+  OutputIterator inclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -399,13 +446,17 @@ OutputIterator inclusive_scan_by_key(
   System2 system2;
   System3 system3;
 
-  return thrust::inclusive_scan_by_key(
-    select_system(system1, system2, system3), first1, last1, first2, result, binary_pred, binary_op);
+  return thrust::inclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result, binary_pred, binary_op);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator
-exclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator exclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -417,12 +468,19 @@ exclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator
   System2 system2;
   System3 system3;
 
-  return thrust::exclusive_scan_by_key(select_system(system1, system2, system3), first1, last1, first2, result);
+  return thrust::exclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename T>
-OutputIterator
-exclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator result, T init)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T>
+  OutputIterator exclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -434,17 +492,21 @@ exclusive_scan_by_key(InputIterator1 first1, InputIterator1 last1, InputIterator
   System2 system2;
   System3 system3;
 
-  return thrust::exclusive_scan_by_key(select_system(system1, system2, system3), first1, last1, first2, result, init);
+  return thrust::exclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result, init);
 }
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename T, typename BinaryPredicate>
-OutputIterator exclusive_scan_by_key(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate>
+  OutputIterator exclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -456,24 +518,23 @@ OutputIterator exclusive_scan_by_key(
   System2 system2;
   System3 system3;
 
-  return thrust::exclusive_scan_by_key(
-    select_system(system1, system2, system3), first1, last1, first2, result, init, binary_pred);
+  return thrust::exclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result, init, binary_pred);
 }
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename T,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-OutputIterator exclusive_scan_by_key(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+  OutputIterator exclusive_scan_by_key(InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -485,8 +546,8 @@ OutputIterator exclusive_scan_by_key(
   System2 system2;
   System3 system3;
 
-  return thrust::exclusive_scan_by_key(
-    select_system(system1, system2, system3), first1, last1, first2, result, init, binary_pred, binary_op);
+  return thrust::exclusive_scan_by_key(select_system(system1,system2,system3), first1, last1, first2, result, init, binary_pred, binary_op);
 }
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/scatter.inl b/projects/rocthrust/thrust/detail/scatter.inl
index 99f93ee46327..3a96b22febeb 100644
--- a/projects/rocthrust/thrust/detail/scatter.inl
+++ b/projects/rocthrust/thrust/detail/scatter.inl
@@ -18,76 +18,79 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/scatter.h>
-#include <thrust/system/detail/adl/scatter.h>
-#include <thrust/system/detail/generic/scatter.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
+#include <thrust/system/detail/generic/scatter.h>
+#include <thrust/system/detail/adl/scatter.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename RandomAccessIterator>
-THRUST_HOST_DEVICE void
-scatter(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-        InputIterator1 first,
-        InputIterator1 last,
-        InputIterator2 map,
-        RandomAccessIterator output)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void scatter(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+               InputIterator1 first,
+               InputIterator1 last,
+               InputIterator2 map,
+               RandomAccessIterator output)
 {
   using thrust::system::detail::generic::scatter;
   return scatter(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, map, output);
 } // end scatter()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename RandomAccessIterator>
-THRUST_HOST_DEVICE void scatter_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 map,
-  InputIterator3 stencil,
-  RandomAccessIterator output)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void scatter_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                  InputIterator1 first,
+                  InputIterator1 last,
+                  InputIterator2 map,
+                  InputIterator3 stencil,
+                  RandomAccessIterator output)
 {
   using thrust::system::detail::generic::scatter_if;
   return scatter_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, map, stencil, output);
 } // end scatter_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename RandomAccessIterator,
-          typename Predicate>
-THRUST_HOST_DEVICE void scatter_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 map,
-  InputIterator3 stencil,
-  RandomAccessIterator output,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename RandomAccessIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  void scatter_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                  InputIterator1 first,
+                  InputIterator1 last,
+                  InputIterator2 map,
+                  InputIterator3 stencil,
+                  RandomAccessIterator output,
+                  Predicate pred)
 {
   using thrust::system::detail::generic::scatter_if;
-  return scatter_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, map, stencil, output, pred);
+  return scatter_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, map, stencil, output, pred);
 } // end scatter_if()
 
-template <typename InputIterator1, typename InputIterator2, typename RandomAccessIterator>
-void scatter(InputIterator1 first, InputIterator1 last, InputIterator2 map, RandomAccessIterator output)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename RandomAccessIterator>
+  void scatter(InputIterator1 first,
+               InputIterator1 last,
+               InputIterator2 map,
+               RandomAccessIterator output)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -99,12 +102,19 @@ void scatter(InputIterator1 first, InputIterator1 last, InputIterator2 map, Rand
   System2 system2;
   System3 system3;
 
-  return thrust::scatter(select_system(system1, system2, system3), first, last, map, output);
+  return thrust::scatter(select_system(system1,system2,system3), first, last, map, output);
 } // end scatter()
 
-template <typename InputIterator1, typename InputIterator2, typename InputIterator3, typename RandomAccessIterator>
-void scatter_if(
-  InputIterator1 first, InputIterator1 last, InputIterator2 map, InputIterator3 stencil, RandomAccessIterator output)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename RandomAccessIterator>
+  void scatter_if(InputIterator1 first,
+                  InputIterator1 last,
+                  InputIterator2 map,
+                  InputIterator3 stencil,
+                  RandomAccessIterator output)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -118,20 +128,21 @@ void scatter_if(
   System3 system3;
   System4 system4;
 
-  return thrust::scatter_if(select_system(system1, system2, system3, system4), first, last, map, stencil, output);
+  return thrust::scatter_if(select_system(system1,system2,system3,system4), first, last, map, stencil, output);
 } // end scatter_if()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename RandomAccessIterator,
-          typename Predicate>
-void scatter_if(InputIterator1 first,
-                InputIterator1 last,
-                InputIterator2 map,
-                InputIterator3 stencil,
-                RandomAccessIterator output,
-                Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename RandomAccessIterator,
+         typename Predicate>
+  void scatter_if(InputIterator1 first,
+                  InputIterator1 last,
+                  InputIterator2 map,
+                  InputIterator3 stencil,
+                  RandomAccessIterator output,
+                  Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -145,7 +156,7 @@ void scatter_if(InputIterator1 first,
   System3 system3;
   System4 system4;
 
-  return thrust::scatter_if(select_system(system1, system2, system3, system4), first, last, map, stencil, output, pred);
+  return thrust::scatter_if(select_system(system1,system2,system3,system4), first, last, map, stencil, output, pred);
 } // end scatter_if()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/select_system.h b/projects/rocthrust/thrust/detail/select_system.h
index c50162ac936e..104bfcd16a20 100644
--- a/projects/rocthrust/thrust/detail/select_system.h
+++ b/projects/rocthrust/thrust/detail/select_system.h
@@ -28,7 +28,9 @@
 #include <thrust/detail/type_deduction.h>
 #include <thrust/system/detail/generic/select_system.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  include _THRUST_STD_INCLUDE(type_traits)
+#endif
 
 THRUST_NAMESPACE_BEGIN
 
@@ -65,7 +67,7 @@ struct select_system_fn final
 
 } // namespace select_system_detail
 
-THRUST_GLOBAL_CONSTANT select_system_detail::select_system_fn select_system{};
+THRUST_INLINE_CONSTANT select_system_detail::select_system_fn select_system{};
 
 } // namespace detail
 
diff --git a/projects/rocthrust/thrust/detail/seq.h b/projects/rocthrust/thrust/detail/seq.h
index 7c926ec908ad..1925d453bb78 100644
--- a/projects/rocthrust/thrust/detail/seq.h
+++ b/projects/rocthrust/thrust/detail/seq.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,13 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
@@ -50,6 +43,6 @@ struct seq_t
 
 } // namespace detail
 
-THRUST_GLOBAL_CONSTANT detail::seq_t seq;
+THRUST_INLINE_CONSTANT detail::seq_t seq;
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/sequence.inl b/projects/rocthrust/thrust/detail/sequence.inl
index cae808b64292..012c64cc0701 100644
--- a/projects/rocthrust/thrust/detail/sequence.inl
+++ b/projects/rocthrust/thrust/detail/sequence.inl
@@ -17,55 +17,57 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/sequence.h>
-#include <thrust/system/detail/adl/sequence.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/sequence.h>
+#include <thrust/system/detail/adl/sequence.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE void
-sequence(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  void sequence(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last)
 {
   using thrust::system::detail::generic::sequence;
   return sequence(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end sequence()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void sequence(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, T init)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void sequence(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                T init)
 {
   using thrust::system::detail::generic::sequence;
   return sequence(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, init);
 } // end sequence()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void sequence(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  T init,
-  T step)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void sequence(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                T init,
+                T step)
 {
   using thrust::system::detail::generic::sequence;
   return sequence(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, init, step);
 } // end sequence()
 
-template <typename ForwardIterator>
-void sequence(ForwardIterator first, ForwardIterator last)
+
+template<typename ForwardIterator>
+  void sequence(ForwardIterator first,
+                ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -76,8 +78,11 @@ void sequence(ForwardIterator first, ForwardIterator last)
   return thrust::sequence(select_system(system), first, last);
 } // end sequence()
 
-template <typename ForwardIterator, typename T>
-void sequence(ForwardIterator first, ForwardIterator last, T init)
+
+template<typename ForwardIterator, typename T>
+  void sequence(ForwardIterator first,
+                ForwardIterator last,
+                T init)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -88,8 +93,12 @@ void sequence(ForwardIterator first, ForwardIterator last, T init)
   return thrust::sequence(select_system(system), first, last, init);
 } // end sequence()
 
-template <typename ForwardIterator, typename T>
-void sequence(ForwardIterator first, ForwardIterator last, T init, T step)
+
+template<typename ForwardIterator, typename T>
+  void sequence(ForwardIterator first,
+                ForwardIterator last,
+                T init,
+                T step)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -100,4 +109,5 @@ void sequence(ForwardIterator first, ForwardIterator last, T init, T step)
   return thrust::sequence(select_system(system), first, last, init, step);
 } // end sequence()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/set_operations.inl b/projects/rocthrust/thrust/detail/set_operations.inl
index e22e1eb575ed..488b28f5e806 100644
--- a/projects/rocthrust/thrust/detail/set_operations.inl
+++ b/projects/rocthrust/thrust/detail/set_operations.inl
@@ -17,431 +17,380 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/set_operations.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/set_operations.h>
+#include <thrust/system/detail/adl/set_operations.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                              InputIterator1                                              first1,
+                              InputIterator1                                              last1,
+                              InputIterator2                                              first2,
+                              InputIterator2                                              last2,
+                              OutputIterator                                              result)
 {
   using thrust::system::detail::generic::set_difference;
-  return set_difference(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
+  return set_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
 } // end set_difference()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE OutputIterator set_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+OutputIterator set_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                              InputIterator1                                              first1,
+                              InputIterator1                                              last1,
+                              InputIterator2                                              first2,
+                              InputIterator2                                              last2,
+                              OutputIterator                                              result,
+                              StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_difference;
-  return set_difference(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
+  return set_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
 } // end set_difference()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_difference_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                        InputIterator1                                              keys_first1,
+                        InputIterator1                                              keys_last1,
+                        InputIterator2                                              keys_first2,
+                        InputIterator2                                              keys_last2,
+                        InputIterator3                                              values_first1,
+                        InputIterator4                                              values_first2,
+                        OutputIterator1                                             keys_result,
+                        OutputIterator2                                             values_result)
 {
   using thrust::system::detail::generic::set_difference_by_key;
-  return set_difference_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return set_difference_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_difference_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_difference_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                        InputIterator1                                              keys_first1,
+                        InputIterator1                                              keys_last1,
+                        InputIterator2                                              keys_first2,
+                        InputIterator2                                              keys_last2,
+                        InputIterator3                                              values_first1,
+                        InputIterator4                                              values_first2,
+                        OutputIterator1                                             keys_result,
+                        OutputIterator2                                             values_result,
+                        StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_difference_by_key;
-  return set_difference_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return set_difference_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_difference_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_intersection(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_intersection(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator1                                              first1,
+                                InputIterator1                                              last1,
+                                InputIterator2                                              first2,
+                                InputIterator2                                              last2,
+                                OutputIterator                                              result)
 {
   using thrust::system::detail::generic::set_intersection;
-  return set_intersection(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
+  return set_intersection(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
 } // end set_intersection()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE OutputIterator set_intersection(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+OutputIterator set_intersection(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                InputIterator1                                              first1,
+                                InputIterator1                                              last1,
+                                InputIterator2                                              first2,
+                                InputIterator2                                              last2,
+                                OutputIterator                                              result,
+                                StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_intersection;
-  return set_intersection(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
+  return set_intersection(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
 } // end set_intersection()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_intersection_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          InputIterator1                                              keys_first1,
+                          InputIterator1                                              keys_last1,
+                          InputIterator2                                              keys_first2,
+                          InputIterator2                                              keys_last2,
+                          InputIterator3                                              values_first1,
+                          OutputIterator1                                             keys_result,
+                          OutputIterator2                                             values_result)
 {
   using thrust::system::detail::generic::set_intersection_by_key;
-  return set_intersection_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    keys_result,
-    values_result);
+  return set_intersection_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, keys_result, values_result);
 } // end set_intersection_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_intersection_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          InputIterator1                                              keys_first1,
+                          InputIterator1                                              keys_last1,
+                          InputIterator2                                              keys_first2,
+                          InputIterator2                                              keys_last2,
+                          InputIterator3                                              values_first1,
+                          OutputIterator1                                             keys_result,
+                          OutputIterator2                                             values_result,
+                          StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_intersection_by_key;
-  return set_intersection_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    keys_result,
-    values_result,
-    comp);
+  return set_intersection_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, keys_result, values_result, comp);
 } // end set_intersection_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_symmetric_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_symmetric_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                        InputIterator1                                              first1,
+                                        InputIterator1                                              last1,
+                                        InputIterator2                                              first2,
+                                        InputIterator2                                              last2,
+                                        OutputIterator                                              result)
 {
   using thrust::system::detail::generic::set_symmetric_difference;
-  return set_symmetric_difference(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
+  return set_symmetric_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
 } // end set_symmetric_difference()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE OutputIterator set_symmetric_difference(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+OutputIterator set_symmetric_difference(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                        InputIterator1                                              first1,
+                                        InputIterator1                                              last1,
+                                        InputIterator2                                              first2,
+                                        InputIterator2                                              last2,
+                                        OutputIterator                                              result,
+                                        StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_symmetric_difference;
-  return set_symmetric_difference(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
+  return set_symmetric_difference(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
 } // end set_symmetric_difference()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_symmetric_difference_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                  InputIterator1                                              keys_first1,
+                                  InputIterator1                                              keys_last1,
+                                  InputIterator2                                              keys_first2,
+                                  InputIterator2                                              keys_last2,
+                                  InputIterator3                                              values_first1,
+                                  InputIterator4                                              values_first2,
+                                  OutputIterator1                                             keys_result,
+                                  OutputIterator2                                             values_result)
 {
   using thrust::system::detail::generic::set_symmetric_difference_by_key;
-  return set_symmetric_difference_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return set_symmetric_difference_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_symmetric_difference_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_symmetric_difference_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                  InputIterator1                                              keys_first1,
+                                  InputIterator1                                              keys_last1,
+                                  InputIterator2                                              keys_first2,
+                                  InputIterator2                                              keys_last2,
+                                  InputIterator3                                              values_first1,
+                                  InputIterator4                                              values_first2,
+                                  OutputIterator1                                             keys_result,
+                                  OutputIterator2                                             values_result,
+                                  StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_symmetric_difference_by_key;
-  return set_symmetric_difference_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return set_symmetric_difference_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_symmetric_difference_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_union(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_union(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator1                                              first1,
+                         InputIterator1                                              last1,
+                         InputIterator2                                              first2,
+                         InputIterator2                                              last2,
+                         OutputIterator                                              result)
 {
   using thrust::system::detail::generic::set_union;
-  return set_union(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
+  return set_union(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result);
 } // end set_union()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE OutputIterator set_union(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+OutputIterator set_union(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                         InputIterator1                                              first1,
+                         InputIterator1                                              last1,
+                         InputIterator2                                              first2,
+                         InputIterator2                                              last2,
+                         OutputIterator                                              result,
+                         StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_union;
-  return set_union(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
+  return set_union(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, last2, result, comp);
 } // end set_union()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_union_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   InputIterator1                                              keys_first1,
+                   InputIterator1                                              keys_last1,
+                   InputIterator2                                              keys_first2,
+                   InputIterator2                                              keys_last2,
+                   InputIterator3                                              values_first1,
+                   InputIterator4                                              values_first2,
+                   OutputIterator1                                             keys_result,
+                   OutputIterator2                                             values_result)
 {
   using thrust::system::detail::generic::set_union_by_key;
-  return set_union_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return set_union_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_union_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakCompare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakCompare comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakCompare>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_union_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   InputIterator1                                              keys_first1,
+                   InputIterator1                                              keys_last1,
+                   InputIterator2                                              keys_first2,
+                   InputIterator2                                              keys_last2,
+                   InputIterator3                                              values_first1,
+                   InputIterator4                                              values_first2,
+                   OutputIterator1                                             keys_result,
+                   OutputIterator2                                             values_result,
+                   StrictWeakCompare                                           comp)
 {
   using thrust::system::detail::generic::set_union_by_key;
-  return set_union_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return set_union_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_union_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator set_difference(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+  OutputIterator set_difference(InputIterator1 first1,
+                                InputIterator1 last1,
+                                InputIterator2 first2,
+                                InputIterator2 last2,
+                                OutputIterator result,
+                                StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -453,12 +402,18 @@ OutputIterator set_difference(
   System2 system2;
   System3 system3;
 
-  return thrust::set_difference(select_system(system1, system2, system3), first1, last1, first2, last2, result, comp);
+  return thrust::set_difference(select_system(system1,system2,system3), first1, last1, first2, last2, result, comp);
 } // end set_difference()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator set_difference(
-  InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator set_difference(InputIterator1 first1,
+                                InputIterator1 last1,
+                                InputIterator2 first2,
+                                InputIterator2 last2,
+                                OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -470,26 +425,27 @@ OutputIterator set_difference(
   System2 system2;
   System3 system3;
 
-  return thrust::set_difference(select_system(system1, system2, system3), first1, last1, first2, last2, result);
+  return thrust::set_difference(select_system(system1,system2,system3), first1, last1, first2, last2, result);
 } // end set_difference()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_difference_by_key(InputIterator1 keys_first1,
+                          InputIterator1 keys_last1,
+                          InputIterator2 keys_first2,
+                          InputIterator2 keys_last2,
+                          InputIterator3 values_first1,
+                          InputIterator4 values_first2,
+                          OutputIterator1 keys_result,
+                          OutputIterator2 values_result,
+                          StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -507,34 +463,25 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_difference_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return thrust::set_difference_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_difference_by_key()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_difference_by_key(InputIterator1 keys_first1,
+                          InputIterator1 keys_last1,
+                          InputIterator2 keys_first2,
+                          InputIterator2 keys_last2,
+                          InputIterator3 values_first1,
+                          InputIterator4 values_first2,
+                          OutputIterator1 keys_result,
+                          OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -552,26 +499,20 @@ thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_difference_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return thrust::set_difference_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_difference_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator set_intersection(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+  OutputIterator set_intersection(InputIterator1 first1,
+                                  InputIterator1 last1,
+                                  InputIterator2 first2,
+                                  InputIterator2 last2,
+                                  OutputIterator result,
+                                  StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -583,12 +524,18 @@ OutputIterator set_intersection(
   System2 system2;
   System3 system3;
 
-  return thrust::set_intersection(select_system(system1, system2, system3), first1, last1, first2, last2, result, comp);
+  return thrust::set_intersection(select_system(system1,system2,system3), first1, last1, first2, last2, result, comp);
 } // end set_intersection()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator set_intersection(
-  InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator set_intersection(InputIterator1 first1,
+                                  InputIterator1 last1,
+                                  InputIterator2 first2,
+                                  InputIterator2 last2,
+                                  OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -600,24 +547,25 @@ OutputIterator set_intersection(
   System2 system2;
   System3 system3;
 
-  return thrust::set_intersection(select_system(system1, system2, system3), first1, last1, first2, last2, result);
+  return thrust::set_intersection(select_system(system1,system2,system3), first1, last1, first2, last2, result);
 } // end set_intersection()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_intersection_by_key(InputIterator1 keys_first1,
+                            InputIterator1 keys_last1,
+                            InputIterator2 keys_first2,
+                            InputIterator2 keys_last2,
+                            InputIterator3 values_first1,
+                            OutputIterator1 keys_result,
+                            OutputIterator2 values_result,
+                            StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -633,31 +581,23 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   System4 system4;
   System5 system5;
 
-  return thrust::set_intersection_by_key(
-    select_system(system1, system2, system3, system4, system5),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    keys_result,
-    values_result,
-    comp);
+  return thrust::set_intersection_by_key(select_system(system1,system2,system3,system4,system5), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, keys_result, values_result, comp);
 } // end set_intersection_by_key()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_intersection_by_key(InputIterator1 keys_first1,
+                            InputIterator1 keys_last1,
+                            InputIterator2 keys_first2,
+                            InputIterator2 keys_last2,
+                            InputIterator3 values_first1,
+                            OutputIterator1 keys_result,
+                            OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -673,25 +613,20 @@ thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
   System4 system4;
   System5 system5;
 
-  return thrust::set_intersection_by_key(
-    select_system(system1, system2, system3, system4, system5),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    keys_result,
-    values_result);
+  return thrust::set_intersection_by_key(select_system(system1,system2,system3,system4,system5), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, keys_result, values_result);
 } // end set_intersection_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator set_symmetric_difference(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+  OutputIterator set_symmetric_difference(InputIterator1 first1,
+                                          InputIterator1 last1,
+                                          InputIterator2 first2,
+                                          InputIterator2 last2,
+                                          OutputIterator result,
+                                          StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -703,13 +638,18 @@ OutputIterator set_symmetric_difference(
   System2 system2;
   System3 system3;
 
-  return thrust::set_symmetric_difference(
-    select_system(system1, system2, system3), first1, last1, first2, last2, result, comp);
+  return thrust::set_symmetric_difference(select_system(system1,system2,system3), first1, last1, first2, last2, result, comp);
 } // end set_symmetric_difference()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator set_symmetric_difference(
-  InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator set_symmetric_difference(InputIterator1 first1,
+                                          InputIterator1 last1,
+                                          InputIterator2 first2,
+                                          InputIterator2 last2,
+                                          OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -721,27 +661,27 @@ OutputIterator set_symmetric_difference(
   System2 system2;
   System3 system3;
 
-  return thrust::set_symmetric_difference(
-    select_system(system1, system2, system3), first1, last1, first2, last2, result);
+  return thrust::set_symmetric_difference(select_system(system1,system2,system3), first1, last1, first2, last2, result);
 } // end set_symmetric_difference()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_symmetric_difference_by_key(InputIterator1 keys_first1,
+                                    InputIterator1 keys_last1,
+                                    InputIterator2 keys_first2,
+                                    InputIterator2 keys_last2,
+                                    InputIterator3 values_first1,
+                                    InputIterator4 values_first2,
+                                    OutputIterator1 keys_result,
+                                    OutputIterator2 values_result,
+                                    StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -759,34 +699,25 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_symmetric_difference_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return thrust::set_symmetric_difference_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_symmetric_difference_by_key()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_symmetric_difference_by_key(InputIterator1 keys_first1,
+                                    InputIterator1 keys_last1,
+                                    InputIterator2 keys_first2,
+                                    InputIterator2 keys_last2,
+                                    InputIterator3 values_first1,
+                                    InputIterator4 values_first2,
+                                    OutputIterator1 keys_result,
+                                    OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -804,26 +735,20 @@ thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_symmetric_difference_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return thrust::set_symmetric_difference_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_symmetric_difference_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
-OutputIterator set_union(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+  OutputIterator set_union(InputIterator1 first1,
+                           InputIterator1 last1,
+                           InputIterator2 first2,
+                           InputIterator2 last2,
+                           OutputIterator result,
+                           StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -835,12 +760,18 @@ OutputIterator set_union(
   System2 system2;
   System3 system3;
 
-  return thrust::set_union(select_system(system1, system2, system3), first1, last1, first2, last2, result, comp);
+  return thrust::set_union(select_system(system1,system2,system3), first1, last1, first2, last2, result, comp);
 } // end set_union()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator>
-OutputIterator set_union(
-  InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+  OutputIterator set_union(InputIterator1 first1,
+                           InputIterator1 last1,
+                           InputIterator2 first2,
+                           InputIterator2 last2,
+                           OutputIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -852,26 +783,27 @@ OutputIterator set_union(
   System2 system2;
   System3 system3;
 
-  return thrust::set_union(select_system(system1, system2, system3), first1, last1, first2, last2, result);
+  return thrust::set_union(select_system(system1,system2,system3), first1, last1, first2, last2, result);
 } // end set_union()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_union_by_key(InputIterator1 keys_first1,
+                     InputIterator1 keys_last1,
+                     InputIterator2 keys_first2,
+                     InputIterator2 keys_last2,
+                     InputIterator3 values_first1,
+                     InputIterator4 values_first2,
+                     OutputIterator1 keys_result,
+                     OutputIterator2 values_result,
+                     StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -889,34 +821,25 @@ thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_union_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    comp);
+  return thrust::set_union_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, comp);
 } // end set_union_by_key()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    set_union_by_key(InputIterator1 keys_first1,
+                     InputIterator1 keys_last1,
+                     InputIterator2 keys_first2,
+                     InputIterator2 keys_last2,
+                     InputIterator3 values_first1,
+                     InputIterator4 values_first2,
+                     OutputIterator1 keys_result,
+                     OutputIterator2 values_result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -934,16 +857,8 @@ thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
   System5 system5;
   System6 system6;
 
-  return thrust::set_union_by_key(
-    select_system(system1, system2, system3, system4, system5, system6),
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result);
+  return thrust::set_union_by_key(select_system(system1,system2,system3,system4,system5,system6), keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result);
 } // end set_union_by_key()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/shuffle.inl b/projects/rocthrust/thrust/detail/shuffle.inl
index 7e43628e4983..592aaa0cebe8 100644
--- a/projects/rocthrust/thrust/detail/shuffle.inl
+++ b/projects/rocthrust/thrust/detail/shuffle.inl
@@ -18,13 +18,7 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/shuffle.h>
 #include <thrust/system/detail/generic/select_system.h>
@@ -35,15 +29,17 @@ THRUST_NAMESPACE_BEGIN
 THRUST_EXEC_CHECK_DISABLE
 template <typename DerivedPolicy, typename RandomIterator, typename URBG>
 THRUST_HOST_DEVICE void shuffle(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, RandomIterator first, RandomIterator last, URBG&& g)
-{
+    const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
+    RandomIterator first, RandomIterator last, URBG&& g) {
   using thrust::system::detail::generic::shuffle;
-  return shuffle(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, g);
+  return shuffle(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      first, last, g);
 }
 
 template <typename RandomIterator, typename URBG>
-THRUST_HOST_DEVICE void shuffle(RandomIterator first, RandomIterator last, URBG&& g)
-{
+THRUST_HOST_DEVICE void shuffle(RandomIterator first, RandomIterator last,
+                                 URBG&& g) {
   using thrust::system::detail::generic::select_system;
 
   using System = typename thrust::iterator_system<RandomIterator>::type;
@@ -53,21 +49,21 @@ THRUST_HOST_DEVICE void shuffle(RandomIterator first, RandomIterator last, URBG&
 }
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomIterator, typename OutputIterator, typename URBG>
+template <typename DerivedPolicy, typename RandomIterator,
+          typename OutputIterator, typename URBG>
 THRUST_HOST_DEVICE void shuffle_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomIterator first,
-  RandomIterator last,
-  OutputIterator result,
-  URBG&& g)
-{
+    const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
+    RandomIterator first, RandomIterator last, OutputIterator result,
+    URBG&& g) {
   using thrust::system::detail::generic::shuffle_copy;
-  return shuffle_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, g);
+  return shuffle_copy(
+      thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
+      first, last, result, g);
 }
 
 template <typename RandomIterator, typename OutputIterator, typename URBG>
-THRUST_HOST_DEVICE void shuffle_copy(RandomIterator first, RandomIterator last, OutputIterator result, URBG&& g)
-{
+THRUST_HOST_DEVICE void shuffle_copy(RandomIterator first, RandomIterator last,
+                                      OutputIterator result, URBG&& g) {
   using thrust::system::detail::generic::select_system;
 
   using System1 = typename thrust::iterator_system<RandomIterator>::type;
@@ -76,7 +72,8 @@ THRUST_HOST_DEVICE void shuffle_copy(RandomIterator first, RandomIterator last,
   System1 system1;
   System2 system2;
 
-  return thrust::shuffle_copy(select_system(system1, system2), first, last, result, g);
+  return thrust::shuffle_copy(select_system(system1, system2), first, last,
+                              result, g);
 }
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/sort.inl b/projects/rocthrust/thrust/detail/sort.inl
index c6e1622e7479..bca9939dc42a 100644
--- a/projects/rocthrust/thrust/detail/sort.inl
+++ b/projects/rocthrust/thrust/detail/sort.inl
@@ -17,174 +17,190 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/sort.h>
-#include <thrust/system/detail/adl/sort.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/sort.h>
+#include <thrust/system/detail/adl/sort.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator>
-THRUST_HOST_DEVICE void sort(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-                            RandomAccessIterator first,
-                            RandomAccessIterator last)
+template<typename DerivedPolicy, typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void sort(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+            RandomAccessIterator first,
+            RandomAccessIterator last)
 {
   using thrust::system::detail::generic::sort;
   return sort(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end sort()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void
-sort(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-     RandomAccessIterator first,
-     RandomAccessIterator last,
-     StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void sort(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+            RandomAccessIterator first,
+            RandomAccessIterator last,
+            StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::sort;
   return sort(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end sort()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator>
-THRUST_HOST_DEVICE void stable_sort(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-                                   RandomAccessIterator first,
-                                   RandomAccessIterator last)
+template<typename DerivedPolicy, typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void stable_sort(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   RandomAccessIterator first,
+                   RandomAccessIterator last)
 {
   using thrust::system::detail::generic::stable_sort;
   return stable_sort(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end stable_sort()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void stable_sort(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomAccessIterator first,
-  RandomAccessIterator last,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void stable_sort(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   RandomAccessIterator first,
+                   RandomAccessIterator last,
+                   StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::stable_sort;
   return stable_sort(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end stable_sort()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator1, typename RandomAccessIterator2>
-THRUST_HOST_DEVICE void sort_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+THRUST_HOST_DEVICE
+  void sort_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first)
 {
   using thrust::system::detail::generic::sort_by_key;
-  return sort_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
+  return sort_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
 } // end sort_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void sort_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void sort_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                   RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first,
+                   StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::sort_by_key;
-  return sort_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, comp);
+  return sort_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, comp);
 } // end sort_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename RandomAccessIterator1, typename RandomAccessIterator2>
-THRUST_HOST_DEVICE void stable_sort_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+THRUST_HOST_DEVICE
+  void stable_sort_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          RandomAccessIterator1 keys_first,
+                          RandomAccessIterator1 keys_last,
+                          RandomAccessIterator2 values_first)
 {
   using thrust::system::detail::generic::stable_sort_by_key;
-  return stable_sort_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
+  return stable_sort_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
 } // end stable_sort_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void stable_sort_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void stable_sort_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          RandomAccessIterator1 keys_first,
+                          RandomAccessIterator1 keys_last,
+                          RandomAccessIterator2 values_first,
+                          StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::stable_sort_by_key;
-  return stable_sort_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, comp);
+  return stable_sort_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, comp);
 } // end stable_sort_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE bool
-is_sorted(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  bool is_sorted(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last)
 {
   using thrust::system::detail::generic::is_sorted;
   return is_sorted(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end is_sorted()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Compare>
-THRUST_HOST_DEVICE bool
-is_sorted(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-          ForwardIterator first,
-          ForwardIterator last,
-          Compare comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename Compare>
+THRUST_HOST_DEVICE
+  bool is_sorted(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 Compare comp)
 {
   using thrust::system::detail::generic::is_sorted;
   return is_sorted(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end is_sorted()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator is_sorted_until(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  ForwardIterator is_sorted_until(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last)
 {
   using thrust::system::detail::generic::is_sorted_until;
   return is_sorted_until(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end is_sorted_until()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Compare>
-THRUST_HOST_DEVICE ForwardIterator is_sorted_until(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Compare comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename Compare>
+THRUST_HOST_DEVICE
+  ForwardIterator is_sorted_until(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last,
+                                  Compare comp)
 {
   using thrust::system::detail::generic::is_sorted_until;
   return is_sorted_until(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, comp);
 } // end is_sorted_until()
 
+
 ///////////////
 // Key Sorts //
 ///////////////
 
-template <typename RandomAccessIterator>
-void sort(RandomAccessIterator first, RandomAccessIterator last)
+template<typename RandomAccessIterator>
+  void sort(RandomAccessIterator first,
+            RandomAccessIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -195,8 +211,13 @@ void sort(RandomAccessIterator first, RandomAccessIterator last)
   return thrust::sort(select_system(system), first, last);
 } // end sort()
 
-template <typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void sort(RandomAccessIterator first, RandomAccessIterator last, StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+  THRUST_HOST_DEVICE
+  void sort(RandomAccessIterator first,
+            RandomAccessIterator last,
+            StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -207,8 +228,10 @@ THRUST_HOST_DEVICE void sort(RandomAccessIterator first, RandomAccessIterator la
   return thrust::sort(select_system(system), first, last, comp);
 } // end sort()
 
-template <typename RandomAccessIterator>
-void stable_sort(RandomAccessIterator first, RandomAccessIterator last)
+
+template<typename RandomAccessIterator>
+  void stable_sort(RandomAccessIterator first,
+                   RandomAccessIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -219,8 +242,12 @@ void stable_sort(RandomAccessIterator first, RandomAccessIterator last)
   return thrust::stable_sort(select_system(system), first, last);
 } // end stable_sort()
 
-template <typename RandomAccessIterator, typename StrictWeakOrdering>
-void stable_sort(RandomAccessIterator first, RandomAccessIterator last, StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+  void stable_sort(RandomAccessIterator first,
+                   RandomAccessIterator last,
+                   StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -231,12 +258,17 @@ void stable_sort(RandomAccessIterator first, RandomAccessIterator last, StrictWe
   return thrust::stable_sort(select_system(system), first, last, comp);
 } // end stable_sort()
 
+
+
 /////////////////////
 // Key-Value Sorts //
 /////////////////////
 
-template <typename RandomAccessIterator1, typename RandomAccessIterator2>
-void sort_by_key(RandomAccessIterator1 keys_first, RandomAccessIterator1 keys_last, RandomAccessIterator2 values_first)
+template<typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+  void sort_by_key(RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -246,14 +278,17 @@ void sort_by_key(RandomAccessIterator1 keys_first, RandomAccessIterator1 keys_la
   System1 system1;
   System2 system2;
 
-  return thrust::sort_by_key(select_system(system1, system2), keys_first, keys_last, values_first);
+  return thrust::sort_by_key(select_system(system1,system2), keys_first, keys_last, values_first);
 } // end sort_by_key()
 
-template <typename RandomAccessIterator1, typename RandomAccessIterator2, typename StrictWeakOrdering>
-void sort_by_key(RandomAccessIterator1 keys_first,
-                 RandomAccessIterator1 keys_last,
-                 RandomAccessIterator2 values_first,
-                 StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+  void sort_by_key(RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first,
+                   StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -263,12 +298,15 @@ void sort_by_key(RandomAccessIterator1 keys_first,
   System1 system1;
   System2 system2;
 
-  return thrust::sort_by_key(select_system(system1, system2), keys_first, keys_last, values_first, comp);
+  return thrust::sort_by_key(select_system(system1,system2), keys_first, keys_last, values_first, comp);
 } // end sort_by_key()
 
-template <typename RandomAccessIterator1, typename RandomAccessIterator2>
-void stable_sort_by_key(
-  RandomAccessIterator1 keys_first, RandomAccessIterator1 keys_last, RandomAccessIterator2 values_first)
+
+template<typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+  void stable_sort_by_key(RandomAccessIterator1 keys_first,
+                          RandomAccessIterator1 keys_last,
+                          RandomAccessIterator2 values_first)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -278,14 +316,17 @@ void stable_sort_by_key(
   System1 system1;
   System2 system2;
 
-  return thrust::stable_sort_by_key(select_system(system1, system2), keys_first, keys_last, values_first);
+  return thrust::stable_sort_by_key(select_system(system1,system2), keys_first, keys_last, values_first);
 } // end stable_sort_by_key()
 
-template <typename RandomAccessIterator1, typename RandomAccessIterator2, typename StrictWeakOrdering>
-void stable_sort_by_key(RandomAccessIterator1 keys_first,
-                        RandomAccessIterator1 keys_last,
-                        RandomAccessIterator2 values_first,
-                        StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+  void stable_sort_by_key(RandomAccessIterator1 keys_first,
+                          RandomAccessIterator1 keys_last,
+                          RandomAccessIterator2 values_first,
+                          StrictWeakOrdering comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -295,11 +336,13 @@ void stable_sort_by_key(RandomAccessIterator1 keys_first,
   System1 system1;
   System2 system2;
 
-  return thrust::stable_sort_by_key(select_system(system1, system2), keys_first, keys_last, values_first, comp);
+  return thrust::stable_sort_by_key(select_system(system1,system2), keys_first, keys_last, values_first, comp);
 } // end stable_sort_by_key()
 
-template <typename ForwardIterator>
-bool is_sorted(ForwardIterator first, ForwardIterator last)
+
+template<typename ForwardIterator>
+  bool is_sorted(ForwardIterator first,
+                 ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -310,8 +353,12 @@ bool is_sorted(ForwardIterator first, ForwardIterator last)
   return thrust::is_sorted(select_system(system), first, last);
 } // end is_sorted()
 
-template <typename ForwardIterator, typename Compare>
-bool is_sorted(ForwardIterator first, ForwardIterator last, Compare comp)
+
+template<typename ForwardIterator,
+         typename Compare>
+  bool is_sorted(ForwardIterator first,
+                 ForwardIterator last,
+                 Compare comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -322,8 +369,10 @@ bool is_sorted(ForwardIterator first, ForwardIterator last, Compare comp)
   return thrust::is_sorted(select_system(system), first, last, comp);
 } // end is_sorted()
 
-template <typename ForwardIterator>
-ForwardIterator is_sorted_until(ForwardIterator first, ForwardIterator last)
+
+template<typename ForwardIterator>
+  ForwardIterator is_sorted_until(ForwardIterator first,
+                                  ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -334,8 +383,12 @@ ForwardIterator is_sorted_until(ForwardIterator first, ForwardIterator last)
   return thrust::is_sorted_until(select_system(system), first, last);
 } // end is_sorted_until()
 
-template <typename ForwardIterator, typename Compare>
-ForwardIterator is_sorted_until(ForwardIterator first, ForwardIterator last, Compare comp)
+
+template<typename ForwardIterator,
+         typename Compare>
+  ForwardIterator is_sorted_until(ForwardIterator first,
+                                  ForwardIterator last,
+                                  Compare comp)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -346,4 +399,5 @@ ForwardIterator is_sorted_until(ForwardIterator first, ForwardIterator last, Com
   return thrust::is_sorted_until(select_system(system), first, last, comp);
 } // end is_sorted_until()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/static_assert.h b/projects/rocthrust/thrust/detail/static_assert.h
index 78b8e62e06eb..ca617afc4210 100644
--- a/projects/rocthrust/thrust/detail/static_assert.h
+++ b/projects/rocthrust/thrust/detail/static_assert.h
@@ -48,9 +48,11 @@ struct depend_on_instantiation
   static constexpr bool value = x;
 };
 
-//! Deprecated [Since 3.0]
-#define THRUST_STATIC_ASSERT(B) static_assert(B)
-//! Deprecated [Since 3.0]
+#if THRUST_CPP_DIALECT >= 2017
+#  define THRUST_STATIC_ASSERT(B) static_assert(B)
+#else
+#  define THRUST_STATIC_ASSERT(B) static_assert(B, "static assertion failed")
+#endif
 #define THRUST_STATIC_ASSERT_MSG(B, msg) static_assert(B, msg)
 
 } // namespace detail
diff --git a/projects/rocthrust/thrust/detail/static_map.h b/projects/rocthrust/thrust/detail/static_map.h
index 5703b7c7b3b3..eba5bfad0554 100644
--- a/projects/rocthrust/thrust/detail/static_map.h
+++ b/projects/rocthrust/thrust/detail/static_map.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
diff --git a/projects/rocthrust/thrust/detail/swap_ranges.inl b/projects/rocthrust/thrust/detail/swap_ranges.inl
index 1be66c8bc4a3..26168a6d8051 100644
--- a/projects/rocthrust/thrust/detail/swap_ranges.inl
+++ b/projects/rocthrust/thrust/detail/swap_ranges.inl
@@ -18,36 +18,35 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/swap.h>
-#include <thrust/system/detail/adl/swap_ranges.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/swap_ranges.h>
+#include <thrust/system/detail/adl/swap_ranges.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE ForwardIterator2 swap_ranges(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator1 first1,
-  ForwardIterator1 last1,
-  ForwardIterator2 first2)
+template<typename DerivedPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2>
+THRUST_HOST_DEVICE
+  ForwardIterator2 swap_ranges(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                               ForwardIterator1 first1,
+                               ForwardIterator1 last1,
+                               ForwardIterator2 first2)
 {
   using thrust::system::detail::generic::swap_ranges;
   return swap_ranges(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2);
 } // end swap_ranges()
 
-template <typename ForwardIterator1, typename ForwardIterator2>
-ForwardIterator2 swap_ranges(ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2)
+
+template<typename ForwardIterator1,
+         typename ForwardIterator2>
+  ForwardIterator2 swap_ranges(ForwardIterator1 first1,
+                               ForwardIterator1 last1,
+                               ForwardIterator2 first2)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -57,7 +56,8 @@ ForwardIterator2 swap_ranges(ForwardIterator1 first1, ForwardIterator1 last1, Fo
   System1 system1;
   System2 system2;
 
-  return thrust::swap_ranges(select_system(system1, system2), first1, last1, first2);
+  return thrust::swap_ranges(select_system(system1,system2), first1, last1, first2);
 } // end swap_ranges()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/tabulate.inl b/projects/rocthrust/thrust/detail/tabulate.inl
index 138a725b9e0b..f4e62d8ca005 100644
--- a/projects/rocthrust/thrust/detail/tabulate.inl
+++ b/projects/rocthrust/thrust/detail/tabulate.inl
@@ -17,36 +17,32 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/tabulate.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/tabulate.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/tabulate.h>
-#include <thrust/tabulate.h>
+#include <thrust/system/detail/adl/tabulate.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename UnaryOperation>
-THRUST_HOST_DEVICE void
-tabulate(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-         ForwardIterator first,
-         ForwardIterator last,
-         UnaryOperation unary_op)
+template<typename DerivedPolicy, typename ForwardIterator, typename UnaryOperation>
+THRUST_HOST_DEVICE
+  void tabulate(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                UnaryOperation unary_op)
 {
   using thrust::system::detail::generic::tabulate;
   return tabulate(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, unary_op);
 } // end tabulate()
 
-template <typename ForwardIterator, typename UnaryOperation>
-void tabulate(ForwardIterator first, ForwardIterator last, UnaryOperation unary_op)
+
+template<typename ForwardIterator, typename UnaryOperation>
+  void tabulate(ForwardIterator first,
+                ForwardIterator last,
+                UnaryOperation unary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -57,4 +53,5 @@ void tabulate(ForwardIterator first, ForwardIterator last, UnaryOperation unary_
   return thrust::tabulate(select_system(system), first, last, unary_op);
 } // end tabulate()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/temporary_array.h b/projects/rocthrust/thrust/detail/temporary_array.h
index ca3a3a1f1fe0..4d150aa96843 100644
--- a/projects/rocthrust/thrust/detail/temporary_array.h
+++ b/projects/rocthrust/thrust/detail/temporary_array.h
@@ -132,7 +132,7 @@ template <typename Iterator, typename FromSystem, typename ToSystem>
 struct move_to_system_base
     : public eval_if<_THRUST_STD::is_convertible<FromSystem, ToSystem>::value,
                      identity_<tagged_iterator_range<Iterator, ToSystem>>,
-                     identity_<temporary_array<thrust::detail::it_value_t<Iterator>, ToSystem>>>
+                     identity_<temporary_array<typename thrust::iterator_value<Iterator>::type, ToSystem>>>
 {};
 
 template <typename Iterator, typename FromSystem, typename ToSystem>
diff --git a/projects/rocthrust/thrust/detail/temporary_buffer.h b/projects/rocthrust/thrust/detail/temporary_buffer.h
index 2f7197a33cf5..8f5b44467fdb 100644
--- a/projects/rocthrust/thrust/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/detail/temporary_buffer.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execute_with_allocator.h>
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/pointer.h>
diff --git a/projects/rocthrust/thrust/detail/transform.inl b/projects/rocthrust/thrust/detail/transform.inl
index ecf2f7a62c53..ab8cf492f9ad 100644
--- a/projects/rocthrust/thrust/detail/transform.inl
+++ b/projects/rocthrust/thrust/detail/transform.inl
@@ -18,124 +18,116 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
+#include <thrust/transform.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/transform.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/transform.h>
-#include <thrust/transform.h>
+#include <thrust/system/detail/adl/transform.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename UnaryFunction>
-THRUST_HOST_DEVICE OutputIterator transform(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  UnaryFunction op)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename UnaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator transform(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator first, InputIterator last,
+                           OutputIterator result,
+                           UnaryFunction op)
 {
   using thrust::system::detail::generic::transform;
   return transform(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, op);
 } // end transform()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator transform(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryFunction op)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator transform(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator1 first1, InputIterator1 last1,
+                           InputIterator2 first2,
+                           OutputIterator result,
+                           BinaryFunction op)
 {
   using thrust::system::detail::generic::transform;
   return transform(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, result, op);
 } // end transform()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename ForwardIterator,
-          typename UnaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  ForwardIterator result,
-  UnaryFunction op,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                               InputIterator first, InputIterator last,
+                               ForwardIterator result,
+                               UnaryFunction op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::transform_if;
   return transform_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result, op, pred);
 } // end transform_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename ForwardIterator,
-          typename UnaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  ForwardIterator result,
-  UnaryFunction op,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                               InputIterator1 first, InputIterator1 last,
+                               InputIterator2 stencil,
+                               ForwardIterator result,
+                               UnaryFunction op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::transform_if;
-  return transform_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, op, pred);
+  return transform_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, stencil, result, op, pred);
 } // end transform_if()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename ForwardIterator,
-          typename BinaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator3 stencil,
-  ForwardIterator result,
-  BinaryFunction binary_op,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename ForwardIterator,
+         typename BinaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                               InputIterator1 first1, InputIterator1 last1,
+                               InputIterator2 first2,
+                               InputIterator3 stencil,
+                               ForwardIterator result,
+                               BinaryFunction binary_op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::transform_if;
-  return transform_if(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    first1,
-    last1,
-    first2,
-    stencil,
-    result,
-    binary_op,
-    pred);
+  return transform_if(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first1, last1, first2, stencil, result, binary_op, pred);
 } // end transform_if()
 
-template <typename InputIterator, typename OutputIterator, typename UnaryFunction>
-OutputIterator transform(InputIterator first, InputIterator last, OutputIterator result, UnaryFunction op)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename UnaryFunction>
+  OutputIterator transform(InputIterator first,
+                           InputIterator last,
+                           OutputIterator result,
+                           UnaryFunction op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -145,12 +137,19 @@ OutputIterator transform(InputIterator first, InputIterator last, OutputIterator
   System1 system1;
   System2 system2;
 
-  return thrust::transform(select_system(system1, system2), first, last, result, op);
+  return thrust::transform(select_system(system1,system2), first, last, result, op);
 } // end transform()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename BinaryFunction>
-OutputIterator
-transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, OutputIterator result, BinaryFunction op)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryFunction>
+  OutputIterator transform(InputIterator1 first1,
+                           InputIterator1 last1,
+                           InputIterator2 first2,
+                           OutputIterator result,
+                           BinaryFunction op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -162,12 +161,19 @@ transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Ou
   System2 system2;
   System3 system3;
 
-  return thrust::transform(select_system(system1, system2, system3), first1, last1, first2, result, op);
+  return thrust::transform(select_system(system1,system2,system3), first1, last1, first2, result, op);
 } // end transform()
 
-template <typename InputIterator, typename ForwardIterator, typename UnaryFunction, typename Predicate>
-ForwardIterator
-transform_if(InputIterator first, InputIterator last, ForwardIterator result, UnaryFunction unary_op, Predicate pred)
+
+template<typename InputIterator,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+  ForwardIterator transform_if(InputIterator first,
+                               InputIterator last,
+                               ForwardIterator result,
+                               UnaryFunction unary_op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -177,21 +183,21 @@ transform_if(InputIterator first, InputIterator last, ForwardIterator result, Un
   System1 system1;
   System2 system2;
 
-  return thrust::transform_if(select_system(system1, system2), first, last, result, unary_op, pred);
+  return thrust::transform_if(select_system(system1,system2), first, last, result, unary_op, pred);
 } // end transform_if()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename ForwardIterator,
-          typename UnaryFunction,
-          typename Predicate>
-ForwardIterator transform_if(
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  ForwardIterator result,
-  UnaryFunction unary_op,
-  Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+  ForwardIterator transform_if(InputIterator1 first,
+                               InputIterator1 last,
+                               InputIterator2 stencil,
+                               ForwardIterator result,
+                               UnaryFunction unary_op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -203,23 +209,23 @@ ForwardIterator transform_if(
   System2 system2;
   System3 system3;
 
-  return thrust::transform_if(select_system(system1, system2, system3), first, last, stencil, result, unary_op, pred);
+  return thrust::transform_if(select_system(system1,system2,system3), first, last, stencil, result, unary_op, pred);
 } // end transform_if()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename ForwardIterator,
-          typename BinaryFunction,
-          typename Predicate>
-ForwardIterator transform_if(
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator3 stencil,
-  ForwardIterator result,
-  BinaryFunction binary_op,
-  Predicate pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename ForwardIterator,
+         typename BinaryFunction,
+         typename Predicate>
+  ForwardIterator transform_if(InputIterator1 first1,
+                               InputIterator1 last1,
+                               InputIterator2 first2,
+                               InputIterator3 stencil,
+                               ForwardIterator result,
+                               BinaryFunction binary_op,
+                               Predicate pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -233,8 +239,8 @@ ForwardIterator transform_if(
   System3 system3;
   System4 system4;
 
-  return thrust::transform_if(
-    select_system(system1, system2, system3, system4), first1, last1, first2, stencil, result, binary_op, pred);
+  return thrust::transform_if(select_system(system1,system2,system3,system4), first1, last1, first2, stencil, result, binary_op, pred);
 } // end transform_if()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/transform_reduce.inl b/projects/rocthrust/thrust/detail/transform_reduce.inl
index 09140c058a90..2750f4434c6e 100644
--- a/projects/rocthrust/thrust/detail/transform_reduce.inl
+++ b/projects/rocthrust/thrust/detail/transform_reduce.inl
@@ -17,43 +17,42 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/transform_reduce.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/transform_reduce.h>
+#include <thrust/system/detail/adl/transform_reduce.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename UnaryFunction,
-          typename OutputType,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE OutputType transform_reduce(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  UnaryFunction unary_op,
-  OutputType init,
-  BinaryFunction binary_op)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename UnaryFunction,
+         typename OutputType,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputType transform_reduce(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                              InputIterator first,
+                              InputIterator last,
+                              UnaryFunction unary_op,
+                              OutputType init,
+                              BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::transform_reduce;
-  return transform_reduce(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, unary_op, init, binary_op);
+  return transform_reduce(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, unary_op, init, binary_op);
 } // end transform_reduce()
 
-template <typename InputIterator, typename UnaryFunction, typename OutputType, typename BinaryFunction>
-OutputType transform_reduce(
-  InputIterator first, InputIterator last, UnaryFunction unary_op, OutputType init, BinaryFunction binary_op)
+
+template<typename InputIterator,
+         typename UnaryFunction,
+         typename OutputType,
+         typename BinaryFunction>
+  OutputType transform_reduce(InputIterator first,
+                              InputIterator last,
+                              UnaryFunction unary_op,
+                              OutputType init,
+                              BinaryFunction binary_op)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -64,4 +63,5 @@ OutputType transform_reduce(
   return thrust::transform_reduce(select_system(system), first, last, unary_op, init, binary_op);
 } // end transform_reduce()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/trivial_sequence.h b/projects/rocthrust/thrust/detail/trivial_sequence.h
index ed57489daa15..3195eb6210c1 100644
--- a/projects/rocthrust/thrust/detail/trivial_sequence.h
+++ b/projects/rocthrust/thrust/detail/trivial_sequence.h
@@ -24,18 +24,11 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/sequence_access.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -77,7 +70,7 @@ struct _trivial_sequence<Iterator, DerivedPolicy, thrust::detail::true_type>
 
   THRUST_HOST_DEVICE friend iterator_type end(_trivial_sequence& sequence)
   {
-    return sequence.last;
+    return sequence.first;
   }
 };
 
@@ -85,7 +78,7 @@ struct _trivial_sequence<Iterator, DerivedPolicy, thrust::detail::true_type>
 template <typename Iterator, typename DerivedPolicy>
 struct _trivial_sequence<Iterator, DerivedPolicy, thrust::detail::false_type>
 {
-  using iterator_value = it_value_t<Iterator>;
+  using iterator_value = typename thrust::iterator_value<Iterator>::type;
   using iterator_type  = typename thrust::detail::temporary_array<iterator_value, DerivedPolicy>::iterator;
 
   thrust::detail::temporary_array<iterator_value, DerivedPolicy> buffer;
diff --git a/projects/rocthrust/thrust/detail/tuple.inl b/projects/rocthrust/thrust/detail/tuple.inl
index 5a6e7eb83e2a..5f38999bff63 100644
--- a/projects/rocthrust/thrust/detail/tuple.inl
+++ b/projects/rocthrust/thrust/detail/tuple.inl
@@ -16,8 +16,6 @@
 
 #pragma once
 
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
-
 #include <thrust/detail/config.h>
 
 #include <thrust/detail/type_traits.h>
@@ -33,10 +31,7 @@ THRUST_HOST_DEVICE inline void swap(Assignable1& a, Assignable2& b)
   b                = temp;
 } // end swap()
 
-// define null_type for backwards compatibility
-struct THRUST_DEPRECATED_BECAUSE("Please remove null_type from parameters to tuple<...>") null_type
-{};
-
+// We can ignore deprecated 'null_type' usage here.
 THRUST_SUPPRESS_DEPRECATED_PUSH
 
 // forward declaration for tuple
@@ -47,8 +42,6 @@ template <
   class T9 = null_type>
 class tuple;
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template <size_t N, class T> struct tuple_element;
 
 template<size_t N, class T>
@@ -104,8 +97,6 @@ template<class T>
 template<class T>
   struct tuple_size<T const volatile> : public tuple_size<T> {};
 
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 /*! This metafunction returns the number of elements
  *  of a \p tuple type of interest.
  *
@@ -122,7 +113,6 @@ template<class T>
   static const int value = 1 + tuple_size<typename T::tail_type>::value;
 }; // end tuple_size
 
-THRUST_SUPPRESS_DEPRECATED_POP
 
 // specializations for tuple_size
 template<>
@@ -131,15 +121,13 @@ template<>
   static const int value = 0;
 }; // end tuple_size< tuple<> >
 
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
   struct tuple_size<null_type>
 {
   static const int value = 0;
 }; // end tuple_size<null_type>
 
-THRUST_SUPPRESS_DEPRECATED_POP
+
 
 // forward declaration of detail::cons
 namespace detail
@@ -276,7 +264,7 @@ template <class T> struct wrap_non_storeable_type
 {
   // XXX is_function looks complicated; punt for now -jph
   //typedef typename IF<
-  //  THRUST_NS_QUALIFIER::detail::is_function<T>::value, non_storeable_type<T>, T
+  //  ::thrust::detail::is_function<T>::value, non_storeable_type<T>, T
   //>::RET type;
 
   using type = T;
@@ -287,7 +275,6 @@ template <> struct wrap_non_storeable_type<void>
   using type = non_storeable_type<void>;
 };
 
-THRUST_SUPPRESS_DEPRECATED_PUSH
 
 template <class HT, class TT>
   struct cons
@@ -537,7 +524,7 @@ template <>
   using type = null_type;
 }; // end map_tuple_to_cons<...>
 
-THRUST_SUPPRESS_DEPRECATED_POP
+
 
 // ---------------------------------------------------------------------------
 // The call_traits for make_tuple
@@ -615,7 +602,6 @@ struct make_tuple_traits<const volatile T[n]> {
 //  using type = T&;
 //};
 
-THRUST_SUPPRESS_DEPRECATED_PUSH
 
 // a helper traits to make the make_tuple functions shorter (Vesa Karvonen's
 // suggestion)
@@ -638,8 +624,6 @@ struct make_tuple_mapper {
                      typename make_tuple_traits<T9>::type>;
 };
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 } // end detail
 
 
@@ -873,30 +857,20 @@ inline bool eq(const T1& lhs, const T2& rhs) {
   return lhs.get_head() == rhs.get_head() &&
          eq(lhs.get_tail(), rhs.get_tail());
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool eq<null_type,null_type>(const null_type&, const null_type&) { return true; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template<class T1, class T2>
 THRUST_HOST_DEVICE
 inline bool neq(const T1& lhs, const T2& rhs) {
   return lhs.get_head() != rhs.get_head()  ||
          neq(lhs.get_tail(), rhs.get_tail());
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool neq<null_type,null_type>(const null_type&, const null_type&) { return false; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template<class T1, class T2>
 THRUST_HOST_DEVICE
 inline bool lt(const T1& lhs, const T2& rhs) {
@@ -904,15 +878,10 @@ inline bool lt(const T1& lhs, const T2& rhs) {
             (!(rhs.get_head() < lhs.get_head()) &&
              lt(lhs.get_tail(), rhs.get_tail()));
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool lt<null_type,null_type>(const null_type&, const null_type&) { return false; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template<class T1, class T2>
 THRUST_HOST_DEVICE
 inline bool gt(const T1& lhs, const T2& rhs) {
@@ -920,15 +889,10 @@ inline bool gt(const T1& lhs, const T2& rhs) {
             (!(rhs.get_head() > lhs.get_head()) &&
              gt(lhs.get_tail(), rhs.get_tail()));
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool gt<null_type,null_type>(const null_type&, const null_type&) { return false; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template<class T1, class T2>
 THRUST_HOST_DEVICE
 inline bool lte(const T1& lhs, const T2& rhs) {
@@ -936,15 +900,10 @@ inline bool lte(const T1& lhs, const T2& rhs) {
           ( !(rhs.get_head() <= lhs.get_head()) ||
             lte(lhs.get_tail(), rhs.get_tail()));
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool lte<null_type,null_type>(const null_type&, const null_type&) { return true; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 template<class T1, class T2>
 THRUST_HOST_DEVICE
 inline bool gte(const T1& lhs, const T2& rhs) {
@@ -952,15 +911,10 @@ inline bool gte(const T1& lhs, const T2& rhs) {
           ( !(rhs.get_head() >= lhs.get_head()) ||
             gte(lhs.get_tail(), rhs.get_tail()));
 }
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
 template<>
 THRUST_HOST_DEVICE
 inline bool gte<null_type,null_type>(const null_type&, const null_type&) { return true; }
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 } // end detail
 
 
@@ -1039,4 +993,6 @@ inline bool operator>=(const detail::cons<T1, T2>& lhs, const detail::cons<S1, S
   return detail::gte(lhs, rhs);
 } // end operator>=()
 
+THRUST_SUPPRESS_DEPRECATED_POP
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/tuple_algorithms.h b/projects/rocthrust/thrust/detail/tuple_algorithms.h
new file mode 100644
index 000000000000..1274eb711e92
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/tuple_algorithms.h
@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_deduction.h>
+#include <thrust/type_traits/integer_sequence.h>
+
+#include <tuple>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename Tuple, std::size_t... Is>
+auto tuple_subset(Tuple&& t, index_sequence<Is...>)
+  THRUST_DECLTYPE_RETURNS(std::make_tuple(std::get<Is>(THRUST_FWD(t))...));
+
+namespace detail
+{
+
+template <typename Tuple, typename F, std::size_t... Is>
+void tuple_for_each_impl(Tuple&& t, F&& f, index_sequence<Is...>)
+{
+  auto l = {(f(std::get<Is>(t)), 0)...};
+  THRUST_UNUSED_VAR(l);
+}
+
+template <typename Tuple, typename F, std::size_t... Is>
+auto tuple_transform_impl(Tuple&& t, F&& f, index_sequence<Is...>)
+  THRUST_DECLTYPE_RETURNS(std::make_tuple(f(std::get<Is>(t))...));
+
+} // namespace detail
+
+template <typename... Ts, typename F>
+auto tuple_for_each(std::tuple<Ts...>& t, F&& f)
+  THRUST_DECLTYPE_RETURNS(detail::tuple_for_each_impl(t, THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+template <typename... Ts, typename F>
+auto tuple_for_each(std::tuple<Ts...> const& t, F&& f)
+  THRUST_DECLTYPE_RETURNS(detail::tuple_for_each_impl(t, THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+template <typename... Ts, typename F>
+auto tuple_for_each(std::tuple<Ts...>&& t, F&& f) THRUST_DECLTYPE_RETURNS(
+  detail::tuple_for_each_impl(std::move(t), THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+
+template <typename... Ts, typename F>
+auto tuple_transform(std::tuple<Ts...>& t, F&& f)
+  THRUST_DECLTYPE_RETURNS(detail::tuple_transform_impl(t, THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+template <typename... Ts, typename F>
+auto tuple_transform(std::tuple<Ts...> const& t, F&& f)
+  THRUST_DECLTYPE_RETURNS(detail::tuple_transform_impl(t, THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+template <typename... Ts, typename F>
+auto tuple_transform(std::tuple<Ts...>&& t, F&& f) THRUST_DECLTYPE_RETURNS(
+  detail::tuple_transform_impl(std::move(t), THRUST_FWD(f), make_index_sequence<sizeof...(Ts)>{}));
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/tuple_meta_transform.h b/projects/rocthrust/thrust/detail/tuple_meta_transform.h
index 9db0096c4534..b4f41709f0a3 100644
--- a/projects/rocthrust/thrust/detail/tuple_meta_transform.h
+++ b/projects/rocthrust/thrust/detail/tuple_meta_transform.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/tuple.h>
 #include <thrust/type_traits/integer_sequence.h>
 
diff --git a/projects/rocthrust/thrust/detail/tuple_transform.h b/projects/rocthrust/thrust/detail/tuple_transform.h
new file mode 100644
index 000000000000..b37c4297dd16
--- /dev/null
+++ b/projects/rocthrust/thrust/detail/tuple_transform.h
@@ -0,0 +1,65 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/detail/tuple_meta_transform.h>
+#include <thrust/tuple.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template <typename Tuple,
+          template <typename>
+          class UnaryMetaFunction,
+          typename UnaryFunction,
+          typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
+struct tuple_transform_functor;
+
+template <typename Tuple, template <typename> class UnaryMetaFunction, typename UnaryFunction, size_t... Is>
+struct tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction, thrust::index_sequence<Is...>>
+{
+  static THRUST_HOST_DEVICE typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type
+  do_it_on_the_host_or_device(const Tuple& t, UnaryFunction f)
+  {
+    using XfrmTuple = typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type;
+
+    return XfrmTuple(f(thrust::get<Is>(t))...);
+  }
+};
+
+template <template <typename> class UnaryMetaFunction, typename Tuple, typename UnaryFunction>
+typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type THRUST_HOST_DEVICE
+tuple_host_device_transform(const Tuple& t, UnaryFunction f)
+{
+  return tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction>::do_it_on_the_host_or_device(t, f);
+}
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/type_deduction.h b/projects/rocthrust/thrust/detail/type_deduction.h
index 31a0d177ceb1..1177c2cd0668 100644
--- a/projects/rocthrust/thrust/detail/type_deduction.h
+++ b/projects/rocthrust/thrust/detail/type_deduction.h
@@ -19,10 +19,8 @@
 
 #include <thrust/detail/preprocessor.h>
 
+#include _THRUST_STD_INCLUDE(type_traits)
 #include _THRUST_STD_INCLUDE(utility)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -31,6 +29,22 @@
 ///
 #define THRUST_FWD(x) _THRUST_STD::forward<decltype(x)>(x)
 
+/// \def THRUST_MVCAP(x)
+/// \brief Capture `x` into a lambda by moving.
+/// deprecated [Since 2.8]
+#define THRUST_MVCAP(x) x = _THRUST_STD::move(x)
+
+/// \def THRUST_RETOF(invocable, ...)
+/// \brief Expands to the type returned by invoking an instance of the invocable
+///        type \a invocable with parameters of type \c __VA_ARGS__. Must
+///        be called with 1 or fewer parameters to the invocable.
+/// deprecated [Since 2.8]
+#define THRUST_RETOF(...) THRUST_PP_DISPATCH(THRUST_RETOF, __VA_ARGS__)
+/// deprecated [Since 2.8]
+#define THRUST_RETOF1(C) decltype(_THRUST_STD::declval<C>()())
+/// deprecated [Since 2.8]
+#define THRUST_RETOF2(C, V) decltype(_THRUST_STD::declval<C>()(_THRUST_STD::declval<V>()))
+
 /// \def THRUST_RETURNS(...)
 /// \brief Expands to a function definition that returns the expression
 ///        \c __VA_ARGS__.
@@ -62,3 +76,28 @@
     }                                                      \
     /**/
 #endif
+
+/// \def THRUST_DECLTYPE_RETURNS_WITH_SFINAE_CONDITION(condition, ...)
+/// \brief Expands to a function definition, including a trailing returning
+///        type, that returns the expression \c __VA_ARGS__. It shall only
+///        participate in overload resolution if \c condition is \c true.
+///
+// Trailing return types seem to confuse Doxygen, and cause it to interpret
+// parts of the function's body as new function signatures.
+#if defined(THRUST_DOXYGEN_INVOKED)
+#  define THRUST_DECLTYPE_RETURNS(...) \
+    {                                  \
+      return (__VA_ARGS__);            \
+    }                                  \
+    /**/
+#else
+/// deprecated [Since 2.8]
+#  define THRUST_DECLTYPE_RETURNS_WITH_SFINAE_CONDITION(condition, ...)                                      \
+    noexcept(noexcept(__VA_ARGS__))->typename _THRUST_STD::enable_if<condition, decltype(__VA_ARGS__)>::type \
+    {                                                                                                        \
+      return (__VA_ARGS__);                                                                                  \
+    }                                                                                                        \
+    /**/
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/projects/rocthrust/thrust/detail/type_traits.h b/projects/rocthrust/thrust/detail/type_traits.h
index c9a49eadc3bf..b99765559b19 100644
--- a/projects/rocthrust/thrust/detail/type_traits.h
+++ b/projects/rocthrust/thrust/detail/type_traits.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2022 NVIDIA Corporation
- *  Modifications Copyright© 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -34,14 +34,11 @@
 
 #include _THRUST_STD_INCLUDE(type_traits)
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
-
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD && _THRUST_USE_ROCPRIM
-// #  include <rocprim/type_traits.hpp>
+#  include <rocprim/type_traits.hpp>
 #  include <rocprim/type_traits_functions.hpp>
 #endif // !_THRUST_HAS_DEVICE_SYSTEM_STD
 
-// TODO(libhipcxx): remove this namespace once libhipcxx gets ready
 namespace internal
 {
 
@@ -49,18 +46,21 @@ namespace internal
 
 using _THRUST_STD::is_arithmetic;
 using _THRUST_STD::is_integral;
-using _THRUST_STD::is_integral_v;
 using _THRUST_STD::make_unsigned;
 
 template <typename T>
 using make_unsigned_t = _THRUST_STD::make_unsigned_t<T>;
 
+template <typename Invokable, typename InputT, typename InitT = InputT>
+using accumulator_t = _THRUST_STD::__accumulator_t<Invokable, InputT, InitT>;
 template <typename T>
 using decay_t = _THRUST_STD::decay_t<T>;
 template <typename T>
 using remove_cvref = _THRUST_STD::remove_cvref<T>;
 template <typename T>
 using remove_cvref_t = _THRUST_STD::remove_cvref_t<T>;
+template <typename... Pred>
+using _And = _THRUST_STD::_And<Pred...>;
 
 #else // !_THRUST_HAS_DEVICE_SYSTEM_STD
 
@@ -69,12 +69,17 @@ using remove_cvref_t = _THRUST_STD::remove_cvref_t<T>;
 // Keeping standard versions for now until compatibility is resolved.
 using ::std::is_arithmetic;
 using ::std::is_integral;
-using ::std::is_integral_v;
 using ::std::make_unsigned;
 
 template <typename T>
 using make_unsigned_t = typename ::std::make_unsigned<T>::type;
 
+template <typename Invokable, typename InputT, typename InitT = InputT>
+#if _THRUST_USE_ROCPRIM
+using accumulator_t = ::rocprim::accumulator_t<Invokable, InputT, InitT>;
+#else
+using accumulator_t = _THRUST_STD::decay_t<_THRUST_STD::invoke_result_t<Invokable, InitT, InputT>>;
+#endif
 template <typename T>
 // If we're not on Windows and we have libstdc++ >= 10, we can use the __decay_t
 // builtin to reduce compilation time.
@@ -88,6 +93,24 @@ using remove_cvref = ::std::remove_cv<::std::remove_reference_t<T>>;
 template <typename T>
 using remove_cvref_t = ::std::remove_cv_t<::std::remove_reference_t<T>>;
 
+namespace detail
+{
+template <typename...>
+using expand_to_true = ::std::true_type;
+template <typename... Pred>
+THRUST_HOST_DEVICE expand_to_true<::std::enable_if_t<Pred::value>...> and_helper(int);
+template <typename...>
+THRUST_HOST_DEVICE ::std::false_type and_helper(...);
+} // namespace detail
+
+template <typename... Pred>
+#  if defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG && defined(__has_attribute) \
+    && __has_attribute(__nodebug__)
+using _And __attribute__((__nodebug__)) = decltype(detail::and_helper<Pred...>(0));
+#  else
+using _And = decltype(detail::and_helper<Pred...>(0));
+#  endif
+
 #endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 } // namespace internal
@@ -116,6 +139,21 @@ struct is_non_bool_integral<bool> : public false_type
 template <typename T>
 struct is_non_bool_arithmetic : public ::internal::is_arithmetic<T>
 {};
+
+template <typename T>
+struct is_unbounded_array : public thrust::detail::false_type
+{};
+template <typename T>
+struct is_unbounded_array<T[]> : public thrust::detail::true_type
+{};
+
+template <typename T>
+struct is_bounded_array : public thrust::detail::false_type
+{};
+template <typename T, _THRUST_STD::size_t N>
+struct is_bounded_array<T[N]> : public thrust::detail::true_type
+{};
+
 template <>
 struct is_non_bool_arithmetic<bool> : public false_type
 {};
@@ -152,6 +190,12 @@ struct identity_
   using type = T;
 }; // end identity
 
+template <class Tp, bool>
+struct dependent_type
+{
+  using type = Tp;
+}; // end dependent_type
+
 template <bool, typename T>
 struct lazy_enable_if
 {};
@@ -193,39 +237,14 @@ struct larger_type
 template <class F, class... Us>
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 using invoke_result = _THRUST_STD::__invoke_of<F, Us...>;
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
-#  if _THRUST_USE_ROCPRIM
+#elif _THRUST_USE_ROCPRIM // !_THRUST_HAS_DEVICE_SYSTEM_STD
 using invoke_result = ::rocprim::invoke_result<F, Us...>;
-#  else
-using invoke_result = ::std::invoke_result<F, Us...>;
-#  endif
+#else
+using invoke_result = _THRUST_STD::invoke_result<F, Us...>;
 #endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 template <class F, class... Us>
 using invoke_result_t = typename invoke_result<F, Us...>::type;
-
-// [NON-CCCL PARITY BEGIN]
-template <typename T>
-struct is_unbounded_array : public thrust::detail::false_type
-{};
-template <typename T>
-struct is_unbounded_array<T[]> : public thrust::detail::true_type
-{};
-
-template <typename T>
-struct is_bounded_array : public thrust::detail::false_type
-{};
-template <typename T, _THRUST_STD::size_t N>
-struct is_bounded_array<T[N]> : public thrust::detail::true_type
-{};
-
-template <class Tp, bool>
-struct dependent_type
-{
-  using type = Tp;
-};
-// [NON-CCCL PARITY END]
-
 } // namespace detail
 
 using detail::false_type;
@@ -234,35 +253,31 @@ using detail::true_type;
 
 THRUST_NAMESPACE_END
 
-// TODO(libhipcxx): remove this namespace and replace ::internal::common_type_t
-// with _THRUST_STD::common_type_t in rocThrust once libhipcxx gets ready
 namespace internal
 {
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 
 template <typename... Tp>
-using common_type_t = _THRUST_STD::common_type_t<Tp...>;
+using promoted_numerical_type = _THRUST_STD::common_type<Tp...>;
 
 #else // !_THRUST_HAS_DEVICE_SYSTEM_STD
 
-namespace detail
-{
-
 template <typename T1, typename T2, typename Enable = void>
-struct common_type;
+struct promoted_numerical_type;
 
 template <typename T1, typename T2>
-struct common_type<T1,
-                   T2,
-                   typename _THRUST_STD::enable_if<_And<typename _THRUST_STD::is_floating_point<T1>::type,
-                                                        typename _THRUST_STD::is_floating_point<T2>::type>::value>::type>
+struct promoted_numerical_type<
+  T1,
+  T2,
+  typename _THRUST_STD::enable_if<_And<typename _THRUST_STD::is_floating_point<T1>::type,
+                                       typename _THRUST_STD::is_floating_point<T2>::type>::value>::type>
 {
-  using type = typename THRUST_NS_QUALIFIER::detail::larger_type<T1, T2>::type;
+  using type = typename ::thrust::detail::larger_type<T1, T2>::type;
 };
 
 template <typename T1, typename T2>
-struct common_type<
+struct promoted_numerical_type<
   T1,
   T2,
   typename _THRUST_STD::enable_if<
@@ -272,19 +287,15 @@ struct common_type<
 };
 
 template <typename T1, typename T2>
-struct common_type<T1,
-                   T2,
-                   typename _THRUST_STD::enable_if<_And<typename _THRUST_STD::is_floating_point<T1>::type,
-                                                        typename is_integral<T2>::type>::value>::type>
+struct promoted_numerical_type<
+  T1,
+  T2,
+  typename _THRUST_STD::enable_if<
+    _And<typename _THRUST_STD::is_floating_point<T1>::type, typename is_integral<T2>::type>::value>::type>
 {
   using type = T1;
 };
 
-} // namespace detail
-
-template <typename... Tp>
-using common_type_t = typename detail::common_type<Tp...>::type;
-
 #endif // _THRUST_HAS_DEVICE_SYSTEM_STD
 
 } // namespace internal
diff --git a/projects/rocthrust/thrust/detail/type_traits/is_metafunction_defined.h b/projects/rocthrust/thrust/detail/type_traits/is_metafunction_defined.h
index 00c5f9835273..358994f93e1c 100644
--- a/projects/rocthrust/thrust/detail/type_traits/is_metafunction_defined.h
+++ b/projects/rocthrust/thrust/detail/type_traits/is_metafunction_defined.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_nested_type.h>
 
diff --git a/projects/rocthrust/thrust/detail/type_traits/is_thrust_pointer.h b/projects/rocthrust/thrust/detail/type_traits/is_thrust_pointer.h
deleted file mode 100644
index 592fd6aedb21..000000000000
--- a/projects/rocthrust/thrust/detail/type_traits/is_thrust_pointer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright 2008-2020 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#include <thrust/detail/type_traits/is_metafunction_defined.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <type_traits>
-#endif
-
-THRUST_NAMESPACE_BEGIN
-namespace detail
-{
-
-namespace pointer_traits_detail
-{
-
-template <typename Ptr, typename Enable = void>
-struct pointer_raw_pointer_impl
-{};
-
-template <typename T>
-struct pointer_raw_pointer_impl<T*>
-{
-  using type = T*;
-};
-
-template <typename Ptr>
-struct pointer_raw_pointer_impl<Ptr, _THRUST_STD::void_t<typename Ptr::raw_pointer>>
-{
-  using type = typename Ptr::raw_pointer;
-};
-
-} // namespace pointer_traits_detail
-
-template <typename T>
-struct pointer_raw_pointer : pointer_traits_detail::pointer_raw_pointer_impl<T>
-{};
-
-// this could be a lot better, but for our purposes, it's probably
-// sufficient just to check if pointer_raw_pointer<T> has meaning
-template <typename T>
-struct is_thrust_pointer : is_metafunction_defined<pointer_raw_pointer<T>>
-{};
-
-} // namespace detail
-
-THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/type_traits/iterator/is_discard_iterator.h b/projects/rocthrust/thrust/detail/type_traits/iterator/is_discard_iterator.h
index 7792334df51d..1fceca81f8f8 100644
--- a/projects/rocthrust/thrust/detail/type_traits/iterator/is_discard_iterator.h
+++ b/projects/rocthrust/thrust/detail/type_traits/iterator/is_discard_iterator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/discard_iterator.h>
 
diff --git a/projects/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h b/projects/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
index f30b7bf4df9e..b06153ac9660 100644
--- a/projects/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
+++ b/projects/rocthrust/thrust/detail/type_traits/iterator/is_output_iterator.h
@@ -25,24 +25,42 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
+#include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/is_metafunction_defined.h>
 #include <thrust/iterator/detail/any_assign.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-template <typename T, typename SFINAE = void>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_output_iterator = true;
 
 template <typename T>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_output_iterator<T, _THRUST_STD::void_t<it_value_t<T>>> =
-  _THRUST_STD::is_void_v<it_value_t<T>> || _THRUST_STD::is_same_v<it_value_t<T>, any_assign>;
+struct is_void_like
+    : _THRUST_STD::disjunction<_THRUST_STD::is_void<T>, _THRUST_STD::is_same<T, thrust::detail::any_assign>>
+{}; // end is_void_like
+
+template <typename T>
+struct lazy_is_void_like : is_void_like<typename T::type>
+{}; // end lazy_is_void_like
+
+// XXX this meta function should first check that T is actually an iterator
+//
+//     if thrust::iterator_value<T> is defined and thrust::iterator_value<T>::type == void
+//       return false
+//     else
+//       return true
+template <typename T>
+struct is_output_iterator
+    : eval_if<is_metafunction_defined<thrust::iterator_value<T>>::value,
+              lazy_is_void_like<thrust::iterator_value<T>>,
+              thrust::detail::true_type>::type
+{}; // end is_output_iterator
+
 } // namespace detail
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/type_traits/pointer_traits.h b/projects/rocthrust/thrust/detail/type_traits/pointer_traits.h
index 25f992d169e9..39cd2367b074 100644
--- a/projects/rocthrust/thrust/detail/type_traits/pointer_traits.h
+++ b/projects/rocthrust/thrust/detail/type_traits/pointer_traits.h
@@ -25,11 +25,9 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/has_nested_type.h>
 #include <thrust/detail/type_traits/is_metafunction_defined.h>
-#include <thrust/detail/type_traits/is_thrust_pointer.h>
 #include <thrust/iterator/iterator_traits.h>
 
 #include _THRUST_STD_INCLUDE(cstddef)
@@ -147,6 +145,31 @@ struct rebind_pointer<
 namespace pointer_traits_detail
 {
 
+template <typename Ptr, typename Enable = void>
+struct pointer_raw_pointer_impl
+{};
+
+template <typename T>
+struct pointer_raw_pointer_impl<T*>
+{
+  using type = T*;
+};
+
+template <typename Ptr>
+struct pointer_raw_pointer_impl<Ptr, _THRUST_STD::void_t<typename Ptr::raw_pointer>>
+{
+  using type = typename Ptr::raw_pointer;
+};
+
+} // namespace pointer_traits_detail
+
+template <typename T>
+struct pointer_raw_pointer : pointer_traits_detail::pointer_raw_pointer_impl<T>
+{};
+
+namespace pointer_traits_detail
+{
+
 template <typename Void>
 struct capture_address
 {
@@ -309,6 +332,12 @@ struct is_void_pointer_system_convertible
                        is_pointer_system_convertible<FromPtr, ToPtr>>
 {};
 
+// this could be a lot better, but for our purposes, it's probably
+// sufficient just to check if pointer_raw_pointer<T> has meaning
+template <typename T>
+struct is_thrust_pointer : is_metafunction_defined<pointer_raw_pointer<T>>
+{};
+
 // avoid inspecting traits of the arguments if they aren't known to be pointers
 template <typename FromPtr, typename ToPtr>
 struct lazy_is_pointer_convertible
diff --git a/projects/rocthrust/thrust/detail/uninitialized_copy.inl b/projects/rocthrust/thrust/detail/uninitialized_copy.inl
index c990ce110e8e..8d5d9890ce5d 100644
--- a/projects/rocthrust/thrust/detail/uninitialized_copy.inl
+++ b/projects/rocthrust/thrust/detail/uninitialized_copy.inl
@@ -18,45 +18,46 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
+#include <thrust/uninitialized_copy.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/uninitialized_copy.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/uninitialized_copy.h>
-#include <thrust/uninitialized_copy.h>
+#include <thrust/system/detail/adl/uninitialized_copy.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator uninitialized_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  ForwardIterator result)
+template<typename DerivedPolicy, typename InputIterator, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  ForwardIterator uninitialized_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                     InputIterator first,
+                                     InputIterator last,
+                                     ForwardIterator result)
 {
   using thrust::system::detail::generic::uninitialized_copy;
   return uninitialized_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, result);
 } // end uninitialized_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator uninitialized_copy_n(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, Size n, ForwardIterator result)
+template<typename DerivedPolicy, typename InputIterator, typename Size, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  ForwardIterator uninitialized_copy_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       InputIterator first,
+                                       Size n,
+                                       ForwardIterator result)
 {
   using thrust::system::detail::generic::uninitialized_copy_n;
   return uninitialized_copy_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, result);
 } // end uninitialized_copy_n()
 
-template <typename InputIterator, typename ForwardIterator>
-ForwardIterator uninitialized_copy(InputIterator first, InputIterator last, ForwardIterator result)
+
+template<typename InputIterator,
+         typename ForwardIterator>
+  ForwardIterator uninitialized_copy(InputIterator first,
+                                     InputIterator last,
+                                     ForwardIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -66,11 +67,16 @@ ForwardIterator uninitialized_copy(InputIterator first, InputIterator last, Forw
   System1 system1;
   System2 system2;
 
-  return thrust::uninitialized_copy(select_system(system1, system2), first, last, result);
+  return thrust::uninitialized_copy(select_system(system1,system2), first, last, result);
 } // end uninitialized_copy()
 
-template <typename InputIterator, typename Size, typename ForwardIterator>
-ForwardIterator uninitialized_copy_n(InputIterator first, Size n, ForwardIterator result)
+
+template<typename InputIterator,
+         typename Size,
+         typename ForwardIterator>
+  ForwardIterator uninitialized_copy_n(InputIterator first,
+                                       Size n,
+                                       ForwardIterator result)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -80,7 +86,8 @@ ForwardIterator uninitialized_copy_n(InputIterator first, Size n, ForwardIterato
   System1 system1;
   System2 system2;
 
-  return thrust::uninitialized_copy_n(select_system(system1, system2), first, n, result);
+  return thrust::uninitialized_copy_n(select_system(system1,system2), first, n, result);
 } // end uninitialized_copy_n()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/uninitialized_fill.inl b/projects/rocthrust/thrust/detail/uninitialized_fill.inl
index 787112705e7d..51a5ff091471 100644
--- a/projects/rocthrust/thrust/detail/uninitialized_fill.inl
+++ b/projects/rocthrust/thrust/detail/uninitialized_fill.inl
@@ -18,45 +18,46 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
+#include <thrust/uninitialized_fill.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/uninitialized_fill.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/uninitialized_fill.h>
-#include <thrust/uninitialized_fill.h>
+#include <thrust/system/detail/adl/uninitialized_fill.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void uninitialized_fill(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& x)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void uninitialized_fill(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                          ForwardIterator first,
+                          ForwardIterator last,
+                          const T &x)
 {
   using thrust::system::detail::generic::uninitialized_fill;
   return uninitialized_fill(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, x);
 } // end uninitialized_fill()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename Size, typename T>
-THRUST_HOST_DEVICE ForwardIterator uninitialized_fill_n(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, Size n, const T& x)
+template<typename DerivedPolicy, typename ForwardIterator, typename Size, typename T>
+THRUST_HOST_DEVICE
+  ForwardIterator uninitialized_fill_n(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                                       ForwardIterator first,
+                                       Size n,
+                                       const T &x)
 {
   using thrust::system::detail::generic::uninitialized_fill_n;
   return uninitialized_fill_n(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, n, x);
 } // end uninitialized_fill_n()
 
-template <typename ForwardIterator, typename T>
-void uninitialized_fill(ForwardIterator first, ForwardIterator last, const T& x)
+
+template<typename ForwardIterator,
+         typename T>
+  void uninitialized_fill(ForwardIterator first,
+                          ForwardIterator last,
+                          const T &x)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -67,8 +68,13 @@ void uninitialized_fill(ForwardIterator first, ForwardIterator last, const T& x)
   thrust::uninitialized_fill(select_system(system), first, last, x);
 } // end uninitialized_fill()
 
-template <typename ForwardIterator, typename Size, typename T>
-ForwardIterator uninitialized_fill_n(ForwardIterator first, Size n, const T& x)
+
+template<typename ForwardIterator,
+         typename Size,
+         typename T>
+  ForwardIterator uninitialized_fill_n(ForwardIterator first,
+                                       Size n,
+                                       const T &x)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -79,4 +85,5 @@ ForwardIterator uninitialized_fill_n(ForwardIterator first, Size n, const T& x)
   return thrust::uninitialized_fill_n(select_system(system), first, n, x);
 } // end uninitialized_fill_n()
 
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/detail/unique.inl b/projects/rocthrust/thrust/detail/unique.inl
index 75f35c6ff853..8a088b153832 100644
--- a/projects/rocthrust/thrust/detail/unique.inl
+++ b/projects/rocthrust/thrust/detail/unique.inl
@@ -17,151 +17,156 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/temporary_array.h>
+#include <thrust/unique.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/adl/unique.h>
-#include <thrust/system/detail/adl/unique_by_key.h>
 #include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/detail/generic/unique_by_key.h>
-#include <thrust/unique.h>
+#include <thrust/system/detail/adl/unique.h>
+#include <thrust/system/detail/adl/unique_by_key.h>
 
 THRUST_NAMESPACE_BEGIN
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator
-unique(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template<typename DerivedPolicy,
+         typename ForwardIterator>
+THRUST_HOST_DEVICE
+ForwardIterator unique(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                       ForwardIterator first,
+                       ForwardIterator last)
 {
   using thrust::system::detail::generic::unique;
   return unique(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end unique()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE ForwardIterator unique(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+ForwardIterator unique(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                       ForwardIterator first,
+                       ForwardIterator last,
+                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::unique;
   return unique(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, binary_pred);
 } // end unique()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator unique_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator output)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator unique_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator first,
+                           InputIterator last,
+                           OutputIterator output)
 {
   using thrust::system::detail::generic::unique_copy;
   return unique_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, output);
 } // end unique_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator unique_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator output,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+OutputIterator unique_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                           InputIterator first,
+                           InputIterator last,
+                           OutputIterator output,
+                           BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::unique_copy;
   return unique_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, output, binary_pred);
 } // end unique_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first)
+template<typename DerivedPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+  unique_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator1 keys_first,
+                ForwardIterator1 keys_last,
+                ForwardIterator2 values_first)
 {
   using thrust::system::detail::generic::unique_by_key;
-  return unique_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
+  return unique_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first);
 } // end unique_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+  unique_by_key(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                ForwardIterator1 keys_first,
+                ForwardIterator1 keys_last,
+                ForwardIterator2 values_first,
+                BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::unique_by_key;
-  return unique_by_key(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, binary_pred);
+  return unique_by_key(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, binary_pred);
 } // end unique_by_key()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+  unique_by_key_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                     InputIterator1 keys_first,
+                     InputIterator1 keys_last,
+                     InputIterator2 values_first,
+                     OutputIterator1 keys_output,
+                     OutputIterator2 values_output)
 {
   using thrust::system::detail::generic::unique_by_key_copy;
-  return unique_by_key_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output);
+  return unique_by_key_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, keys_output, values_output);
 } // end unique_by_key_copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+  unique_by_key_copy(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                     InputIterator1 keys_first,
+                     InputIterator1 keys_last,
+                     InputIterator2 values_first,
+                     OutputIterator1 keys_output,
+                     OutputIterator2 values_output,
+                     BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::unique_by_key_copy;
-  return unique_by_key_copy(
-    thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred);
+  return unique_by_key_copy(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
 } // end unique_by_key_copy()
 
-template <typename ForwardIterator>
-ForwardIterator unique(ForwardIterator first, ForwardIterator last)
+
+template<typename ForwardIterator>
+  ForwardIterator unique(ForwardIterator first,
+                         ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -172,8 +177,12 @@ ForwardIterator unique(ForwardIterator first, ForwardIterator last)
   return thrust::unique(select_system(system), first, last);
 } // end unique()
 
-template <typename ForwardIterator, typename BinaryPredicate>
-ForwardIterator unique(ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+
+template<typename ForwardIterator,
+         typename BinaryPredicate>
+  ForwardIterator unique(ForwardIterator first,
+                         ForwardIterator last,
+                         BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -184,8 +193,12 @@ ForwardIterator unique(ForwardIterator first, ForwardIterator last, BinaryPredic
   return thrust::unique(select_system(system), first, last, binary_pred);
 } // end unique()
 
-template <typename InputIterator, typename OutputIterator>
-OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterator output)
+
+template<typename InputIterator,
+         typename OutputIterator>
+  OutputIterator unique_copy(InputIterator first,
+                             InputIterator last,
+                             OutputIterator output)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -195,11 +208,17 @@ OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterat
   System1 system1;
   System2 system2;
 
-  return thrust::unique_copy(select_system(system1, system2), first, last, output);
+  return thrust::unique_copy(select_system(system1,system2), first, last, output);
 } // end unique_copy()
 
-template <typename InputIterator, typename OutputIterator, typename BinaryPredicate>
-OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterator output, BinaryPredicate binary_pred)
+
+template<typename InputIterator,
+         typename OutputIterator,
+         typename BinaryPredicate>
+  OutputIterator unique_copy(InputIterator first,
+                             InputIterator last,
+                             OutputIterator output,
+                             BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -209,12 +228,16 @@ OutputIterator unique_copy(InputIterator first, InputIterator last, OutputIterat
   System1 system1;
   System2 system2;
 
-  return thrust::unique_copy(select_system(system1, system2), first, last, output, binary_pred);
+  return thrust::unique_copy(select_system(system1,system2), first, last, output, binary_pred);
 } // end unique_copy()
 
-template <typename ForwardIterator1, typename ForwardIterator2>
-thrust::pair<ForwardIterator1, ForwardIterator2>
-unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first)
+
+template<typename ForwardIterator1,
+         typename ForwardIterator2>
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+    unique_by_key(ForwardIterator1 keys_first,
+                  ForwardIterator1 keys_last,
+                  ForwardIterator2 values_first)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -224,12 +247,18 @@ unique_by_key(ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIt
   System1 system1;
   System2 system2;
 
-  return thrust::unique_by_key(select_system(system1, system2), keys_first, keys_last, values_first);
+  return thrust::unique_by_key(select_system(system1,system2), keys_first, keys_last, values_first);
 } // end unique_by_key()
 
-template <typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  ForwardIterator1 keys_first, ForwardIterator1 keys_last, ForwardIterator2 values_first, BinaryPredicate binary_pred)
+
+template<typename ForwardIterator1,
+         typename ForwardIterator2,
+         typename BinaryPredicate>
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+    unique_by_key(ForwardIterator1 keys_first,
+                  ForwardIterator1 keys_last,
+                  ForwardIterator2 values_first,
+                  BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -239,16 +268,20 @@ thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
   System1 system1;
   System2 system2;
 
-  return thrust::unique_by_key(select_system(system1, system2), keys_first, keys_last, values_first, binary_pred);
+  return thrust::unique_by_key(select_system(system1,system2), keys_first, keys_last, values_first, binary_pred);
 } // end unique_by_key()
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator1, typename OutputIterator2>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    unique_by_key_copy(InputIterator1 keys_first,
+                       InputIterator1 keys_last,
+                       InputIterator2 values_first,
+                       OutputIterator1 keys_output,
+                       OutputIterator2 values_output)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -262,22 +295,22 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   System3 system3;
   System4 system4;
 
-  return thrust::unique_by_key_copy(
-    select_system(system1, system2, system3, system4), keys_first, keys_last, values_first, keys_output, values_output);
+  return thrust::unique_by_key_copy(select_system(system1,system2,system3,system4), keys_first, keys_last, values_first, keys_output, values_output);
 } // end unique_by_key_copy()
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    unique_by_key_copy(InputIterator1 keys_first,
+                       InputIterator1 keys_last,
+                       InputIterator2 values_first,
+                       OutputIterator1 keys_output,
+                       OutputIterator2 values_output,
+                       BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -291,41 +324,45 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
   System3 system3;
   System4 system4;
 
-  return thrust::unique_by_key_copy(
-    select_system(system1, system2, system3, system4),
-    keys_first,
-    keys_last,
-    values_first,
-    keys_output,
-    values_output,
-    binary_pred);
+  return thrust::unique_by_key_copy(select_system(system1,system2,system3,system4), keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
 } // end unique_by_key_copy()
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate binary_pred)
+template <typename DerivedPolicy,
+          typename ForwardIterator,
+          typename BinaryPredicate>
+THRUST_HOST_DEVICE
+    typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::unique_count;
   return unique_count(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last, binary_pred);
 } // end unique_count()
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
-  const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+template <typename DerivedPolicy,
+          typename ForwardIterator>
+THRUST_HOST_DEVICE
+    typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(const thrust::detail::execution_policy_base<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last)
 {
   using thrust::system::detail::generic::unique_count;
   return unique_count(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), first, last);
 } // end unique_count()
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
-unique_count(ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+template <typename ForwardIterator,
+          typename BinaryPredicate>
+THRUST_HOST_DEVICE
+    typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(ForwardIterator first,
+                 ForwardIterator last,
+                 BinaryPredicate binary_pred)
 {
   using thrust::system::detail::generic::select_system;
 
@@ -338,8 +375,10 @@ unique_count(ForwardIterator first, ForwardIterator last, BinaryPredicate binary
 
 THRUST_EXEC_CHECK_DISABLE
 template <typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
-unique_count(ForwardIterator first, ForwardIterator last)
+THRUST_HOST_DEVICE
+    typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(ForwardIterator first,
+                 ForwardIterator last)
 {
   using thrust::system::detail::generic::select_system;
 
diff --git a/projects/rocthrust/thrust/detail/use_default.h b/projects/rocthrust/thrust/detail/use_default.h
index 6ee7f59a7b1a..4576a5bd26f1 100644
--- a/projects/rocthrust/thrust/detail/use_default.h
+++ b/projects/rocthrust/thrust/detail/use_default.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 struct use_default
diff --git a/projects/rocthrust/thrust/detail/util/align.h b/projects/rocthrust/thrust/detail/util/align.h
index b51fe0c774fd..e8d407c0509c 100644
--- a/projects/rocthrust/thrust/detail/util/align.h
+++ b/projects/rocthrust/thrust/detail/util/align.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <cstdint>
 
 // functions to handle memory alignment
diff --git a/projects/rocthrust/thrust/detail/vector_base.h b/projects/rocthrust/thrust/detail/vector_base.h
index a778e28248c0..1062f39d445d 100644
--- a/projects/rocthrust/thrust/detail/vector_base.h
+++ b/projects/rocthrust/thrust/detail/vector_base.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,11 +33,12 @@
 #endif // no system header
 
 #include <thrust/detail/contiguous_storage.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
 #include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/iterator_traits.h>
 #include <thrust/iterator/detail/normal_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/reverse_iterator.h>
+#include <thrust/sequence_access.h>
 
 #include _THRUST_STD_INCLUDE(utility)
 
@@ -193,8 +194,7 @@ class vector_base
    *  \param first The beginning of the range.
    *  \param last The end of the range.
    */
-  template <typename InputIterator,
-            _THRUST_STD::enable_if_t<::internal::is_cpp17_input_iterator<InputIterator>::value, int> = 0>
+  template <typename InputIterator, _THRUST_STD::enable_if_t<is_cpp17_input_iterator<InputIterator>::value, int> = 0>
   vector_base(InputIterator first, InputIterator last);
 
   /*! This constructor builds a vector_base from a range.
@@ -202,8 +202,7 @@ class vector_base
    *  \param last The end of the range.
    *  \param alloc The allocator to use by this vector_base.
    */
-  template <typename InputIterator,
-            _THRUST_STD::enable_if_t<::internal::is_cpp17_input_iterator<InputIterator>::value, int> = 0>
+  template <typename InputIterator, _THRUST_STD::enable_if_t<is_cpp17_input_iterator<InputIterator>::value, int> = 0>
   vector_base(InputIterator first, InputIterator last, const Alloc& alloc);
 
   /*! The destructor erases the elements.
@@ -505,6 +504,12 @@ class vector_base
   template <typename InputIterator>
   void range_init(InputIterator first, InputIterator last);
 
+  template <typename InputIterator>
+  void range_init(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag);
+
+  template <typename ForwardIterator>
+  void range_init(ForwardIterator first, ForwardIterator last, thrust::random_access_traversal_tag);
+
   void value_init(size_type n);
 
   void fill_init(size_type n, const T& x);
@@ -540,6 +545,14 @@ class vector_base
   template <typename InputIterator>
   void range_assign(InputIterator first, InputIterator last);
 
+  // this method performs assignment from a range of RandomAccessIterators
+  template <typename RandomAccessIterator>
+  void range_assign(RandomAccessIterator first, RandomAccessIterator last, thrust::random_access_traversal_tag);
+
+  // this method performs assignment from a range of InputIterators
+  template <typename InputIterator>
+  void range_assign(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag);
+
   // this method performs assignment from a fill value
   void fill_assign(size_type n, const T& x);
 
diff --git a/projects/rocthrust/thrust/detail/vector_base.inl b/projects/rocthrust/thrust/detail/vector_base.inl
index 1dd175552edb..e4a0149545c1 100644
--- a/projects/rocthrust/thrust/detail/vector_base.inl
+++ b/projects/rocthrust/thrust/detail/vector_base.inl
@@ -25,28 +25,22 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
 #include <thrust/advance.h>
 #include <thrust/detail/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__iterator/iterator_traits.h>
+#include <thrust/detail/minmax.h>
 #include <thrust/detail/overlapped_copy.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/vector_base.h>
 #include <thrust/distance.h>
 #include <thrust/equal.h>
+#include <thrust/iterator/detail/iterator_traits.h>
 #include <thrust/iterator/iterator_traits.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
-#include _THRUST_STD_INCLUDE(type_traits)
 
 #include <stdexcept>
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
 
 THRUST_NAMESPACE_BEGIN
 
@@ -256,25 +250,31 @@ template <typename T, typename Alloc>
 template <typename InputIterator>
 void vector_base<T, Alloc>::range_init(InputIterator first, InputIterator last)
 {
-  using traversal = typename iterator_traversal<InputIterator>::type;
-  if constexpr (_THRUST_STD::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    size_type new_size = thrust::distance(first, last);
+  range_init(first, last, typename thrust::iterator_traversal<InputIterator>::type());
+} // end vector_base::range_init()
 
-    allocate_and_copy(new_size, first, last, m_storage);
-    m_size = new_size;
-  }
-  else
+template <typename T, typename Alloc>
+template <typename InputIterator>
+void vector_base<T, Alloc>::range_init(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag)
+{
+  for (; first != last; ++first)
   {
-    for (; first != last; ++first)
-    {
-      push_back(*first);
-    }
+    push_back(*first);
   }
 } // end vector_base::range_init()
 
 template <typename T, typename Alloc>
-template <typename InputIterator, _THRUST_STD::enable_if_t<::internal::is_cpp17_input_iterator<InputIterator>::value, int>>
+template <typename ForwardIterator>
+void vector_base<T, Alloc>::range_init(ForwardIterator first, ForwardIterator last, thrust::random_access_traversal_tag)
+{
+  size_type new_size = thrust::distance(first, last);
+
+  allocate_and_copy(new_size, first, last, m_storage);
+  m_size = new_size;
+} // end vector_base::range_init()
+
+template <typename T, typename Alloc>
+template <typename InputIterator, _THRUST_STD::enable_if_t<is_cpp17_input_iterator<InputIterator>::value, int>>
 vector_base<T, Alloc>::vector_base(InputIterator first, InputIterator last)
     : m_storage()
     , m_size(0)
@@ -287,7 +287,7 @@ vector_base<T, Alloc>::vector_base(InputIterator first, InputIterator last)
 } // end vector_base::vector_base()
 
 template <typename T, typename Alloc>
-template <typename InputIterator, _THRUST_STD::enable_if_t<::internal::is_cpp17_input_iterator<InputIterator>::value, int>>
+template <typename InputIterator, _THRUST_STD::enable_if_t<is_cpp17_input_iterator<InputIterator>::value, int>>
 vector_base<T, Alloc>::vector_base(InputIterator first, InputIterator last, const Alloc& alloc)
     : m_storage(alloc)
     , m_size(0)
@@ -350,7 +350,7 @@ void vector_base<T, Alloc>::reserve(size_type n)
     size_type new_capacity = n;
 
     // do not exceed maximum storage
-    new_capacity = _THRUST_STD::min<size_type>(new_capacity, max_size());
+    new_capacity = thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, max_size());
 
     // create new storage
     storage_type new_storage(copy_allocator_t(), m_storage, new_capacity);
@@ -728,14 +728,13 @@ void vector_base<T, Alloc>::copy_insert(iterator position, ForwardIterator first
       const size_type old_size = size();
 
       // compute the new capacity after the allocation
-      size_type new_capacity =
-        old_size + _THRUST_STD::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, num_new_elements);
+      size_type new_capacity = old_size + thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, num_new_elements);
 
       // allocate exponentially larger new storage
-      new_capacity = _THRUST_STD::max<size_type>(new_capacity, 2 * capacity());
+      new_capacity = thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, 2 * capacity());
 
       // do not exceed maximum storage
-      new_capacity = _THRUST_STD::min<size_type>(new_capacity, max_size());
+      new_capacity = thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, max_size());
 
       if (new_capacity > max_size())
       {
@@ -800,13 +799,13 @@ void vector_base<T, Alloc>::append(size_type n)
       const size_type old_size = size();
 
       // compute the new capacity after the allocation
-      size_type new_capacity = old_size + _THRUST_STD::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, n);
+      size_type new_capacity = old_size + thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, n);
 
       // allocate exponentially larger new storage
-      new_capacity = _THRUST_STD::max<size_type>(new_capacity, 2 * capacity());
+      new_capacity = thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, 2 * capacity());
 
       // do not exceed maximum storage
-      new_capacity = _THRUST_STD::min<size_type>(new_capacity, max_size());
+      new_capacity = thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, max_size());
 
       // create new storage
       storage_type new_storage(copy_allocator_t(), m_storage, new_capacity);
@@ -895,13 +894,13 @@ void vector_base<T, Alloc>::fill_insert(iterator position, size_type n, const T&
       const size_type old_size = size();
 
       // compute the new capacity after the allocation
-      size_type new_capacity = old_size + _THRUST_STD::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, n);
+      size_type new_capacity = old_size + thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION(old_size, n);
 
       // allocate exponentially larger new storage
-      new_capacity = _THRUST_STD::max<size_type>(new_capacity, 2 * capacity());
+      new_capacity = thrust::max THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, 2 * capacity());
 
       // do not exceed maximum storage
-      new_capacity = _THRUST_STD::min<size_type>(new_capacity, max_size());
+      new_capacity = thrust::min THRUST_PREVENT_MACRO_SUBSTITUTION<size_type>(new_capacity, max_size());
 
       if (new_capacity > max_size())
       {
@@ -951,77 +950,86 @@ template <typename T, typename Alloc>
 template <typename InputIterator>
 void vector_base<T, Alloc>::range_assign(InputIterator first, InputIterator last)
 {
-  using traversal = typename iterator_traversal<InputIterator>::type;
-  if constexpr (_THRUST_STD::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    const size_type n = thrust::distance(first, last);
-    if (n > capacity())
-    {
-      storage_type new_storage(copy_allocator_t(), m_storage);
-      allocate_and_copy(n, first, last, new_storage);
+  // dispatch on traversal
+  range_assign(first, last, typename thrust::iterator_traversal<InputIterator>::type());
+} // end range_assign()
 
-      // call destructors on the elements in the old storage
-      m_storage.destroy(begin(), end());
+template <typename T, typename Alloc>
+template <typename InputIterator>
+void vector_base<T, Alloc>::range_assign(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag)
+{
+  iterator current(begin());
 
-      // record the vector's new state
-      m_storage.swap(new_storage);
-      m_size = n;
-    } // end if
-    else if (size() >= n)
-    {
-      // we can already accommodate the new range
-      iterator new_end = thrust::copy(first, last, begin());
+  // assign to elements which already exist
+  for (; first != last && current != end(); ++current, ++first)
+  {
+    *current = *first;
+  } // end for
 
-      // destroy the elements we don't need
-      m_storage.destroy(new_end, end());
+  // either just the input was exhausted or both
+  // the input and vector elements were exhausted
+  if (first == last)
+  {
+    // if we exhausted the input, erase leftover elements
+    erase(current, end());
+  } // end if
+  else
+  {
+    // insert the rest of the input at the end of the vector
+    insert(end(), first, last);
+  } // end else
+} // end vector_base::range_assign()
 
-      // update size
-      m_size = n;
-    } // end else if
-    else
-    {
-      // range fits inside allocated storage, but some elements
-      // have not been constructed yet
+template <typename T, typename Alloc>
+template <typename RandomAccessIterator>
+void vector_base<T, Alloc>::range_assign(
+  RandomAccessIterator first, RandomAccessIterator last, thrust::random_access_traversal_tag)
+{
+  const size_type n = thrust::distance(first, last);
 
-      // XXX TODO we could possibly implement this with one call
-      // to transform rather than copy + uninitialized_copy
+  if (n > capacity())
+  {
+    storage_type new_storage(copy_allocator_t(), m_storage);
+    allocate_and_copy(n, first, last, new_storage);
 
-      // copy to elements which already exist
-      InputIterator mid = first;
-      thrust::advance(mid, size());
-      thrust::copy(first, mid, begin());
+    // call destructors on the elements in the old storage
+    m_storage.destroy(begin(), end());
 
-      // uninitialize_copy to elements which must be constructed
-      m_storage.uninitialized_copy(mid, last, end());
+    // record the vector's new state
+    m_storage.swap(new_storage);
+    m_size = n;
+  } // end if
+  else if (size() >= n)
+  {
+    // we can already accommodate the new range
+    iterator new_end = thrust::copy(first, last, begin());
 
-      // update size
-      m_size = n;
-    } // end else
-  }
-  else // for less than random access iterators
+    // destroy the elements we don't need
+    m_storage.destroy(new_end, end());
+
+    // update size
+    m_size = n;
+  } // end else if
+  else
   {
-    iterator current(begin());
+    // range fits inside allocated storage, but some elements
+    // have not been constructed yet
 
-    // assign to elements which already exist
-    for (; first != last && current != end(); ++current, ++first)
-    {
-      *current = *first;
-    } // end for
+    // XXX TODO we could possibly implement this with one call
+    // to transform rather than copy + uninitialized_copy
 
-    // either just the input was exhausted or both
-    // the input and vector elements were exhausted
-    if (first == last)
-    {
-      // if we exhausted the input, erase leftover elements
-      erase(current, end());
-    } // end if
-    else
-    {
-      // insert the rest of the input at the end of the vector
-      insert(end(), first, last);
-    } // end else
-  }
-} // end range_assign()
+    // copy to elements which already exist
+    RandomAccessIterator mid = first;
+    thrust::advance(mid, size());
+    thrust::copy(first, mid, begin());
+
+    // uninitialize_copy to elements which must be constructed
+    m_storage.uninitialized_copy(mid, last, end());
+
+    // update size
+    m_size = n;
+  } // end else
+} // end vector_base::assign()
 
 template <typename T, typename Alloc>
 void vector_base<T, Alloc>::fill_assign(size_type n, const T& x)
@@ -1066,10 +1074,10 @@ void vector_base<T, Alloc>::allocate_and_copy(
   } // end if
 
   // allocate exponentially larger new storage
-  size_type allocated_size = _THRUST_STD::max<size_type>(requested_size, 2 * capacity());
+  size_type allocated_size = thrust::max<size_type>(requested_size, 2 * capacity());
 
   // do not exceed maximum storage
-  allocated_size = _THRUST_STD::min<size_type>(allocated_size, max_size());
+  allocated_size = thrust::min<size_type>(allocated_size, max_size());
 
   if (requested_size > allocated_size)
   {
@@ -1108,7 +1116,7 @@ bool vector_equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 fi
 template <typename InputIterator1, typename InputIterator2>
 bool vector_equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, thrust::detail::false_type)
 {
-  it_difference_t<InputIterator1> n = thrust::distance(first1, last1);
+  typename thrust::iterator_difference<InputIterator1>::type n = thrust::distance(first1, last1);
 
   using FromSystem1 = typename thrust::iterator_system<InputIterator1>::type;
   using FromSystem2 = typename thrust::iterator_system<InputIterator2>::type;
diff --git a/projects/rocthrust/thrust/device_allocator.h b/projects/rocthrust/thrust/device_allocator.h
index c3ad71a570cf..4c5a0dddeda3 100644
--- a/projects/rocthrust/thrust/device_allocator.h
+++ b/projects/rocthrust/thrust/device_allocator.h
@@ -23,13 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/device_ptr.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/mr/device_memory_resource.h>
@@ -115,7 +108,7 @@ class device_allocator
   template <typename U>
   struct rebind
   {
-    /*! The alias \p other gives the type of the rebound \p device_allocator.
+    /*! The typedef \p other gives the type of the rebound \p device_allocator.
      */
     using other = device_allocator<U>;
   };
diff --git a/projects/rocthrust/thrust/device_delete.h b/projects/rocthrust/thrust/device_delete.h
index bfc8d398d09d..45e0470d25a1 100644
--- a/projects/rocthrust/thrust/device_delete.h
+++ b/projects/rocthrust/thrust/device_delete.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/device_ptr.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/device_free.h b/projects/rocthrust/thrust/device_free.h
index 4269a82694b2..1fc0cd61e87c 100644
--- a/projects/rocthrust/thrust/device_free.h
+++ b/projects/rocthrust/thrust/device_free.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/device_ptr.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/device_malloc.h b/projects/rocthrust/thrust/device_malloc.h
index bc2b7c9a829f..bf5c0e80e920 100644
--- a/projects/rocthrust/thrust/device_malloc.h
+++ b/projects/rocthrust/thrust/device_malloc.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/device_ptr.h>
 
 #include <cstddef> // for std::size_t
@@ -53,11 +46,11 @@ THRUST_NAMESPACE_BEGIN
  *  #include <thrust/device_malloc.h>
  *  #include <thrust/device_free.h>
  *  ...
- *  // allocate some memory with device_malloc
+ *  // allocate some integers with device_malloc
  *  const int N = 100;
  *  thrust::device_ptr<void> void_ptr = thrust::device_malloc(N);
  *
- *  // manipulate memory
+ *  // manipulate integers
  *  ...
  *
  *  // deallocate with device_free
@@ -83,11 +76,11 @@ inline thrust::device_ptr<void> device_malloc(const std::size_t n);
  *  #include <thrust/device_malloc.h>
  *  #include <thrust/device_free.h>
  *  ...
- *  // allocate some integers with device_malloc
+ *  // allocate some memory with device_malloc
  *  const int N = 100;
  *  thrust::device_ptr<int> int_array = thrust::device_malloc<int>(N);
  *
- *  // manipulate integers
+ *  // manipulate memory
  *  ...
  *
  *  // deallocate with device_free
diff --git a/projects/rocthrust/thrust/device_new.h b/projects/rocthrust/thrust/device_new.h
index dc1dd19054e2..ad9f08780853 100644
--- a/projects/rocthrust/thrust/device_new.h
+++ b/projects/rocthrust/thrust/device_new.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // #include this for size_t
 #include <thrust/device_ptr.h>
 
diff --git a/projects/rocthrust/thrust/device_ptr.h b/projects/rocthrust/thrust/device_ptr.h
index 3a025a7e547b..4783ac6166b5 100644
--- a/projects/rocthrust/thrust/device_ptr.h
+++ b/projects/rocthrust/thrust/device_ptr.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -78,7 +78,6 @@ class device_ptr
   using super_t = thrust::pointer<T, thrust::device_system_tag, thrust::device_reference<T>, thrust::device_ptr<T>>;
 
 public:
-  // TODO(libhipcxx): replace inline with _CCCL_HIDE_FROM_ABI once libhipcxx gets ready
   inline device_ptr() = default;
 
   /*! \brief Construct a null \c device_ptr.
diff --git a/projects/rocthrust/thrust/distance.h b/projects/rocthrust/thrust/distance.h
index 660ffc38b370..50e017f78bf3 100644
--- a/projects/rocthrust/thrust/distance.h
+++ b/projects/rocthrust/thrust/distance.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -70,7 +63,7 @@ THRUST_NAMESPACE_BEGIN
  *  \see https://en.cppreference.com/w/cpp/iterator/distance
  */
 template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+inline THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 distance(InputIterator first, InputIterator last);
 
 /*! \} // end iterators
diff --git a/projects/rocthrust/thrust/equal.h b/projects/rocthrust/thrust/equal.h
index 21a7c1243952..550c44120bad 100644
--- a/projects/rocthrust/thrust/equal.h
+++ b/projects/rocthrust/thrust/equal.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -148,9 +141,9 @@ bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryPredicate's first argument type.
+ * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator2's \c value_type is convertible to \p BinaryPredicate's second argument type.
+ * Iterator</a>, and \p InputIterator2's \c value_type is convertible to \p BinaryPredicate's \c second_argument_type.
  *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
  * Predicate</a>.
  *
@@ -164,7 +157,7 @@ bool equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
  *
  *  struct compare_modulo_two
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x, int y) const
  *    {
  *      return (x % 2) == (y % 2);
@@ -204,9 +197,9 @@ equal(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \return \c true, if the sequences are equal; \c false, otherwise.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryPredicate's first argument type.
+ * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator2's \c value_type is convertible to \p BinaryPredicate's second argument type.
+ * Iterator</a>, and \p InputIterator2's \c value_type is convertible to \p BinaryPredicate's \c second_argument_type.
  *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
  * Predicate</a>.
  *
@@ -218,7 +211,7 @@ equal(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *
  *  struct compare_modulo_two
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x, int y) const
  *    {
  *      return (x % 2) == (y % 2);
diff --git a/projects/rocthrust/thrust/event.h b/projects/rocthrust/thrust/event.h
new file mode 100644
index 000000000000..0de060abb809
--- /dev/null
+++ b/projects/rocthrust/thrust/event.h
@@ -0,0 +1,25 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file thrust/event.h
+ *  \brief `thrust::event`, an asynchronous handle type.
+ */
+
+#pragma once
+
+#include <thrust/future.h>
+
+// TODO: Actually separate `<thrust/future.h>` into two headers.
diff --git a/projects/rocthrust/thrust/execution_policy.h b/projects/rocthrust/thrust/execution_policy.h
index dc829a1009d1..7d415ee3b179 100644
--- a/projects/rocthrust/thrust/execution_policy.h
+++ b/projects/rocthrust/thrust/execution_policy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -298,13 +298,13 @@ static const detail::host_t host;
  *  algorithm dispatch at Thrust's device system by providing \p thrust::device as an algorithm parameter.
  *
  *  Explicit dispatch can be useful in avoiding the introduction of data copies into containers such as
- *  \p thrust::device_vector or to avoid wrapping e.g. raw pointers allocated by the CUDA or HIP API with types
+ *  \p thrust::device_vector or to avoid wrapping e.g. raw pointers allocated by the HIP API with types
  *  such as \p thrust::device_ptr.
  *
  *  The user must take care to guarantee that the iterators provided to an algorithm are compatible with
  *  the device backend system. For example, raw pointers allocated by <tt>std::malloc</tt> typically
  *  cannot be dereferenced by a GPU. For this reason, raw pointers allocated by host APIs should not be mixed
- *  with a \p thrust::device algorithm invocation when the device backend is CUDA or HIP.
+ *  with a \p thrust::device algorithm invocation when the device backend is HIP.
  *
  *  The type of \p thrust::device is implementation-defined.
  *
@@ -337,7 +337,7 @@ static const detail::host_t host;
  *  \see host_execution_policy
  *  \see thrust::device
  */
-THRUST_GLOBAL_CONSTANT detail::device_t device;
+THRUST_INLINE_CONSTANT detail::device_t device;
 
 // define seq for the purpose of Doxygenating it
 // it is actually defined elsewhere
diff --git a/projects/rocthrust/thrust/extrema.h b/projects/rocthrust/thrust/extrema.h
index 128ff58d614d..a8910bc9109b 100644
--- a/projects/rocthrust/thrust/extrema.h
+++ b/projects/rocthrust/thrust/extrema.h
@@ -22,28 +22,158 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/pair.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
 
 THRUST_NAMESPACE_BEGIN
 
-using _THRUST_STD::max;
-using _THRUST_STD::min;
+/*! This version of \p min returns the smaller of two values, given a comparison operation.
+ *  \param lhs The first value to compare.
+ *  \param rhs The second value to compare.
+ *  \param comp A comparison operation.
+ *  \return The smaller element.
+ *
+ *  \tparam T is convertible to \p BinaryPredicate's first argument type and to its second argument type.
+ *  \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">BinaryPredicate</a>.
+ *
+ *  The following code snippet demonstrates how to use \p min to compute the smaller of two
+ *  key-value objects.
+ *
+ *  \code
+ *  #include <thrust/extrema.h>
+ *  ...
+ *  struct key_value
+ *  {
+ *    int key;
+ *    int value;
+ *  };
+ *
+ *  struct compare_key_value
+ *  {
+ *    THRUST_HOST_DEVICE
+ *    bool operator()(key_value lhs, key_value rhs)
+ *    {
+ *      return lhs.key < rhs.key;
+ *    }
+ *  };
+ *
+ *  ...
+ *  key_value a = {13, 0};
+ *  key_value b = { 7, 1);
+ *
+ *  key_value smaller = thrust::min(a, b, compare_key_value());
+ *
+ *  // smaller is {7, 1}
+ *  \endcode
+ *
+ *  \note Returns the first argument when the arguments are equivalent.
+ *  \see max
+ */
+template <typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE T min THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs, BinaryPredicate comp);
+
+/*! This version of \p min returns the smaller of two values.
+ *  \param lhs The first value to compare.
+ *  \param rhs The second value to compare.
+ *  \return The smaller element.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  The following code snippet demonstrates how to use \p min to compute the smaller of two
+ *  integers.
+ *
+ *  \code
+ *  #include <thrust/extrema.h>
+ *  ...
+ *  int a = 13;
+ *  int b = 7;
+ *
+ *  int smaller = thrust::min(a, b);
+ *
+ *  // smaller is 7
+ *  \endcode
+ *
+ *  \note Returns the first argument when the arguments are equivalent.
+ *  \see max
+ */
+template <typename T>
+THRUST_HOST_DEVICE T min THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs);
+
+/*! This version of \p max returns the larger of two values, given a comparison operation.
+ *  \param lhs The first value to compare.
+ *  \param rhs The second value to compare.
+ *  \param comp A comparison operation.
+ *  \return The larger element.
+ *
+ *  \tparam T is convertible to \p BinaryPredicate's first argument type and to its second argument type.
+ *  \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">BinaryPredicate</a>.
+ *
+ *  The following code snippet demonstrates how to use \p max to compute the larger of two
+ *  key-value objects.
+ *
+ *  \code
+ *  #include <thrust/extrema.h>
+ *  ...
+ *  struct key_value
+ *  {
+ *    int key;
+ *    int value;
+ *  };
+ *
+ *  struct compare_key_value
+ *  {
+ *    THRUST_HOST_DEVICE
+ *    bool operator()(key_value lhs, key_value rhs)
+ *    {
+ *      return lhs.key < rhs.key;
+ *    }
+ *  };
+ *
+ *  ...
+ *  key_value a = {13, 0};
+ *  key_value b = { 7, 1);
+ *
+ *  key_value larger = thrust::max(a, b, compare_key_value());
+ *
+ *  // larger is {13, 0}
+ *  \endcode
+ *
+ *  \note Returns the first argument when the arguments are equivalent.
+ *  \see min
+ */
+template <typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE T max THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs, BinaryPredicate comp);
+
+/*! This version of \p max returns the larger of two values.
+ *  \param lhs The first value to compare.
+ *  \param rhs The second value to compare.
+ *  \return The larger element.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  The following code snippet demonstrates how to use \p max to compute the larger of two
+ *  integers.
+ *
+ *  \code
+ *  #include <thrust/extrema.h>
+ *  ...
+ *  int a = 13;
+ *  int b = 7;
+ *
+ *  int larger = thrust::min(a, b);
+ *
+ *  // larger is 13
+ *  \endcode
+ *
+ *  \note Returns the first argument when the arguments are equivalent.
+ *  \see min
+ */
+template <typename T>
+THRUST_HOST_DEVICE T max THRUST_PREVENT_MACRO_SUBSTITUTION(const T& lhs, const T& rhs);
 
 /*! \addtogroup reductions
  *  \{
@@ -152,8 +282,8 @@ ForwardIterator min_element(ForwardIterator first, ForwardIterator last);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p min_element to find the smallest element
@@ -172,7 +302,7 @@ ForwardIterator min_element(ForwardIterator first, ForwardIterator last);
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -216,9 +346,9 @@ THRUST_HOST_DEVICE ForwardIterator min_element(
  *          if it is not an empty range; \p last, otherwise.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
- * Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p min_element to find the smallest element
  *  of a collection of key-value pairs.
@@ -234,7 +364,7 @@ THRUST_HOST_DEVICE ForwardIterator min_element(
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -354,9 +484,9 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
- * Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p max_element to find the largest element
  *  of a collection of key-value pairs using the \p thrust::host execution policy for parallelization.
@@ -374,7 +504,7 @@ ForwardIterator max_element(ForwardIterator first, ForwardIterator last);
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -418,9 +548,9 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
  *          if it is not an empty range; \p last, otherwise.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
- * Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p max_element to find the largest element
  *  of a collection of key-value pairs.
@@ -436,7 +566,7 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -545,9 +675,9 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
- * Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p minmax_element to find the smallest and largest elements
  *  of a collection of key-value pairs using the \p thrust::host execution policy for parallelization:
@@ -566,7 +696,7 @@ thrust::pair<ForwardIterator, ForwardIterator> minmax_element(ForwardIterator fi
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -608,9 +738,9 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *          if it is not an empty range; \p last, otherwise.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's first and second argument type.
- *  \tparam BinaryPredicate is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary
- * Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \p comp's \c first_argument_type and \c
+ * second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p minmax_element to find the smallest and largest elements
  *  of a collection of key-value pairs.
@@ -627,7 +757,7 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
  *
  *  struct compare_key_value
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(key_value lhs, key_value rhs)
  *    {
  *      return lhs.key < rhs.key;
@@ -660,3 +790,4 @@ minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp
 THRUST_NAMESPACE_END
 
 #include <thrust/detail/extrema.inl>
+#include <thrust/detail/minmax.h>
diff --git a/projects/rocthrust/thrust/fill.h b/projects/rocthrust/thrust/fill.h
index 0657e87b71e5..d7b38e62f6de 100644
--- a/projects/rocthrust/thrust/fill.h
+++ b/projects/rocthrust/thrust/fill.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/find.h b/projects/rocthrust/thrust/find.h
index c09f735c1d4c..225967843bcf 100644
--- a/projects/rocthrust/thrust/find.h
+++ b/projects/rocthrust/thrust/find.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -149,7 +142,7 @@ InputIterator find(InputIterator first, InputIterator last, const T& value);
  *
  *  struct greater_than_four
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 4;
@@ -158,7 +151,7 @@ InputIterator find(InputIterator first, InputIterator last, const T& value);
  *
  *  struct greater_than_ten
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 10;
@@ -211,7 +204,7 @@ THRUST_HOST_DEVICE InputIterator find_if(
  *
  *  struct greater_than_four
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 4;
@@ -220,7 +213,7 @@ THRUST_HOST_DEVICE InputIterator find_if(
  *
  *  struct greater_than_ten
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 10;
@@ -274,7 +267,7 @@ InputIterator find_if(InputIterator first, InputIterator last, Predicate pred);
  *
  *  struct greater_than_four
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 4;
@@ -283,7 +276,7 @@ InputIterator find_if(InputIterator first, InputIterator last, Predicate pred);
  *
  *  struct greater_than_ten
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 10;
@@ -336,7 +329,7 @@ THRUST_HOST_DEVICE InputIterator find_if_not(
  *
  *  struct greater_than_four
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 4;
@@ -345,7 +338,7 @@ THRUST_HOST_DEVICE InputIterator find_if_not(
  *
  *  struct greater_than_ten
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x > 10;
diff --git a/projects/rocthrust/thrust/for_each.h b/projects/rocthrust/thrust/for_each.h
index bb22c46e59d8..c6bc0eefc7d2 100644
--- a/projects/rocthrust/thrust/for_each.h
+++ b/projects/rocthrust/thrust/for_each.h
@@ -21,13 +21,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/type_traits.h>
 
@@ -55,8 +48,9 @@ THRUST_NAMESPACE_BEGIN
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/named_req/InputIterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type. \tparam
- * UnaryFunction does not apply any non-constant operation through its argument.
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a>, and \p UnaryFunction does not apply any non-constant operation through its argument.
  *
  *  The following code snippet demonstrates how to use \p for_each to print the elements
  *  of a \p thrust::device_vector using the \p thrust::device parallelization policy:
@@ -70,10 +64,10 @@ THRUST_NAMESPACE_BEGIN
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
- *      // note that using printf in a __device__ function requires
+ *      // note that using printf in a THRUST_DEVICE function requires
  *      // code compiled for a GPU with compute capability 2.0 or
  *      // higher (nvcc --arch=sm_20)
  *      printf("%d\n", x);
@@ -114,8 +108,10 @@ THRUST_HOST_DEVICE InputIterator for_each(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/named_req/InputIterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type. \tparam
- * Size is an integral type. \tparam UnaryFunction does not apply any non-constant operation through its argument.
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * Size is an integral type. \tparam UnaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a>, and \p UnaryFunction
+ * does not apply any non-constant operation through its argument.
  *
  *  The following code snippet demonstrates how to use \p for_each_n to print the elements
  *  of a \p device_vector using the \p thrust::device parallelization policy.
@@ -128,10 +124,10 @@ THRUST_HOST_DEVICE InputIterator for_each(
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
- *      // note that using printf in a __device__ function requires
+ *      // note that using printf in a THRUST_DEVICE function requires
  *      // code compiled for a GPU with compute capability 2.0 or
  *      // higher (nvcc --arch=sm_20)
  *      printf("%d\n", x);
@@ -166,8 +162,9 @@ THRUST_HOST_DEVICE InputIterator for_each_n(
  *  \return last
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/named_req/InputIterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type.
- *  \tparam UnaryFunction does not apply any non-constant operation through its argument.
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a>, and \p UnaryFunction does not apply any non-constant operation through its argument.
  *
  *  The following code snippet demonstrates how to use \p for_each to print the elements
  *  of a \p device_vector.
@@ -179,10 +176,10 @@ THRUST_HOST_DEVICE InputIterator for_each_n(
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
- *      // note that using printf in a __device__ function requires
+ *      // note that using printf in a THRUST_DEVICE function requires
  *      // code compiled for a GPU with compute capability 2.0 or
  *      // higher (nvcc --arch=sm_20)
  *      printf("%d\n", x);
@@ -215,9 +212,10 @@ InputIterator for_each(InputIterator first, InputIterator last, UnaryFunction f)
  *  \return <tt>first + n</tt>
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/named_req/InputIterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type. \tparam
- * Size is an integral type.
- *  \tparam UnaryFunction does not apply any non-constant operation through its argument.
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * Size is an integral type. \tparam UnaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a>, and \p UnaryFunction
+ * does not apply any non-constant operation through its argument.
  *
  *  The following code snippet demonstrates how to use \p for_each_n to print the elements
  *  of a \p device_vector.
@@ -229,10 +227,10 @@ InputIterator for_each(InputIterator first, InputIterator last, UnaryFunction f)
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
- *      // note that using printf in a __device__ function requires
+ *      // note that using printf in a THRUST_DEVICE function requires
  *      // code compiled for a GPU with compute capability 2.0 or
  *      // higher (nvcc --arch=sm_20)
  *      printf("%d\n", x);
diff --git a/projects/rocthrust/thrust/functional.h b/projects/rocthrust/thrust/functional.h
index eb0816258753..15c8d6b525af 100644
--- a/projects/rocthrust/thrust/functional.h
+++ b/projects/rocthrust/thrust/functional.h
@@ -31,139 +31,1293 @@
 #endif // no system header
 
 #include <thrust/detail/functional/actor.h>
-#include <thrust/detail/libcxx_wrapper/__functional/maximum.h>
-#include <thrust/detail/libcxx_wrapper/__functional/minimum.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/not_fn.h>
+#include <thrust/detail/functional/address_stability.h>
+#include <thrust/detail/type_traits.h>
 
 #include _THRUST_STD_INCLUDE(functional)
+
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 #  include _THRUST_LIBCXX_INCLUDE(functional)
+#else
+#  include <utility>
 #endif
 
-THRUST_NAMESPACE_BEGIN
+/*! \cond
+ */
+namespace internal
+{
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+using _THRUST_LIBCXX::maximum;
+using _THRUST_LIBCXX::minimum;
+using identity = _THRUST_STD::__identity;
+#else
+// cuda::maximum or hip::maximum
+template <typename T = void>
+struct maximum
+{
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr T operator()(const T& lhs, const T& rhs) const
+    noexcept(noexcept((lhs < rhs) ? rhs : lhs))
+  {
+    return (lhs < rhs) ? rhs : lhs;
+  }
+};
+
+template <>
+struct maximum<void>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T1, typename T2>
+  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr ::std::common_type_t<T1, T2>
+  operator()(const T1& lhs, const T2& rhs) const noexcept(noexcept((lhs < rhs) ? rhs : lhs))
+  {
+    return (lhs < rhs) ? rhs : lhs;
+  }
+};
+
+// cuda::minimum or hip::minimum
+template <typename T = void>
+struct minimum
+{
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr T operator()(const T& lhs, const T& rhs) const
+    noexcept(noexcept((lhs < rhs) ? lhs : rhs))
+  {
+    return (lhs < rhs) ? lhs : rhs;
+  }
+};
+
+template <>
+struct minimum<void>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T1, typename T2>
+  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr ::std::common_type_t<T1, T2>
+  operator()(const T1& lhs, const T2& rhs) const noexcept(noexcept((lhs < rhs) ? lhs : rhs))
+  {
+    return (lhs < rhs) ? lhs : rhs;
+  }
+};
+
+// _THRUST_STD::__identity
+struct identity
+{
+  template <typename T>
+  THRUST_NODISCARD inline THRUST_HOST_DEVICE constexpr T&& operator()(T&& t) const noexcept
+  {
+    return ::std::forward<T>(t);
+  }
+
+  using is_transparent = void;
+};
+#endif
+
+} // namespace internal
+/*! \endcond
+ */
+
+THRUST_NAMESPACE_BEGIN
+
+/*! \addtogroup function_objects Function Objects
+ */
+
+//! deprecated [Since 2.6]
+template <typename Operation>
+struct THRUST_DEPRECATED unary_traits;
+
+//! deprecated [Since 2.6]
+template <typename Operation>
+struct THRUST_DEPRECATED binary_traits;
+
+/*! \addtogroup function_object_adaptors Function Object Adaptors
+ *  \ingroup function_objects
+ *  \{
+ */
+
+/*! \p unary_function is an empty base class: it contains no member functions
+ *  or member variables, but only type information. The only reason it exists
+ *  is to make it more convenient to define types that are models of the
+ *  concept Adaptable Unary Function. Specifically, any model of Adaptable
+ *  Unary Function must define nested aliases. Those are
+ *  provided by the base class \p unary_function.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  The following code snippet demonstrates how to construct an
+ *  Adaptable Unary Function using \p unary_function.
+ *
+ *  \code
+ *  struct sine : public thrust::unary_function<float,float>
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x) { return sinf(x); }
+ *  };
+ *  \endcode
+ *
+ *  \note Because C++11 language support makes the functionality of
+ *        \c unary_function obsolete, its use is optional if C++11 language
+ *        features are enabled.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/unary_function
+ *  \see binary_function
+ */
+template <typename Argument, typename Result>
+struct THRUST_DEPRECATED unary_function
+{
+  /*! \typedef argument_type
+   *  \brief The type of the function object's argument.
+   */
+  using argument_type = Argument;
+
+  /*! \typedef result_type;
+   *  \brief The type of the function object's result.
+   */
+  using result_type = Result;
+}; // end unary_function
+
+/*! \p binary_function is an empty base class: it contains no member functions
+ *  or member variables, but only type information. The only reason it exists
+ *  is to make it more convenient to define types that are models of the
+ *  concept Adaptable Binary Function. Specifically, any model of Adaptable
+ *  Binary Function must define nested aliases. Those are
+ *  provided by the base class \p binary_function.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  The following code snippet demonstrates how to construct an
+ *  Adaptable Binary Function using \p binary_function.
+ *
+ *  \code
+ *  struct exponentiate : public thrust::binary_function<float,float,float>
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x, float y) { return powf(x,y); }
+ *  };
+ *  \endcode
+ *
+ *  \note Because C++11 language support makes the functionality of
+ *        \c binary_function obsolete, its use is optional if C++11 language
+ *        features are enabled.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/binary_function
+ *  \see unary_function
+ */
+template <typename Argument1, typename Argument2, typename Result>
+struct THRUST_DEPRECATED binary_function
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   */
+  using first_argument_type = Argument1;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   */
+  using second_argument_type = Argument2;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type = Result;
+}; // end binary_function
+
+/*! \}
+ */
+
+/*! \addtogroup predefined_function_objects Predefined Function Objects
+ *  \ingroup function_objects
+ */
+
+/*! \addtogroup arithmetic_operations Arithmetic Operations
+ *  \ingroup predefined_function_objects
+ *  \{
+ */
+
+#define THRUST_BINARY_FUNCTOR_VOID_SPECIALIZATION(func, impl)                                                       \
+  template <>                                                                                                       \
+  struct func<void>                                                                                                 \
+  {                                                                                                                 \
+    /*! This functor is transparent. */                                                                             \
+    using is_transparent = void;                                                                                    \
+    /*! Function call operator. */                                                                                  \
+    THRUST_EXEC_CHECK_DISABLE                                                                                       \
+    template <typename T1, typename T2>                                                                             \
+    THRUST_HOST_DEVICE constexpr auto operator()(T1&& t1, T2&& t2) const noexcept(noexcept(impl)) -> decltype(impl) \
+    {                                                                                                               \
+      return impl;                                                                                                  \
+    }                                                                                                               \
+  }
+
+/*! \p plus is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>plus<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x+y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x+y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>plus</tt> to sum two
+ *  device_vectors of \c floats.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<float> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 75);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::plus<float>());
+ *  // V3 is now {76, 77, 78, ..., 1075}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/plus
+ *  \see binary_function
+ */
+template <typename T = void>
+struct plus : public _THRUST_STD::plus<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end plus
+
+/*! \p minus is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>minus<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x-y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x-y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>minus</tt> to subtract
+ *  a device_vector of \c floats from another.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<float> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 75);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::minus<float>());
+ *  // V3 is now {-74, -73, -72, ..., 925}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/minus
+ *  \see binary_function
+ */
+template <typename T = void>
+struct minus : public _THRUST_STD::minus<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end minus
+
+/*! \p multiplies is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>multiplies<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x*y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x*y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>multiplies</tt> to multiply
+ *  two device_vectors of \c floats.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<float> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 75);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::multiplies<float>());
+ *  // V3 is now {75, 150, 225, ..., 75000}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/multiplies
+ *  \see binary_function
+ */
+template <typename T = void>
+struct multiplies : public _THRUST_STD::multiplies<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end multiplies
+
+/*! \p divides is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>divides<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x/y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x/y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>divides</tt> to divide
+ *  one device_vectors of \c floats by another.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<float> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 75);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::divides<float>());
+ *  // V3 is now {1/75, 2/75, 3/75, ..., 1000/75}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/divides
+ *  \see binary_function
+ */
+template <typename T = void>
+struct divides : public _THRUST_STD::divides<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end divides
+
+/*! \p modulus is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>modulus<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x \% y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x \% y</tt> must be defined and must have a return
+ * type that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>modulus</tt> to take
+ *  the modulus of one device_vectors of \c floats by another.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<float> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 75);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::modulus<int>());
+ *  // V3 is now {1%75, 2%75, 3%75, ..., 1000%75}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/modulus
+ *  \see binary_function
+ */
+template <typename T = void>
+struct modulus : public _THRUST_STD::modulus<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end modulus
+
+/*! \p negate is a function object. Specifically, it is an Adaptable Unary Function.
+ *  If \c f is an object of class <tt>negate<T></tt>, and \c x is an object
+ *  of class \c T, then <tt>f(x)</tt> returns <tt>-x</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x is an object of type \p T, then <tt>-x</tt> must be defined and must have a return type that is
+ * convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>negate</tt> to negate
+ *  the elements of a device_vector of \c floats.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(),
+ *                    thrust::negate<float>());
+ *  // V2 is now {-1, -2, -3, ..., -1000}
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/negate
+ *  \see unary_function
+ */
+template <typename T = void>
+struct negate : _THRUST_STD::negate<T>
+{
+  /*! \typedef argument_type
+   *  \brief The type of the function object's argument.
+   */
+  using argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end negate
+
+/*! \p square is a function object. Specifically, it is an Adaptable Unary Function.
+ *  If \c f is an object of class <tt>square<T></tt>, and \c x is an object
+ *  of class \c T, then <tt>f(x)</tt> returns <tt>x*x</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x is an object of type \p T, then <tt>x*x</tt> must be defined and must have a return type that is
+ * convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>square</tt> to square
+ *  the elements of a device_vector of \c floats.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<float> V1(N);
+ *  thrust::device_vector<float> V2(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(),
+ *                    thrust::square<float>());
+ *  // V2 is now {1, 4, 9, ..., 1000000}
+ *  \endcode
+ *
+ *  \see unary_function
+ */
+template <typename T = void>
+struct square
+{
+  /*! \typedef argument_type
+   *  \brief The type of the function object's argument.
+   */
+  using argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! Function call operator. The return value is <tt>x*x</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr T operator()(const T& x) const
+  {
+    return x * x;
+  }
+}; // end square
+
+/*! \brief Specialization of \p square for type void.
+ */
+template <>
+struct square<void>
+{
+  /*! This functor is transparent. */
+  using is_transparent = void;
+
+  /*! Function call operator - returns the square of its argument*/
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T>
+  THRUST_HOST_DEVICE constexpr T operator()(const T& x) const noexcept(noexcept(x * x))
+  {
+    return x * x;
+  }
+};
+
+/*! \}
+ */
+
+/*! \addtogroup comparison_operations Comparison Operations
+ *  \ingroup predefined_function_objects
+ *  \{
+ */
+
+/*! \p equal_to is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>equal_to<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x == y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/equal_to
+ *  \see binary_function
+ */
+template <typename T = void>
+struct equal_to : public _THRUST_STD::equal_to<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end equal_to
+
+/*! \p not_equal_to is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>not_equal_to<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x != y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/concepts/equality_comparable">Equality
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/not_equal_to
+ *  \see binary_function
+ */
+template <typename T = void>
+struct not_equal_to : public _THRUST_STD::not_equal_to<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end not_equal_to
+
+/*! \p greater is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>greater<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x > y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/greater
+ *  \see binary_function
+ */
+template <typename T = void>
+struct greater : public _THRUST_STD::greater<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end greater
+
+/*! \p less is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>less<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x < y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/less
+ *  \see binary_function
+ */
+template <typename T = void>
+struct less : public _THRUST_STD::less<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end less
+
+/*! \p greater_equal is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>greater_equal<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x >= y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/greater_equal
+ *  \see binary_function
+ */
+template <typename T = void>
+struct greater_equal : public _THRUST_STD::greater_equal<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end greater_equal
+
+/*! \p less_equal is a function object. Specifically, it is an Adaptable Binary
+ *  Predicate, which means it is a function object that tests the truth or falsehood
+ *  of some condition. If \c f is an object of class <tt>less_equal<T></tt> and \c x
+ *  and \c y are objects of class \c T, then <tt>f(x,y)</tt> returns \c true if
+ *  <tt>x <= y</tt> and \c false otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/less_equal
+ *  \see binary_function
+ */
+template <typename T = void>
+struct less_equal : public _THRUST_STD::less_equal<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end less_equal
+
+/*! \}
+ */
+
+/*! \addtogroup logical_operations Logical Operations
+ *  \ingroup predefined_function_objects
+ *  \{
+ */
+
+/*! \p logical_and is a function object. Specifically, it is an Adaptable Binary Predicate,
+ *  which means it is a function object that tests the truth or falsehood of some condition.
+ *  If \c f is an object of class <tt>logical_and<T></tt> and \c x and \c y are objects of
+ *  class \c T (where \c T is convertible to \c bool) then <tt>f(x,y)</tt> returns \c true
+ *  if and only if both \c x and \c y are \c true.
+ *
+ *  \tparam T must be convertible to \c bool.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/logical_and
+ *  \see binary_function
+ */
+template <typename T = void>
+struct logical_and : public _THRUST_STD::logical_and<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end logical_and
+
+/*! \p logical_or is a function object. Specifically, it is an Adaptable Binary Predicate,
+ *  which means it is a function object that tests the truth or falsehood of some condition.
+ *  If \c f is an object of class <tt>logical_or<T></tt> and \c x and \c y are objects of
+ *  class \c T (where \c T is convertible to \c bool) then <tt>f(x,y)</tt> returns \c true
+ *  if and only if either \c x or \c y are \c true.
+ *
+ *  \tparam T must be convertible to \c bool.
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/logical_or
+ *  \see binary_function
+ */
+template <typename T = void>
+struct logical_or : public _THRUST_STD::logical_or<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end logical_or
+
+/*! \p logical_not is a function object. Specifically, it is an Adaptable Predicate,
+ *  which means it is a function object that tests the truth or falsehood of some condition.
+ *  If \c f is an object of class <tt>logical_not<T></tt> and \c x is an object of
+ *  class \c T (where \c T is convertible to \c bool) then <tt>f(x)</tt> returns \c true
+ *  if and only if \c x is \c false.
+ *
+ *  \tparam T must be convertible to \c bool.
+ *
+ *  The following code snippet demonstrates how to use \p logical_not to transform
+ *  a device_vector of \c bools into its logical complement.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/transform.h>
+ *  #include <thrust/functional.h>
+ *  ...
+ *  thrust::device_vector<bool> V;
+ *  ...
+ *  thrust::transform(V.begin(), V.end(), V.begin(), thrust::logical_not<bool>());
+ *  // The elements of V are now the logical complement of what they were prior
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/logical_not
+ *  \see unary_function
+ */
+template <typename T = void>
+struct logical_not : public _THRUST_STD::logical_not<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-/*! \addtogroup predefined_function_objects Predefined Function Objects
- *  \ingroup function_objects
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end logical_not
+
+/*! \}
  */
 
-/*! \addtogroup arithmetic_operations Arithmetic Operations
+/*! \addtogroup bitwise_operations Bitwise Operations
  *  \ingroup predefined_function_objects
  *  \{
  */
 
-using _THRUST_STD::divides;
-using _THRUST_STD::minus;
-using _THRUST_STD::modulus;
-using _THRUST_STD::multiplies;
-using _THRUST_STD::negate;
-using _THRUST_STD::plus;
-
-/*! \p square is a function object. Specifically, it is an Adaptable Unary Function.
- *  If \c f is an object of class <tt>square<T></tt>, and \c x is an object
- *  of class \c T, then <tt>f(x)</tt> returns <tt>x*x</tt>.
+/*! \p bit_and is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>bit_and<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x&y</tt>.
  *
  *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
- *          and if \c x is an object of type \p T, then <tt>x*x</tt> must be defined and must have a return type that is
- * convertible to \c T.
+ *          and if \c x and \c y are objects of type \p T, then <tt>x&y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
  *
- *  The following code snippet demonstrates how to use <tt>square</tt> to square
- *  the elements of a device_vector of \c floats.
+ *  The following code snippet demonstrates how to use <tt>bit_and</tt> to take
+ *  the bitwise AND of one device_vector of \c ints by another.
  *
  *  \code
  *  #include <thrust/device_vector.h>
  *  #include <thrust/functional.h>
  *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
  *  #include <thrust/transform.h>
  *  ...
  *  const int N = 1000;
- *  thrust::device_vector<float> V1(N);
- *  thrust::device_vector<float> V2(N);
+ *  thrust::device_vector<int> V1(N);
+ *  thrust::device_vector<int> V2(N);
+ *  thrust::device_vector<int> V3(N);
  *
  *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 13);
  *
- *  thrust::transform(V1.begin(), V1.end(), V2.begin(),
- *                    thrust::square<float>());
- *  // V2 is now {1, 4, 9, ..., 1000000}
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::bit_and<int>());
+ *  // V3 is now {1&13, 2&13, 3&13, ..., 1000%13}
  *  \endcode
+ *
+ *  \see binary_function
  */
 template <typename T = void>
-struct square
+struct bit_and : public _THRUST_STD::bit_and<T>
 {
-  /*! Function call operator. The return value is <tt>x*x</tt>.
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
    */
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE constexpr T operator()(const T& x) const
-  {
-    return x * x;
-  }
-};
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-/*! \brief Specialization of \p square for type void.
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end bit_and
+
+/*! \p bit_or is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>bit_and<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x|y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x|y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>bit_or</tt> to take
+ *  the bitwise OR of one device_vector of \c ints by another.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<int> V1(N);
+ *  thrust::device_vector<int> V2(N);
+ *  thrust::device_vector<int> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 13);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::bit_or<int>());
+ *  // V3 is now {1|13, 2|13, 3|13, ..., 1000|13}
+ *  \endcode
+ *
+ *  \see binary_function
  */
-template <>
-struct square<void>
+template <typename T = void>
+struct bit_or : public _THRUST_STD::bit_or<T>
 {
-  /*! This functor is transparent. */
-  using is_transparent = void;
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-  /*! Function call operator - returns the square of its argument*/
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T>
-  THRUST_HOST_DEVICE constexpr T operator()(const T& x) const noexcept(noexcept(x * x))
-  {
-    return x * x;
-  }
-};
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-/*! \}
- */
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end bit_or
 
-/*! \addtogroup comparison_operations Comparison Operations
- *  \ingroup predefined_function_objects
- *  \{
+/*! \p bit_xor is a function object. Specifically, it is an Adaptable Binary Function.
+ *  If \c f is an object of class <tt>bit_and<T></tt>, and \c x and \c y are objects
+ *  of class \c T, then <tt>f(x,y)</tt> returns <tt>x^y</tt>.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>,
+ *          and if \c x and \c y are objects of type \p T, then <tt>x^y</tt> must be defined and must have a return type
+ * that is convertible to \c T.
+ *
+ *  The following code snippet demonstrates how to use <tt>bit_xor</tt> to take
+ *  the bitwise XOR of one device_vector of \c ints by another.
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/sequence.h>
+ *  #include <thrust/fill.h>
+ *  #include <thrust/transform.h>
+ *  ...
+ *  const int N = 1000;
+ *  thrust::device_vector<int> V1(N);
+ *  thrust::device_vector<int> V2(N);
+ *  thrust::device_vector<int> V3(N);
+ *
+ *  thrust::sequence(V1.begin(), V1.end(), 1);
+ *  thrust::fill(V2.begin(), V2.end(), 13);
+ *
+ *  thrust::transform(V1.begin(), V1.end(), V2.begin(), V3.begin(),
+ *                    thrust::bit_xor<int>());
+ *  // V3 is now {1^13, 2^13, 3^13, ..., 1000^13}
+ *  \endcode
+ *
+ *  \see binary_function
  */
+template <typename T = void>
+struct bit_xor : public _THRUST_STD::bit_xor<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-using _THRUST_STD::equal_to;
-using _THRUST_STD::greater;
-using _THRUST_STD::greater_equal;
-using _THRUST_STD::less;
-using _THRUST_STD::less_equal;
-using _THRUST_STD::not_equal_to;
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end bit_xor
 
 /*! \}
  */
 
-/*! \addtogroup logical_operations Logical Operations
+/*! \addtogroup generalized_identity_operations Generalized Identity Operations
  *  \ingroup predefined_function_objects
  *  \{
  */
 
-using _THRUST_STD::logical_and;
-using _THRUST_STD::logical_not;
-using _THRUST_STD::logical_or;
-
-/*! \}
+/*! \p identity is a Unary Function that represents the identity function: it takes
+ *  a single argument \c x, and returns \c x.
+ *
+ *  \tparam T No requirements on \p T.
+ *
+ *  The following code snippet demonstrates that \p identity returns its
+ *  argument.
+ *
+ *  \code
+ *  #include <thrust/functional.h>
+ *  #include <assert.h>
+ *  ...
+ *  int x = 137;
+ *  thrust::identity<int> id;
+ *  assert(x == id(x));
+ *  \endcode
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/identity
+ *  \see unary_function
  */
+// TODO(bgruber): this version can also act as a functor casting to T making it not equivalent to _THRUST_STD::identity
+template <typename T = void>
+struct THRUST_DEPRECATED_BECAUSE("use ::internal::identity instead") identity
+{
+  /*! \typedef argument_type
+   *  \brief The type of the function object's first argument.
+   */
+  using argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-/*! \addtogroup bitwise_operations Bitwise Operations
- *  \ingroup predefined_function_objects
- *  \{
- */
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-using _THRUST_STD::bit_and;
-using _THRUST_STD::bit_or;
-using _THRUST_STD::bit_xor;
+  /*! Function call operator. The return value is <tt>x</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T& operator()(const T& x) const
+  {
+    return x;
+  }
 
-/*! \}
+  /*! Function call operator. The return value is <tt>x</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr T& operator()(T& x) const
+  {
+    return x;
+  }
+
+  // we cannot add an overload for `const T&&` because then calling e.g. `thrust::identity<int>{}(3.14);` is ambiguous
+  // on MSVC
+
+  /*! Function call operator. The return value is <tt>move(x)</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr T&& operator()(T&& x) const
+  {
+    return _THRUST_STD::move(x);
+  }
+};
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <>
+struct THRUST_DEPRECATED_BECAUSE("use ::internal::identity instead") identity<void> : ::internal::identity
+{};
+THRUST_SUPPRESS_DEPRECATED_POP
+
+/*! \p maximum is a function object that takes two arguments and returns the greater
+ *  of the two. Specifically, it is an Adaptable Binary Function. If \c f is an
+ *  object of class <tt>maximum<T></tt> and \c x and \c y are objects of class \c T
+ *  <tt>f(x,y)</tt> returns \c x if <tt>x > y</tt> and \c y, otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  The following code snippet demonstrates that \p maximum returns its
+ *  greater argument.
+ *
+ *  \code
+ *  #include <thrust/functional.h>
+ *  #include <assert.h>
+ *  ...
+ *  int x =  137;
+ *  int y = -137;
+ *  thrust::maximum<int> mx;
+ *  assert(x == mx(x,y));
+ *  \endcode
+ *
+ *  \see minimum
+ *  \see min
+ *  \see binary_function
  */
+template <typename T = void>
+struct maximum : ::internal::maximum<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-/*! \addtogroup generalized_identity_operations Generalized Identity Operations
- *  \ingroup predefined_function_objects
- *  \{
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end maximum
+
+/*! \p minimum is a function object that takes two arguments and returns the lesser
+ *  of the two. Specifically, it is an Adaptable Binary Function. If \c f is an
+ *  object of class <tt>minimum<T></tt> and \c x and \c y are objects of class \c T
+ *  <tt>f(x,y)</tt> returns \c x if <tt>x < y</tt> and \c y, otherwise.
+ *
+ *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/LessThanComparable">LessThan
+ * Comparable</a>.
+ *
+ *  The following code snippet demonstrates that \p minimum returns its
+ *  lesser argument.
+ *
+ *  \code
+ *  #include <thrust/functional.h>
+ *  #include <assert.h>
+ *  ...
+ *  int x =  137;
+ *  int y = -137;
+ *  thrust::minimum<int> mn;
+ *  assert(y == mn(x,y));
+ *  \endcode
+ *
+ *  \see maximum
+ *  \see max
+ *  \see binary_function
  */
+template <typename T = void>
+struct minimum : ::internal::minimum<T>
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
 
-using ::internal::maximum;
-using ::internal::minimum;
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T;
+}; // end minimum
 
 /*! \p project1st is a function object that takes two arguments and returns
  *  its first argument; the second argument is unused. It is essentially a
@@ -181,17 +1335,36 @@ using ::internal::minimum;
  *
  *  \see identity
  *  \see project2nd
+ *  \see binary_function
  */
 template <typename T1 = void, typename T2 = void>
 struct project1st
 {
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T1;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T2;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T1;
+
   /*! Function call operator. The return value is <tt>lhs</tt>.
    */
   THRUST_HOST_DEVICE constexpr const T1& operator()(const T1& lhs, const T2& /*rhs*/) const
   {
     return lhs;
   }
-};
+}; // end project1st
 
 /*! \brief Specialization of \p project1st for two void arguments.
  */
@@ -201,7 +1374,6 @@ struct project1st<void, void>
   /// Indicate that this functor is transparent: it accepts any argument that can be
   /// converted to the required type, and uses perfect forwarding.
   using is_transparent = void;
-
   /// \brief Invocation operator - returns its first argument.
   THRUST_EXEC_CHECK_DISABLE
   template <typename T1, typename T2>
@@ -228,10 +1400,29 @@ struct project1st<void, void>
  *
  *  \see identity
  *  \see project1st
+ *  \see binary_function
  */
 template <typename T1 = void, typename T2 = void>
 struct project2nd
 {
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   *  deprecated [Since 2.6]
+   */
+  using first_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T1;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   *  deprecated [Since 2.6]
+   */
+  using second_argument_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T2;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   *  deprecated [Since 2.6]
+   */
+  using result_type THRUST_ALIAS_ATTRIBUTE(THRUST_DEPRECATED) = T2;
+
   /*! Function call operator. The return value is <tt>rhs</tt>.
    */
   THRUST_HOST_DEVICE constexpr const T2& operator()(const T1& /*lhs*/, const T2& rhs) const
@@ -248,7 +1439,6 @@ struct project2nd<void, void>
   /// Indicate that this functor is transparent: it accepts any argument that can be
   /// converted to the required type, and uses perfect forwarding.
   using is_transparent = void;
-
   /// \brief Invocation operator - returns its second argument.
   THRUST_EXEC_CHECK_DISABLE
   template <typename T1, typename T2>
@@ -268,7 +1458,182 @@ struct project2nd<void, void>
  *  \{
  */
 
-using ::internal::not_fn;
+/*! \p unary_negate is a function object adaptor: it is an Adaptable Predicate
+ *  that represents the logical negation of some other Adaptable Predicate.
+ *  That is: if \c f is an object of class <tt>unary_negate<AdaptablePredicate></tt>,
+ *  then there exists an object \c pred of class \c AdaptablePredicate such
+ *  that <tt>f(x)</tt> always returns the same value as <tt>!pred(x)</tt>.
+ *  There is rarely any reason to construct a <tt>unary_negate</tt> directly;
+ *  it is almost always easier to use the helper function not1.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/unary_negate
+ *  \see not1
+ */
+template <typename Predicate>
+struct THRUST_DEPRECATED unary_negate
+{
+  /*! \typedef argument_type
+   *  \brief The type of the function object's argument.
+   */
+  using argument_type = typename Predicate::argument_type;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type = bool;
+
+  /*! Constructor takes a \p Predicate object to negate.
+   *  \param p The \p Predicate object to negate.
+   */
+  THRUST_HOST_DEVICE explicit unary_negate(Predicate p)
+      : pred(p)
+  {}
+
+  /*! Function call operator. The return value is <tt>!pred(x)</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE bool operator()(const typename Predicate::argument_type& x)
+  {
+    return !pred(x);
+  }
+
+  /*! \cond
+   */
+  Predicate pred;
+  /*! \endcond
+   */
+}; // end unary_negate
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+/*! \p not1 is a helper function to simplify the creation of Adaptable Predicates:
+ *  it takes an Adaptable Predicate \p pred as an argument and returns a new Adaptable
+ *  Predicate that represents the negation of \p pred. That is: if \c pred is an object
+ *  of a type which models Adaptable Predicate, then the the type of the result
+ *  \c npred of <tt>not1(pred)</tt> is also a model of Adaptable Predicate and
+ *  <tt>npred(x)</tt> always returns the same value as <tt>!pred(x)</tt>.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  \param pred The Adaptable Predicate to negate.
+ *  \return A new object, <tt>npred</tt> such that <tt>npred(x)</tt> always returns
+ *          the same value as <tt>!pred(x)</tt>.
+ *  \tparam Predicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_negate">Adaptable Predicate</a>.
+ *  \see unary_negate
+ *  \see not2
+ */
+template <typename Predicate>
+THRUST_HOST_DEVICE
+  THRUST_DEPRECATED_BECAUSE("Use thrust::not_fn instead") unary_negate<Predicate> not1(const Predicate& pred);
+THRUST_SUPPRESS_DEPRECATED_POP
+
+/*! \p binary_negate is a function object adaptor: it is an Adaptable Binary
+ *  Predicate that represents the logical negation of some other Adaptable
+ *  Binary Predicate. That is: if \c f is an object of class <tt>binary_negate<AdaptablePredicate></tt>,
+ *  then there exists an object \c pred of class \c AdaptableBinaryPredicate
+ *  such that <tt>f(x,y)</tt> always returns the same value as <tt>!pred(x,y)</tt>.
+ *  There is rarely any reason to construct a <tt>binary_negate</tt> directly;
+ *  it is almost always easier to use the helper function not2.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  \see https://en.cppreference.com/w/cpp/utility/functional/binary_negate
+ */
+template <typename Predicate>
+struct THRUST_DEPRECATED binary_negate
+{
+  /*! \typedef first_argument_type
+   *  \brief The type of the function object's first argument.
+   */
+  using first_argument_type = typename Predicate::first_argument_type;
+
+  /*! \typedef second_argument_type
+   *  \brief The type of the function object's second argument.
+   */
+  using second_argument_type = typename Predicate::second_argument_type;
+
+  /*! \typedef result_type
+   *  \brief The type of the function object's result;
+   */
+  using result_type = bool;
+
+  /*! Constructor takes a \p Predicate object to negate.
+   *  \param p The \p Predicate object to negate.
+   */
+  THRUST_HOST_DEVICE explicit binary_negate(Predicate p)
+      : pred(p)
+  {}
+
+  /*! Function call operator. The return value is <tt>!pred(x,y)</tt>.
+   */
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE bool operator()(const first_argument_type& x, const second_argument_type& y)
+  {
+    return !pred(x, y);
+  }
+
+  /*! \cond
+   */
+  Predicate pred;
+  /*! \endcond
+   */
+}; // end binary_negate
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+/*! \p not2 is a helper function to simplify the creation of Adaptable Binary Predicates:
+ *  it takes an Adaptable Binary Predicate \p pred as an argument and returns a new Adaptable
+ *  Binary Predicate that represents the negation of \p pred. That is: if \c pred is an object
+ *  of a type which models Adaptable Binary Predicate, then the the type of the result
+ *  \c npred of <tt>not2(pred)</tt> is also a model of Adaptable Binary Predicate and
+ *  <tt>npred(x,y)</tt> always returns the same value as <tt>!pred(x,y)</tt>.
+ *
+ *  deprecated [Since 2.6]
+ *
+ *  \param pred The Adaptable Binary Predicate to negate.
+ *  \return A new object, <tt>npred</tt> such that <tt>npred(x,y)</tt> always returns
+ *          the same value as <tt>!pred(x,y)</tt>.
+ *  \tparam Binary Predicate is a model of an Adaptable Binary Predicate.
+ *  \see binary_negate
+ *  \see not1
+ */
+template <typename BinaryPredicate>
+THRUST_HOST_DEVICE THRUST_DEPRECATED_BECAUSE("Use thrust::not_fn instead")
+  binary_negate<BinaryPredicate> not2(const BinaryPredicate& pred);
+THRUST_SUPPRESS_DEPRECATED_POP
+
+namespace detail
+{
+template <typename F>
+struct not_fun_t
+{
+  F f;
+
+  template <typename... Ts>
+  THRUST_HOST_DEVICE auto operator()(Ts&&... args) noexcept(noexcept(!f(std::forward<Ts>(args)...)))
+    -> decltype(!f(std::forward<Ts>(args)...))
+  {
+    return !f(std::forward<Ts>(args)...);
+  }
+
+  template <typename... Ts>
+  THRUST_HOST_DEVICE auto operator()(Ts&&... args) const noexcept(noexcept(!f(std::forward<Ts>(args)...)))
+    -> decltype(!f(std::forward<Ts>(args)...))
+  {
+    return !f(std::forward<Ts>(args)...);
+  }
+};
+} // namespace detail
+
+//! Takes a predicate (a callable returning bool) and returns a new predicate that returns the negated result.
+//! \see https://en.cppreference.com/w/cpp/utility/functional/not_fn
+// TODO(bgruber): alias to _THRUST_STD::not_fn in C++17
+template <class F>
+THRUST_HOST_DEVICE auto not_fn(F&& f) -> detail::not_fun_t<::internal::decay_t<F>>
+{
+  return detail::not_fun_t<::internal::decay_t<F>>{std::forward<F>(f)};
+}
 
 /*! \}
  */
@@ -325,50 +1690,88 @@ namespace placeholders
 
 /*! \p thrust::placeholders::_1 is the placeholder for the first function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<0>::type _1;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<0>::type _1;
 
 /*! \p thrust::placeholders::_2 is the placeholder for the second function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<1>::type _2;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<1>::type _2;
 
 /*! \p thrust::placeholders::_3 is the placeholder for the third function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<2>::type _3;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<2>::type _3;
 
 /*! \p thrust::placeholders::_4 is the placeholder for the fourth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<3>::type _4;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<3>::type _4;
 
 /*! \p thrust::placeholders::_5 is the placeholder for the fifth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<4>::type _5;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<4>::type _5;
 
 /*! \p thrust::placeholders::_6 is the placeholder for the sixth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<5>::type _6;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<5>::type _6;
 
 /*! \p thrust::placeholders::_7 is the placeholder for the seventh function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<6>::type _7;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<6>::type _7;
 
 /*! \p thrust::placeholders::_8 is the placeholder for the eighth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<7>::type _8;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<7>::type _8;
 
 /*! \p thrust::placeholders::_9 is the placeholder for the ninth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<8>::type _9;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<8>::type _9;
 
 /*! \p thrust::placeholders::_10 is the placeholder for the tenth function parameter.
  */
-THRUST_GLOBAL_CONSTANT thrust::detail::functional::placeholder<9>::type _10;
+THRUST_INLINE_CONSTANT thrust::detail::functional::placeholder<9>::type _10;
 
 } // namespace placeholders
 
 /*! \} // placeholder_objects
  */
 
+#undef THRUST_BINARY_FUNCTOR_VOID_SPECIALIZATION
+
+THRUST_NAMESPACE_END
+
+#ifndef THRUST_DOXYGEN_INVOKED // Do not document
+#  if _THRUST_HAS_DEVICE_SYSTEM_STD
+_LIBCUDACXX_BEGIN_NAMESPACE_CUDA
+#  else
+THRUST_NAMESPACE_BEGIN
+namespace detail
+{
+#  endif
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::plus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::minus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::multiplies);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::divides);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::modulus);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::negate);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::bit_and);
+// THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::bit_not); // does not exist?
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::bit_or);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::bit_xor);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::equal_to);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::not_equal_to);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::less);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::less_equal);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::greater_equal);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::greater);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::logical_and);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::logical_not);
+THRUST_MARK_CAN_COPY_ARGUMENTS(THRUST_NS_QUALIFIER::logical_or);
+#  if _THRUST_HAS_DEVICE_SYSTEM_STD
+_LIBCUDACXX_END_NAMESPACE_CUDA
+#  else
+}
 THRUST_NAMESPACE_END
+#  endif
+#endif // THRUST_DOXYGEN_INVOKED
 
+#include <thrust/detail/functional.inl>
 #include <thrust/detail/functional/operators.h>
 #include <thrust/detail/type_traits/is_commutative.h>
diff --git a/projects/rocthrust/thrust/future.h b/projects/rocthrust/thrust/future.h
new file mode 100644
index 000000000000..f2cf1afc720e
--- /dev/null
+++ b/projects/rocthrust/thrust/future.h
@@ -0,0 +1,195 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file thrust/future.h
+ *  \brief `thrust::future`, an asynchronous value type.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/execution_policy.h>
+
+#  include <utility>
+
+/*! \cond
+ */
+
+/*
+// #include the host system's pointer.h header.
+#define __THRUST_HOST_SYSTEM_POINTER_HEADER <__THRUST_HOST_SYSTEM_ROOT/pointer.h>
+  #include __THRUST_HOST_SYSTEM_POINTER_HEADER
+#undef __THRUST_HOST_SYSTEM_POINTER_HEADER
+*/
+
+// #include the device system's pointer.h header.
+#  define __THRUST_DEVICE_SYSTEM_POINTER_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/pointer.h>
+#  include __THRUST_DEVICE_SYSTEM_POINTER_HEADER
+#  undef __THRUST_DEVICE_SYSTEM_POINTER_HEADER
+
+/*
+// #include the host system's future.h header.
+#define __THRUST_HOST_SYSTEM_FUTURE_HEADER <__THRUST_HOST_SYSTEM_ROOT/future.h>
+  #include __THRUST_HOST_SYSTEM_FUTURE_HEADER
+#undef __THRUST_HOST_SYSTEM_FUTURE_HEADER
+*/
+
+// #include the device system's future.h header.
+#  define __THRUST_DEVICE_SYSTEM_FUTURE_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/future.h>
+#  include __THRUST_DEVICE_SYSTEM_FUTURE_HEADER
+#  undef __THRUST_DEVICE_SYSTEM_FUTURE_HEADER
+
+/*! \endcond
+ */
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+/*! \cond
+ */
+
+///////////////////////////////////////////////////////////////////////////////
+
+// `select_unique_(future|event)_type` is a hook for choosing the
+// `unique_eager_event`/`unique_eager_future` type for a system. `decltype` is
+// used to determine the return type of an ADL call to
+// `select_unique_eager_(future|event)_type(system)`; that return type should
+// be the correct event/future type for `system`. Overloads should only be
+// declared, not defined.
+
+namespace unimplemented
+{
+
+struct THRUST_DEPRECATED no_unique_eager_event_type_found
+{};
+
+THRUST_DEPRECATED THRUST_HOST inline no_unique_eager_event_type_found unique_eager_event_type(...) noexcept;
+
+struct THRUST_DEPRECATED no_unique_eager_future_type_found
+{};
+
+template <typename T>
+THRUST_DEPRECATED THRUST_HOST no_unique_eager_future_type_found unique_eager_future_type(...) noexcept;
+
+} // namespace unimplemented
+
+namespace unique_eager_event_type_detail
+{
+
+using unimplemented::unique_eager_event_type;
+
+template <typename System>
+using select THRUST_DEPRECATED = decltype(unique_eager_event_type(std::declval<System>()));
+
+} // namespace unique_eager_event_type_detail
+
+namespace unique_eager_future_type_detail
+{
+
+using unimplemented::unique_eager_future_type;
+
+template <typename System, typename T>
+using select THRUST_DEPRECATED = decltype(unique_eager_future_type<T>(std::declval<System>()));
+
+} // namespace unique_eager_future_type_detail
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename System>
+using unique_eager_event THRUST_DEPRECATED = unique_eager_event_type_detail::select<System>;
+
+template <typename System>
+using event THRUST_DEPRECATED = unique_eager_event<System>;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename System, typename T>
+using unique_eager_future THRUST_DEPRECATED = unique_eager_future_type_detail::select<System, T>;
+
+template <typename System, typename T>
+using future THRUST_DEPRECATED = unique_eager_future<System, T>;
+
+/*
+///////////////////////////////////////////////////////////////////////////////
+
+using host_unique_eager_event = unique_eager_event_type_detail::select<
+  thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::tag
+>;
+using host_event = host_unique_eager_event;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+using host_unique_eager_future = unique_eager_future_type_detail::select<
+  thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::tag, T
+>;
+template <typename T>
+using host_future = host_unique_eager_future<T>;
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+
+using device_unique_eager_event THRUST_DEPRECATED =
+  unique_eager_event_type_detail::select<thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::tag>;
+
+using device_event THRUST_DEPRECATED = device_unique_eager_event;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+using device_unique_eager_future THRUST_DEPRECATED =
+  unique_eager_future_type_detail::select<thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::tag, T>;
+
+template <typename T>
+using device_future THRUST_DEPRECATED = device_unique_eager_future<T>;
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct THRUST_DEPRECATED new_stream_t final
+{};
+
+#  ifndef CCCL_HEADER_MACRO_CHECK
+// when building header tests, we get a deprecation warning from cudafe1.stub.c if we deprecate a global variable
+THRUST_DEPRECATED
+#  endif
+  THRUST_INLINE_CONSTANT new_stream_t new_stream{};
+
+///////////////////////////////////////////////////////////////////////////////
+
+using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::when_all;
+
+///////////////////////////////////////////////////////////////////////////////
+
+/*! \endcond
+ */
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif
diff --git a/projects/rocthrust/thrust/gather.h b/projects/rocthrust/thrust/gather.h
index 701062b9a098..ceb142f535f0 100644
--- a/projects/rocthrust/thrust/gather.h
+++ b/projects/rocthrust/thrust/gather.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -306,7 +299,7 @@ OutputIterator gather_if(
  * Iterator</a> and \c InputIterator1's \c value_type must be convertible to \c RandomAccessIterator's \c
  * difference_type. \tparam InputIterator2 must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \c InputIterator2's \c
- * value_type must be convertible to \c Predicate's argument type. \tparam RandomAccessIterator must be a model of <a
+ * value_type must be convertible to \c Predicate's \c argument_type. \tparam RandomAccessIterator must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access iterator</a> and \c
  * RandomAccessIterator's \c value_type must be convertible to \c OutputIterator's \c value_type. \tparam OutputIterator
  * must be a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
@@ -330,7 +323,7 @@ OutputIterator gather_if(
  *
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
@@ -392,7 +385,7 @@ THRUST_HOST_DEVICE OutputIterator gather_if(
  * Iterator</a> and \c InputIterator1's \c value_type must be convertible to \c RandomAccessIterator's \c
  * difference_type. \tparam InputIterator2 must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \c InputIterator2's \c
- * value_type must be convertible to \c Predicate's argument type. \tparam RandomAccessIterator must be a model of <a
+ * value_type must be convertible to \c Predicate's \c argument_type. \tparam RandomAccessIterator must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access iterator</a> and \c
  * RandomAccessIterator's \c value_type must be convertible to \c OutputIterator's \c value_type. \tparam OutputIterator
  * must be a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
@@ -414,7 +407,7 @@ THRUST_HOST_DEVICE OutputIterator gather_if(
  *
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(const int x)
  *    {
  *      return (x % 2) == 0;
diff --git a/projects/rocthrust/thrust/generate.h b/projects/rocthrust/thrust/generate.h
index 9f0424acb366..62a37867c21c 100644
--- a/projects/rocthrust/thrust/generate.h
+++ b/projects/rocthrust/thrust/generate.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -50,8 +43,9 @@ THRUST_NAMESPACE_BEGIN
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator is mutable.
- *  \tparam Generator A nullary function with a return type convertible to \p ForwardIterator's \c value_type.
+ * Iterator</a>, and \p ForwardIterator is mutable. \tparam Generator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional">Generator</a>, and \p Generator's \c result_type is
+ * convertible to \p ForwardIterator's \c value_type.
  *
  *  The following code snippet demonstrates how to fill a \c host_vector with random numbers,
  *  using the standard C library function \c rand using the \p thrust::host execution policy for parallelization:
@@ -88,8 +82,9 @@ generate(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *             elements in the range <tt>[first,last)</tt>.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator is mutable.
- *  \tparam Generator A nullary function with a return type convertible to \p ForwardIterator's \c value_type.
+ * Iterator</a>, and \p ForwardIterator is mutable. \tparam Generator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional">Generator</a>, and \p Generator's \c result_type is
+ * convertible to \p ForwardIterator's \c value_type.
  *
  *  The following code snippet demonstrates how to fill a \c host_vector with random numbers,
  *  using the standard C library function \c rand.
@@ -126,8 +121,9 @@ void generate(ForwardIterator first, ForwardIterator last, Generator gen);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
- * Iterator</a>. \tparam Size is an integral type (either signed or unsigned).
- *  \tparam Generator A nullary function with a return type convertible to \p ForwardIterator's \c value_type.
+ * Iterator</a>. \tparam Size is an integral type (either signed or unsigned). \tparam Generator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional">Generator</a>, and \p Generator's \c result_type is
+ * convertible to a type in \p OutputIterator's set of \c value_types.
  *
  *  The following code snippet demonstrates how to fill a \c host_vector with random numbers,
  *  using the standard C library function \c rand using the \p thrust::host execution policy for parallelization:
@@ -161,8 +157,9 @@ THRUST_HOST_DEVICE OutputIterator generate_n(
  *             elements in the range <tt>[first,first + n)</tt>.
  *
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
- * Iterator</a>. \tparam Size is an integral type (either signed or unsigned).
- *  \tparam Generator A nullary function with a return type convertible to \p ForwardIterator's \c value_type.
+ * Iterator</a>. \tparam Size is an integral type (either signed or unsigned). \tparam Generator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional">Generator</a>, and \p Generator's \c result_type is
+ * convertible to a type in \p OutputIterator's set of \c value_types.
  *
  *  The following code snippet demonstrates how to fill a \c host_vector with random numbers,
  *  using the standard C library function \c rand.
diff --git a/projects/rocthrust/thrust/inner_product.h b/projects/rocthrust/thrust/inner_product.h
index e98db5180785..0a3b5876c860 100644
--- a/projects/rocthrust/thrust/inner_product.h
+++ b/projects/rocthrust/thrust/inner_product.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -153,14 +146,16 @@ OutputType inner_product(InputIterator1 first1, InputIterator1 last1, InputItera
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryFunction2's first argument type.
+ * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryFunction2's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>. and \p InputIterator2's \c value_type is convertible to \p BinaryFunction2's second argument type.
+ * Iterator</a>. and \p InputIterator2's \c value_type is convertible to \p BinaryFunction2's \c second_argument_type.
  *  \tparam OutputType is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p OutputType is convertible to
- * \p BinaryFunction1's first argument type.
- *  \tparam BinaryFunction1 The function's return type must be convertible to \p OutputType.
- *  \tparam BinaryFunction2 The function's return type must be convertible to \p BinaryFunction1's second argument type.
+ * \p BinaryFunction1's \c first_argument_type. \tparam BinaryFunction1 is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction1's \c return_type is convertible to \p OutputType. \tparam BinaryFunction2 is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction2's \c return_type is convertible to \p BinaryFunction1's \c second_argument_type.
  *
  *  \code
  *  #include <thrust/inner_product.h>
@@ -216,14 +211,16 @@ THRUST_HOST_DEVICE OutputType inner_product(
  *  \return The inner product of sequences <tt>[first1, last1)</tt> and <tt>[first2, last2)</tt>.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryFunction2's first argument type.
+ * Iterator</a>, and \p InputIterator1's \c value_type is convertible to \p BinaryFunction2's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>. and \p InputIterator2's \c value_type is convertible to \p BinaryFunction2's second argument type.
+ * Iterator</a>. and \p InputIterator2's \c value_type is convertible to \p BinaryFunction2's \c second_argument_type.
  *  \tparam OutputType is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p OutputType is convertible to
- * \p BinaryFunction1's first argument type.
- *  \tparam BinaryFunction1 The function's return type must be convertible to \p OutputType.
- *  \tparam BinaryFunction2 The function's return type must be convertible to \p BinaryFunction1's second argument type.
+ * \p BinaryFunction1's \c first_argument_type. \tparam BinaryFunction1 is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction1's \c return_type is convertible to \p OutputType. \tparam BinaryFunction2 is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction2's \c return_type is convertible to \p BinaryFunction1's \c second_argument_type.
  *
  *  \code
  *  #include <thrust/inner_product.h>
diff --git a/projects/rocthrust/thrust/iterator/constant_iterator.h b/projects/rocthrust/thrust/iterator/constant_iterator.h
index d55c43707453..234ff5b669e9 100644
--- a/projects/rocthrust/thrust/iterator/constant_iterator.h
+++ b/projects/rocthrust/thrust/iterator/constant_iterator.h
@@ -14,8 +14,10 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/constant_iterator.h
-//! \brief An iterator which returns a constant value when dereferenced
+/*! \file thrust/iterator/constant_iterator.h
+ *  \brief An iterator which returns a constant value when
+ *         dereferenced
+ */
 
 #pragma once
 
@@ -28,157 +30,152 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/detail/constant_iterator_base.h>
 #include <thrust/iterator/iterator_facade.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 THRUST_NAMESPACE_BEGIN
 
-template <typename, typename, typename>
-class constant_iterator;
+/*! \addtogroup iterators
+ *  \{
+ */
 
-namespace detail
-{
-template <typename Value, typename Incrementable, typename System>
-struct make_constant_iterator_base
-{
-  using incrementable = replace_if_use_default<Incrementable, identity_<_THRUST_STD::intmax_t>>;
-  using base_iterator = counting_iterator<incrementable, System, random_access_traversal_tag>;
-  using type =
-    iterator_adaptor<constant_iterator<Value, Incrementable, System>,
-                     base_iterator,
-                     Value,
-                     iterator_system_t<base_iterator>,
-                     iterator_traversal_t<base_iterator>,
-                     Value>;
-};
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p constant_iterator is an iterator which represents a pointer into a range of constant values. This iterator is
-//! useful for creating a range filled with the same value without explicitly storing it in memory. Using \p
-//! constant_iterator saves both memory capacity and bandwidth.
-//!
-//! The following code snippet demonstrates how to create a \p constant_iterator whose \c value_type is \c int and whose
-//! value is \c 10.
-//!
-//! \code
-//! #include <thrust/iterator/constant_iterator.h>
-//!
-//! thrust::constant_iterator<int> iter(10);
-//!
-//! *iter;    // returns 10
-//! iter[0];  // returns 10
-//! iter[1];  // returns 10
-//! iter[13]; // returns 10
-//!
-//! // and so on...
-//! \endcode
-//!
-//! This next example demonstrates how to use a \p constant_iterator with the \p thrust::transform function to increment
-//! all elements of a sequence by the same value. We will create a temporary \p constant_iterator with the function \p
-//! make_constant_iterator function in order to avoid explicitly specifying its type:
-//!
-//! \code
-//! #include <thrust/iterator/constant_iterator.h>
-//! #include <thrust/transform.h>
-//! #include <thrust/functional.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<int> data(4);
-//!   data[0] = 3;
-//!   data[1] = 7;
-//!   data[2] = 2;
-//!   data[3] = 5;
-//!
-//!   // add 10 to all values in data
-//!   thrust::transform(data.begin(), data.end(),
-//!                     thrust::make_constant_iterator(10),
-//!                     data.begin(),
-//!                     thrust::plus<int>());
-//!
-//!   // data is now [13, 17, 12, 15]
-//!
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! \see make_constant_iterator
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
+
+/*! \p constant_iterator is an iterator which represents a pointer into a range
+ *  of constant values. This iterator is useful for creating a range filled with the same
+ *  value without explicitly storing it in memory. Using \p constant_iterator saves both
+ *  memory capacity and bandwidth.
+ *
+ *  The following code snippet demonstrates how to create a \p constant_iterator whose
+ *  \c value_type is \c int and whose value is \c 10.
+ *
+ *  \code
+ *  #include <thrust/iterator/constant_iterator.h>
+ *
+ *  thrust::constant_iterator<int> iter(10);
+ *
+ *  *iter;    // returns 10
+ *  iter[0];  // returns 10
+ *  iter[1];  // returns 10
+ *  iter[13]; // returns 10
+ *
+ *  // and so on...
+ *  \endcode
+ *
+ *  This next example demonstrates how to use a \p constant_iterator with the
+ *  \p thrust::transform function to increment all elements of a sequence by the
+ *  same value. We will create a temporary \p constant_iterator with the function
+ *  \p make_constant_iterator function in order to avoid explicitly specifying
+ *  its type:
+ *
+ *  \code
+ *  #include <thrust/iterator/constant_iterator.h>
+ *  #include <thrust/transform.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<int> data(4);
+ *    data[0] = 3;
+ *    data[1] = 7;
+ *    data[2] = 2;
+ *    data[3] = 5;
+ *
+ *    // add 10 to all values in data
+ *    thrust::transform(data.begin(), data.end(),
+ *                      thrust::make_constant_iterator(10),
+ *                      data.begin(),
+ *                      thrust::plus<int>());
+ *
+ *    // data is now [13, 17, 12, 15]
+ *
+ *    return 0;
+ *  }
+ *  \endcode
+ *
+ *  \see make_constant_iterator
+ */
 template <typename Value, typename Incrementable = use_default, typename System = use_default>
-class constant_iterator : public detail::make_constant_iterator_base<Value, Incrementable, System>::type
+class constant_iterator : public detail::constant_iterator_base<Value, Incrementable, System>::type
 {
-  //! \cond
+  /*! \cond
+   */
   friend class iterator_core_access;
-  using super_t       = typename detail::make_constant_iterator_base<Value, Incrementable, System>::type;
-  using incrementable = typename detail::make_constant_iterator_base<Value, Incrementable, System>::incrementable;
-  using base_iterator = typename detail::make_constant_iterator_base<Value, Incrementable, System>::base_iterator;
+  using super_t       = typename detail::constant_iterator_base<Value, Incrementable, System>::type;
+  using incrementable = typename detail::constant_iterator_base<Value, Incrementable, System>::incrementable;
+  using base_iterator = typename detail::constant_iterator_base<Value, Incrementable, System>::base_iterator;
 
 public:
   using reference  = typename super_t::reference;
   using value_type = typename super_t::value_type;
 
-  //! \endcond
+  /*! \endcond
+   */
 
-  //! Default constructor initializes this \p constant_iterator's constant using its default constructor
+  /*! Default constructor initializes this \p constant_iterator's constant using its default constructor
+   */
   THRUST_HOST_DEVICE constant_iterator()
       : super_t()
       , m_value()
   {}
 
-  //! Copy constructor copies the value of another \p constant_iterator with related System type.
-  //!
-  //! \param rhs The \p constant_iterator to copy.
-  template <
-    class OtherSystem,
-    detail::enable_if_convertible_t<typename iterator_system<constant_iterator<Value, Incrementable, OtherSystem>>::type,
-                                    typename iterator_system<super_t>::type,
-                                    int> = 0>
+  /*! Copy constructor copies the value of another \p constant_iterator with related
+   *  System type.
+   *
+   *  \param rhs The \p constant_iterator to copy.
+   */
+  template <class OtherSystem,
+            detail::enable_if_convertible_t<
+              typename thrust::iterator_system<constant_iterator<Value, Incrementable, OtherSystem>>::type,
+              typename thrust::iterator_system<super_t>::type,
+              int> = 0>
   THRUST_HOST_DEVICE constant_iterator(constant_iterator<Value, Incrementable, OtherSystem> const& rhs)
       : super_t(rhs.base())
       , m_value(rhs.value())
   {}
 
-  //! This constructor receives a value to use as the constant value of this \p constant_iterator and an index
-  //! specifying the location of this \p constant_iterator in a sequence.
-  //!
-  //! \p v The value of this \p constant_iterator's constant value.
-  //! \p i The index of this \p constant_iterator in a sequence. Defaults to the value returned by \c Incrementable's
-  //! null constructor. For example, when <tt>Incrementable == int</tt>, \c 0.
-  THRUST_HOST_DEVICE constant_iterator(value_type const& v, incrementable const& i = incrementable())
+  /*! This constructor receives a value to use as the constant value of this
+   *  \p constant_iterator and an index specifying the location of this
+   *  \p constant_iterator in a sequence.
+   *
+   *  \p v The value of this \p constant_iterator's constant value.
+   *  \p i The index of this \p constant_iterator in a sequence. Defaults to the
+   *       value returned by \c Incrementable's null constructor. For example,
+   *       when <tt>Incrementable == int</tt>, \c 0.
+   */
+  THRUST_HOST_DEVICE constexpr constant_iterator(value_type const& v, incrementable const& i = incrementable())
       : super_t(base_iterator(i))
       , m_value(v)
   {}
 
-  //! This constructor is templated to allow construction from a value type and incrementable type related this this \p
-  //! constant_iterator's respective types.
-  //!
-  //! \p v The value of this \p constant_iterator's constant value.
-  //! \p i The index of this \p constant_iterator in a sequence. Defaults to the value returned by \c Incrementable's
-  //! null constructor. For example, when <tt>Incrementable == int</tt>, \c 0.
+  /*! This constructor is templated to allow construction from a value type and
+   *  incrementable type related this this \p constant_iterator's respective types.
+   *
+   *  \p v The value of this \p constant_iterator's constant value.
+   *  \p i The index of this \p constant_iterator in a sequence. Defaults to the
+   *       value returned by \c Incrementable's null constructor. For example,
+   *       when <tt>Incrementable == int</tt>, \c 0.
+   */
   template <typename OtherValue, typename OtherIncrementable>
   THRUST_HOST_DEVICE constant_iterator(OtherValue const& v, OtherIncrementable const& i = incrementable())
       : super_t(base_iterator(i))
       , m_value(v)
   {}
 
-  //! This method returns the value of this \p constant_iterator's constant value. \return A \c const reference to this
-  //! \p constant_iterator's constant value.
+  /*! This method returns the value of this \p constant_iterator's constant value.
+   *  \return A \c const reference to this \p constant_iterator's constant value.
+   */
   THRUST_HOST_DEVICE Value const& value() const
   {
     return m_value;
   }
 
-  //! \cond
+  /*! \cond
+   */
 
 protected:
   THRUST_HOST_DEVICE Value const& value_reference() const
@@ -197,38 +194,52 @@ class constant_iterator : public detail::make_constant_iterator_base<Value, Incr
     return m_value;
   }
 
+private:
   Value m_value;
 
-  //! \endcond
-};
-
-//! This version of \p make_constant_iterator creates a \p constant_iterator from values given for both value and index.
-//! The type of \p constant_iterator may be inferred by the compiler from the types of its parameters.
-//!
-//! \param x The value of the returned \p constant_iterator's constant value.
-//! \param i The index of the returned \p constant_iterator within a sequence. The type of this parameter defaults to \c
-//! int. In the default case, the value of this parameter is \c 0.
-//! \return A new \p constant_iterator with constant value & index as given by \p x & \p i.
-//! \see constant_iterator
+  /*! \endcond
+   */
+}; // end constant_iterator
+
+/*! This version of \p make_constant_iterator creates a \p constant_iterator
+ *  from values given for both value and index. The type of \p constant_iterator
+ *  may be inferred by the compiler from the types of its parameters.
+ *
+ *  \param x The value of the returned \p constant_iterator's constant value.
+ *  \param i The index of the returned \p constant_iterator within a sequence.
+ *           The type of this parameter defaults to \c int. In the default case,
+ *           the value of this parameter is \c 0.
+ *
+ *  \return A new \p constant_iterator with constant value & index as given
+ *          by \p x & \p i.
+ *
+ *  \see constant_iterator
+ */
 template <typename ValueT, typename IndexT>
 inline THRUST_HOST_DEVICE constant_iterator<ValueT, IndexT> make_constant_iterator(ValueT x, IndexT i = int())
 {
   return constant_iterator<ValueT, IndexT>(x, i);
 } // end make_constant_iterator()
 
-//! This version of \p make_constant_iterator creates a \p constant_iterator using only a parameter for the desired
-//! constant value. The value of the returned \p constant_iterator's index is set to \c 0.
-//!
-//! \param x The value of the returned \p constant_iterator's constant value.
-//! \return A new \p constant_iterator with constant value equal to \p x and index equal to \c 0.
-//! \see constant_iterator
+/*! This version of \p make_constant_iterator creates a \p constant_iterator
+ *  using only a parameter for the desired constant value. The value of the
+ *  returned \p constant_iterator's index is set to \c 0.
+ *
+ *  \param x The value of the returned \p constant_iterator's constant value.
+ *  \return A new \p constant_iterator with constant value equal to \p x and
+ *          index equal to \c 0.
+ *  \see constant_iterator
+ */
 template <typename V>
 inline THRUST_HOST_DEVICE constant_iterator<V> make_constant_iterator(V x)
 {
   return constant_iterator<V>(x, 0);
 } // end make_constant_iterator()
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/counting_iterator.h b/projects/rocthrust/thrust/iterator/counting_iterator.h
index 266f428a973a..9fc14c8a9fe7 100644
--- a/projects/rocthrust/thrust/iterator/counting_iterator.h
+++ b/projects/rocthrust/thrust/iterator/counting_iterator.h
@@ -40,177 +40,153 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/type_identity.h>
-#include <thrust/detail/type_traits.h>
-#include <thrust/iterator/counting_iterator.h>
+#include <thrust/detail/attributes.h>
 #include <thrust/iterator/iterator_adaptor.h>
-#include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/iterator_categories.h>
+#include <thrust/iterator/iterator_facade.h>
 
-#include _THRUST_STD_INCLUDE(cstddef)
-#include _THRUST_STD_INCLUDE(type_traits)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(type_traits)
-#else
-#  include <rocprim/type_traits.hpp>
-#endif
+// #include the details first
+#include <thrust/iterator/detail/counting_iterator.inl>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename Incrementable, typename System, typename Traversal, typename Difference>
-class counting_iterator;
-
-namespace detail
-{
-template <typename Number>
-using counting_iterator_difference_type =
-  ::internal::If<::internal::is_integral_v<Number> && sizeof(Number) < sizeof(int), int, _THRUST_STD::ptrdiff_t>;
-
-template <typename Incrementable, typename System, typename Traversal, typename Difference>
-struct make_counting_iterator_base
-{
-  using system =
-    typename eval_if<_THRUST_STD::is_same<System, use_default>::value, identity_<any_system_tag>, identity_<System>>::type;
-
-  using traversal = replace_if_use_default<Traversal, ::internal::type_identity<random_access_traversal_tag>>;
-  using difference =
-    replace_if_use_default<Difference, ::internal::type_identity<counting_iterator_difference_type<Incrementable>>>;
-
-  // our implementation departs from Boost's in that counting_iterator::dereference
-  // returns a copy of its counter, rather than a reference to it. returning a reference
-  // to the internal state of an iterator causes subtle bugs (consider the temporary
-  // iterator created in the expression *(iter + i)) and has no compelling use case
-  using type =
-    iterator_adaptor<counting_iterator<Incrementable, System, Traversal, Difference>,
-                     Incrementable,
-                     Incrementable,
-                     system,
-                     traversal,
-                     Incrementable,
-                     difference>;
-};
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
+/*! \addtogroup iterators
+ *  \{
+ */
 
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-//! \p counting_iterator is an iterator which represents a pointer into a range of sequentially changing values. This
-//! iterator is useful for creating a range filled with a sequence without explicitly storing it in memory. Using \p
-//! counting_iterator saves memory capacity and bandwidth.
-//!
-//! The following code snippet demonstrates how to create a \p counting_iterator whose \c value_type is \c int and which
-//! sequentially increments by \c 1.
-//!
-//! \code
-//! #include <thrust/iterator/counting_iterator.h>
-//! ...
-//! // create iterators
-//! thrust::counting_iterator<int> first(10);
-//! thrust::counting_iterator<int> last = first + 3;
-//!
-//! first[0]   // returns 10
-//! first[1]   // returns 11
-//! first[100] // returns 110
-//!
-//! // sum of [first, last)
-//! thrust::reduce(first, last);   // returns 33 (i.e. 10 + 11 + 12)
-//!
-//! // initialize vector to [0,1,2,..]
-//! thrust::counting_iterator<int> iter(0);
-//! thrust::device_vector<int> vec(500);
-//! thrust::copy(iter, iter + vec.size(), vec.begin());
-//! \endcode
-//!
-//! This next example demonstrates how to use a \p counting_iterator with the \p thrust::copy_if function to compute the
-//! indices of the non-zero elements of a \p device_vector. In this example, we use the \p make_counting_iterator
-//! function to avoid specifying the type of the \p counting_iterator.
-//!
-//! \code
-//! #include <thrust/iterator/counting_iterator.h>
-//! #include <thrust/copy.h>
-//! #include <thrust/functional.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!  // this example computes indices for all the nonzero values in a sequence
-//!
-//!  // sequence of zero and nonzero values
-//!  thrust::device_vector<int> stencil(8);
-//!  stencil[0] = 0;
-//!  stencil[1] = 1;
-//!  stencil[2] = 1;
-//!  stencil[3] = 0;
-//!  stencil[4] = 0;
-//!  stencil[5] = 1;
-//!  stencil[6] = 0;
-//!  stencil[7] = 1;
-//!
-//!  // storage for the nonzero indices
-//!  thrust::device_vector<int> indices(8);
-//!
-//!  // compute indices of nonzero elements
-//!  using IndexIterator = thrust::device_vector<int>::iterator;
-//!
-//!  // use make_counting_iterator to define the sequence [0, 8)
-//!  IndexIterator indices_end = thrust::copy_if(thrust::make_counting_iterator(0),
-//!                                              thrust::make_counting_iterator(8),
-//!                                              stencil.begin(),
-//!                                              indices.begin(),
-//!                                              ::internal::identity{});
-//!  // indices now contains [1,2,5,7]
-//!
-//!  return 0;
-//! }
-//! \endcode
-//!
-//! \see make_counting_iterator
+/*! \p counting_iterator is an iterator which represents a pointer into a range
+ *  of sequentially changing values. This iterator is useful for creating a range
+ *  filled with a sequence without explicitly storing it in memory. Using
+ *  \p counting_iterator saves memory capacity and bandwidth.
+ *
+ *  The following code snippet demonstrates how to create a \p counting_iterator whose
+ *  \c value_type is \c int and which sequentially increments by \c 1.
+ *
+ *  \code
+ *  #include <thrust/iterator/counting_iterator.h>
+ *  ...
+ *  // create iterators
+ *  thrust::counting_iterator<int> first(10);
+ *  thrust::counting_iterator<int> last = first + 3;
+ *
+ *  first[0]   // returns 10
+ *  first[1]   // returns 11
+ *  first[100] // returns 110
+ *
+ *  // sum of [first, last)
+ *  thrust::reduce(first, last);   // returns 33 (i.e. 10 + 11 + 12)
+ *
+ *  // initialize vector to [0,1,2,..]
+ *  thrust::counting_iterator<int> iter(0);
+ *  thrust::device_vector<int> vec(500);
+ *  thrust::copy(iter, iter + vec.size(), vec.begin());
+ *  \endcode
+ *
+ *  This next example demonstrates how to use a \p counting_iterator with the
+ *  \p thrust::copy_if function to compute the indices of the non-zero elements
+ *  of a \p device_vector. In this example, we use the \p make_counting_iterator
+ *  function to avoid specifying the type of the \p counting_iterator.
+ *
+ *  \code
+ *  #include <thrust/iterator/counting_iterator.h>
+ *  #include <thrust/copy.h>
+ *  #include <thrust/functional.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  int main()
+ *  {
+ *   // this example computes indices for all the nonzero values in a sequence
+ *
+ *   // sequence of zero and nonzero values
+ *   thrust::device_vector<int> stencil(8);
+ *   stencil[0] = 0;
+ *   stencil[1] = 1;
+ *   stencil[2] = 1;
+ *   stencil[3] = 0;
+ *   stencil[4] = 0;
+ *   stencil[5] = 1;
+ *   stencil[6] = 0;
+ *   stencil[7] = 1;
+ *
+ *   // storage for the nonzero indices
+ *   thrust::device_vector<int> indices(8);
+ *
+ *   // compute indices of nonzero elements
+ *   using IndexIterator = thrust::device_vector<int>::iterator;
+ *
+ *   // use make_counting_iterator to define the sequence [0, 8)
+ *   IndexIterator indices_end = thrust::copy_if(thrust::make_counting_iterator(0),
+ *                                               thrust::make_counting_iterator(8),
+ *                                               stencil.begin(),
+ *                                               indices.begin(),
+ *                                               ::internal::identity{});
+ *   // indices now contains [1,2,5,7]
+ *
+ *   return 0;
+ *  }
+ *  \endcode
+ *
+ *  \see make_counting_iterator
+ */
 template <typename Incrementable,
           typename System     = use_default,
           typename Traversal  = use_default,
           typename Difference = use_default>
 class THRUST_DECLSPEC_EMPTY_BASES counting_iterator
-    : public detail::make_counting_iterator_base<Incrementable, System, Traversal, Difference>::type
+    : public detail::counting_iterator_base<Incrementable, System, Traversal, Difference>::type
 {
-  //! \cond
-  using super_t = typename detail::make_counting_iterator_base<Incrementable, System, Traversal, Difference>::type;
+  /*! \cond
+   */
+  using super_t = typename detail::counting_iterator_base<Incrementable, System, Traversal, Difference>::type;
+
   friend class iterator_core_access;
 
 public:
   using reference       = typename super_t::reference;
   using difference_type = typename super_t::difference_type;
-  //! \endcond
 
-  //! Default constructor initializes this \p counting_iterator's counter to `Incrementable{}`.
-  THRUST_HOST_DEVICE counting_iterator()
+  /*! \endcond
+   */
+
+  /*! Default constructor initializes this \p counting_iterator's counter to
+   * `Incrementable{}`.
+   */
+  THRUST_HOST_DEVICE constexpr counting_iterator()
       : super_t(Incrementable{})
   {}
 
-  //! Copy constructor copies the value of another counting_iterator with related System type.
-  //!
-  //! \param rhs The \p counting_iterator to copy.
-  template <class OtherSystem,
-            detail::enable_if_convertible_t<
-              typename iterator_system<counting_iterator<Incrementable, OtherSystem, Traversal, Difference>>::type,
-              typename iterator_system<super_t>::type,
-              int> = 0>
+  /*! Copy constructor copies the value of another counting_iterator
+   *  with related System type.
+   *
+   *  \param rhs The \p counting_iterator to copy.
+   */
+  template <
+    class OtherSystem,
+    detail::enable_if_convertible_t<
+      typename thrust::iterator_system<counting_iterator<Incrementable, OtherSystem, Traversal, Difference>>::type,
+      typename thrust::iterator_system<super_t>::type,
+      int> = 0>
   THRUST_HOST_DEVICE counting_iterator(counting_iterator<Incrementable, OtherSystem, Traversal, Difference> const& rhs)
       : super_t(rhs.base())
   {}
 
-  //! This \c explicit constructor copies the value of an \c Incrementable into a new \p counting_iterator's \c
-  //! Incrementable counter.
-  //!
-  //! \param x The initial value of the new \p counting_iterator's \c Incrementable counter.
+  /*! This \c explicit constructor copies the value of an \c Incrementable
+   *  into a new \p counting_iterator's \c Incrementable counter.
+   *
+   *  \param x The initial value of the new \p counting_iterator's \c Incrementable
+   *         counter.
+   */
   THRUST_HOST_DEVICE explicit counting_iterator(Incrementable x)
       : super_t(x)
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
   THRUST_HOST_DEVICE reference dereference() const
@@ -219,53 +195,47 @@ class THRUST_DECLSPEC_EMPTY_BASES counting_iterator
   }
 
   // note that we implement equal specially for floating point counting_iterator
-  template <typename OtherSystem, typename OtherTraversal, typename OtherDifference>
+  template <typename OtherIncrementable, typename OtherSystem, typename OtherTraversal, typename OtherDifference>
   THRUST_HOST_DEVICE bool
-  equal(counting_iterator<Incrementable, OtherSystem, OtherTraversal, OtherDifference> const& y) const
+  equal(counting_iterator<OtherIncrementable, OtherSystem, OtherTraversal, OtherDifference> const& y) const
   {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    if constexpr (_THRUST_LIBCXX::is_floating_point_v<Incrementable>)
-#else
-    if constexpr (::rocprim::is_floating_point<Incrementable>::value)
-#endif
-    {
-      return distance_to(y) == 0;
-    }
-    else
-    {
-      return this->base() == y.base();
-    }
+    using e = thrust::detail::counting_iterator_equal<difference_type, Incrementable, OtherIncrementable>;
+    return e::equal(this->base(), y.base());
   }
 
-  template <typename OtherSystem, typename OtherTraversal, typename OtherDifference>
+  template <class OtherIncrementable>
   THRUST_HOST_DEVICE difference_type
-  distance_to(counting_iterator<Incrementable, OtherSystem, OtherTraversal, OtherDifference> const& y) const
+  distance_to(counting_iterator<OtherIncrementable, System, Traversal, Difference> const& y) const
   {
-    if constexpr (::internal::is_integral<Incrementable>::value)
-    {
-      return static_cast<difference_type>(y.base()) - static_cast<difference_type>(this->base());
-    }
-    else
-    {
-      return y.base() - this->base();
-    }
+    using d = typename thrust::detail::eval_if<
+      thrust::detail::is_numeric<Incrementable>::value,
+      thrust::detail::identity_<thrust::detail::number_distance<difference_type, Incrementable, OtherIncrementable>>,
+      thrust::detail::identity_<
+        thrust::detail::iterator_distance<difference_type, Incrementable, OtherIncrementable>>>::type;
+
+    return d::distance(this->base(), y.base());
   }
 
-  //! \endcond
-};
+  /*! \endcond
+   */
+}; // end counting_iterator
 
-//! \p make_counting_iterator creates a \p counting_iterator
-//! using an initial value for its \c Incrementable counter.
-//!
-//! \param x The initial value of the new \p counting_iterator's counter.
-//! \return A new \p counting_iterator whose counter has been initialized to \p x.
+/*! \p make_counting_iterator creates a \p counting_iterator
+ *  using an initial value for its \c Incrementable counter.
+ *
+ *  \param x The initial value of the new \p counting_iterator's counter.
+ *  \return A new \p counting_iterator whose counter has been initialized to \p x.
+ */
 template <typename Incrementable>
 inline THRUST_HOST_DEVICE counting_iterator<Incrementable> make_counting_iterator(Incrementable x)
 {
   return counting_iterator<Incrementable>(x);
 }
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/any_assign.h b/projects/rocthrust/thrust/iterator/detail/any_assign.h
index 609d23830c51..08b0b492c441 100644
--- a/projects/rocthrust/thrust/iterator/detail/any_assign.h
+++ b/projects/rocthrust/thrust/iterator/detail/any_assign.h
@@ -18,31 +18,32 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
+
 // a type which may be assigned any other type
 struct any_assign
 {
-  any_assign() = default;
+  inline THRUST_HOST_DEVICE any_assign() {}
 
   template <typename T>
-  THRUST_HOST_DEVICE any_assign(T)
+  inline THRUST_HOST_DEVICE any_assign(T)
   {}
 
   template <typename T>
-  THRUST_HOST_DEVICE any_assign& operator=(T)
+  inline THRUST_HOST_DEVICE any_assign& operator=(T)
   {
+    if (0)
+    {
+      // trick the compiler into silencing "warning: this expression has no effect"
+      int* x = 0;
+      *x     = 13;
+    } // end if
+
     return *this;
   }
 };
+
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/any_system_tag.h b/projects/rocthrust/thrust/iterator/detail/any_system_tag.h
index 869beebf5302..480e4ec1309f 100644
--- a/projects/rocthrust/thrust/iterator/detail/any_system_tag.h
+++ b/projects/rocthrust/thrust/iterator/detail/any_system_tag.h
@@ -29,7 +29,7 @@
 
 THRUST_NAMESPACE_BEGIN
 
-struct any_system_tag : execution_policy<any_system_tag>
+struct any_system_tag : thrust::execution_policy<any_system_tag>
 {
   // allow any_system_tag to convert to any type at all
   // XXX make this safer using enable_if<is_tag<T>> upon c++11
diff --git a/projects/rocthrust/thrust/iterator/detail/constant_iterator_base.h b/projects/rocthrust/thrust/iterator/detail/constant_iterator_base.h
new file mode 100644
index 000000000000..f132a730c68d
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/constant_iterator_base.h
@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/iterator_adaptor.h>
+
+THRUST_NAMESPACE_BEGIN
+
+// forward declaration of constant_iterator
+template <typename, typename, typename>
+class constant_iterator;
+
+namespace detail
+{
+
+template <typename Value, typename Incrementable, typename System>
+struct constant_iterator_base
+{
+  using value_type = Value;
+
+  // the reference type is the same as the value_type.
+  // we wish to avoid returning a reference to the internal state
+  // of the constant_iterator, which is prone to subtle bugs.
+  // consider the temporary iterator created in the expression
+  // *(iter + i)
+  using reference = value_type;
+
+  // the incrementable type is int unless otherwise specified
+  using incrementable =
+    typename thrust::detail::ia_dflt_help<Incrementable, thrust::detail::identity_<thrust::detail::intmax_t>>::type;
+
+  using base_iterator = typename thrust::counting_iterator<incrementable, System, thrust::random_access_traversal_tag>;
+
+  using type = typename thrust::iterator_adaptor<
+    constant_iterator<Value, Incrementable, System>,
+    base_iterator,
+    value_type,
+    typename thrust::iterator_system<base_iterator>::type,
+    typename thrust::iterator_traversal<base_iterator>::type,
+    reference>;
+}; // end constant_iterator_base
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/counting_iterator.inl b/projects/rocthrust/thrust/iterator/detail/counting_iterator.inl
new file mode 100644
index 000000000000..7ced94215dcc
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/counting_iterator.inl
@@ -0,0 +1,129 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/detail/numeric_traits.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/iterator_traits.h>
+
+#include _THRUST_STD_INCLUDE(cstddef)
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+// forward declaration of counting_iterator
+template <typename Incrementable, typename System, typename Traversal, typename Difference>
+class counting_iterator;
+
+namespace detail
+{
+
+template <typename Incrementable, typename System, typename Traversal, typename Difference>
+struct counting_iterator_base
+{
+  using system = typename thrust::detail::eval_if<_THRUST_STD::is_same<System, use_default>::value,
+                                                  thrust::detail::identity_<thrust::any_system_tag>,
+                                                  thrust::detail::identity_<System>>::type;
+
+  using traversal = typename thrust::detail::ia_dflt_help<
+    Traversal,
+    thrust::detail::eval_if<thrust::detail::is_numeric<Incrementable>::value,
+                            thrust::detail::identity_<random_access_traversal_tag>,
+                            thrust::iterator_traversal<Incrementable>>>::type;
+
+  // unlike Boost, we explicitly use std::ptrdiff_t as the difference type
+  // for floating point counting_iterators
+  using difference = typename thrust::detail::ia_dflt_help<
+    Difference,
+    thrust::detail::eval_if<thrust::detail::is_numeric<Incrementable>::value,
+                            thrust::detail::eval_if<::internal::is_integral<Incrementable>::value,
+                                                    thrust::detail::numeric_difference<Incrementable>,
+                                                    thrust::detail::identity_<_THRUST_STD::ptrdiff_t>>,
+                            thrust::iterator_difference<Incrementable>>>::type;
+
+  // our implementation departs from Boost's in that counting_iterator::dereference
+  // returns a copy of its counter, rather than a reference to it. returning a reference
+  // to the internal state of an iterator causes subtle bugs (consider the temporary
+  // iterator created in the expression *(iter + i)) and has no compelling use case
+  using type =
+    thrust::iterator_adaptor<counting_iterator<Incrementable, System, Traversal, Difference>,
+                             Incrementable,
+                             Incrementable,
+                             system,
+                             traversal,
+                             Incrementable,
+                             difference>;
+}; // end counting_iterator_base
+
+template <typename Difference, typename Incrementable1, typename Incrementable2>
+struct iterator_distance
+{
+  THRUST_HOST_DEVICE static Difference distance(Incrementable1 x, Incrementable2 y)
+  {
+    return y - x;
+  }
+};
+
+template <typename Difference, typename Incrementable1, typename Incrementable2>
+struct number_distance
+{
+  THRUST_HOST_DEVICE static Difference distance(Incrementable1 x, Incrementable2 y)
+  {
+    return static_cast<Difference>(numeric_distance(x, y));
+  }
+};
+
+template <typename Difference, typename Incrementable1, typename Incrementable2, typename Enable = void>
+struct counting_iterator_equal
+{
+  THRUST_HOST_DEVICE static bool equal(Incrementable1 x, Incrementable2 y)
+  {
+    return x == y;
+  }
+};
+
+// specialization for floating point equality
+template <typename Difference, typename Incrementable1, typename Incrementable2>
+struct counting_iterator_equal<Difference,
+                               Incrementable1,
+                               Incrementable2,
+                               _THRUST_STD::enable_if_t<_THRUST_STD::is_floating_point<Incrementable1>::value
+                                                        || _THRUST_STD::is_floating_point<Incrementable2>::value>>
+{
+  THRUST_HOST_DEVICE static bool equal(Incrementable1 x, Incrementable2 y)
+  {
+    using d = number_distance<Difference, Incrementable1, Incrementable2>;
+    return d::distance(x, y) == 0;
+  }
+};
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/device_system_tag.h b/projects/rocthrust/thrust/iterator/detail/device_system_tag.h
index a7235c09ecae..775c778efaaf 100644
--- a/projects/rocthrust/thrust/iterator/detail/device_system_tag.h
+++ b/projects/rocthrust/thrust/iterator/detail/device_system_tag.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // #include the device system's execution_policy header
 #define __THRUST_DEVICE_SYSTEM_TAG_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/execution_policy.h>
 #include __THRUST_DEVICE_SYSTEM_TAG_HEADER
diff --git a/projects/rocthrust/thrust/iterator/detail/discard_iterator_base.h b/projects/rocthrust/thrust/iterator/detail/discard_iterator_base.h
new file mode 100644
index 000000000000..fd6bc7e374c6
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/discard_iterator_base.h
@@ -0,0 +1,65 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/detail/any_assign.h>
+#include <thrust/iterator/iterator_adaptor.h>
+
+#include _THRUST_STD_INCLUDE(cstddef) // for std::ptrdiff_t
+
+THRUST_NAMESPACE_BEGIN
+
+// forward declaration of discard_iterator
+template <typename>
+class discard_iterator;
+
+namespace detail
+{
+
+template <typename System>
+struct discard_iterator_base
+{
+  // XXX value_type should actually be void
+  //     but this interferes with zip_iterator<discard_iterator>
+  using value_type    = any_assign;
+  using reference     = any_assign&;
+  using incrementable = _THRUST_STD::ptrdiff_t;
+
+  using base_iterator = typename thrust::counting_iterator<incrementable, System, thrust::random_access_traversal_tag>;
+
+  using type = typename thrust::iterator_adaptor<
+    discard_iterator<System>,
+    base_iterator,
+    value_type,
+    typename thrust::iterator_system<base_iterator>::type,
+    typename thrust::iterator_traversal<base_iterator>::type,
+    reference>;
+}; // end discard_iterator_base
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/distance_from_result.h b/projects/rocthrust/thrust/iterator/detail/distance_from_result.h
new file mode 100644
index 000000000000..f2dc635ba973
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/distance_from_result.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_traits.h>
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+// since both arguments are known to be specializations of iterator_facade,
+// it's legal to access IteratorFacade2::difference_type
+template <typename IteratorFacade1, typename IteratorFacade2>
+struct distance_from_result
+    : eval_if<_THRUST_STD::is_convertible<IteratorFacade2, IteratorFacade1>::value,
+              identity_<typename IteratorFacade1::difference_type>,
+              identity_<typename IteratorFacade2::difference_type>>
+{};
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/host_system_tag.h b/projects/rocthrust/thrust/iterator/detail/host_system_tag.h
index 406287ff576c..1363b397687c 100644
--- a/projects/rocthrust/thrust/iterator/detail/host_system_tag.h
+++ b/projects/rocthrust/thrust/iterator/detail/host_system_tag.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // #include the host system's execution_policy header
 #define __THRUST_HOST_SYSTEM_TAG_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/execution_policy.h>
 #include __THRUST_HOST_SYSTEM_TAG_HEADER
diff --git a/projects/rocthrust/thrust/iterator/detail/is_iterator_category.h b/projects/rocthrust/thrust/iterator/detail/is_iterator_category.h
new file mode 100644
index 000000000000..44254e94683c
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/is_iterator_category.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/iterator_categories.h>
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template <typename T>
+struct is_host_iterator_category
+    : _THRUST_STD::disjunction<_THRUST_STD::is_convertible<T, thrust::input_host_iterator_tag>,
+                               _THRUST_STD::is_convertible<T, thrust::output_host_iterator_tag>>
+{}; // end is_host_iterator_category
+
+template <typename T>
+struct is_device_iterator_category
+    : _THRUST_STD::disjunction<_THRUST_STD::is_convertible<T, thrust::input_device_iterator_tag>,
+                               _THRUST_STD::is_convertible<T, thrust::output_device_iterator_tag>>
+{}; // end is_device_iterator_category
+
+template <typename T>
+struct is_iterator_category : _THRUST_STD::disjunction<is_host_iterator_category<T>, is_device_iterator_category<T>>
+{}; // end is_iterator_category
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h b/projects/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
index 87581bb7dcbe..0dcd7a41da95 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_adaptor_base.h
@@ -26,7 +26,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/use_default.h>
 #include <thrust/iterator/iterator_facade.h>
@@ -38,7 +37,7 @@
 
 THRUST_NAMESPACE_BEGIN
 
-// forward declaration of iterator_adaptor for make_iterator_adaptor_base below
+// forward declaration of iterator_adaptor for iterator_adaptor_base below
 template <typename Derived,
           typename Base,
           typename Value,
@@ -50,12 +49,18 @@ class iterator_adaptor;
 
 namespace detail
 {
-// If T is use_default, return the result of invoking DefaultNullaryFn, otherwise return T.
+
+// If T is use_default, return the result of invoking
+// DefaultNullaryFn, otherwise return T.
+// XXX rename to dflt_help
 template <class T, class DefaultNullaryFn>
-using replace_if_use_default =
-  typename ::internal::If<_THRUST_STD::is_same_v<T, use_default>, DefaultNullaryFn, identity_<T>>::type;
+struct ia_dflt_help
+    : thrust::detail::
+        eval_if<_THRUST_STD::is_same<T, thrust::use_default>::value, DefaultNullaryFn, thrust::detail::identity_<T>>
+{}; // end ia_dflt_help
 
-// A metafunction which computes an iterator_adaptor's base class, a specialization of iterator_facade.
+// A metafunction which computes an iterator_adaptor's base class,
+// a specialization of iterator_facade.
 template <typename Derived,
           typename Base,
           typename Value,
@@ -63,22 +68,24 @@ template <typename Derived,
           typename Traversal,
           typename Reference,
           typename Difference>
-struct make_iterator_adaptor_base
+struct iterator_adaptor_base
 {
-private:
-  using value     = replace_if_use_default<Value, lazy_trait<it_value_t, Base>>;
-  using system    = replace_if_use_default<System, iterator_system<Base>>;
-  using traversal = replace_if_use_default<Traversal, iterator_traversal<Base>>;
+  using value = typename ia_dflt_help<Value, iterator_value<Base>>::type;
+
+  using system = typename ia_dflt_help<System, thrust::iterator_system<Base>>::type;
+
+  using traversal = typename ia_dflt_help<Traversal, thrust::iterator_traversal<Base>>::type;
+
   using reference =
-    replace_if_use_default<Reference,
-                           ::internal::If<_THRUST_STD::is_same_v<Value, use_default>,
-                                          lazy_trait<it_reference_t, Base>,
-                                          _THRUST_STD::add_lvalue_reference<Value>>>;
-  using difference = replace_if_use_default<Difference, lazy_trait<it_difference_t, Base>>;
-
-public:
-  using type = iterator_facade<Derived, value, system, traversal, reference, difference>;
-};
+    typename ia_dflt_help<Reference,
+                          thrust::detail::eval_if<_THRUST_STD::is_same<Value, use_default>::value,
+                                                  thrust::iterator_reference<Base>,
+                                                  _THRUST_STD::add_lvalue_reference<Value>>>::type;
+
+  using difference = typename ia_dflt_help<Difference, iterator_difference<Base>>::type;
+
+  using type = thrust::iterator_facade<Derived, value, system, traversal, reference, difference>;
+}; // end iterator_adaptor_base
 
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_category_to_system.h b/projects/rocthrust/thrust/iterator/detail/iterator_category_to_system.h
index 407738a0ae74..854977688e3c 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_category_to_system.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_category_to_system.h
@@ -25,27 +25,57 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/iterator/detail/device_system_tag.h>
 #include <thrust/iterator/detail/host_system_tag.h>
+#include <thrust/iterator/detail/iterator_traversal_tags.h>
 #include <thrust/iterator/iterator_categories.h>
 
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
 THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-THRUST_HOST_DEVICE auto cat_to_system_impl(...) -> void;
 
-THRUST_HOST_DEVICE auto cat_to_system_impl(const input_host_iterator_tag&) -> host_system_tag;
-THRUST_HOST_DEVICE auto cat_to_system_impl(const output_host_iterator_tag&) -> host_system_tag;
+// forward declaration
+template <typename>
+struct is_iterator_system;
 
-THRUST_HOST_DEVICE auto cat_to_system_impl(const input_device_iterator_tag&) -> device_system_tag;
-THRUST_HOST_DEVICE auto cat_to_system_impl(const output_device_iterator_tag&) -> device_system_tag;
+template <typename>
+struct device_iterator_category_to_backend_system;
 
+// XXX this should work entirely differently
+// we should just specialize this metafunction for iterator_category_with_system_and_traversal
 template <typename Category>
 struct iterator_category_to_system
-{
-  using type = decltype(cat_to_system_impl(Category{}));
-};
+    // convertible to host iterator?
+    : eval_if<
+        _THRUST_STD::disjunction<_THRUST_STD::is_convertible<Category, thrust::input_host_iterator_tag>,
+                                 _THRUST_STD::is_convertible<Category, thrust::output_host_iterator_tag>>::value,
+
+        detail::identity_<thrust::host_system_tag>,
+
+        // convertible to device iterator?
+        eval_if<_THRUST_STD::disjunction<_THRUST_STD::is_convertible<Category, thrust::input_device_iterator_tag>,
+                                         _THRUST_STD::is_convertible<Category, thrust::output_device_iterator_tag>>::value,
+
+                detail::identity_<thrust::device_system_tag>,
+
+                // unknown system
+                detail::identity_<void>> // if device
+        > // if host
+{}; // end iterator_category_to_system
+
+template <typename CategoryOrTraversal>
+struct iterator_category_or_traversal_to_system
+    : eval_if<is_iterator_system<CategoryOrTraversal>::value,
+              detail::identity_<CategoryOrTraversal>,
+              iterator_category_to_system<CategoryOrTraversal>>
+{}; // end iterator_category_or_traversal_to_system
+
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h b/projects/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
index c02ad8d53012..01b878f7df67 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_category_to_traversal.h
@@ -25,9 +25,8 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/iterator_category_to_system.h>
 #include <thrust/iterator/detail/iterator_traversal_tags.h>
 #include <thrust/iterator/iterator_categories.h>
 
@@ -39,29 +38,69 @@ THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(...) -> void;
-
-// host
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const random_access_host_iterator_tag&) -> random_access_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const bidirectional_host_iterator_tag&) -> bidirectional_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const forward_host_iterator_tag&) -> forward_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const input_host_iterator_tag&) -> single_pass_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const output_host_iterator_tag&) -> incrementable_traversal_tag;
-
-// device
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const random_access_device_iterator_tag&) -> random_access_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const bidirectional_device_iterator_tag&) -> bidirectional_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const forward_device_iterator_tag&) -> forward_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const input_device_iterator_tag&) -> single_pass_traversal_tag;
-THRUST_HOST_DEVICE auto cat_to_traversal_impl(const output_device_iterator_tag&) -> incrementable_traversal_tag;
+
+// forward declarations
+template <typename>
+struct is_iterator_system;
+template <typename>
+struct is_iterator_traversal;
+
+template <typename Category>
+struct host_system_category_to_traversal
+    : eval_if<_THRUST_STD::is_convertible<Category, random_access_host_iterator_tag>::value,
+              detail::identity_<random_access_traversal_tag>,
+              eval_if<_THRUST_STD::is_convertible<Category, bidirectional_host_iterator_tag>::value,
+                      detail::identity_<bidirectional_traversal_tag>,
+                      eval_if<_THRUST_STD::is_convertible<Category, forward_host_iterator_tag>::value,
+                              detail::identity_<forward_traversal_tag>,
+                              eval_if<_THRUST_STD::is_convertible<Category, input_host_iterator_tag>::value,
+                                      detail::identity_<single_pass_traversal_tag>,
+                                      eval_if<_THRUST_STD::is_convertible<Category, output_host_iterator_tag>::value,
+                                              detail::identity_<incrementable_traversal_tag>,
+                                              detail::identity_<void>>>>>>
+{}; // end host_system_category_to_traversal
+
+template <typename Category>
+struct device_system_category_to_traversal
+    : eval_if<_THRUST_STD::is_convertible<Category, random_access_device_iterator_tag>::value,
+              detail::identity_<random_access_traversal_tag>,
+              eval_if<_THRUST_STD::is_convertible<Category, bidirectional_device_iterator_tag>::value,
+                      detail::identity_<bidirectional_traversal_tag>,
+                      eval_if<_THRUST_STD::is_convertible<Category, forward_device_iterator_tag>::value,
+                              detail::identity_<forward_traversal_tag>,
+                              eval_if<_THRUST_STD::is_convertible<Category, input_device_iterator_tag>::value,
+                                      detail::identity_<single_pass_traversal_tag>,
+                                      eval_if<_THRUST_STD::is_convertible<Category, output_device_iterator_tag>::value,
+                                              detail::identity_<incrementable_traversal_tag>,
+                                              detail::identity_<void>>>>>>
+{}; // end device_system_category_to_traversal
+
+template <typename Category>
+struct category_to_traversal
+    // check for host system
+    : eval_if<
+        _THRUST_STD::disjunction<_THRUST_STD::is_convertible<Category, thrust::input_host_iterator_tag>,
+                                 _THRUST_STD::is_convertible<Category, thrust::output_host_iterator_tag>>::value,
+
+        host_system_category_to_traversal<Category>,
+
+        // check for device system
+        eval_if<_THRUST_STD::disjunction<_THRUST_STD::is_convertible<Category, thrust::input_device_iterator_tag>,
+                                         _THRUST_STD::is_convertible<Category, thrust::output_device_iterator_tag>>::value,
+
+                device_system_category_to_traversal<Category>,
+
+                // unknown category
+                detail::identity_<void>>>
+{};
 
 template <typename CategoryOrTraversal>
 struct iterator_category_to_traversal
-{
-  using type = ::internal::If<_THRUST_STD::is_convertible_v<CategoryOrTraversal, incrementable_traversal_tag>,
-                              CategoryOrTraversal,
-                              decltype(cat_to_traversal_impl(CategoryOrTraversal{}))>;
-};
+    : eval_if<is_iterator_traversal<CategoryOrTraversal>::value,
+              detail::identity_<CategoryOrTraversal>,
+              category_to_traversal<CategoryOrTraversal>>
+{}; // end iterator_category_to_traversal
+
 } // namespace detail
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_category_with_system_and_traversal.h b/projects/rocthrust/thrust/iterator/detail/iterator_category_with_system_and_traversal.h
index d84ae5c8b226..06ef25499fac 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_category_with_system_and_traversal.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_category_with_system_and_traversal.h
@@ -18,20 +18,13 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
+
 template <typename Category, typename System, typename Traversal>
 struct iterator_category_with_system_and_traversal : Category
-{};
+{}; // end iterator_category_with_system_and_traversal
 
 // specialize iterator_category_to_system for iterator_category_with_system_and_traversal
 template <typename Category>
@@ -41,7 +34,7 @@ template <typename Category, typename System, typename Traversal>
 struct iterator_category_to_system<iterator_category_with_system_and_traversal<Category, System, Traversal>>
 {
   using type = System;
-};
+}; // end iterator_category_to_system
 
 // specialize iterator_category_to_traversal for iterator_category_with_system_and_traversal
 template <typename Category>
@@ -51,7 +44,7 @@ template <typename Category, typename System, typename Traversal>
 struct iterator_category_to_traversal<iterator_category_with_system_and_traversal<Category, System, Traversal>>
 {
   using type = Traversal;
-};
+}; // end iterator_category_to_traversal
 
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_facade_category.h b/projects/rocthrust/thrust/iterator/detail/iterator_facade_category.h
index 7a8a7c6b9162..f32ca05f5c2b 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_facade_category.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_facade_category.h
@@ -25,12 +25,11 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/iterator/detail/device_system_tag.h>
 #include <thrust/iterator/detail/host_system_tag.h>
-#include <thrust/iterator/detail/iterator_category_to_system.h>
+#include <thrust/iterator/detail/is_iterator_category.h>
 #include <thrust/iterator/detail/iterator_category_to_traversal.h>
 #include <thrust/iterator/detail/iterator_category_with_system_and_traversal.h>
 #include <thrust/iterator/detail/iterator_traversal_tags.h>
@@ -46,21 +45,6 @@ THRUST_NAMESPACE_BEGIN
 
 namespace detail
 {
-template <typename T>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_host_iterator_category =
-  _THRUST_STD::is_convertible_v<T, input_host_iterator_tag>
-  || _THRUST_STD::is_convertible_v<T, output_host_iterator_tag>;
-
-template <typename T>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_device_iterator_category =
-  _THRUST_STD::is_convertible_v<T, input_device_iterator_tag>
-  || _THRUST_STD::is_convertible_v<T, output_device_iterator_tag>;
-
-template <typename T>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_iterator_category = is_host_iterator_category<T> || is_device_iterator_category<T>;
 
 // adapted from http://www.boost.org/doc/libs/1_37_0/libs/iterator/doc/iterator_facade.html#iterator-category
 //
@@ -105,99 +89,125 @@ inline constexpr bool is_iterator_category = is_host_iterator_category<T> || is_
 //        derived traversal tag type to which X is also convertible,
 //        and not to any more-derived traversal tag type.
 
+template <typename System, typename Traversal, typename ValueParam, typename Reference>
+struct iterator_facade_default_category;
+
 // Thrust's implementation of iterator_facade_default_category is slightly
 // different from Boost's equivalent.
-// Thrust does not check is_convertible_v<Reference, ValueParam> because Reference
-// may not be a complete type at this point, and implementations of is_convertible_v
+// Thrust does not check is_convertible<Reference, ValueParam> because Reference
+// may not be a complete type at this point, and implementations of is_convertible
 // typically require that both types be complete.
-// Instead, it simply assumes that if is_convertible_v<Traversal, single_pass_traversal_tag>,
+// Instead, it simply assumes that if is_convertible<Traversal, single_pass_traversal_tag>,
 // then the category is input_iterator_tag
 
 // this is the function for standard system iterators
 template <typename Traversal, typename ValueParam, typename Reference>
-using iterator_facade_default_category_std =
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-                 ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
-                                _THRUST_STD::random_access_iterator_tag,
-                                ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
-                                               _THRUST_STD::bidirectional_iterator_tag,
-                                               _THRUST_STD::forward_iterator_tag>>,
-                 ::internal::If< // we differ from Boost here
-                   _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
-                   _THRUST_STD::input_iterator_tag,
-                   Traversal>>;
+struct iterator_facade_default_category_std
+    : thrust::detail::eval_if<
+        _THRUST_STD::is_convertible<Traversal, thrust::forward_traversal_tag>::value,
+        thrust::detail::eval_if<
+          _THRUST_STD::is_convertible<Traversal, thrust::random_access_traversal_tag>::value,
+          thrust::detail::identity_<_THRUST_STD::random_access_iterator_tag>,
+          thrust::detail::eval_if<_THRUST_STD::is_convertible<Traversal, thrust::bidirectional_traversal_tag>::value,
+                                  thrust::detail::identity_<_THRUST_STD::bidirectional_iterator_tag>,
+                                  thrust::detail::identity_<_THRUST_STD::forward_iterator_tag>>>,
+        thrust::detail::eval_if< // XXX note we differ from Boost here
+          _THRUST_STD::is_convertible<Traversal, thrust::single_pass_traversal_tag>::value,
+          thrust::detail::identity_<_THRUST_STD::input_iterator_tag>,
+          thrust::detail::identity_<Traversal>>>
+{}; // end iterator_facade_default_category_std
 
 // this is the function for host system iterators
 template <typename Traversal, typename ValueParam, typename Reference>
-using iterator_facade_default_category_host =
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-                 ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
-                                random_access_host_iterator_tag,
-                                ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
-                                               bidirectional_host_iterator_tag,
-                                               forward_host_iterator_tag>>,
-                 ::internal::If< // we differ from Boost here
-                   _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
-                   input_host_iterator_tag,
-                   Traversal>>;
+struct iterator_facade_default_category_host
+    : thrust::detail::eval_if<
+        _THRUST_STD::is_convertible<Traversal, thrust::forward_traversal_tag>::value,
+        thrust::detail::eval_if<
+          _THRUST_STD::is_convertible<Traversal, thrust::random_access_traversal_tag>::value,
+          thrust::detail::identity_<thrust::random_access_host_iterator_tag>,
+          thrust::detail::eval_if<_THRUST_STD::is_convertible<Traversal, thrust::bidirectional_traversal_tag>::value,
+                                  thrust::detail::identity_<thrust::bidirectional_host_iterator_tag>,
+                                  thrust::detail::identity_<thrust::forward_host_iterator_tag>>>,
+        thrust::detail::eval_if< // XXX note we differ from Boost here
+          _THRUST_STD::is_convertible<Traversal, thrust::single_pass_traversal_tag>::value,
+          thrust::detail::identity_<thrust::input_host_iterator_tag>,
+          thrust::detail::identity_<Traversal>>>
+{}; // end iterator_facade_default_category_host
 
 // this is the function for device system iterators
 template <typename Traversal, typename ValueParam, typename Reference>
-using iterator_facade_default_category_device =
-  ::internal::If<_THRUST_STD::is_convertible_v<Traversal, forward_traversal_tag>,
-                 ::internal::If<_THRUST_STD::is_convertible_v<Traversal, random_access_traversal_tag>,
-                                random_access_device_iterator_tag,
-                                ::internal::If<_THRUST_STD::is_convertible_v<Traversal, bidirectional_traversal_tag>,
-                                               bidirectional_device_iterator_tag,
-                                               forward_device_iterator_tag>>,
-                 ::internal::If<
-                   // XXX note we differ from Boost here
-                   _THRUST_STD::is_convertible_v<Traversal, single_pass_traversal_tag>,
-                   input_device_iterator_tag,
-                   Traversal>>;
+struct iterator_facade_default_category_device
+    : thrust::detail::eval_if<
+        _THRUST_STD::is_convertible<Traversal, thrust::forward_traversal_tag>::value,
+        thrust::detail::eval_if<
+          _THRUST_STD::is_convertible<Traversal, thrust::random_access_traversal_tag>::value,
+          thrust::detail::identity_<thrust::random_access_device_iterator_tag>,
+          thrust::detail::eval_if<_THRUST_STD::is_convertible<Traversal, thrust::bidirectional_traversal_tag>::value,
+                                  thrust::detail::identity_<thrust::bidirectional_device_iterator_tag>,
+                                  thrust::detail::identity_<thrust::forward_device_iterator_tag>>>,
+        thrust::detail::eval_if<
+          // XXX note we differ from Boost here
+          _THRUST_STD::is_convertible<Traversal, thrust::single_pass_traversal_tag>::value,
+          thrust::detail::identity_<thrust::input_device_iterator_tag>,
+          thrust::detail::identity_<Traversal>>>
+{}; // end iterator_facade_default_category_device
 
 // this is the function for any system iterators
 template <typename Traversal, typename ValueParam, typename Reference>
-using iterator_facade_default_category_any =
-  iterator_category_with_system_and_traversal<iterator_facade_default_category_std<Traversal, ValueParam, Reference>,
-                                              any_system_tag,
-                                              Traversal>;
+struct iterator_facade_default_category_any
+{
+  using type = thrust::detail::iterator_category_with_system_and_traversal<
+    typename iterator_facade_default_category_std<Traversal, ValueParam, Reference>::type,
+    thrust::any_system_tag,
+    Traversal>;
+}; // end iterator_facade_default_category_any
 
 template <typename System, typename Traversal, typename ValueParam, typename Reference>
-using iterator_facade_default_category = ::internal::If<
-  _THRUST_STD::is_convertible_v<System, any_system_tag>,
-  iterator_facade_default_category_any<Traversal, ValueParam, Reference>,
-  // check for host system
-  ::internal::If<_THRUST_STD::is_convertible_v<System, host_system_tag>,
-                 iterator_facade_default_category_host<Traversal, ValueParam, Reference>,
-                 // check for device system
-                 ::internal::If<_THRUST_STD::is_convertible_v<System, device_system_tag>,
-                                iterator_facade_default_category_device<Traversal, ValueParam, Reference>,
-                                // if we don't recognize the system, get a standard iterator category
-                                // and combine it with System & Traversal
-                                iterator_category_with_system_and_traversal<
-                                  iterator_facade_default_category_std<Traversal, ValueParam, Reference>,
-                                  System,
-                                  Traversal>>>>;
+struct iterator_facade_default_category
+    // check for any system
+    : thrust::detail::eval_if<
+        _THRUST_STD::is_convertible<System, thrust::any_system_tag>::value,
+        iterator_facade_default_category_any<Traversal, ValueParam, Reference>,
+
+        // check for host system
+        thrust::detail::eval_if<
+          _THRUST_STD::is_convertible<System, thrust::host_system_tag>::value,
+          iterator_facade_default_category_host<Traversal, ValueParam, Reference>,
+
+          // check for device system
+          thrust::detail::eval_if<_THRUST_STD::is_convertible<System, thrust::device_system_tag>::value,
+                                  iterator_facade_default_category_device<Traversal, ValueParam, Reference>,
+
+                                  // if we don't recognize the system, get a standard iterator category
+                                  // and combine it with System & Traversal
+                                  thrust::detail::identity_<thrust::detail::iterator_category_with_system_and_traversal<
+                                    typename iterator_facade_default_category_std<Traversal, ValueParam, Reference>::type,
+                                    System,
+                                    Traversal>>>>>
+{};
 
 template <typename System, typename Traversal, typename ValueParam, typename Reference>
 struct iterator_facade_category_impl
 {
-  using category = iterator_facade_default_category<System, Traversal, ValueParam, Reference>;
-
-  // we must be able to deduce both Traversal & System from category, otherwise, munge them all together
-  using type = ::internal::If<_THRUST_STD::is_same_v<Traversal, typename iterator_category_to_traversal<category>::type>
-                                && _THRUST_STD::is_same_v<System, typename iterator_category_to_system<category>::type>,
-                              category,
-                              iterator_category_with_system_and_traversal<category, System, Traversal>>;
-};
+  using category = typename iterator_facade_default_category<System, Traversal, ValueParam, Reference>::type;
+
+  // we must be able to deduce both Traversal & System from category
+  // otherwise, munge them all together
+  using type = typename thrust::detail::eval_if<
+    ::internal::_And<
+      _THRUST_STD::is_same<Traversal, typename thrust::detail::iterator_category_to_traversal<category>::type>,
+      _THRUST_STD::is_same<System, typename thrust::detail::iterator_category_to_system<category>::type>>::value,
+    thrust::detail::identity_<category>,
+    thrust::detail::identity_<
+      thrust::detail::iterator_category_with_system_and_traversal<category, System, Traversal>>>::type;
+}; // end iterator_facade_category_impl
 
 template <typename CategoryOrSystem, typename CategoryOrTraversal, typename ValueParam, typename Reference>
 struct iterator_facade_category
 {
-  using type = typename ::internal::If<
-    is_iterator_category<CategoryOrTraversal>,
-    identity_<CategoryOrTraversal>,
+  using type = typename thrust::detail::eval_if<
+    thrust::detail::is_iterator_category<CategoryOrTraversal>::value,
+    thrust::detail::identity_<CategoryOrTraversal>,
     iterator_facade_category_impl<CategoryOrSystem, CategoryOrTraversal, ValueParam, Reference>>::type;
 }; // end iterator_facade_category
 
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_traits.h b/projects/rocthrust/thrust/iterator/detail/iterator_traits.h
new file mode 100644
index 000000000000..df2ade6baf18
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_traits.h
@@ -0,0 +1,95 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef ITERATOR_DETAIL_ITERATOR_TRAITS_H
+#define ITERATOR_DETAIL_ITERATOR_TRAITS_H
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__iterator/iterator_traits.h)
+// clang-format on
+#else
+#  include <type_traits>
+#endif
+
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
+#  if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+#    include <xutility> // for ::std::input_iterator_tag
+#  else // ^^^ THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC ^^^ / vvv THRUST_HOST_COMPILER !=
+        // THRUST_HOST_COMPILER_MSVC vvv
+#    include <iterator> // for ::std::input_iterator_tag
+#  endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+
+template <typename T>
+using is_cpp17_input_iterator = _THRUST_STD::__is_cpp17_input_iterator<T>;
+template <typename T>
+using is_cpp17_random_access_iterator = _THRUST_STD::__is_cpp17_random_access_iterator<T>;
+
+#else
+
+using input_iterator_tag         = ::std::input_iterator_tag;
+using random_access_iterator_tag = ::std::random_access_iterator_tag;
+
+template <typename T>
+struct has_iterator_category
+{
+private:
+  template <typename U>
+  inline THRUST_HOST_DEVICE static ::std::false_type test(...);
+  template <typename U>
+  inline THRUST_HOST_DEVICE static ::std::true_type test(typename U::iterator_category* = nullptr);
+
+public:
+  static const bool value = decltype(test<T>(nullptr))::value;
+};
+
+template <typename T, typename U, bool = has_iterator_category<::std::iterator_traits<T>>::value>
+struct has_iterator_category_convertible_to
+    : ::std::is_convertible<typename ::std::iterator_traits<T>::iterator_category, U>
+{};
+
+template <typename T, typename U>
+struct has_iterator_category_convertible_to<T, U, false> : ::std::false_type
+{};
+
+template <typename T>
+struct is_cpp17_input_iterator : public has_iterator_category_convertible_to<T, input_iterator_tag>
+{};
+
+template <typename T>
+struct is_cpp17_random_access_iterator : public has_iterator_category_convertible_to<T, random_access_iterator_tag>
+{};
+
+#endif
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
+
+#endif // ITERATOR_DETAIL_ITERATOR_TRAITS_H
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_traits.inl b/projects/rocthrust/thrust/iterator/detail/iterator_traits.inl
new file mode 100644
index 000000000000..745c3c629ec5
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_traits.inl
@@ -0,0 +1,129 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/iterator_category_to_traversal.h>
+#include <thrust/iterator/iterator_categories.h>
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename Iterator>
+struct iterator_value
+{
+  using type = typename thrust::iterator_traits<Iterator>::value_type;
+}; // end iterator_value
+
+template <typename Iterator>
+using iterator_value_t = typename iterator_value<Iterator>::type;
+
+template <typename Iterator>
+struct iterator_pointer
+{
+  using type = typename thrust::iterator_traits<Iterator>::pointer;
+}; // end iterator_pointer
+
+template <typename Iterator>
+using iterator_pointer_t = typename iterator_pointer<Iterator>::type;
+
+template <typename Iterator>
+struct iterator_reference
+{
+  using type = typename iterator_traits<Iterator>::reference;
+}; // end iterator_reference
+
+template <typename Iterator>
+using iterator_reference_t = typename iterator_reference<Iterator>::type;
+
+template <typename Iterator>
+struct iterator_difference
+{
+  using type = typename thrust::iterator_traits<Iterator>::difference_type;
+}; // end iterator_difference
+
+template <typename Iterator>
+using iterator_difference_t = typename iterator_difference<Iterator>::type;
+
+namespace detail
+{
+
+template <typename Iterator, typename = void>
+struct iterator_system_impl
+{};
+
+template <typename Iterator>
+struct iterator_system_impl<Iterator, _THRUST_STD::void_t<typename iterator_traits<Iterator>::iterator_category>>
+    : detail::iterator_category_to_system<typename iterator_traits<Iterator>::iterator_category>
+{};
+
+} // namespace detail
+
+template <typename Iterator>
+struct iterator_system : detail::iterator_system_impl<Iterator>
+{};
+
+// specialize iterator_system for void *, which has no category
+template <>
+struct iterator_system<void*>
+{
+  using type = thrust::iterator_system<int*>::type;
+}; // end iterator_system<void*>
+
+template <>
+struct iterator_system<const void*>
+{
+  using type = thrust::iterator_system<const int*>::type;
+}; // end iterator_system<void*>
+
+template <typename Iterator>
+using iterator_system_t = typename iterator_system<Iterator>::type;
+
+template <typename Iterator>
+struct iterator_traversal
+    : detail::iterator_category_to_traversal<typename thrust::iterator_traits<Iterator>::iterator_category>
+{}; // end iterator_traversal
+
+namespace detail
+{
+
+template <typename T>
+struct is_iterator_traversal : _THRUST_STD::is_convertible<T, incrementable_traversal_tag>
+{}; // end is_iterator_traversal
+
+template <typename T>
+struct is_iterator_system
+    : _THRUST_STD::disjunction<_THRUST_STD::is_convertible<T, any_system_tag>,
+                              _THRUST_STD::disjunction<_THRUST_STD::is_convertible<T, host_system_tag>,
+                                                      _THRUST_STD::is_convertible<T, device_system_tag>>>
+{}; // end is_iterator_system
+
+} // end namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/iterator_traversal_tags.h b/projects/rocthrust/thrust/iterator/detail/iterator_traversal_tags.h
index 1f949f48746b..7d1be696e7c7 100644
--- a/projects/rocthrust/thrust/iterator/detail/iterator_traversal_tags.h
+++ b/projects/rocthrust/thrust/iterator/detail/iterator_traversal_tags.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 // define Boost's traversal tags
diff --git a/projects/rocthrust/thrust/iterator/detail/join_iterator.h b/projects/rocthrust/thrust/iterator/detail/join_iterator.h
new file mode 100644
index 000000000000..297338a6b008
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/join_iterator.h
@@ -0,0 +1,126 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/detail/minimum_system.h>
+#include <thrust/iterator/iterator_facade.h>
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+namespace detail
+{
+
+template <typename RandomAccessIterator1, typename RandomAccessIterator2, typename Difference, typename Reference>
+class join_iterator;
+
+namespace join_iterator_detail
+{
+
+template <typename RandomAccessIterator1, typename RandomAccessIterator2, typename Difference, typename Reference>
+struct join_iterator_base
+{
+  using value_type = _THRUST_STD::remove_reference_t<Reference>;
+
+  using system1 = typename thrust::iterator_system<RandomAccessIterator1>::type;
+  using system2 = typename thrust::iterator_system<RandomAccessIterator2>::type;
+  using system  = typename thrust::detail::minimum_system<system1, system2>::type;
+
+  using type =
+    thrust::iterator_adaptor<join_iterator<RandomAccessIterator1, RandomAccessIterator2, Difference, Reference>,
+                             thrust::counting_iterator<Difference>,
+                             value_type,
+                             system,
+                             thrust::random_access_traversal_tag,
+                             Reference,
+                             Difference>;
+}; // end join_iterator_base
+
+} // namespace join_iterator_detail
+
+template <typename RandomAccessIterator1,
+          typename RandomAccessIterator2,
+          typename Difference = typename thrust::iterator_difference<RandomAccessIterator1>::type,
+          typename Reference  = typename thrust::iterator_value<RandomAccessIterator1>::type>
+class join_iterator
+    : public join_iterator_detail::
+        join_iterator_base<RandomAccessIterator1, RandomAccessIterator2, Difference, Reference>::type
+{
+private:
+  using super_t = typename join_iterator_detail::
+    join_iterator_base<RandomAccessIterator1, RandomAccessIterator2, Difference, Reference>::type;
+  using size_type = typename super_t::difference_type;
+
+public:
+  inline THRUST_HOST_DEVICE join_iterator(RandomAccessIterator1 first1, size_type n, RandomAccessIterator2 first2)
+      : super_t(thrust::counting_iterator<size_type>(0))
+      , m_n1(n)
+      , m_iter1(first1)
+      , m_iter2(first2 - m_n1)
+  {}
+
+  inline THRUST_HOST_DEVICE join_iterator(const join_iterator& other)
+      : super_t(other)
+      , m_n1(other.m_n1)
+      , m_iter1(other.m_iter1)
+      , m_iter2(other.m_iter2)
+  {}
+
+private:
+  friend class thrust::iterator_core_access;
+
+  // MSVC 2013 and 2015 incorrectly warning about returning a reference to
+  // a local/temporary here.
+  // See goo.gl/LELTNp
+  THRUST_DIAG_PUSH
+  THRUST_DIAG_SUPPRESS_MSVC(4172)
+
+  THRUST_HOST_DEVICE typename super_t::reference dereference() const
+  {
+    size_type i = *super_t::base();
+    return (i < m_n1) ? m_iter1[i] : static_cast<typename super_t::reference>(m_iter2[i]);
+  } // end dereference()
+
+  THRUST_DIAG_POP
+
+  size_type m_n1;
+  RandomAccessIterator1 m_iter1;
+  RandomAccessIterator2 m_iter2;
+}; // end join_iterator
+
+template <typename RandomAccessIterator1, typename Size, typename RandomAccessIterator2>
+THRUST_HOST_DEVICE join_iterator<RandomAccessIterator1, RandomAccessIterator2, Size>
+make_join_iterator(RandomAccessIterator1 first1, Size n1, RandomAccessIterator2 first2)
+{
+  return join_iterator<RandomAccessIterator1, RandomAccessIterator2, Size>(first1, n1, first2);
+} // end make_join_iterator()
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/minimum_category.h b/projects/rocthrust/thrust/iterator/detail/minimum_category.h
new file mode 100644
index 000000000000..31cd276edcc7
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/minimum_category.h
@@ -0,0 +1,49 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_traits/minimum_type.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+template <typename T1,
+          typename T2  = minimum_type_detail::any_conversion,
+          typename T3  = minimum_type_detail::any_conversion,
+          typename T4  = minimum_type_detail::any_conversion,
+          typename T5  = minimum_type_detail::any_conversion,
+          typename T6  = minimum_type_detail::any_conversion,
+          typename T7  = minimum_type_detail::any_conversion,
+          typename T8  = minimum_type_detail::any_conversion,
+          typename T9  = minimum_type_detail::any_conversion,
+          typename T10 = minimum_type_detail::any_conversion,
+          typename T11 = minimum_type_detail::any_conversion,
+          typename T12 = minimum_type_detail::any_conversion,
+          typename T13 = minimum_type_detail::any_conversion,
+          typename T14 = minimum_type_detail::any_conversion,
+          typename T15 = minimum_type_detail::any_conversion,
+          typename T16 = minimum_type_detail::any_conversion>
+struct minimum_category : minimum_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>
+{}; // end minimum_category
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/minimum_system.h b/projects/rocthrust/thrust/iterator/detail/minimum_system.h
index 660778d33f83..be7bf6bb74b9 100644
--- a/projects/rocthrust/thrust/iterator/detail/minimum_system.h
+++ b/projects/rocthrust/thrust/iterator/detail/minimum_system.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/is_metafunction_defined.h>
 #include <thrust/detail/type_traits/minimum_type.h>
@@ -34,15 +26,51 @@ THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
-template <typename... Ts>
+template <typename T1,
+          typename T2  = void,
+          typename T3  = void,
+          typename T4  = void,
+          typename T5  = void,
+          typename T6  = void,
+          typename T7  = void,
+          typename T8  = void,
+          typename T9  = void,
+          typename T10 = void,
+          typename T11 = void,
+          typename T12 = void,
+          typename T13 = void,
+          typename T14 = void,
+          typename T15 = void,
+          typename T16 = void>
 struct unrelated_systems
 {};
 
 // if a minimum system exists for these arguments, return it
 // otherwise, collect the arguments and report them as unrelated
-template <typename... Ts>
-using minimum_system = ::internal::
-  If<is_metafunction_defined<minimum_type<Ts...>>::value, minimum_type<Ts...>, identity_<unrelated_systems<Ts...>>>;
+template <typename T1,
+          typename T2  = minimum_type_detail::any_conversion,
+          typename T3  = minimum_type_detail::any_conversion,
+          typename T4  = minimum_type_detail::any_conversion,
+          typename T5  = minimum_type_detail::any_conversion,
+          typename T6  = minimum_type_detail::any_conversion,
+          typename T7  = minimum_type_detail::any_conversion,
+          typename T8  = minimum_type_detail::any_conversion,
+          typename T9  = minimum_type_detail::any_conversion,
+          typename T10 = minimum_type_detail::any_conversion,
+          typename T11 = minimum_type_detail::any_conversion,
+          typename T12 = minimum_type_detail::any_conversion,
+          typename T13 = minimum_type_detail::any_conversion,
+          typename T14 = minimum_type_detail::any_conversion,
+          typename T15 = minimum_type_detail::any_conversion,
+          typename T16 = minimum_type_detail::any_conversion>
+struct minimum_system
+    : thrust::detail::eval_if<
+        is_metafunction_defined<
+          minimum_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>::value,
+        minimum_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>,
+        thrust::detail::identity_<
+          unrelated_systems<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>>
+{}; // end minimum_system
 
 } // namespace detail
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/normal_iterator.h b/projects/rocthrust/thrust/iterator/detail/normal_iterator.h
index 80c1c90fb8fa..aa431ebf0038 100644
--- a/projects/rocthrust/thrust/iterator/detail/normal_iterator.h
+++ b/projects/rocthrust/thrust/iterator/detail/normal_iterator.h
@@ -14,8 +14,10 @@
  *  limitations under the License.
  */
 
-//! \file normal_iterator.h
-//! \brief Defines the interface to an iterator class which adapts a pointer type.
+/*! \file normal_iterator.h
+ *  \brief Defines the interface to an iterator class
+ *         which adapts a pointer type.
+ */
 
 #pragma once
 
@@ -36,13 +38,13 @@
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
+
 template <typename Pointer>
 class normal_iterator : public iterator_adaptor<normal_iterator<Pointer>, Pointer>
 {
   using super_t = iterator_adaptor<normal_iterator<Pointer>, Pointer>;
 
 public:
-  // TODO(libhipcxx): replace inline with _CCCL_HIDE_FROM_ABI once libhipcxx gets ready
   inline normal_iterator() = default;
 
   THRUST_HOST_DEVICE normal_iterator(Pointer p)
@@ -50,21 +52,23 @@ class normal_iterator : public iterator_adaptor<normal_iterator<Pointer>, Pointe
   {}
 
   template <typename OtherPointer>
-  THRUST_HOST_DEVICE
-  normal_iterator(const normal_iterator<OtherPointer>& other, enable_if_convertible_t<OtherPointer, Pointer>* = 0)
+  THRUST_HOST_DEVICE normal_iterator(const normal_iterator<OtherPointer>& other,
+                                     thrust::detail::enable_if_convertible_t<OtherPointer, Pointer>* = 0)
       : super_t(other.base())
   {}
-};
+
+}; // end normal_iterator
 
 template <typename Pointer>
-THRUST_HOST_DEVICE normal_iterator<Pointer> make_normal_iterator(Pointer ptr)
+inline THRUST_HOST_DEVICE normal_iterator<Pointer> make_normal_iterator(Pointer ptr)
 {
   return normal_iterator<Pointer>(ptr);
 }
+
 } // namespace detail
 
 template <typename T>
-struct proclaim_contiguous_iterator<detail::normal_iterator<T>> : true_type
+struct proclaim_contiguous_iterator<thrust::detail::normal_iterator<T>> : true_type
 {};
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/permutation_iterator_base.h b/projects/rocthrust/thrust/iterator/detail/permutation_iterator_base.h
new file mode 100644
index 000000000000..cefc64c720c6
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/permutation_iterator_base.h
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/minimum_system.h>
+#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/iterator_traits.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename, typename>
+class permutation_iterator;
+
+namespace detail
+{
+
+template <typename ElementIterator, typename IndexIterator>
+struct permutation_iterator_base
+{
+  using System1 = typename thrust::iterator_system<ElementIterator>::type;
+  using System2 = typename thrust::iterator_system<IndexIterator>::type;
+
+  using type =
+    thrust::iterator_adaptor<permutation_iterator<ElementIterator, IndexIterator>,
+                             IndexIterator,
+                             typename thrust::iterator_value<ElementIterator>::type,
+                             typename detail::minimum_system<System1, System2>::type,
+                             thrust::use_default,
+                             typename thrust::iterator_reference<ElementIterator>::type>;
+}; // end permutation_iterator_base
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/retag.h b/projects/rocthrust/thrust/iterator/detail/retag.h
index b56d2879ee8c..81e6370d1870 100644
--- a/projects/rocthrust/thrust/iterator/detail/retag.h
+++ b/projects/rocthrust/thrust/iterator/detail/retag.h
@@ -36,76 +36,84 @@
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
-// we can retag an iterator if FromTag converts to ToTag or vice versa
+
+// we can retag an iterator if FromTag converts to ToTag
+// or vice versa
 template <typename FromTag, typename ToTag>
-// TODO(libhipcxx): replace inline with _CCCL_INLINE_VAR once libhipcxx gets ready
-inline constexpr bool is_retaggable =
-  _THRUST_STD::is_convertible_v<FromTag, ToTag> || _THRUST_STD::is_convertible_v<ToTag, FromTag>;
+struct is_retaggable
+    : integral_constant<bool,
+                        (_THRUST_STD::is_convertible<FromTag, ToTag>::value
+                         || _THRUST_STD::is_convertible<ToTag, FromTag>::value)>
+{};
+
+template <typename FromTag, typename ToTag, typename Result>
+struct enable_if_retaggable : _THRUST_STD::enable_if<is_retaggable<FromTag, ToTag>::value, Result>
+{}; // end enable_if_retaggable
+
 } // namespace detail
 
 template <typename Tag, typename Iterator>
-THRUST_HOST_DEVICE detail::tagged_iterator<Iterator, Tag> reinterpret_tag(Iterator iter)
+THRUST_HOST_DEVICE thrust::detail::tagged_iterator<Iterator, Tag> reinterpret_tag(Iterator iter)
 {
-  return detail::tagged_iterator<Iterator, Tag>(iter);
-}
+  return thrust::detail::tagged_iterator<Iterator, Tag>(iter);
+} // end reinterpret_tag()
 
 // specialization for raw pointer
 template <typename Tag, typename T>
-THRUST_HOST_DEVICE pointer<T, Tag> reinterpret_tag(T* ptr)
+THRUST_HOST_DEVICE thrust::pointer<T, Tag> reinterpret_tag(T* ptr)
 {
-  return pointer<T, Tag>(ptr);
-}
+  return thrust::pointer<T, Tag>(ptr);
+} // end reinterpret_tag()
 
-// specialization for pointer
+// specialization for thrust::pointer
 template <typename Tag, typename T, typename OtherTag, typename Reference, typename Derived>
-THRUST_HOST_DEVICE pointer<T, Tag> reinterpret_tag(pointer<T, OtherTag, Reference, Derived> ptr)
+THRUST_HOST_DEVICE thrust::pointer<T, Tag> reinterpret_tag(thrust::pointer<T, OtherTag, Reference, Derived> ptr)
 {
   return reinterpret_tag<Tag>(ptr.get());
-}
+} // end reinterpret_tag()
 
 // avoid deeply-nested tagged_iterator
 template <typename Tag, typename BaseIterator, typename OtherTag>
-THRUST_HOST_DEVICE detail::tagged_iterator<BaseIterator, Tag>
-reinterpret_tag(detail::tagged_iterator<BaseIterator, OtherTag> iter)
+THRUST_HOST_DEVICE thrust::detail::tagged_iterator<BaseIterator, Tag>
+reinterpret_tag(thrust::detail::tagged_iterator<BaseIterator, OtherTag> iter)
 {
   return reinterpret_tag<Tag>(iter.base());
-}
+} // end reinterpret_tag()
 
-template <typename Tag,
-          typename Iterator,
-          _THRUST_STD::enable_if_t<detail::is_retaggable<typename iterator_system<Iterator>::type, Tag>, int> = 0>
-THRUST_HOST_DEVICE detail::tagged_iterator<Iterator, Tag> retag(Iterator iter)
+template <typename Tag, typename Iterator>
+THRUST_HOST_DEVICE
+  typename thrust::detail::enable_if_retaggable<typename thrust::iterator_system<Iterator>::type,
+                                                Tag,
+                                                thrust::detail::tagged_iterator<Iterator, Tag>>::type
+  retag(Iterator iter)
 {
   return reinterpret_tag<Tag>(iter);
-}
+} // end retag()
 
 // specialization for raw pointer
-template <typename Tag,
-          typename T,
-          _THRUST_STD::enable_if_t<detail::is_retaggable<typename iterator_system<T*>::type, Tag>, int> = 0>
-THRUST_HOST_DEVICE pointer<T, Tag> retag(T* ptr)
+template <typename Tag, typename T>
+THRUST_HOST_DEVICE typename thrust::detail::
+  enable_if_retaggable<typename thrust::iterator_system<T*>::type, Tag, thrust::pointer<T, Tag>>::type
+  retag(T* ptr)
 {
   return reinterpret_tag<Tag>(ptr);
-}
-
-// specialization for pointer
-template <typename Tag,
-          typename T,
-          typename OtherTag,
-          _THRUST_STD::enable_if_t<detail::is_retaggable<OtherTag, Tag>, int> = 0>
-THRUST_HOST_DEVICE pointer<T, Tag> retag(pointer<T, OtherTag> ptr)
+} // end retag()
+
+// specialization for thrust::pointer
+template <typename Tag, typename T, typename OtherTag>
+THRUST_HOST_DEVICE typename thrust::detail::enable_if_retaggable<OtherTag, Tag, thrust::pointer<T, Tag>>::type
+retag(thrust::pointer<T, OtherTag> ptr)
 {
   return reinterpret_tag<Tag>(ptr);
-}
+} // end retag()
 
 // avoid deeply-nested tagged_iterator
-template <typename Tag,
-          typename BaseIterator,
-          typename OtherTag,
-          _THRUST_STD::enable_if_t<detail::is_retaggable<OtherTag, Tag>, int> = 0>
-THRUST_HOST_DEVICE detail::tagged_iterator<BaseIterator, Tag> retag(detail::tagged_iterator<BaseIterator, OtherTag> iter)
+template <typename Tag, typename BaseIterator, typename OtherTag>
+THRUST_HOST_DEVICE
+  typename thrust::detail::enable_if_retaggable<OtherTag, Tag, thrust::detail::tagged_iterator<BaseIterator, Tag>>::type
+  retag(thrust::detail::tagged_iterator<BaseIterator, OtherTag> iter)
 {
   return reinterpret_tag<Tag>(iter);
-}
+} // end retag()
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/reverse_iterator.inl b/projects/rocthrust/thrust/iterator/detail/reverse_iterator.inl
new file mode 100644
index 000000000000..6ef26a897029
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/reverse_iterator.inl
@@ -0,0 +1,90 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/iterator/reverse_iterator.h>
+#include <thrust/iterator/iterator_traits.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace detail
+{
+
+THRUST_EXEC_CHECK_DISABLE
+template<typename Iterator>
+  THRUST_HOST_DEVICE
+  Iterator prior(Iterator x)
+{
+  return --x;
+} // end prior()
+
+} // end detail
+
+template<typename BidirectionalIterator>
+  THRUST_HOST_DEVICE
+  typename reverse_iterator<BidirectionalIterator>::super_t::reference
+    reverse_iterator<BidirectionalIterator>
+      ::dereference() const
+{
+  return *thrust::detail::prior(this->base());
+} // end reverse_iterator::increment()
+
+template<typename BidirectionalIterator>
+  THRUST_HOST_DEVICE
+  void reverse_iterator<BidirectionalIterator>
+    ::increment()
+{
+  --this->base_reference();
+} // end reverse_iterator::increment()
+
+template<typename BidirectionalIterator>
+  THRUST_HOST_DEVICE
+  void reverse_iterator<BidirectionalIterator>
+    ::decrement()
+{
+  ++this->base_reference();
+} // end reverse_iterator::decrement()
+
+template<typename BidirectionalIterator>
+  THRUST_HOST_DEVICE
+  void reverse_iterator<BidirectionalIterator>
+    ::advance(typename super_t::difference_type n)
+{
+  this->base_reference() += -n;
+} // end reverse_iterator::advance()
+
+template<typename BidirectionalIterator>
+  template<typename OtherBidirectionalIterator>
+    THRUST_HOST_DEVICE
+    typename reverse_iterator<BidirectionalIterator>::super_t::difference_type
+      reverse_iterator<BidirectionalIterator>
+        ::distance_to(reverse_iterator<OtherBidirectionalIterator> const &y) const
+{
+  return this->base_reference() - y.base();
+} // end reverse_iterator::distance_to()
+
+template<typename BidirectionalIterator>
+THRUST_HOST_DEVICE
+reverse_iterator<BidirectionalIterator> make_reverse_iterator(BidirectionalIterator x)
+{
+  return reverse_iterator<BidirectionalIterator>(x);
+} // end make_reverse_iterator()
+
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/reverse_iterator_base.h b/projects/rocthrust/thrust/iterator/detail/reverse_iterator_base.h
new file mode 100644
index 000000000000..007709136c33
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/reverse_iterator_base.h
@@ -0,0 +1,40 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/iterator_traits.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename>
+class reverse_iterator;
+
+namespace detail
+{
+
+template <typename BidirectionalIterator>
+struct reverse_iterator_base
+{
+  using type = thrust::iterator_adaptor<thrust::reverse_iterator<BidirectionalIterator>, BidirectionalIterator>;
+}; // end reverse_iterator_base
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/tabulate_output_iterator.inl b/projects/rocthrust/thrust/iterator/detail/tabulate_output_iterator.inl
new file mode 100644
index 000000000000..d5e1b03484e6
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/tabulate_output_iterator.inl
@@ -0,0 +1,61 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/iterator/counting_iterator.h>
+#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/tabulate_output_iterator.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename BinaryFunction, typename System, typename DifferenceT>
+class tabulate_output_iterator;
+
+namespace detail
+{
+
+// Proxy reference that invokes a BinaryFunction with the index of the dereferenced iterator and the assigned value
+template <typename BinaryFunction, typename DifferenceT>
+class tabulate_output_iterator_proxy
+{
+public:
+  THRUST_HOST_DEVICE tabulate_output_iterator_proxy(BinaryFunction fun, DifferenceT index)
+      : fun(fun)
+      , index(index)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T>
+  THRUST_HOST_DEVICE tabulate_output_iterator_proxy operator=(const T& x)
+  {
+    fun(index, x);
+    return *this;
+  }
+
+private:
+  BinaryFunction fun;
+  DifferenceT index;
+};
+
+// Alias template for the iterator_adaptor instantiation to be used for tabulate_output_iterator
+template <typename BinaryFunction, typename System, typename DifferenceT>
+using tabulate_output_iterator_base =
+    thrust::iterator_adaptor<tabulate_output_iterator<BinaryFunction, System, DifferenceT>,
+                             counting_iterator<DifferenceT>,
+                             thrust::use_default,
+                             System,
+                             thrust::use_default,
+                             tabulate_output_iterator_proxy<BinaryFunction, DifferenceT>>;
+
+// Register tabulate_output_iterator_proxy with 'is_proxy_reference' from
+// type_traits to enable its use with algorithms.
+template <class BinaryFunction, class OutputIterator>
+struct is_proxy_reference<tabulate_output_iterator_proxy<BinaryFunction, OutputIterator>>
+    : public thrust::detail::true_type
+{};
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/tagged_iterator.h b/projects/rocthrust/thrust/iterator/detail/tagged_iterator.h
index 22ac66a026ff..d82050932eeb 100644
--- a/projects/rocthrust/thrust/iterator/detail/tagged_iterator.h
+++ b/projects/rocthrust/thrust/iterator/detail/tagged_iterator.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/use_default.h>
 #include <thrust/iterator/iterator_adaptor.h>
 #include <thrust/iterator/iterator_traits.h>
@@ -33,40 +26,48 @@
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
+
 template <typename, typename>
 class tagged_iterator;
 
 template <typename Iterator, typename Tag>
-using make_tagged_iterator_base =
-  iterator_adaptor<tagged_iterator<Iterator, Tag>,
-                   Iterator,
-                   it_value_t<Iterator>,
-                   Tag,
-                   typename iterator_traversal<Iterator>::type,
-                   it_reference_t<Iterator>,
-                   it_difference_t<Iterator>>;
+struct tagged_iterator_base
+{
+  using type =
+    thrust::iterator_adaptor<tagged_iterator<Iterator, Tag>,
+                             Iterator,
+                             typename thrust::iterator_value<Iterator>::type,
+                             Tag,
+                             typename thrust::iterator_traversal<Iterator>::type,
+                             typename thrust::iterator_reference<Iterator>::type,
+                             typename thrust::iterator_difference<Iterator>::type>;
+}; // end tagged_iterator_base
 
 template <typename Iterator, typename Tag>
-class tagged_iterator : public make_tagged_iterator_base<Iterator, Tag>
+class tagged_iterator : public tagged_iterator_base<Iterator, Tag>::type
 {
-  using super_t = make_tagged_iterator_base<Iterator, Tag>;
+private:
+  using super_t = typename tagged_iterator_base<Iterator, Tag>::type;
 
 public:
-  tagged_iterator() = default;
+  THRUST_HOST_DEVICE tagged_iterator() {}
 
   THRUST_HOST_DEVICE explicit tagged_iterator(Iterator x)
       : super_t(x)
   {}
-};
+}; // end tagged_iterator
 
-//! \p make_tagged_iterator creates a \p tagged_iterator from a \c Iterator with system tag \c Tag.
-//!
-//! \tparam Tag Any system tag.
-//! \tparam Iterator Any iterator type.
-//! \param iter The iterator of interest.
-//! \return An iterator whose system tag is \p Tag and whose behavior is otherwise equivalent to \p iter.
+/*! \p make_tagged_iterator creates a \p tagged_iterator
+ *  from a \c Iterator with system tag \c Tag.
+ *
+ *  \tparam Tag Any system tag.
+ *  \tparam Iterator Any iterator type.
+ *  \param iter The iterator of interest.
+ *  \return An iterator whose system tag is \p Tag and whose behavior is otherwise
+ *          equivalent to \p iter.
+ */
 template <typename Tag, typename Iterator>
-auto make_tagged_iterator(Iterator iter) -> tagged_iterator<Iterator, Tag>
+inline auto make_tagged_iterator(Iterator iter) -> tagged_iterator<Iterator, Tag>
 {
   return tagged_iterator<Iterator, Tag>(iter);
 }
diff --git a/projects/rocthrust/thrust/iterator/detail/transform_input_output_iterator.inl b/projects/rocthrust/thrust/iterator/detail/transform_input_output_iterator.inl
new file mode 100644
index 000000000000..e3231d151ce1
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/transform_input_output_iterator.inl
@@ -0,0 +1,111 @@
+/*
+ *  Copyright 2020-2021 NVIDIA Corporation
+ *  Modifications Copyright© 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/iterator_adaptor.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename InputFunction, typename OutputFunction, typename Iterator>
+class transform_input_output_iterator;
+
+namespace detail
+{
+
+// Proxy reference that invokes InputFunction when reading from and
+// OutputFunction when writing to the dereferenced iterator
+template <typename InputFunction, typename OutputFunction, typename Iterator>
+class transform_input_output_iterator_proxy
+{
+  using iterator_value_type = typename thrust::iterator_value<Iterator>::type;
+
+  using Value = invoke_result_t<InputFunction, iterator_value_type>;
+
+public:
+  THRUST_HOST_DEVICE transform_input_output_iterator_proxy(
+    const Iterator& io, InputFunction input_function, OutputFunction output_function)
+      : io(io)
+      , input_function(input_function)
+      , output_function(output_function)
+  {}
+
+  transform_input_output_iterator_proxy(const transform_input_output_iterator_proxy&) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE operator Value() const
+  {
+    return input_function(*io);
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T>
+  THRUST_HOST_DEVICE transform_input_output_iterator_proxy operator=(const T& x)
+  {
+    *io = output_function(x);
+    return *this;
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE transform_input_output_iterator_proxy operator=(const transform_input_output_iterator_proxy& x)
+  {
+    *io = output_function(x);
+    return *this;
+  }
+
+private:
+  Iterator io;
+  InputFunction input_function;
+  OutputFunction output_function;
+};
+
+// Compute the iterator_adaptor instantiation to be used for transform_input_output_iterator
+template <typename InputFunction, typename OutputFunction, typename Iterator>
+struct transform_input_output_iterator_base
+{
+private:
+  using iterator_value_type = typename thrust::iterator_value<Iterator>::type;
+
+public:
+  using type =
+    thrust::iterator_adaptor<transform_input_output_iterator<InputFunction, OutputFunction, Iterator>,
+                             Iterator,
+                             detail::invoke_result_t<InputFunction, iterator_value_type>,
+                             thrust::use_default,
+                             thrust::use_default,
+                             transform_input_output_iterator_proxy<InputFunction, OutputFunction, Iterator>>;
+};
+
+// Register transform_input_output_iterator_proxy with 'is_proxy_reference' from
+// type_traits to enable its use with algorithms.
+template <typename InputFunction, typename OutputFunction, typename Iterator>
+struct is_proxy_reference<transform_input_output_iterator_proxy<InputFunction, OutputFunction, Iterator>>
+    : public thrust::detail::true_type
+{};
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/transform_iterator.inl b/projects/rocthrust/thrust/iterator/detail/transform_iterator.inl
new file mode 100644
index 000000000000..002d829a2edd
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/transform_iterator.inl
@@ -0,0 +1,100 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/functional/actor.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/functional.h>
+#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/iterator_traits.h>
+
+#include _THRUST_STD_INCLUDE(type_traits)
+
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <utility>
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+template <class UnaryFunction, class Iterator, class Reference, class Value>
+class transform_iterator;
+
+namespace detail
+{
+
+template <class UnaryFunc, class Iterator>
+struct transform_iterator_reference
+{
+  // by default, dereferencing the iterator yields the same as the function.
+  using type = decltype(_THRUST_STD::declval<UnaryFunc>()(_THRUST_STD::declval<iterator_value_t<Iterator>>()));
+};
+
+// for certain function objects, we need to tweak the reference type. Notably, identity functions must decay to values.
+// See the implementation of transform_iterator<...>::dereference() for several comments on why this is necessary.
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename T, class Iterator>
+struct transform_iterator_reference<identity<T>, Iterator>
+{
+  using type = T;
+};
+template <class Iterator>
+struct transform_iterator_reference<identity<>, Iterator>
+{
+  using type = iterator_value_t<Iterator>;
+};
+THRUST_SUPPRESS_DEPRECATED_POP
+template <class Iterator>
+struct transform_iterator_reference<::internal::identity, Iterator>
+{
+  using type = iterator_value_t<Iterator>;
+};
+template <typename Eval, class Iterator>
+struct transform_iterator_reference<functional::actor<Eval>, Iterator>
+{
+  using type = _THRUST_STD::remove_reference_t<decltype(_THRUST_STD::declval<functional::actor<Eval>>()(
+    _THRUST_STD::declval<iterator_value_t<Iterator>>()))>;
+};
+
+// Type function to compute the iterator_adaptor instantiation to be used for transform_iterator
+template <class UnaryFunc, class Iterator, class Reference, class Value>
+struct make_transform_iterator_base
+{
+private:
+  using reference  = typename ia_dflt_help<Reference, transform_iterator_reference<UnaryFunc, Iterator>>::type;
+  using value_type = typename ia_dflt_help<Value, ::internal::remove_cvref<reference>>::type;
+
+public:
+  using type =
+    iterator_adaptor<transform_iterator<UnaryFunc, Iterator, Reference, Value>,
+                     Iterator,
+                     value_type,
+                     use_default,
+                     typename iterator_traits<Iterator>::iterator_category,
+                     reference>;
+};
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/transform_output_iterator.inl b/projects/rocthrust/thrust/iterator/detail/transform_output_iterator.inl
new file mode 100644
index 000000000000..0e3bf6a10b43
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/transform_output_iterator.inl
@@ -0,0 +1,85 @@
+/*
+ *  Copyright 2008-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/transform_output_iterator.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename UnaryFunction, typename OutputIterator>
+class transform_output_iterator;
+
+namespace detail
+{
+
+// Proxy reference that uses Unary Function to transform the rhs of assignment
+// operator before writing the result to OutputIterator
+template <typename UnaryFunction, typename OutputIterator>
+class transform_output_iterator_proxy
+{
+public:
+  THRUST_HOST_DEVICE transform_output_iterator_proxy(const OutputIterator& out, UnaryFunction fun)
+      : out(out)
+      , fun(fun)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename T>
+  THRUST_HOST_DEVICE transform_output_iterator_proxy operator=(const T& x)
+  {
+    *out = fun(x);
+    return *this;
+  }
+
+private:
+  OutputIterator out;
+  UnaryFunction fun;
+};
+
+// Compute the iterator_adaptor instantiation to be used for transform_output_iterator
+template <typename UnaryFunction, typename OutputIterator>
+struct transform_output_iterator_base
+{
+  using type =
+    thrust::iterator_adaptor<transform_output_iterator<UnaryFunction, OutputIterator>,
+                             OutputIterator,
+                             thrust::use_default,
+                             thrust::use_default,
+                             thrust::use_default,
+                             transform_output_iterator_proxy<UnaryFunction, OutputIterator>>;
+};
+
+// Register transform_output_iterator_proxy with 'is_proxy_reference' from
+// type_traits to enable its use with algorithms.
+template <class UnaryFunction, class OutputIterator>
+struct is_proxy_reference<transform_output_iterator_proxy<UnaryFunction, OutputIterator>>
+    : public thrust::detail::true_type
+{};
+
+} // namespace detail
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h b/projects/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
index 6436c6e422e0..ea2cf43bb262 100644
--- a/projects/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
+++ b/projects/rocthrust/thrust/iterator/detail/tuple_of_iterator_references.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -58,9 +58,9 @@ struct maybe_unwrap_nested
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <class... Us, class... Ts>
-struct maybe_unwrap_nested<tuple<Us...>, tuple_of_iterator_references<Ts...>>
+struct maybe_unwrap_nested<thrust::tuple<Us...>, tuple_of_iterator_references<Ts...>>
 {
-  THRUST_HOST_DEVICE tuple<Us...> operator()(const tuple_of_iterator_references<Ts...>& t) const
+  THRUST_HOST_DEVICE thrust::tuple<Us...> operator()(const tuple_of_iterator_references<Ts...>& t) const
   {
     return t.template __to_tuple<Us...>(typename _THRUST_STD::__make_tuple_indices<sizeof...(Ts)>::type{});
   }
@@ -68,20 +68,22 @@ struct maybe_unwrap_nested<tuple<Us...>, tuple_of_iterator_references<Ts...>>
 #endif
 
 template <typename... Ts>
-class tuple_of_iterator_references : public tuple<Ts...>
+class tuple_of_iterator_references : public thrust::tuple<Ts...>
 {
 public:
-  using super_t = tuple<Ts...>;
+  using super_t = thrust::tuple<Ts...>;
   using super_t::super_t;
 
-  tuple_of_iterator_references() = default;
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references()
+      : super_t()
+  {}
 
   // allow implicit construction from tuple<refs>
-  THRUST_HOST_DEVICE tuple_of_iterator_references(const super_t& other)
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references(const super_t& other)
       : super_t(other)
   {}
 
-  THRUST_HOST_DEVICE tuple_of_iterator_references(super_t&& other)
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references(super_t&& other)
       : super_t(_THRUST_STD::move(other))
   {}
 
@@ -89,7 +91,7 @@ class tuple_of_iterator_references : public tuple<Ts...>
   // XXX might be worthwhile to guard this with an enable_if is_assignable
   THRUST_EXEC_CHECK_DISABLE
   template <typename... Us>
-  THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const tuple<Us...>& other)
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const thrust::tuple<Us...>& other)
   {
     super_t::operator=(other);
     return *this;
@@ -99,19 +101,21 @@ class tuple_of_iterator_references : public tuple<Ts...>
   // XXX might be worthwhile to guard this with an enable_if is_assignable
   THRUST_EXEC_CHECK_DISABLE
   template <typename U1, typename U2>
-  THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const pair<U1, U2>& other)
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const thrust::pair<U1, U2>& other)
   {
     super_t::operator=(other);
     return *this;
   }
 
   // allow assignment from reference<tuple>
-  // XXX perhaps we should generalize to reference<T> we could captures reference<pair> this way
+  // XXX perhaps we should generalize to reference<T>
+  //     we could captures reference<pair> this way
   THRUST_EXEC_CHECK_DISABLE
   template <typename Pointer, typename Derived, typename... Us>
-  THRUST_HOST_DEVICE tuple_of_iterator_references& operator=(const reference<tuple<Us...>, Pointer, Derived>& other)
+  inline THRUST_HOST_DEVICE tuple_of_iterator_references&
+  operator=(const thrust::reference<thrust::tuple<Us...>, Pointer, Derived>& other)
   {
-    using tuple_type = tuple<Us...>;
+    using tuple_type = thrust::tuple<Us...>;
 
     // XXX perhaps this could be accelerated
     super_t::operator=(tuple_type{other});
@@ -120,7 +124,7 @@ class tuple_of_iterator_references : public tuple<Ts...>
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
   template <class... Us, _THRUST_STD::enable_if_t<sizeof...(Us) == sizeof...(Ts), int> = 0>
-  THRUST_HOST_DEVICE constexpr operator tuple<Us...>() const
+  inline THRUST_HOST_DEVICE constexpr operator thrust::tuple<Us...>() const
   {
     return __to_tuple<Us...>(typename _THRUST_STD::__make_tuple_indices<sizeof...(Ts)>::type{});
   }
@@ -129,14 +133,14 @@ class tuple_of_iterator_references : public tuple<Ts...>
   // this overload of swap() permits swapping tuple_of_iterator_references returned as temporaries from
   // iterator dereferences
   template <class... Us>
-  THRUST_HOST_DEVICE friend void swap(tuple_of_iterator_references&& x, tuple_of_iterator_references<Us...>&& y)
+  inline THRUST_HOST_DEVICE friend void swap(tuple_of_iterator_references&& x, tuple_of_iterator_references<Us...>&& y)
   {
     x.swap(y);
   }
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
   template <class... Us, size_t... Id>
-  THRUST_HOST_DEVICE constexpr tuple<Us...> __to_tuple(_THRUST_STD::__tuple_indices<Id...>) const
+  inline THRUST_HOST_DEVICE constexpr thrust::tuple<Us...> __to_tuple(_THRUST_STD::__tuple_indices<Id...>) const
   {
     return {maybe_unwrap_nested<Us, Ts>{}(get<Id>(*this))...};
   }
@@ -170,7 +174,7 @@ struct tuple_element<Id, THRUST_NS_QUALIFIER::detail::tuple_of_iterator_referenc
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
     : _THRUST_STD::tuple_element<Id, _THRUST_STD::tuple<Ts...>>
 #else
-    : THRUST_NS_QUALIFIER::tuple_element<Id, THRUST_NS_QUALIFIER::tuple<Ts...>>
+    : ::thrust::tuple_element<Id, ::thrust::tuple<Ts...>>
 #endif
 {};
 
@@ -181,7 +185,7 @@ THRUST_NAMESPACE_END
 #endif
 
 // structured bindings support
-#if !THRUST_COMPILER(NVRTC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
 namespace std
 {
 
@@ -195,9 +199,9 @@ struct tuple_element<Id, THRUST_NS_QUALIFIER::detail::tuple_of_iterator_referenc
 #  if _THRUST_HAS_DEVICE_SYSTEM_STD
     : _THRUST_STD::tuple_element<Id, _THRUST_STD::tuple<Ts...>>
 #  else
-    : THRUST_NS_QUALIFIER::tuple_element<Id, THRUST_NS_QUALIFIER::tuple<Ts...>>
+    : ::thrust::tuple_element<Id, ::thrust::tuple<Ts...>>
 #  endif
 {};
 
 } // namespace std
-#endif // !THRUST_COMPILER(NVRTC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
diff --git a/projects/rocthrust/thrust/iterator/detail/universal_categories.h b/projects/rocthrust/thrust/iterator/detail/universal_categories.h
new file mode 100644
index 000000000000..218108c8ddfb
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/universal_categories.h
@@ -0,0 +1,125 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/iterator/iterator_categories.h>
+
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+// define these types without inheritance to avoid ambiguous conversion to base classes
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED input_universal_iterator_tag
+{
+  operator input_host_iterator_tag()
+  {
+    return input_host_iterator_tag();
+  }
+
+  operator input_device_iterator_tag()
+  {
+    return input_device_iterator_tag();
+  }
+};
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED output_universal_iterator_tag
+{
+  operator output_host_iterator_tag()
+  {
+    return output_host_iterator_tag();
+  }
+
+  operator output_device_iterator_tag()
+  {
+    return output_device_iterator_tag();
+  }
+};
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED forward_universal_iterator_tag : input_universal_iterator_tag
+{
+  operator forward_host_iterator_tag()
+  {
+    return forward_host_iterator_tag();
+  };
+
+  operator forward_device_iterator_tag()
+  {
+    return forward_device_iterator_tag();
+  };
+};
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED bidirectional_universal_iterator_tag : forward_universal_iterator_tag
+{
+  operator bidirectional_host_iterator_tag()
+  {
+    return bidirectional_host_iterator_tag();
+  };
+
+  operator bidirectional_device_iterator_tag()
+  {
+    return bidirectional_device_iterator_tag();
+  };
+};
+
+namespace detail
+{
+
+// create this struct to control conversion precedence in random_access_universal_iterator_tag
+template <typename T>
+struct one_degree_of_separation : T
+{};
+
+} // namespace detail
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED random_access_universal_iterator_tag
+{
+  // these conversions are all P0
+  operator random_access_host_iterator_tag()
+  {
+    return random_access_host_iterator_tag();
+  };
+
+  operator random_access_device_iterator_tag()
+  {
+    return random_access_device_iterator_tag();
+  };
+
+  // bidirectional_universal_iterator_tag is P1
+  operator detail::one_degree_of_separation<bidirectional_universal_iterator_tag>()
+  {
+    return detail::one_degree_of_separation<bidirectional_universal_iterator_tag>();
+  }
+};
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_NVRTC
diff --git a/projects/rocthrust/thrust/iterator/detail/zip_iterator.inl b/projects/rocthrust/thrust/iterator/detail/zip_iterator.inl
new file mode 100644
index 000000000000..c1e381987498
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/zip_iterator.inl
@@ -0,0 +1,128 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/detail/tuple_transform.h>
+
+THRUST_NAMESPACE_BEGIN
+
+
+template<typename IteratorTuple>
+THRUST_HOST_DEVICE
+  zip_iterator<IteratorTuple>
+    ::zip_iterator(IteratorTuple iterator_tuple)
+      :m_iterator_tuple(iterator_tuple)
+{
+} // end zip_iterator::zip_iterator()
+
+template<typename IteratorTuple>
+THRUST_HOST_DEVICE
+const IteratorTuple &zip_iterator<IteratorTuple>
+  ::get_iterator_tuple() const
+{
+  return m_iterator_tuple;
+} // end zip_iterator::get_iterator_tuple()
+
+
+template<typename IteratorTuple>
+  typename zip_iterator<IteratorTuple>::super_t::reference
+  THRUST_HOST_DEVICE
+    zip_iterator<IteratorTuple>
+      ::dereference() const
+{
+  using namespace detail::tuple_impl_specific;
+
+  return thrust::detail::tuple_host_device_transform<
+    detail::dereference_iterator::template apply
+  >(get_iterator_tuple(), detail::dereference_iterator());
+} // end zip_iterator::dereference()
+
+
+THRUST_EXEC_CHECK_DISABLE
+template<typename IteratorTuple>
+  template<typename OtherIteratorTuple>
+  THRUST_HOST_DEVICE
+    bool zip_iterator<IteratorTuple>
+      ::equal(const zip_iterator<OtherIteratorTuple> &other) const
+{
+  return get<0>(get_iterator_tuple()) == get<0>(other.get_iterator_tuple());
+} // end zip_iterator::equal()
+
+
+template<typename IteratorTuple>
+THRUST_HOST_DEVICE
+  void zip_iterator<IteratorTuple>
+    ::advance(typename super_t::difference_type n)
+{
+  using namespace detail::tuple_impl_specific;
+  tuple_for_each(m_iterator_tuple,
+                 detail::advance_iterator<typename super_t::difference_type>(n));
+} // end zip_iterator::advance()
+
+
+template<typename IteratorTuple>
+THRUST_HOST_DEVICE
+  void zip_iterator<IteratorTuple>
+    ::increment()
+{
+  using namespace detail::tuple_impl_specific;
+  tuple_for_each(m_iterator_tuple, detail::increment_iterator());
+} // end zip_iterator::increment()
+
+
+template<typename IteratorTuple>
+THRUST_HOST_DEVICE
+  void zip_iterator<IteratorTuple>
+    ::decrement()
+{
+  using namespace detail::tuple_impl_specific;
+  tuple_for_each(m_iterator_tuple, detail::decrement_iterator());
+} // end zip_iterator::decrement()
+
+
+THRUST_EXEC_CHECK_DISABLE
+template<typename IteratorTuple>
+  template <typename OtherIteratorTuple>
+  THRUST_HOST_DEVICE
+    typename zip_iterator<IteratorTuple>::super_t::difference_type
+      zip_iterator<IteratorTuple>
+        ::distance_to(const zip_iterator<OtherIteratorTuple> &other) const
+{
+  return get<0>(other.get_iterator_tuple()) - get<0>(get_iterator_tuple());
+} // end zip_iterator::distance_to()
+
+
+template<typename... Iterators>
+THRUST_HOST_DEVICE
+  zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(thrust::tuple<Iterators...> t)
+{
+  return zip_iterator<thrust::tuple<Iterators...>>(t);
+} // end make_zip_iterator()
+
+
+template<typename... Iterators>
+THRUST_HOST_DEVICE
+  zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(Iterators... its)
+{
+  return make_zip_iterator(thrust::make_tuple(its...));
+} // end make_zip_iterator()
+
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/detail/zip_iterator_base.h b/projects/rocthrust/thrust/iterator/detail/zip_iterator_base.h
new file mode 100644
index 000000000000..6ddc79b53b62
--- /dev/null
+++ b/projects/rocthrust/thrust/iterator/detail/zip_iterator_base.h
@@ -0,0 +1,287 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/advance.h>
+#include <thrust/detail/tuple_meta_transform.h>
+#include <thrust/detail/tuple_transform.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/minimum_category.h>
+#include <thrust/iterator/detail/minimum_system.h>
+#include <thrust/iterator/detail/tuple_of_iterator_references.h>
+#include <thrust/iterator/iterator_categories.h>
+#include <thrust/iterator/iterator_facade.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/tuple.h>
+#include <thrust/type_traits/integer_sequence.h>
+
+THRUST_NAMESPACE_BEGIN
+
+// forward declare zip_iterator for zip_iterator_base
+template <typename IteratorTuple>
+class zip_iterator;
+
+namespace detail
+{
+
+// Functors to be used with tuple algorithms
+//
+template <typename DiffType>
+class advance_iterator
+{
+public:
+  inline THRUST_HOST_DEVICE advance_iterator(DiffType step)
+      : m_step(step)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename Iterator>
+  inline THRUST_HOST_DEVICE void operator()(Iterator& it) const
+  {
+    thrust::advance(it, m_step);
+  }
+
+private:
+  DiffType m_step;
+}; // end advance_iterator
+
+struct increment_iterator
+{
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename Iterator>
+  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
+  {
+    ++it;
+  }
+}; // end increment_iterator
+
+struct decrement_iterator
+{
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename Iterator>
+  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
+  {
+    --it;
+  }
+}; // end decrement_iterator
+
+struct dereference_iterator
+{
+  template <typename Iterator>
+  struct apply
+  {
+    using type = typename iterator_traits<Iterator>::reference;
+  }; // end apply
+
+  // XXX silence warnings of the form "calling a __host__ function from a __host__ __device__ function is not allowed
+  THRUST_EXEC_CHECK_DISABLE
+  template <typename Iterator>
+  THRUST_HOST_DEVICE typename apply<Iterator>::type operator()(Iterator const& it)
+  {
+    return *it;
+  }
+}; // end dereference_iterator
+
+// The namespace tuple_impl_specific provides two meta-
+// algorithms and two algorithms for tuples.
+namespace tuple_impl_specific
+{
+
+// define apply1 for tuple_meta_transform_impl
+template <typename UnaryMetaFunctionClass, class Arg>
+struct apply1 : UnaryMetaFunctionClass::template apply<Arg>
+{}; // end apply1
+
+// define apply2 for tuple_meta_accumulate_impl
+template <typename UnaryMetaFunctionClass, class Arg1, class Arg2>
+struct apply2 : UnaryMetaFunctionClass::template apply<Arg1, Arg2>
+{}; // end apply2
+
+// Meta-accumulate algorithm for tuples. Note: The template
+// parameter StartType corresponds to the initial value in
+// ordinary accumulation.
+//
+template <class Tuple, class BinaryMetaFun, class StartType>
+struct tuple_meta_accumulate;
+
+template <class BinaryMetaFun, typename StartType>
+struct tuple_meta_accumulate<thrust::tuple<>, BinaryMetaFun, StartType>
+{
+  using type = typename thrust::detail::identity_<StartType>::type;
+};
+
+template <class BinaryMetaFun, typename StartType, typename T, typename... Ts>
+struct tuple_meta_accumulate<thrust::tuple<T, Ts...>, BinaryMetaFun, StartType>
+{
+  using type =
+    typename apply2<BinaryMetaFun,
+                    T,
+                    typename tuple_meta_accumulate<thrust::tuple<Ts...>, BinaryMetaFun, StartType>::type>::type;
+};
+
+template <typename Fun>
+inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f)
+{
+  return f;
+}
+
+template <typename Fun, typename T, typename... Ts>
+inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f, T& t, Ts&... ts)
+{
+  f(t);
+  return tuple_for_each_helper(f, ts...);
+}
+
+// for_each algorithm for tuples.
+
+template <typename Fun, typename... Ts, size_t... Is>
+inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f, thrust::index_sequence<Is...>)
+{
+  return tuple_for_each_helper(f, thrust::get<Is>(t)...);
+} // end tuple_for_each()
+
+// for_each algorithm for tuples.
+template <typename Fun, typename... Ts>
+inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f)
+{
+  return tuple_for_each(t, f, thrust::make_index_sequence<thrust::tuple_size<thrust::tuple<Ts...>>::value>{});
+}
+
+} // namespace tuple_impl_specific
+
+// Metafunction to obtain the type of the tuple whose element types
+// are the value_types of an iterator tuple.
+//
+template <typename IteratorTuple>
+struct tuple_of_value_types : tuple_meta_transform<IteratorTuple, iterator_value>
+{}; // end tuple_of_value_types
+
+struct minimum_category_lambda
+{
+  template <typename T1, typename T2>
+  struct apply : minimum_category<T1, T2>
+  {};
+};
+
+// Metafunction to obtain the minimal traversal tag in a tuple
+// of iterators.
+//
+template <typename IteratorTuple>
+struct minimum_traversal_category_in_iterator_tuple
+{
+  using tuple_of_traversal_tags = typename tuple_meta_transform<IteratorTuple, thrust::iterator_traversal>::type;
+
+  using type = typename tuple_impl_specific::
+    tuple_meta_accumulate<tuple_of_traversal_tags, minimum_category_lambda, thrust::random_access_traversal_tag>::type;
+};
+
+struct minimum_system_lambda
+{
+  template <typename T1, typename T2>
+  struct apply : minimum_system<T1, T2>
+  {};
+};
+
+// Metafunction to obtain the minimal system tag in a tuple
+// of iterators.
+template <typename IteratorTuple>
+struct minimum_system_in_iterator_tuple
+{
+  using tuple_of_system_tags =
+    typename thrust::detail::tuple_meta_transform<IteratorTuple, thrust::iterator_system>::type;
+
+  using type = typename tuple_impl_specific::
+    tuple_meta_accumulate<tuple_of_system_tags, minimum_system_lambda, thrust::any_system_tag>::type;
+};
+
+namespace zip_iterator_base_ns
+{
+
+template <typename Tuple, typename IndexSequence>
+struct tuple_of_iterator_references_helper;
+
+template <typename Tuple, size_t... Is>
+struct tuple_of_iterator_references_helper<Tuple, thrust::index_sequence<Is...>>
+{
+  using type = thrust::detail::tuple_of_iterator_references<typename thrust::tuple_element<Is, Tuple>::type...>;
+};
+
+template <typename IteratorTuple>
+struct tuple_of_iterator_references
+{
+  // get a thrust::tuple of the iterators' references
+  using tuple_of_references = typename tuple_meta_transform<IteratorTuple, thrust::iterator_reference>::type;
+
+  // map thrust::tuple<T...> to tuple_of_iterator_references<T...>
+  using type = typename tuple_of_iterator_references_helper<
+    tuple_of_references,
+    thrust::make_index_sequence<thrust::tuple_size<tuple_of_references>::value>>::type;
+};
+
+} // namespace zip_iterator_base_ns
+
+///////////////////////////////////////////////////////////////////
+//
+// Class zip_iterator_base
+//
+// Builds and exposes the iterator facade type from which the zip
+// iterator will be derived.
+//
+template <typename IteratorTuple>
+struct zip_iterator_base
+{
+  // private:
+  //  reference type is the type of the tuple obtained from the
+  //  iterators' reference types.
+  using reference = typename zip_iterator_base_ns::tuple_of_iterator_references<IteratorTuple>::type;
+
+  // Boost's Value type is the same as reference type.
+  // using value_type = reference;
+  using value_type = typename tuple_of_value_types<IteratorTuple>::type;
+
+  // Difference type is the first iterator's difference type
+  using difference_type =
+    typename thrust::iterator_traits<typename thrust::tuple_element<0, IteratorTuple>::type>::difference_type;
+
+  // Iterator system is the minimum system tag in the
+  // iterator tuple
+  using system = typename minimum_system_in_iterator_tuple<IteratorTuple>::type;
+
+  // Traversal category is the minimum traversal category in the
+  // iterator tuple
+  using traversal_category = typename minimum_traversal_category_in_iterator_tuple<IteratorTuple>::type;
+
+public:
+  // The iterator facade type from which the zip iterator will
+  // be derived.
+  using type = thrust::
+    iterator_facade<zip_iterator<IteratorTuple>, value_type, system, traversal_category, reference, difference_type>;
+}; // end zip_iterator_base
+
+} // namespace detail
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/discard_iterator.h b/projects/rocthrust/thrust/iterator/discard_iterator.h
index 25f32ce9dc24..37af68640d19 100644
--- a/projects/rocthrust/thrust/iterator/discard_iterator.h
+++ b/projects/rocthrust/thrust/iterator/discard_iterator.h
@@ -29,123 +29,106 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+#include <thrust/iterator/detail/discard_iterator_base.h>
+#include <thrust/iterator/iterator_facade.h>
 
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/detail/any_assign.h>
-#include <thrust/iterator/iterator_adaptor.h>
-
-#include _THRUST_STD_INCLUDE(cstddef)
+THRUST_DIAG_PUSH
+#ifndef THRUST_DOXYGEN_INVOKED
+THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
+#endif
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename>
-class discard_iterator;
-
-namespace detail
-{
-template <typename System>
-struct make_discard_iterator_base
-{
-  // XXX value_type should actually be void but this interferes with zip_iterator<discard_iterator>
-  using value_type    = any_assign;
-  using reference     = any_assign&;
-  using incrementable = _THRUST_STD::ptrdiff_t;
-
-  using base_iterator = counting_iterator<incrementable, System, random_access_traversal_tag>;
-
-  using type =
-    iterator_adaptor<discard_iterator<System>,
-                     base_iterator,
-                     value_type,
-                     iterator_system_t<base_iterator>,
-                     iterator_traversal_t<base_iterator>,
-                     reference>;
-};
-} // namespace detail
+/*! \addtogroup iterators
+ *  \{
+ */
 
-THRUST_DIAG_PUSH
-THRUST_DIAG_SUPPRESS_MSVC(4244 4267) // possible loss of data
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p discard_iterator is an iterator which represents a special kind of pointer that ignores values written to it upon
-//! dereference. This iterator is useful for ignoring the output of certain algorithms without wasting memory capacity
-//! or bandwidth. \p discard_iterator may also be used to count the size of an algorithm's output which may not be known
-//! a priori.
-//!
-//! The following code snippet demonstrates how to use \p discard_iterator to ignore one of the output ranges of
-//! reduce_by_key
-//!
-//! \code
-//! #include <thrust/iterator/discard_iterator.h>
-//! #include <thrust/reduce.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<int> keys(7), values(7);
-//!
-//!   keys[0] = 1;
-//!   keys[1] = 3;
-//!   keys[2] = 3;
-//!   keys[3] = 3;
-//!   keys[4] = 2;
-//!   keys[5] = 2;
-//!   keys[6] = 1;
-//!
-//!   values[0] = 9;
-//!   values[1] = 8;
-//!   values[2] = 7;
-//!   values[3] = 6;
-//!   values[4] = 5;
-//!   values[5] = 4;
-//!   values[6] = 3;
-//!
-//!   thrust::device_vector<int> result(4);
-//!
-//!   // we are only interested in the reduced values
-//!   // use discard_iterator to ignore the output keys
-//!   thrust::reduce_by_key(keys.begin(), keys.end(),
-//!                         values.begin(),
-//!                         thrust::make_discard_iterator(),
-//!                         result.begin());
-//!
-//!   // result is now [9, 21, 9, 3]
-//!
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! \see make_discard_iterator
+/*! \p discard_iterator is an iterator which represents a special kind of pointer that
+ *  ignores values written to it upon dereference. This iterator is useful for ignoring
+ *  the output of certain algorithms without wasting memory capacity or bandwidth.
+ *  \p discard_iterator may also be used to count the size of an algorithm's output which
+ *  may not be known a priori.
+ *
+ *  The following code snippet demonstrates how to use \p discard_iterator to
+ *  ignore one of the output ranges of reduce_by_key
+ *
+ *  \code
+ *  #include <thrust/iterator/discard_iterator.h>
+ *  #include <thrust/reduce.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<int> keys(7), values(7);
+ *
+ *    keys[0] = 1;
+ *    keys[1] = 3;
+ *    keys[2] = 3;
+ *    keys[3] = 3;
+ *    keys[4] = 2;
+ *    keys[5] = 2;
+ *    keys[6] = 1;
+ *
+ *    values[0] = 9;
+ *    values[1] = 8;
+ *    values[2] = 7;
+ *    values[3] = 6;
+ *    values[4] = 5;
+ *    values[5] = 4;
+ *    values[6] = 3;
+ *
+ *    thrust::device_vector<int> result(4);
+ *
+ *    // we are only interested in the reduced values
+ *    // use discard_iterator to ignore the output keys
+ *    thrust::reduce_by_key(keys.begin(), keys.end(),
+ *                          values.begin(),
+ *                          thrust::make_discard_iterator(),
+ *                          result.begin());
+ *
+ *    // result is now [9, 21, 9, 3]
+ *
+ *    return 0;
+ *  }
+ *  \endcode
+ *
+ *  \see make_discard_iterator
+ */
 template <typename System = use_default>
-class discard_iterator : public detail::make_discard_iterator_base<System>::type
+class discard_iterator : public detail::discard_iterator_base<System>::type
 {
-  //! \cond
+  /*! \cond
+   */
   friend class iterator_core_access;
-  using super_t       = typename detail::make_discard_iterator_base<System>::type;
-  using incrementable = typename detail::make_discard_iterator_base<System>::incrementable;
-  using base_iterator = typename detail::make_discard_iterator_base<System>::base_iterator;
+  using super_t       = typename detail::discard_iterator_base<System>::type;
+  using incrementable = typename detail::discard_iterator_base<System>::incrementable;
+  using base_iterator = typename detail::discard_iterator_base<System>::base_iterator;
 
 public:
   using reference  = typename super_t::reference;
   using value_type = typename super_t::value_type;
 
-  //! \endcond
+  /*! \endcond
+   */
 
-  //! This constructor receives an optional index specifying the position of this \p discard_iterator in a range.
-  //!
-  //! \p i The index of this \p discard_iterator in a range. Defaults to the value returned by \c Incrementable's null
-  //! constructor. For example, when <tt>Incrementable == int</tt>, \c 0.
+  /*! This constructor receives an optional index specifying the position of this
+   *  \p discard_iterator in a range.
+   *
+   *  \p i The index of this \p discard_iterator in a range. Defaults to the
+   *       value returned by \c Incrementable's null constructor. For example,
+   *       when <tt>Incrementable == int</tt>, \c 0.
+   */
   THRUST_HOST_DEVICE discard_iterator(incrementable const& i = incrementable())
       : super_t(base_iterator(i))
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private: // Core iterator interface
   THRUST_HOST_DEVICE reference dereference() const
@@ -155,24 +138,31 @@ class discard_iterator : public detail::make_discard_iterator_base<System>::type
 
   mutable value_type m_element;
 
-  //! \endcond
-};
+  /*! \endcond
+   */
+}; // end constant_iterator
 
-//! \p make_discard_iterator creates a \p discard_iterator from an optional index parameter.
-//!
-//! \param i The index of the returned \p discard_iterator within a range. In the default case, the value of this
-//! parameter is \c 0.
-//! \return A new \p discard_iterator with index as given by \p i.
-//! \see constant_iterator
+/*! \p make_discard_iterator creates a \p discard_iterator from an optional index parameter.
+ *
+ *  \param i The index of the returned \p discard_iterator within a range.
+ *           In the default case, the value of this parameter is \c 0.
+ *
+ *  \return A new \p discard_iterator with index as given by \p i.
+ *
+ *  \see constant_iterator
+ */
 inline THRUST_HOST_DEVICE discard_iterator<>
 make_discard_iterator(discard_iterator<>::difference_type i = discard_iterator<>::difference_type(0))
 {
   return discard_iterator<>(i);
-}
+} // end make_discard_iterator()
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
 
-THRUST_DIAG_POP
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
+
+THRUST_DIAG_POP
diff --git a/projects/rocthrust/thrust/iterator/iterator_adaptor.h b/projects/rocthrust/thrust/iterator/iterator_adaptor.h
index bd0078a79777..9ec36d52e3f5 100644
--- a/projects/rocthrust/thrust/iterator/iterator_adaptor.h
+++ b/projects/rocthrust/thrust/iterator/iterator_adaptor.h
@@ -40,6 +40,7 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+#include <thrust/detail/attributes.h>
 #include <thrust/detail/use_default.h>
 #include <thrust/iterator/detail/iterator_adaptor_base.h>
 #include <thrust/iterator/iterator_facade.h>
@@ -127,7 +128,7 @@ template <typename Derived,
           typename Reference  = use_default,
           typename Difference = use_default>
 class THRUST_DECLSPEC_EMPTY_BASES iterator_adaptor
-    : public detail::make_iterator_adaptor_base<Derived, Base, Value, System, Traversal, Reference, Difference>::type
+    : public detail::iterator_adaptor_base<Derived, Base, Value, System, Traversal, Reference, Difference>::type
 {
   /*! \cond
    */
@@ -136,7 +137,7 @@ class THRUST_DECLSPEC_EMPTY_BASES iterator_adaptor
 
 protected:
   using super_t =
-    typename detail::make_iterator_adaptor_base<Derived, Base, Value, System, Traversal, Reference, Difference>::type;
+    typename detail::iterator_adaptor_base<Derived, Base, Value, System, Traversal, Reference, Difference>::type;
 
   /*! \endcond
    */
diff --git a/projects/rocthrust/thrust/iterator/iterator_categories.h b/projects/rocthrust/thrust/iterator/iterator_categories.h
index 55d58b8214a9..3d5c0b9e240a 100644
--- a/projects/rocthrust/thrust/iterator/iterator_categories.h
+++ b/projects/rocthrust/thrust/iterator/iterator_categories.h
@@ -213,3 +213,5 @@ using random_access_host_iterator_tag = _THRUST_STD::random_access_iterator_tag;
  */
 
 THRUST_NAMESPACE_END
+
+#include <thrust/iterator/detail/universal_categories.h>
diff --git a/projects/rocthrust/thrust/iterator/iterator_facade.h b/projects/rocthrust/thrust/iterator/iterator_facade.h
index 8b361dae2d4f..a91d6ffdb3f1 100644
--- a/projects/rocthrust/thrust/iterator/iterator_facade.h
+++ b/projects/rocthrust/thrust/iterator/iterator_facade.h
@@ -40,8 +40,8 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
 #include <thrust/detail/type_traits.h>
+#include <thrust/iterator/detail/distance_from_result.h>
 #include <thrust/iterator/detail/iterator_facade_category.h>
 
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
@@ -51,17 +51,6 @@
 
 THRUST_NAMESPACE_BEGIN
 
-namespace detail
-{
-// since both arguments are known to be specializations of iterator_facade,
-// it's legal to access IteratorFacade2::difference_type
-template <typename IteratorFacade1, typename IteratorFacade2>
-using distance_from_result =
-  ::internal::If<_THRUST_STD::is_convertible_v<IteratorFacade2, IteratorFacade1>,
-                 typename IteratorFacade1::difference_type,
-                 typename IteratorFacade2::difference_type>;
-} // namespace detail
-
 /*! \addtogroup iterators
  *  \{
  */
@@ -198,9 +187,9 @@ class iterator_core_access
             typename Traversal2,
             typename Reference2,
             typename Difference2>
-  inline THRUST_HOST_DEVICE friend detail::distance_from_result<
+  inline THRUST_HOST_DEVICE friend typename thrust::detail::distance_from_result<
     iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1>,
-    iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2>>
+    iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2>>::type
   operator-(iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1> const& lhs,
             iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2> const& rhs);
 
@@ -268,7 +257,7 @@ class iterator_core_access
   }
 
   template <class Facade1, class Facade2>
-  THRUST_HOST_DEVICE static typename detail::distance_from_result<Facade1, Facade2>
+  THRUST_HOST_DEVICE static typename thrust::detail::distance_from_result<Facade1, Facade2>::type
   distance_from(Facade1 const& f1, Facade2 const& f2)
   {
     // dispatch the implementation of this method upon whether or not
@@ -619,12 +608,13 @@ template <typename Derived1,
           typename Difference2>
 inline THRUST_HOST_DEVICE
 
-// divine the type this operator returns
-detail::distance_from_result<iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1>,
-                             iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2>>
+  // divine the type this operator returns
+  typename thrust::detail::distance_from_result<
+    iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1>,
+    iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2>>::type
 
-operator-(iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1> const& lhs,
-          iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2> const& rhs)
+  operator-(iterator_facade<Derived1, Value1, System1, Traversal1, Reference1, Difference1> const& lhs,
+            iterator_facade<Derived2, Value2, System2, Traversal2, Reference2, Difference2> const& rhs)
 {
   return iterator_core_access ::distance_from(static_cast<Derived1 const&>(lhs), static_cast<Derived2 const&>(rhs));
 }
diff --git a/projects/rocthrust/thrust/iterator/iterator_traits.h b/projects/rocthrust/thrust/iterator/iterator_traits.h
index a8c94426e4e8..fa0dc04206a2 100644
--- a/projects/rocthrust/thrust/iterator/iterator_traits.h
+++ b/projects/rocthrust/thrust/iterator/iterator_traits.h
@@ -39,174 +39,48 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/iterator/detail/device_system_tag.h>
-#include <thrust/iterator/detail/iterator_category_to_system.h>
-#include <thrust/iterator/detail/iterator_category_to_traversal.h>
-#include <thrust/iterator/iterator_categories.h>
-
-#include _THRUST_STD_INCLUDE(iterator)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
-#else
-#  include <type_traits>
-#endif
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
+#  include <cuda/std/iterator>
+#else // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
+#  include <iterator>
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
 
 THRUST_NAMESPACE_BEGIN
 
-namespace detail
-{
-// the following iterator helpers are not named it_value_t etc, like the C++20 facilities, because they are defined in
-// terms of C++17 iterator_traits and not the new C++20 indirectly_readable trait etc. This allows them to detect nested
-// value_type, difference_type and reference aliases, which the new C+20 traits do not consider (they only consider
-// specializations of iterator_traits). Also, a value_type of void remains supported (needed by some output iterators).
-
-template <typename It>
-using it_value_t = typename _THRUST_STD::iterator_traits<It>::value_type;
-
-template <typename It>
-using it_reference_t = typename _THRUST_STD::iterator_traits<It>::reference;
-
-template <typename It>
-using it_difference_t = typename _THRUST_STD::iterator_traits<It>::difference_type;
-
-template <typename It>
-using it_pointer_t = typename _THRUST_STD::iterator_traits<It>::pointer;
-
-// use this whenever you need to lazily evaluate a trait. E.g., as an alternative in replace_if_use_default.
-template <template <typename...> typename Trait, typename... Args>
-struct lazy_trait
-{
-  using type = Trait<Args...>;
-};
-} // namespace detail
-
-//! \p iterator_traits is a type trait class that provides a uniform interface for querying the properties of iterators
-//! at compile-time. You can specialize _THRUST_STD::iterator_traits for your own iterator types if needed.
-//! deprecated [Since 3.0]
+/*! \p iterator_traits is a type trait class that provides a uniform
+ *  interface for querying the properties of iterators at compile-time.
+ */
 template <typename T>
-using iterator_traits THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::iterator_traits instead") =
-// FIXME(bgruber): switching to _THRUST_STD::iterator_traits<T> breaks some tests, e.g. cub.test.device_merge_sort.lid_1
-#if THRUST_COMPILER(NVRTC)
-  ::cuda
-#endif // THRUST_COMPILER(NVRTC)
-  ::std::iterator_traits<T>;
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
-
-// value
-
-//! deprecated [Since 3.0]
-template <typename Iterator>
-struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::iterator_traits<>::value_type or _THRUST_STD::iter_value_t instead")
-  iterator_value
-{
-#ifndef THRUST_DOXYGEN_INVOKED
-  using type = typename iterator_traits<Iterator>::value_type;
-#endif
-};
-
-//! deprecated [Since 3.0]
-template <typename Iterator>
-using iterator_value_t THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::iterator_traits<>::value_type or "
-                                                 "_THRUST_STD::iter_value_t instead") = iterator_value<Iterator>;
-
-// pointer
-
-//! deprecated [Since 3.0]
-template <typename Iterator>
-struct THRUST_DEPRECATED iterator_pointer
-{
-#ifndef THRUST_DOXYGEN_INVOKED
-  using type = typename iterator_traits<Iterator>::pointer;
-#endif
-};
-
-//! deprecated [Since 3.0]
-template <typename Iterator>
-using iterator_pointer_t THRUST_DEPRECATED = typename iterator_pointer<Iterator>::type;
-
-// reference
+struct iterator_traits
+    :
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
+    ::cuda
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC
+    ::std::iterator_traits<T>
+{};
 
-//! deprecated [Since 3.0]
-template <typename Iterator>
-struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::iterator_traits<>::reference or _THRUST_STD::iter_reference_t "
-                                 "instead") iterator_reference
-{
-#ifndef THRUST_DOXYGEN_INVOKED
-  using type = typename iterator_traits<Iterator>::reference;
-#endif
-};
-
-//! deprecated [Since 3.0]
 template <typename Iterator>
-using iterator_reference_t THRUST_DEPRECATED_BECAUSE(
-  "Use _THRUST_STD::iterator_traits<>::reference or "
-  "_THRUST_STD::iter_reference_t instead") = typename iterator_reference<Iterator>::type;
-
-// difference
+struct iterator_value;
 
-//! deprecated [Since 3.0]
 template <typename Iterator>
-struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::iterator_traits<>::difference_t or _THRUST_STD::iter_difference_t "
-                                 "instead") iterator_difference
-{
-#ifndef THRUST_DOXYGEN_INVOKED
-  using type = typename iterator_traits<Iterator>::difference_type;
-#endif
-};
-
-//! deprecated [Since 3.0]
-template <typename Iterator>
-using iterator_difference_t THRUST_DEPRECATED_BECAUSE(
-  "Use _THRUST_STD::iterator_traits<>::difference_t or "
-  "_THRUST_STD::iter_difference_t instead") = typename iterator_difference<Iterator>::type;
-
-// traversal
+struct iterator_pointer;
 
 template <typename Iterator>
-struct iterator_traversal
-    : detail::iterator_category_to_traversal<typename iterator_traits<Iterator>::iterator_category>
-{};
+struct iterator_reference;
 
-#ifndef THRUST_DOXYGEN_INVOKED
 template <typename Iterator>
-using iterator_traversal_t = typename iterator_traversal<Iterator>::type;
-#endif
-
-// system
-
-namespace detail
-{
-template <typename Iterator, typename = void>
-struct iterator_system_impl
-{};
+struct iterator_difference;
 
 template <typename Iterator>
-struct iterator_system_impl<Iterator, _THRUST_STD::void_t<typename iterator_traits<Iterator>::iterator_category>>
-    : iterator_category_to_system<typename iterator_traits<Iterator>::iterator_category>
-{};
-} // namespace detail
-
-THRUST_SUPPRESS_DEPRECATED_POP
+struct iterator_traversal;
 
 template <typename Iterator>
-struct iterator_system : detail::iterator_system_impl<Iterator>
-{};
-
-// specialize iterator_system for void *, which has no category
-template <>
-struct iterator_system<void*> : iterator_system<int*>
-{};
-
-template <>
-struct iterator_system<const void*> : iterator_system<const int*>
-{};
-
-#ifndef THRUST_DOXYGEN_INVOKED
-template <typename Iterator>
-using iterator_system_t = typename iterator_system<Iterator>::type;
-#endif
+struct iterator_system;
 
 THRUST_NAMESPACE_END
 
+#include <thrust/iterator/detail/any_system_tag.h>
+#include <thrust/iterator/detail/device_system_tag.h>
+#include <thrust/iterator/detail/host_system_tag.h>
+#include <thrust/iterator/detail/iterator_traits.inl>
 #include <thrust/iterator/detail/iterator_traversal_tags.h>
diff --git a/projects/rocthrust/thrust/iterator/offset_iterator.h b/projects/rocthrust/thrust/iterator/offset_iterator.h
deleted file mode 100644
index b5cdb99fc3dc..000000000000
--- a/projects/rocthrust/thrust/iterator/offset_iterator.h
+++ /dev/null
@@ -1,201 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2026 Advanced Micro Devices, Inc. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/libcxx_wrapper/std/__iterator/concepts.h>
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/iterator_adaptor.h>
-#include <thrust/iterator/iterator_facade.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(cstdint)
-#else
-#  include <iterator>
-#  include <utility>
-#endif
-
-THRUST_NAMESPACE_BEGIN
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p offset_iterator wraps another iterator and an integral offset, applies the offset to the iterator when
-//! dereferencing, comparing, or computing the distance between two offset_iterators. This is useful, when the
-//! underlying iterator cannot be incremented, decremented, or advanced (e.g., because those operations are only
-//! supported in device code).
-//!
-//!
-//! The following code snippet demonstrates how to create an \p offset_iterator:
-//!
-//! \code
-//! #include <thrust/iterator/offset_iterator.h>
-//! #include <thrust/fill.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<int> data{1, 2, 3, 4};
-//!   auto b = offset_iterator{data.begin(), 1};
-//!   auto e = offset_iterator{data.end(), -1};
-//!   thrust::fill(b, e, 42);
-//!   // data is now [1, 42, 42, 4]
-//!   ++b; // does not call ++ on the underlying iterator
-//!   assert(b == e - 1);
-//!
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! Alternatively, an \p offset_iterator can also use an iterator to retrieve the offset from an iterator. However, such
-//! an \p offset_iterator cannot be moved anymore by changing the offset, so it will move the base iterator instead.
-//!
-//! \code
-//! #include <thrust/iterator/offset_iterator.h>
-//! #include <thrust/fill.h>
-//! #include <thrust/functional.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!   using thrust::placeholders::_1;
-//!   thrust::device_vector<int> data{1, 2, 3, 4};
-//!
-//!   thrust::device_vector<ptrdiff> offsets{1}; // offset is only available on device
-//!   auto offset = thrust::make_transform_iterator(offsets.begin(), _1 * 2);
-//!   thrust::offset_iterator iter(data.begin(), offset); // load and transform offset upon access
-//!   // iter is at position 2 (= 1 * 2) in data, and would return 3 in device code
-//!
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! In the above example, the offset is loaded from a device vector, transformed by a \p transform_iterator, and then
-//! applied to the underlying iterator, when the \p offset_iterator is accessed.
-template <typename Iterator, typename Offset = typename _THRUST_STD::iterator_traits<Iterator>::difference_type>
-class offset_iterator : public iterator_adaptor<offset_iterator<Iterator, Offset>, Iterator>
-{
-  //! \cond
-  friend class iterator_core_access;
-  using super_t = iterator_adaptor<offset_iterator<Iterator, Offset>, Iterator>;
-
-public:
-  using reference       = typename super_t::reference;
-  using difference_type = typename super_t::difference_type;
-  //! \endcond
-
-  THRUST_HOST_DEVICE offset_iterator(Iterator it = {}, Offset offset = {})
-      : super_t(_THRUST_STD::move(it))
-      , m_offset(offset)
-  {}
-
-  THRUST_HOST_DEVICE const Offset& offset() const
-  {
-    return m_offset;
-  }
-
-  THRUST_HOST_DEVICE Offset& offset()
-  {
-    return m_offset;
-  }
-
-  //! \cond
-
-private:
-  static constexpr bool indirect_offset = ::internal::indirectly_readable<Offset>;
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE auto offset_value() const
-  {
-    if constexpr (indirect_offset)
-    {
-      return static_cast<difference_type>(*m_offset);
-    }
-    else
-    {
-      return static_cast<difference_type>(m_offset);
-    }
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE reference dereference() const
-  {
-    return *(this->base() + offset_value());
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE bool equal(const offset_iterator& other) const
-  {
-    return this->base() + offset_value() == other.base() + other.offset_value();
-  }
-
-  THRUST_HOST_DEVICE void advance(difference_type n)
-  {
-    if constexpr (indirect_offset)
-    {
-      this->base_reference() += n;
-    }
-    else
-    {
-      m_offset += n;
-    }
-  }
-
-  THRUST_HOST_DEVICE void increment()
-  {
-    if constexpr (indirect_offset)
-    {
-      ++this->base_reference();
-    }
-    else
-    {
-      ++m_offset;
-    }
-  }
-
-  THRUST_HOST_DEVICE void decrement()
-  {
-    if constexpr (indirect_offset)
-    {
-      --this->base_reference();
-    }
-    else
-    {
-      --m_offset;
-    }
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE difference_type distance_to(const offset_iterator& other) const
-  {
-    return (other.base() + other.offset_value()) - (this->base() + offset_value());
-  }
-
-  Offset m_offset;
-  //! \endcond
-};
-
-#ifndef THRUST_DOXYGEN_INVOKED
-template <typename Iterator>
-offset_iterator(Iterator) -> offset_iterator<Iterator>;
-#endif
-
-//! \} // end fancyiterators
-//! \} // end iterators
-
-THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/permutation_iterator.h b/projects/rocthrust/thrust/iterator/permutation_iterator.h
index e2c111eb1ab7..f70726b258f1 100644
--- a/projects/rocthrust/thrust/iterator/permutation_iterator.h
+++ b/projects/rocthrust/thrust/iterator/permutation_iterator.h
@@ -14,8 +14,9 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/permutation_iterator.h
-//! \brief An iterator which performs a gather or scatter operation when dereferenced
+/*! \file thrust/iterator/permutation_iterator.h
+ *  \brief An iterator which performs a gather or scatter operation when dereferenced
+ */
 
 /*
  * (C) Copyright Toon Knapen    2001.
@@ -39,133 +40,123 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
+#include <thrust/detail/attributes.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/iterator/detail/minimum_system.h>
-#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/detail/permutation_iterator_base.h>
 #include <thrust/iterator/iterator_facade.h>
 #include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename, typename>
-class permutation_iterator;
+/*! \addtogroup iterators
+ *  \{
+ */
 
-#ifndef THRUST_DOXYGEN_INVOKED
-namespace detail
-{
-template <typename ElementIterator, typename IndexIterator>
-struct make_permutation_iterator_base
-{
-  using System1 = typename iterator_system<ElementIterator>::type;
-  using System2 = typename iterator_system<IndexIterator>::type;
-
-  using type =
-    iterator_adaptor<permutation_iterator<ElementIterator, IndexIterator>,
-                     IndexIterator,
-                     it_value_t<ElementIterator>,
-                     typename minimum_system<System1, System2>::type,
-                     use_default,
-                     it_reference_t<ElementIterator>>;
-};
-} // namespace detail
-#endif
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p permutation_iterator is an iterator which represents a pointer into a reordered view of a given range. \p
-//! permutation_iterator is an imprecise name; the reordered view need not be a strict permutation. This iterator is
-//! useful for fusing a scatter or gather operation with other algorithms.
-//!
-//! This iterator takes two arguments:
-//!
-//!   - an iterator to the range \c V on which the "permutation" will be applied
-//!   - the reindexing scheme that defines how the elements of \c V will be permuted.
-//!
-//! Note that \p permutation_iterator is not limited to strict permutations of the given range \c V. The distance
-//! between begin and end of the reindexing iterators is allowed to be smaller compared to the size of the range \c V,
-//! in which case the \p permutation_iterator only provides a "permutation" of a subrange of \c V. The indices neither
-//! need to be unique. In this same context, it must be noted that the past-the-end \p permutation_iterator is
-//! completely defined by means of the past-the-end iterator to the indices.
-//!
-//! The following code snippet demonstrates how to create a \p permutation_iterator which represents a reordering of the
-//! contents of a \p device_vector.
-//!
-//! \code
-//! #include <thrust/iterator/permutation_iterator.h>
-//! #include <thrust/device_vector.h>
-//! ...
-//! thrust::device_vector<float> values(8);
-//! values[0] = 10.0f;
-//! values[1] = 20.0f;
-//! values[2] = 30.0f;
-//! values[3] = 40.0f;
-//! values[4] = 50.0f;
-//! values[5] = 60.0f;
-//! values[6] = 70.0f;
-//! values[7] = 80.0f;
-//!
-//! thrust::device_vector<int> indices(4);
-//! indices[0] = 2;
-//! indices[1] = 6;
-//! indices[2] = 1;
-//! indices[3] = 3;
-//!
-//! using ElementIterator = thrust::device_vector<float>::iterator;
-//! using IndexIterator = thrust::device_vector<int>::iterator  ;
-//!
-//! thrust::permutation_iterator<ElementIterator,IndexIterator> iter(values.begin(), indices.begin());
-//!
-//! *iter;   // returns 30.0f;
-//! iter[0]; // returns 30.0f;
-//! iter[1]; // returns 70.0f;
-//! iter[2]; // returns 20.0f;
-//! iter[3]; // returns 40.0f;
-//!
-//! // iter[4] is an out-of-bounds error
-//!
-//! *iter   = -1.0f; // sets values[2] to -1.0f;
-//! iter[0] = -1.0f; // sets values[2] to -1.0f;
-//! iter[1] = -1.0f; // sets values[6] to -1.0f;
-//! iter[2] = -1.0f; // sets values[1] to -1.0f;
-//! iter[3] = -1.0f; // sets values[3] to -1.0f;
-//!
-//! // values is now {10, -1, -1, -1, 50, 60, -1, 80}
-//! \endcode
-//!
-//! \see make_permutation_iterator
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
+
+/*! \p permutation_iterator is an iterator which represents a pointer into a
+ *  reordered view of a given range. \p permutation_iterator is an imprecise name;
+ *  the reordered view need not be a strict permutation. This iterator is useful
+ *  for fusing a scatter or gather operation with other algorithms.
+ *
+ *  This iterator takes two arguments:
+ *
+ *    - an iterator to the range \c V on which the "permutation" will be applied
+ *    - the reindexing scheme that defines how the elements of \c V will be permuted.
+ *
+ *  Note that \p permutation_iterator is not limited to strict permutations of the
+ *  given range \c V. The distance between begin and end of the reindexing iterators
+ *  is allowed to be smaller compared to the size of the range \c V, in which case
+ *  the \p permutation_iterator only provides a "permutation" of a subrange of \c V.
+ *  The indices neither need to be unique. In this same context, it must be noted
+ *  that the past-the-end \p permutation_iterator is completely defined by means of
+ *  the past-the-end iterator to the indices.
+ *
+ *  The following code snippet demonstrates how to create a \p permutation_iterator
+ *  which represents a reordering of the contents of a \p device_vector.
+ *
+ *  \code
+ *  #include <thrust/iterator/permutation_iterator.h>
+ *  #include <thrust/device_vector.h>
+ *  ...
+ *  thrust::device_vector<float> values(8);
+ *  values[0] = 10.0f;
+ *  values[1] = 20.0f;
+ *  values[2] = 30.0f;
+ *  values[3] = 40.0f;
+ *  values[4] = 50.0f;
+ *  values[5] = 60.0f;
+ *  values[6] = 70.0f;
+ *  values[7] = 80.0f;
+ *
+ *  thrust::device_vector<int> indices(4);
+ *  indices[0] = 2;
+ *  indices[1] = 6;
+ *  indices[2] = 1;
+ *  indices[3] = 3;
+ *
+ *  using ElementIterator = thrust::device_vector<float>::iterator;
+ *  using IndexIterator = thrust::device_vector<int>::iterator;
+ *
+ *  thrust::permutation_iterator<ElementIterator,IndexIterator> iter(values.begin(), indices.begin());
+ *
+ *  *iter;   // returns 30.0f;
+ *  iter[0]; // returns 30.0f;
+ *  iter[1]; // returns 70.0f;
+ *  iter[2]; // returns 20.0f;
+ *  iter[3]; // returns 40.0f;
+ *
+ *  // iter[4] is an out-of-bounds error
+ *
+ *  *iter   = -1.0f; // sets values[2] to -1.0f;
+ *  iter[0] = -1.0f; // sets values[2] to -1.0f;
+ *  iter[1] = -1.0f; // sets values[6] to -1.0f;
+ *  iter[2] = -1.0f; // sets values[1] to -1.0f;
+ *  iter[3] = -1.0f; // sets values[3] to -1.0f;
+ *
+ *  // values is now {10, -1, -1, -1, 50, 60, -1, 80}
+ *  \endcode
+ *
+ *  \see make_permutation_iterator
+ */
 template <typename ElementIterator, typename IndexIterator>
 class THRUST_DECLSPEC_EMPTY_BASES permutation_iterator
-    : public detail::make_permutation_iterator_base<ElementIterator, IndexIterator>::type
+    : public thrust::detail::permutation_iterator_base<ElementIterator, IndexIterator>::type
 {
-  //! \cond
+  /*! \cond
+   */
 
-  using super_t = typename detail::make_permutation_iterator_base<ElementIterator, IndexIterator>::type;
+private:
+  using super_t = typename detail::permutation_iterator_base<ElementIterator, IndexIterator>::type;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
 public:
-  //! Null constructor calls the null constructor of this \p permutation_iterator's element iterator.
+  /*! Null constructor calls the null constructor of this \p permutation_iterator's
+   *  element iterator.
+   */
   permutation_iterator() = default;
 
-  //! Constructor accepts an \c ElementIterator into a range of values and an \c IndexIterator into a range of indices
-  //! defining the indexing scheme on the values.
-  //!
-  //! \param x An \c ElementIterator pointing this \p permutation_iterator's range of values.
-  //! \param y An \c IndexIterator pointing to an indexing scheme to use on \p x.
+  /*! Constructor accepts an \c ElementIterator into a range of values and an
+   *  \c IndexIterator into a range of indices defining the indexing scheme on the
+   *  values.
+   *
+   *  \param x An \c ElementIterator pointing this \p permutation_iterator's range of values.
+   *  \param y An \c IndexIterator pointing to an indexing scheme to use on \p x.
+   */
   THRUST_HOST_DEVICE explicit permutation_iterator(ElementIterator x, IndexIterator y)
       : super_t(y)
       , m_element_iterator(x)
   {}
 
-  //! Copy constructor accepts a related \p permutation_iterator. \param rhs A compatible \p permutation_iterator to
-  //! copy from.
+  /*! Copy constructor accepts a related \p permutation_iterator.
+   *  \param rhs A compatible \p permutation_iterator to copy from.
+   */
   template <typename OtherElementIterator,
             typename OtherIndexIterator,
             detail::enable_if_convertible_t<OtherElementIterator, ElementIterator, int> = 0,
@@ -175,15 +166,16 @@ class THRUST_DECLSPEC_EMPTY_BASES permutation_iterator
       , m_element_iterator(rhs.m_element_iterator)
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
   // MSVC incorrectly warning about returning a reference to a local/temporary here.
   // NVHPC breaks with push / pop within a class
-#if THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
   THRUST_DIAG_PUSH
   THRUST_DIAG_SUPPRESS_MSVC(4172)
-#endif // THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
 
   THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
@@ -191,22 +183,29 @@ class THRUST_DECLSPEC_EMPTY_BASES permutation_iterator
     return *(m_element_iterator + *this->base());
   }
 
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
+  THRUST_DIAG_POP
+#endif // (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
+
   // make friends for the copy constructor
   template <typename, typename>
   friend class permutation_iterator;
 
   ElementIterator m_element_iterator;
-  //! \endcond
-};
-
-//! \p make_permutation_iterator creates a \p permutation_iterator from an \c ElementIterator pointing to a range of
-//! elements to "permute" and an \c IndexIterator pointing to a range of indices defining an indexing scheme on the
-//! values.
-//!
-//! \param e An \c ElementIterator pointing to a range of values.
-//! \param i An \c IndexIterator pointing to an indexing scheme to use on \p e.
-//! \return A new \p permutation_iterator which permutes the range \p e by \p i.
-//! \see permutation_iterator
+  /*! \endcond
+   */
+}; // end permutation_iterator
+
+/*! \p make_permutation_iterator creates a \p permutation_iterator
+ *  from an \c ElementIterator pointing to a range of elements to "permute"
+ *  and an \c IndexIterator pointing to a range of indices defining an indexing
+ *  scheme on the values.
+ *
+ *  \param e An \c ElementIterator pointing to a range of values.
+ *  \param i An \c IndexIterator pointing to an indexing scheme to use on \p e.
+ *  \return A new \p permutation_iterator which permutes the range \p e by \p i.
+ *  \see permutation_iterator
+ */
 template <typename ElementIterator, typename IndexIterator>
 THRUST_HOST_DEVICE permutation_iterator<ElementIterator, IndexIterator>
 make_permutation_iterator(ElementIterator e, IndexIterator i)
@@ -214,7 +213,10 @@ make_permutation_iterator(ElementIterator e, IndexIterator i)
   return permutation_iterator<ElementIterator, IndexIterator>(e, i);
 }
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/retag.h b/projects/rocthrust/thrust/iterator/retag.h
index 2ec85868143c..1257d7f2998e 100644
--- a/projects/rocthrust/thrust/iterator/retag.h
+++ b/projects/rocthrust/thrust/iterator/retag.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/detail/retag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/iterator/reverse_iterator.h b/projects/rocthrust/thrust/iterator/reverse_iterator.h
index d35f26241c3a..8a48cb3a0b7d 100644
--- a/projects/rocthrust/thrust/iterator/reverse_iterator.h
+++ b/projects/rocthrust/thrust/iterator/reverse_iterator.h
@@ -14,8 +14,9 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/reverse_iterator.h
-//! \brief An iterator adaptor which adapts another iterator to traverse backwards
+/*! \file thrust/iterator/reverse_iterator.h
+ *  \brief An iterator adaptor which adapts another iterator to traverse backwards
+ */
 
 /*
  * (C) Copyright David Abrahams 2002.
@@ -39,197 +40,190 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
 #include <thrust/detail/type_traits.h>
-#include <thrust/iterator/iterator_adaptor.h>
-#include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/detail/reverse_iterator_base.h>
+#include <thrust/iterator/iterator_facade.h>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename>
-class reverse_iterator;
+/*! \addtogroup iterators
+ *  \{
+ */
 
-namespace detail
-{
-template <typename BidirectionalIterator>
-struct make_reverse_iterator_base
-{
-  using type = iterator_adaptor<reverse_iterator<BidirectionalIterator>, BidirectionalIterator>;
-};
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p reverse_iterator is an iterator which represents a pointer into a reversed view of a given range. In this way, \p
-//! reverse_iterator allows backwards iteration through a bidirectional input range.
-//!
-//! It is important to note that although \p reverse_iterator is constructed from a given iterator, it points to the
-//! element preceding it. In this way, the past-the-end \p reverse_iterator of a given range points to the element
-//! preceding the first element of the input range. By the same token, the first \p reverse_iterator of a given range is
-//! constructed from a past-the-end iterator of the original range yet points to the last element of the input.
-//!
-//! The following code snippet demonstrates how to create a \p reverse_iterator which represents a reversed view of the
-//! contents of a \p device_vector.
-//!
-//! \code
-//! #include <thrust/iterator/reverse_iterator.h>
-//! #include <thrust/device_vector.h>
-//! ...
-//! thrust::device_vector<float> v(4);
-//! v[0] = 0.0f;
-//! v[1] = 1.0f;
-//! v[2] = 2.0f;
-//! v[3] = 3.0f;
-//!
-//! using Iterator = thrust::device_vector<float>::iterator;
-//!
-//! // note that we point the iterator to the *end* of the device_vector
-//! thrust::reverse_iterator<Iterator> iter(values.end());
-//!
-//! *iter;   // returns 3.0f;
-//! iter[0]; // returns 3.0f;
-//! iter[1]; // returns 2.0f;
-//! iter[2]; // returns 1.0f;
-//! iter[3]; // returns 0.0f;
-//!
-//! // iter[4] is an out-of-bounds error
-//! \endcode
-//!
-//! Since reversing a range is a common operation, containers like \p device_vector have nested aliases for declaration
-//! shorthand and methods for constructing reverse_iterators. The following code snippet is equivalent to the previous:
-//!
-//! \code
-//! #include <thrust/device_vector.h>
-//! ...
-//! thrust::device_vector<float> v(4);
-//! v[0] = 0.0f;
-//! v[1] = 1.0f;
-//! v[2] = 2.0f;
-//! v[3] = 3.0f;
-//!
-//! // we use the nested type reverse_iterator to refer to a reversed view of a device_vector and the method rbegin() to
-//! // create a reverse_iterator pointing to the beginning of the reversed device_vector
-//! thrust::device_iterator<float>::reverse_iterator iter = values.rbegin();
-//!
-//! *iter;   // returns 3.0f;
-//! iter[0]; // returns 3.0f;
-//! iter[1]; // returns 2.0f;
-//! iter[2]; // returns 1.0f;
-//! iter[3]; // returns 0.0f;
-//!
-//! // iter[4] is an out-of-bounds error
-//!
-//! // similarly, rend() points to the end of the reversed sequence:
-//! assert(values.rend() == (iter + 4));
-//! \endcode
-//!
-//! Finally, the following code snippet demonstrates how to use reverse_iterator to perform a reversed prefix sum
-//! operation on the contents of a device_vector:
-//!
-//! \code
-//! #include <thrust/device_vector.h>
-//! #include <thrust/scan.h>
-//! ...
-//! thrust::device_vector<int> v(5);
-//! v[0] = 0;
-//! v[1] = 1;
-//! v[2] = 2;
-//! v[3] = 3;
-//! v[4] = 4;
-//!
-//! thrust::device_vector<int> result(5);
-//!
-//! // exclusive scan v into result in reverse
-//! thrust::exclusive_scan(v.rbegin(), v.rend(), result.begin());
-//!
-//! // result is now {0, 4, 7, 9, 10}
-//! \endcode
-//!
-//! \see make_reverse_iterator
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
+
+/*! \p reverse_iterator is an iterator which represents a pointer into a
+ *  reversed view of a given range. In this way, \p reverse_iterator allows
+ *  backwards iteration through a bidirectional input range.
+ *
+ *  It is important to note that although \p reverse_iterator is constructed
+ *  from a given iterator, it points to the element preceding it. In this way,
+ *  the past-the-end \p reverse_iterator of a given range points to the element
+ *  preceding the first element of the input range. By the same token, the first
+ *  \p reverse_iterator of a given range is constructed from a past-the-end iterator
+ *  of the original range yet points to the last element of the input.
+ *
+ *  The following code snippet demonstrates how to create a \p reverse_iterator
+ *  which represents a reversed view of the contents of a \p device_vector.
+ *
+ *  \code
+ *  #include <thrust/iterator/reverse_iterator.h>
+ *  #include <thrust/device_vector.h>
+ *  ...
+ *  thrust::device_vector<float> v(4);
+ *  v[0] = 0.0f;
+ *  v[1] = 1.0f;
+ *  v[2] = 2.0f;
+ *  v[3] = 3.0f;
+ *
+ *  using Iterator = thrust::device_vector<float>::iterator;
+ *
+ *  // note that we point the iterator to the *end* of the device_vector
+ *  thrust::reverse_iterator<Iterator> iter(values.end());
+ *
+ *  *iter;   // returns 3.0f;
+ *  iter[0]; // returns 3.0f;
+ *  iter[1]; // returns 2.0f;
+ *  iter[2]; // returns 1.0f;
+ *  iter[3]; // returns 0.0f;
+ *
+ *  // iter[4] is an out-of-bounds error
+ *  \endcode
+ *
+ *  Since reversing a range is a common operation, containers like \p device_vector
+ *  have nested aliases for declaration shorthand and methods for constructing
+ *  reverse_iterators. The following code snippet is equivalent to the previous:
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  ...
+ *  thrust::device_vector<float> v(4);
+ *  v[0] = 0.0f;
+ *  v[1] = 1.0f;
+ *  v[2] = 2.0f;
+ *  v[3] = 3.0f;
+ *
+ *  // we use the nested type reverse_iterator to refer to a reversed view of
+ *  // a device_vector and the method rbegin() to create a reverse_iterator pointing
+ *  // to the beginning of the reversed device_vector
+ *  thrust::device_iterator<float>::reverse_iterator iter = values.rbegin();
+ *
+ *  *iter;   // returns 3.0f;
+ *  iter[0]; // returns 3.0f;
+ *  iter[1]; // returns 2.0f;
+ *  iter[2]; // returns 1.0f;
+ *  iter[3]; // returns 0.0f;
+ *
+ *  // iter[4] is an out-of-bounds error
+ *
+ *  // similarly, rend() points to the end of the reversed sequence:
+ *  assert(values.rend() == (iter + 4));
+ *  \endcode
+ *
+ *  Finally, the following code snippet demonstrates how to use reverse_iterator to
+ *  perform a reversed prefix sum operation on the contents of a device_vector:
+ *
+ *  \code
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/scan.h>
+ *  ...
+ *  thrust::device_vector<int> v(5);
+ *  v[0] = 0;
+ *  v[1] = 1;
+ *  v[2] = 2;
+ *  v[3] = 3;
+ *  v[4] = 4;
+ *
+ *  thrust::device_vector<int> result(5);
+ *
+ *  // exclusive scan v into result in reverse
+ *  thrust::exclusive_scan(v.rbegin(), v.rend(), result.begin());
+ *
+ *  // result is now {0, 4, 7, 9, 10}
+ *  \endcode
+ *
+ *  \see make_reverse_iterator
+ */
 template <typename BidirectionalIterator>
-class reverse_iterator : public detail::make_reverse_iterator_base<BidirectionalIterator>::type
+class reverse_iterator : public detail::reverse_iterator_base<BidirectionalIterator>::type
 {
-  //! \cond
+  /*! \cond
+   */
 
 private:
-  using super_t = typename detail::make_reverse_iterator_base<BidirectionalIterator>::type;
+  using super_t = typename thrust::detail::reverse_iterator_base<BidirectionalIterator>::type;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
 public:
-  //! Default constructor does nothing.
+  /*! Default constructor does nothing.
+   */
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && THRUST_MSVC_VERSION < 1920
+  THRUST_HOST_DEVICE reverse_iterator() {}
+#else
   reverse_iterator() = default;
+#endif
 
-  //! \p Constructor accepts a \c BidirectionalIterator pointing to a range
-  //! for this \p reverse_iterator to reverse.
-  //!
-  //! \param x A \c BidirectionalIterator pointing to a range to reverse.
+  /*! \p Constructor accepts a \c BidirectionalIterator pointing to a range
+   *  for this \p reverse_iterator to reverse.
+   *
+   *  \param x A \c BidirectionalIterator pointing to a range to reverse.
+   */
   THRUST_HOST_DEVICE explicit reverse_iterator(BidirectionalIterator x)
       : super_t(x)
   {}
 
-  //!  \p Copy constructor allows construction from a related compatible
-  //!  \p reverse_iterator.
-  //!
-  //!  \param rhs A \p reverse_iterator to copy from.
+  /*! \p Copy constructor allows construction from a related compatible
+   *  \p reverse_iterator.
+   *
+   *  \param rhs A \p reverse_iterator to copy from.
+   */
   template <typename OtherBidirectionalIterator,
             detail::enable_if_convertible_t<OtherBidirectionalIterator, BidirectionalIterator, int> = 0>
   THRUST_HOST_DEVICE reverse_iterator(reverse_iterator<OtherBidirectionalIterator> const& rhs)
       : super_t(rhs.base())
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
   THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE typename super_t::reference dereference() const
-  {
-    auto b = this->base();
-    return *--b;
-  }
-
-  THRUST_HOST_DEVICE void increment()
-  {
-    --this->base_reference();
-  }
-
-  THRUST_HOST_DEVICE void decrement()
-  {
-    ++this->base_reference();
-  }
-
-  THRUST_HOST_DEVICE void advance(typename super_t::difference_type n)
-  {
-    this->base_reference() += -n;
-  }
+  THRUST_HOST_DEVICE typename super_t::reference dereference() const;
+
+  THRUST_HOST_DEVICE void increment();
+
+  THRUST_HOST_DEVICE void decrement();
+
+  THRUST_HOST_DEVICE void advance(typename super_t::difference_type n);
 
   template <typename OtherBidirectionalIterator>
   THRUST_HOST_DEVICE typename super_t::difference_type
-  distance_to(reverse_iterator<OtherBidirectionalIterator> const& y) const
-  {
-    return this->base_reference() - y.base();
-  }
-  //! \endcond
-};
-
-//! \p make_reverse_iterator creates a \p reverse_iterator
-//! from a \c BidirectionalIterator pointing to a range of elements to reverse.
-//!
-//! \param x A \c BidirectionalIterator pointing to a range to reverse.
-//! \return A new \p reverse_iterator which reverses the range \p x.
+  distance_to(reverse_iterator<OtherBidirectionalIterator> const& y) const;
+  /*! \endcond
+   */
+}; // end reverse_iterator
+
+/*! \p make_reverse_iterator creates a \p reverse_iterator
+ *  from a \c BidirectionalIterator pointing to a range of elements to reverse.
+ *
+ *  \param x A \c BidirectionalIterator pointing to a range to reverse.
+ *  \return A new \p reverse_iterator which reverses the range \p x.
+ */
 template <typename BidirectionalIterator>
-THRUST_HOST_DEVICE reverse_iterator<BidirectionalIterator> make_reverse_iterator(BidirectionalIterator x)
-{
-  return reverse_iterator<BidirectionalIterator>(x);
-}
+THRUST_HOST_DEVICE reverse_iterator<BidirectionalIterator> make_reverse_iterator(BidirectionalIterator x);
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
+
+#include <thrust/iterator/detail/reverse_iterator.inl>
diff --git a/projects/rocthrust/thrust/iterator/tabulate_output_iterator.h b/projects/rocthrust/thrust/iterator/tabulate_output_iterator.h
index 3bcf1a41d337..41807bb973c4 100644
--- a/projects/rocthrust/thrust/iterator/tabulate_output_iterator.h
+++ b/projects/rocthrust/thrust/iterator/tabulate_output_iterator.h
@@ -13,138 +13,105 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/config.h>
-
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/iterator_adaptor.h>
-#include <thrust/iterator/tabulate_output_iterator.h>
+#include <thrust/iterator/detail/tabulate_output_iterator.inl>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename BinaryFunction, typename System, typename DifferenceT>
-class tabulate_output_iterator;
+/*! \addtogroup iterators
+ *  \{
+ */
+
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
+
+/*! \p tabulate_output_iterator is a special kind of output iterator which, whenever a value is assigned to a
+ * dereferenced iterator, calls the given callable with the index that corresponds to the offset of the dereferenced
+ * iterator and the assigned value.
+ *
+ * The following code snippet demonstrated how to create a \p tabulate_output_iterator which prints the index and the
+ * assigned value.
+ *
+ * \code
+ * #include <thrust/iterator/tabulate_output_iterator.h>
+ *
+ *  // note: functor inherits form binary function
+ *  struct print_op
+ *  {
+ *    __host__ __device__
+ *    void operator()(int index, float value) const
+ *    {
+ *      printf("%d: %f\n", index, value);
+ *    }
+ *  };
+ *
+ *  int main()
+ *  {
+ *    auto tabulate_it = thrust::make_tabulate_output_iterator(print_op{});
+ *
+ *    tabulate_it[0] =  1.0f;    // prints: 0: 1.0
+ *    tabulate_it[1] =  3.0f;    // prints: 1: 3.0
+ *    tabulate_it[9] =  5.0f;    // prints: 9: 5.0
+ *  }
+ *  \endcode
+ *
+ *  \see make_tabulate_output_iterator
+ */
 
-namespace detail
-{
-// Proxy reference that invokes a BinaryFunction with the index of the dereferenced iterator and the assigned value
-template <typename BinaryFunction, typename DifferenceT>
-class tabulate_output_iterator_proxy
-{
-public:
-  THRUST_HOST_DEVICE tabulate_output_iterator_proxy(BinaryFunction fun, DifferenceT index)
-      : fun(fun)
-      , index(index)
-  {}
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T>
-  THRUST_HOST_DEVICE tabulate_output_iterator_proxy operator=(const T& x)
-  {
-    fun(index, x);
-    return *this;
-  }
-
-private:
-  BinaryFunction fun;
-  DifferenceT index;
-};
-
-// Alias template for the iterator_adaptor instantiation to be used for tabulate_output_iterator
-template <typename BinaryFunction, typename System, typename DifferenceT>
-using make_tabulate_output_iterator_base =
-  iterator_adaptor<tabulate_output_iterator<BinaryFunction, System, DifferenceT>,
-                   counting_iterator<DifferenceT>,
-                   void,
-                   System,
-                   use_default,
-                   tabulate_output_iterator_proxy<BinaryFunction, DifferenceT>>;
-
-// Register tabulate_output_iterator_proxy with 'is_proxy_reference' from
-// type_traits to enable its use with algorithms.
-template <class BinaryFunction, class OutputIterator>
-struct is_proxy_reference<tabulate_output_iterator_proxy<BinaryFunction, OutputIterator>> : true_type
-{};
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p tabulate_output_iterator is a special kind of output iterator which, whenever a value is assigned to a
-//! dereferenced iterator, calls the given callable with the index that corresponds to the offset of the dereferenced
-//! iterator and the assigned value.
-//!
-//! The following code snippet demonstrated how to create a \p tabulate_output_iterator which prints the index and the
-//! assigned value.
-//!
-//! \code
-//! #include <thrust/iterator/tabulate_output_iterator.h>
-//!
-//! // note: functor inherits form binary function
-//! struct print_op
-//! {
-//!   __host__ __device__
-//!   void operator()(int index, float value) const
-//!   {
-//!     printf("%d: %f\n", index, value);
-//!   }
-//! };
-//!
-//! int main()
-//! {
-//!   auto tabulate_it = thrust::make_tabulate_output_iterator(print_op{});
-//!
-//!   tabulate_it[0] =  1.0f;    // prints: 0: 1.0
-//!   tabulate_it[1] =  3.0f;    // prints: 1: 3.0
-//!   tabulate_it[9] =  5.0f;    // prints: 9: 5.0
-//! }
-//! \endcode
-//!
-//! \see make_tabulate_output_iterator
 template <typename BinaryFunction, typename System = use_default, typename DifferenceT = ptrdiff_t>
-class tabulate_output_iterator : public detail::make_tabulate_output_iterator_base<BinaryFunction, System, DifferenceT>
+class tabulate_output_iterator : public detail::tabulate_output_iterator_base<BinaryFunction, System, DifferenceT>
 {
+  /*! \cond
+   */
+
 public:
-  //! \cond
-  using super_t = detail::make_tabulate_output_iterator_base<BinaryFunction, System, DifferenceT>;
+  using super_t = detail::tabulate_output_iterator_base<BinaryFunction, System, DifferenceT>;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
   tabulate_output_iterator() = default;
 
-  //!  This constructor takes as argument a \c BinaryFunction and copies it to a new \p tabulate_output_iterator
-  //!
-  //! \param fun A \c BinaryFunction called whenever a value is assigned to this \p tabulate_output_iterator.
+  /*! This constructor takes as argument a \c BinaryFunction and copies it to a new \p tabulate_output_iterator
+   *
+   * \param fun A \c BinaryFunction called whenever a value is assigned to this \p tabulate_output_iterator.
+   */
   THRUST_HOST_DEVICE tabulate_output_iterator(BinaryFunction fun)
       : fun(fun)
   {}
 
+  /*! \cond
+   */
+
 private:
-  //! \cond
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
   {
-    return detail::tabulate_output_iterator_proxy<BinaryFunction, DifferenceT>{fun, *this->base()};
+    return detail::tabulate_output_iterator_proxy<BinaryFunction, DifferenceT>(fun, *this->base());
   }
 
   BinaryFunction fun;
-  //! \endcond
-};
 
-//! \p make_tabulate_output_iterator creates a \p tabulate_output_iterator from a \c BinaryFunction.
-//!
-//! \param fun The \c BinaryFunction invoked whenever assigning to a dereferenced \p tabulate_output_iterator
-//! \see tabulate_output_iterator
+  /*! \endcond
+   */
+}; // end tabulate_output_iterator
+
+/*! \p make_tabulate_output_iterator creates a \p tabulate_output_iterator from a \c BinaryFunction.
+ *
+ *  \param fun The \c BinaryFunction invoked whenever assigning to a dereferenced \p tabulate_output_iterator
+ *  \see tabulate_output_iterator
+ */
 template <typename BinaryFunction>
 tabulate_output_iterator<BinaryFunction> THRUST_HOST_DEVICE make_tabulate_output_iterator(BinaryFunction fun)
 {
   return tabulate_output_iterator<BinaryFunction>(fun);
-}
+} // end make_tabulate_output_iterator
+
+/*! \} // end fancyiterators
+ */
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/transform_input_output_iterator.h b/projects/rocthrust/thrust/iterator/transform_input_output_iterator.h
index 73579c46fed9..3c03808973f4 100644
--- a/projects/rocthrust/thrust/iterator/transform_input_output_iterator.h
+++ b/projects/rocthrust/thrust/iterator/transform_input_output_iterator.h
@@ -14,9 +14,10 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/transform_input_output_iterator.h
-//! \brief An iterator which adapts another iterator by applying transform functions when reading and writing
-//! dereferenced values.
+/*! \file thrust/iterator/transform_input_output_iterator.h
+ *  \brief An iterator which adapts another iterator by applying transform
+ *         functions when reading and writing dereferenced values.
+ */
 
 #pragma once
 
@@ -29,160 +30,92 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
-#include <thrust/detail/type_traits.h>
-#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/detail/transform_input_output_iterator.inl>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename InputFunction, typename OutputFunction, typename Iterator>
-class transform_input_output_iterator;
-
-namespace detail
-{
-// Proxy reference that invokes InputFunction when reading from and
-// OutputFunction when writing to the dereferenced iterator
-template <typename InputFunction, typename OutputFunction, typename Iterator>
-class transform_input_output_iterator_proxy
-{
-  using iterator_value_type = it_value_t<Iterator>;
-  using Value               = invoke_result_t<InputFunction, iterator_value_type>;
-
-public:
-  THRUST_HOST_DEVICE transform_input_output_iterator_proxy(
-    const Iterator& io, InputFunction input_function, OutputFunction output_function)
-      : io(io)
-      , input_function(input_function)
-      , output_function(output_function)
-  {}
-
-  transform_input_output_iterator_proxy(const transform_input_output_iterator_proxy&) = default;
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE operator Value() const
-  {
-    return input_function(*io);
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T>
-  THRUST_HOST_DEVICE transform_input_output_iterator_proxy operator=(const T& x)
-  {
-    *io = output_function(x);
-    return *this;
-  }
-
-  THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE transform_input_output_iterator_proxy operator=(const transform_input_output_iterator_proxy& x)
-  {
-    *io = output_function(x);
-    return *this;
-  }
+/*! \addtogroup iterators
+ *  \{
+ */
 
-private:
-  Iterator io;
-  InputFunction input_function;
-  OutputFunction output_function;
-};
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-// Compute the iterator_adaptor instantiation to be used for transform_input_output_iterator
-template <typename InputFunction, typename OutputFunction, typename Iterator>
-struct make_transform_input_output_iterator_base
-{
-private:
-  using iterator_value_type = it_value_t<Iterator>;
+/*! \p transform_input_output_iterator is a special kind of iterator which applies
+ * transform functions when reading from or writing to dereferenced values.
+ * This iterator is useful for algorithms that operate on a type that needs to
+ * be serialized/deserialized from values in another iterator, avoiding the
+ * need to materialize intermediate results in memory. This also enables the
+ * transform functions to be fused with the operations that read and write to
+ * the `transform_input_output_iterator`.
+ *
+ * The following code snippet demonstrates how to create a
+ * \p transform_input_output_iterator which performs different transformations when
+ * reading from and writing to the iterator.
+ *
+ * \code
+ * #include <thrust/iterator/transform_input_output_iterator.h>
+ * #include <thrust/device_vector.h>
+ *
+ *  int main()
+ *  {
+ *    const size_t size = 4;
+ *    thrust::device_vector<float> v(size);
+ *
+ *    // Write 1.0f, 2.0f, 3.0f, 4.0f to vector
+ *    thrust::sequence(v.begin(), v.end(), 1);
+ *
+ *    // Iterator that returns negated values and writes squared values
+ *    auto iter = thrust::make_transform_input_output_iterator(v.begin(),
+ *        thrust::negate<float>{}, thrust::square<float>{});
+ *
+ *    // Iterator negates values when reading
+ *    std::cout << iter[0] << " ";  // -1.0f;
+ *    std::cout << iter[1] << " ";  // -2.0f;
+ *    std::cout << iter[2] << " ";  // -3.0f;
+ *    std::cout << iter[3] << "\n"; // -4.0f;
+ *
+ *    // Write 1.0f, 2.0f, 3.0f, 4.0f to iterator
+ *    thrust::sequence(iter, iter + size, 1);
+ *
+ *    // Values were squared before writing to vector
+ *    std::cout << v[0] << " ";  // 1.0f;
+ *    std::cout << v[1] << " ";  // 4.0f;
+ *    std::cout << v[2] << " ";  // 9.0f;
+ *    std::cout << v[3] << "\n"; // 16.0f;
+ *
+ *  }
+ * \endcode
+ *
+ * \see make_transform_input_output_iterator
+ */
 
-public:
-  using type =
-    iterator_adaptor<transform_input_output_iterator<InputFunction, OutputFunction, Iterator>,
-                     Iterator,
-                     invoke_result_t<InputFunction, iterator_value_type>,
-                     use_default,
-                     use_default,
-                     transform_input_output_iterator_proxy<InputFunction, OutputFunction, Iterator>>;
-};
-
-// Register transform_input_output_iterator_proxy with 'is_proxy_reference' from type_traits to enable its use with
-// algorithms.
-template <typename InputFunction, typename OutputFunction, typename Iterator>
-struct is_proxy_reference<transform_input_output_iterator_proxy<InputFunction, OutputFunction, Iterator>> : true_type
-{};
-
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p transform_input_output_iterator is a special kind of iterator which applies transform functions when reading from
-//! or writing to dereferenced values. This iterator is useful for algorithms that operate on a type that needs to be
-//! serialized/deserialized from values in another iterator, avoiding the need to materialize intermediate results in
-//! memory. This also enables the transform functions to be fused with the operations that read and write to the
-//! `transform_input_output_iterator`.
-//!
-//! The following code snippet demonstrates how to create a \p transform_input_output_iterator which performs different
-//! transformations when reading from and writing to the iterator.
-//!
-//! \code
-//! #include <thrust/iterator/transform_input_output_iterator.h>
-//! #include <thrust/device_vector.h>
-//!
-//!  int main()
-//!  {
-//!    const size_t size = 4;
-//!    thrust::device_vector<float> v(size);
-//!
-//!    // Write 1.0f, 2.0f, 3.0f, 4.0f to vector
-//!    thrust::sequence(v.begin(), v.end(), 1);
-//!
-//!    // Iterator that returns negated values and writes squared values
-//!    auto iter = thrust::make_transform_input_output_iterator(v.begin(),
-//!        thrust::negate<float>{}, thrust::square<float>{});
-//!
-//!    // Iterator negates values when reading
-//!    std::cout << iter[0] << " ";  // -1.0f;
-//!    std::cout << iter[1] << " ";  // -2.0f;
-//!    std::cout << iter[2] << " ";  // -3.0f;
-//!    std::cout << iter[3] << "\n"; // -4.0f;
-//!
-//!    // Write 1.0f, 2.0f, 3.0f, 4.0f to iterator
-//!    thrust::sequence(iter, iter + size, 1);
-//!
-//!    // Values were squared before writing to vector
-//!    std::cout << v[0] << " ";  // 1.0f;
-//!    std::cout << v[1] << " ";  // 4.0f;
-//!    std::cout << v[2] << " ";  // 9.0f;
-//!    std::cout << v[3] << "\n"; // 16.0f;
-//!
-//!  }
-//! \endcode
-//!
-//! \see make_transform_input_output_iterator
 template <typename InputFunction, typename OutputFunction, typename Iterator>
 class transform_input_output_iterator
-    : public detail::make_transform_input_output_iterator_base<InputFunction, OutputFunction, Iterator>::type
+    : public detail::transform_input_output_iterator_base<InputFunction, OutputFunction, Iterator>::type
 {
-  //! \cond
+  /*! \cond
+   */
 
 public:
-  using super_t =
-    typename detail::make_transform_input_output_iterator_base<InputFunction, OutputFunction, Iterator>::type;
+  using super_t = typename detail::transform_input_output_iterator_base<InputFunction, OutputFunction, Iterator>::type;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
   transform_input_output_iterator() = default;
 
-  //!  This constructor takes as argument a \c Iterator an \c InputFunction and an
-  //! \c OutputFunction and copies them to a new \p transform_input_output_iterator
-  //!
-  //! \param io An \c Iterator pointing to where the input to \c InputFunction will be read from and the result of \c
-  //!           OutputFunction will be written to
-  //! \param input_function An \c InputFunction to be executed on values read from the iterator
-  //! \param output_function An \c OutputFunction to be executed on values written to the iterator
+  /*! This constructor takes as argument a \c Iterator an \c InputFunction and an
+   * \c OutputFunction and copies them to a new \p transform_input_output_iterator
+   *
+   * \param io An \c Iterator pointing to where the input to \c InputFunction
+   *           will be read from and the result of \c OutputFunction will be written to
+   * \param input_function An \c InputFunction to be executed on values read from the iterator
+   * \param output_function An \c OutputFunction to be executed on values written to the iterator
+   */
   THRUST_HOST_DEVICE
   transform_input_output_iterator(Iterator const& io, InputFunction input_function, OutputFunction output_function)
       : super_t(io)
@@ -190,7 +123,8 @@ class transform_input_output_iterator
       , output_function(output_function)
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
@@ -202,25 +136,30 @@ class transform_input_output_iterator
   InputFunction input_function;
   OutputFunction output_function;
 
-  //! \endcond
-};
-
-//! \p make_transform_input_output_iterator creates a \p transform_input_output_iterator from an \c Iterator a \c
-//! InputFunction and a \c OutputFunction
-//!
-//! \param io An \c Iterator pointing to where the input to \c InputFunction will be read from and the result of \c
-//!           OutputFunction will be written to
-//! \param input_function An \c InputFunction to be executed on values read from the iterator
-//! \param output_function An \c OutputFunction to be executed on values written to the iterator
-//! \see transform_input_output_iterator
+  /*! \endcond
+   */
+}; // end transform_input_output_iterator
+
+/*! \p make_transform_input_output_iterator creates a \p transform_input_output_iterator from
+ *  an \c Iterator a \c InputFunction and a \c OutputFunction
+ *
+ * \param io An \c Iterator pointing to where the input to \c InputFunction
+ *           will be read from and the result of \c OutputFunction will be written to
+ * \param input_function An \c InputFunction to be executed on values read from the iterator
+ * \param output_function An \c OutputFunction to be executed on values written to the iterator
+ *  \see transform_input_output_iterator
+ */
 template <typename InputFunction, typename OutputFunction, typename Iterator>
 transform_input_output_iterator<InputFunction, OutputFunction, Iterator> THRUST_HOST_DEVICE
 make_transform_input_output_iterator(Iterator io, InputFunction input_function, OutputFunction output_function)
 {
   return transform_input_output_iterator<InputFunction, OutputFunction, Iterator>(io, input_function, output_function);
-}
+} // end make_transform_input_output_iterator
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/transform_iterator.h b/projects/rocthrust/thrust/iterator/transform_iterator.h
index 2f7674444ae2..640eb3aef19a 100644
--- a/projects/rocthrust/thrust/iterator/transform_iterator.h
+++ b/projects/rocthrust/thrust/iterator/transform_iterator.h
@@ -41,284 +41,272 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/functional/actor.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
-#include <thrust/detail/libcxx_wrapper/std/__memory/construct_at.h>
+// #include the details first
 #include <thrust/detail/type_traits.h>
-#include <thrust/functional.h>
-#include <thrust/iterator/iterator_adaptor.h>
+#include <thrust/iterator/detail/transform_iterator.inl>
+#include <thrust/iterator/iterator_facade.h>
 #include <thrust/iterator/iterator_traits.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(functional)
-#endif
-
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#  include <utility>
+#  include <type_traits>
 #endif
 
 THRUST_NAMESPACE_BEGIN
 
-template <class UnaryFunction, class Iterator, class Reference, class Value>
-class transform_iterator;
-
-namespace detail
-{
-
-template <class UnaryFunc, class Iterator>
-struct transform_iterator_reference
-{
-  // by default, dereferencing the iterator yields the same as the function.
-  using type = decltype(_THRUST_STD::declval<UnaryFunc>()(_THRUST_STD::declval<it_value_t<Iterator>>()));
-};
-
-// for certain function objects, we need to tweak the reference type. Notably, identity functions must decay to values.
-// See the implementation of transform_iterator<...>::dereference() for several comments on why this is necessary.
-template <class Iterator>
-struct transform_iterator_reference<::internal::identity, Iterator>
-{
-  using type = it_value_t<Iterator>;
-};
-template <typename Eval, class Iterator>
-struct transform_iterator_reference<functional::actor<Eval>, Iterator>
-{
-  using type = _THRUST_STD::remove_reference_t<decltype(_THRUST_STD::declval<functional::actor<Eval>>()(
-    _THRUST_STD::declval<it_value_t<Iterator>>()))>;
-};
+/*! \addtogroup iterators
+ *  \{
+ */
 
-// Type function to compute the iterator_adaptor instantiation to be used for transform_iterator
-template <class UnaryFunc, class Iterator, class Reference, class Value>
-struct make_transform_iterator_base
-{
-private:
-  using reference  = replace_if_use_default<Reference, transform_iterator_reference<UnaryFunc, Iterator>>;
-  using value_type = replace_if_use_default<Value, ::internal::remove_cvref<reference>>;
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-public:
-  using type =
-    iterator_adaptor<transform_iterator<UnaryFunc, Iterator, Reference, Value>,
-                     Iterator,
-                     value_type,
-                     use_default,
-                     typename _THRUST_STD::iterator_traits<Iterator>::iterator_category,
-                     reference>;
-};
-
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//!! \addtogroup fancyiterator Fancy Iterators
-//!  \ingroup iterators
-//!  \{
-
-//! \p transform_iterator is an iterator which represents a pointer into a range of values after transformation by a
-//! function. This iterator is useful for creating a range filled with the result of applying an operation to another
-//! range without either explicitly storing it in memory, or explicitly executing the transformation. Using \p
-//! transform_iterator facilitates kernel fusion by deferring the execution of a transformation until the value is
-//! needed while saving both memory capacity and bandwidth.
-//!
-//! The following code snippet demonstrates how to create a \p transform_iterator which represents the result of \c
-//! sqrtf applied to the contents of a \p device_vector.
-//!
-//! \code
-//! #include <thrust/iterator/transform_iterator.h>
-//! #include <thrust/device_vector.h>
-//!
-//! struct square_root
-//! {
-//!   __host__ __device__
-//!   float operator()(float x) const
-//!   {
-//!     return sqrtf(x);
-//!   }
-//! };
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<float> v(4);
-//!   v[0] = 1.0f;
-//!   v[1] = 4.0f;
-//!   v[2] = 9.0f;
-//!   v[3] = 16.0f;
-//!
-//!   using FloatIterator = thrust::device_vector<float>::iterator;
-//!
-//!   thrust::transform_iterator<square_root, FloatIterator> iter(v.begin(), square_root());
-//!
-//!   *iter;   // returns 1.0f
-//!   iter[0]; // returns 1.0f;
-//!   iter[1]; // returns 2.0f;
-//!   iter[2]; // returns 3.0f;
-//!   iter[3]; // returns 4.0f;
-//!
-//!   // iter[4] is an out-of-bounds error
-//! }
-//! \endcode
-//!
-//! This next example demonstrates how to use a \p transform_iterator with the \p thrust::reduce function to compute the
-//! sum of squares of a sequence. We will create temporary \p transform_iterators with the \p make_transform_iterator
-//! function in order to avoid explicitly specifying their type:
-//!
-//! \code
-//! #include <thrust/iterator/transform_iterator.h>
-//! #include <thrust/device_vector.h>
-//! #include <thrust/reduce.h>
-//! #include <iostream>
-//!
-//! struct square
-//! {
-//!   __host__ __device__
-//!   float operator()(float x) const
-//!   {
-//!     return x * x;
-//!   }
-//! };
-//!
-//! int main()
-//! {
-//!   // initialize a device array
-//!   thrust::device_vector<float> v(4);
-//!   v[0] = 1.0f;
-//!   v[1] = 2.0f;
-//!   v[2] = 3.0f;
-//!   v[3] = 4.0f;
-//!
-//!   float sum_of_squares =
-//!    thrust::reduce(thrust::make_transform_iterator(v.begin(), square()),
-//!                   thrust::make_transform_iterator(v.end(),   square()));
-//!
-//!   std::cout << "sum of squares: " << sum_of_squares << std::endl;
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! The following example illustrates how to use the third template argument to explicitly specify the return type of
-//! the function.
-//!
-//! \code
-//! #include <thrust/iterator/transform_iterator.h>
-//! #include <thrust/device_vector.h>
-//!
-//! struct square_root
-//! {
-//!   __host__ __device__
-//!   float operator()(float x) const
-//!   {
-//!     return sqrtf(x);
-//!   }
-//! };
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<float> v(4);
-//!   v[0] = 1.0f;
-//!   v[1] = 4.0f;
-//!   v[2] = 9.0f;
-//!   v[3] = 16.0f;
-//!
-//!   using FloatIterator = thrust::device_vector<float>::iterator;
-//!
-//!   // note: float result_type is specified explicitly
-//!   thrust::transform_iterator<square_root, FloatIterator, float> iter(v.begin(), square_root());
-//!
-//!   *iter;   // returns 1.0f
-//!   iter[0]; // returns 1.0f;
-//!   iter[1]; // returns 2.0f;
-//!   iter[2]; // returns 3.0f;
-//!   iter[3]; // returns 4.0f;
-//!
-//!   // iter[4] is an out-of-bounds error
-//! }
-//! \endcode
-//!
-//! \see make_transform_iterator
+/*! \p transform_iterator is an iterator which represents a pointer into a range
+ *  of values after transformation by a function. This iterator is useful for
+ *  creating a range filled with the result of applying an operation to another range
+ *  without either explicitly storing it in memory, or explicitly executing the transformation.
+ *  Using \p transform_iterator facilitates kernel fusion by deferring the execution
+ *  of a transformation until the value is needed while saving both memory capacity
+ *  and bandwidth.
+ *
+ *  The following code snippet demonstrates how to create a \p transform_iterator
+ *  which represents the result of \c sqrtf applied to the contents of a \p device_vector.
+ *
+ *  \code
+ *  #include <thrust/iterator/transform_iterator.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  // note: functor inherits from unary_function
+ *  struct square_root : public thrust::unary_function<float,float>
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x) const
+ *    {
+ *      return sqrtf(x);
+ *    }
+ *  };
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<float> v(4);
+ *    v[0] = 1.0f;
+ *    v[1] = 4.0f;
+ *    v[2] = 9.0f;
+ *    v[3] = 16.0f;
+ *
+ *    using FloatIterator = thrust::device_vector<float>::iterator;
+ *
+ *    thrust::transform_iterator<square_root, FloatIterator> iter(v.begin(), square_root());
+ *
+ *    *iter;   // returns 1.0f
+ *    iter[0]; // returns 1.0f;
+ *    iter[1]; // returns 2.0f;
+ *    iter[2]; // returns 3.0f;
+ *    iter[3]; // returns 4.0f;
+ *
+ *    // iter[4] is an out-of-bounds error
+ *  }
+ *  \endcode
+ *
+ *  This next example demonstrates how to use a \p transform_iterator with the
+ *  \p thrust::reduce function to compute the sum of squares of a sequence.
+ *  We will create temporary \p transform_iterators with the
+ *  \p make_transform_iterator function in order to avoid explicitly specifying their type:
+ *
+ *  \code
+ *  #include <thrust/iterator/transform_iterator.h>
+ *  #include <thrust/device_vector.h>
+ *  #include <thrust/reduce.h>
+ *  #include <iostream>
+ *
+ *  // note: functor inherits from unary_function
+ *  struct square : public thrust::unary_function<float,float>
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x) const
+ *    {
+ *      return x * x;
+ *    }
+ *  };
+ *
+ *  int main()
+ *  {
+ *    // initialize a device array
+ *    thrust::device_vector<float> v(4);
+ *    v[0] = 1.0f;
+ *    v[1] = 2.0f;
+ *    v[2] = 3.0f;
+ *    v[3] = 4.0f;
+ *
+ *    float sum_of_squares =
+ *     thrust::reduce(thrust::make_transform_iterator(v.begin(), square()),
+ *                    thrust::make_transform_iterator(v.end(),   square()));
+ *
+ *    std::cout << "sum of squares: " << sum_of_squares << std::endl;
+ *    return 0;
+ *  }
+ *  \endcode
+ *
+ *  Note that in the previous two examples the transform functor (namely \c square_root
+ *  and \c square) inherits from \c thrust::unary_function.  Inheriting from
+ *  \c thrust::unary_function ensures that a functor is a valid \c AdaptableUnaryFunction
+ *  and provides all the necessary nested alias.  The \p transform_iterator
+ *  can also be applied to a \c UnaryFunction that does not inherit from
+ *  \c thrust::unary_function using an optional template argument.  The following example
+ *  illustrates how to use the third template argument to specify the \c result_type of
+ *  the function.
+ *
+ *  \code
+ *  #include <thrust/iterator/transform_iterator.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  // note: functor *does not* inherit from unary_function
+ *  struct square_root
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x) const
+ *    {
+ *      return sqrtf(x);
+ *    }
+ *  };
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<float> v(4);
+ *    v[0] = 1.0f;
+ *    v[1] = 4.0f;
+ *    v[2] = 9.0f;
+ *    v[3] = 16.0f;
+ *
+ *    using FloatIterator = thrust::device_vector<float>::iterator;
+ *
+ *    // note: float result_type is specified explicitly
+ *    thrust::transform_iterator<square_root, FloatIterator, float> iter(v.begin(), square_root());
+ *
+ *    *iter;   // returns 1.0f
+ *    iter[0]; // returns 1.0f;
+ *    iter[1]; // returns 2.0f;
+ *    iter[2]; // returns 3.0f;
+ *    iter[3]; // returns 4.0f;
+ *
+ *    // iter[4] is an out-of-bounds error
+ *  }
+ *  \endcode
+ *
+ *  \see make_transform_iterator
+ */
 template <class AdaptableUnaryFunction, class Iterator, class Reference = use_default, class Value = use_default>
 class transform_iterator
     : public detail::make_transform_iterator_base<AdaptableUnaryFunction, Iterator, Reference, Value>::type
 {
-  //! \cond
+  /*! \cond
+   */
 
 public:
   using super_t =
     typename detail::make_transform_iterator_base<AdaptableUnaryFunction, Iterator, Reference, Value>::type;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
-  //! Null constructor does nothing.
+public:
+  /*! Null constructor does nothing.
+   */
   transform_iterator() = default;
 
-  //! Default copy constructor.
+  /*! Default copy constructor.
+   */
   transform_iterator(transform_iterator const&) = default;
 
-  //! This constructor takes as arguments an \c Iterator and an \c AdaptableUnaryFunction and copies them to a new \p
-  //! transform_iterator.
-  //!
-  //! \param x An \c Iterator pointing to the input to this \p transform_iterator's \c AdaptableUnaryFunction.
-  //! \param f An \c AdaptableUnaryFunction used to transform the objects pointed to by \p x.
+  /*! This constructor takes as arguments an \c Iterator and an \c AdaptableUnaryFunction
+   *  and copies them to a new \p transform_iterator.
+   *
+   *  \param x An \c Iterator pointing to the input to this \p transform_iterator's \c AdaptableUnaryFunction.
+   *  \param f An \c AdaptableUnaryFunction used to transform the objects pointed to by \p x.
+   */
   THRUST_HOST_DEVICE transform_iterator(Iterator const& x, AdaptableUnaryFunction f)
       : super_t(x)
       , m_f(f)
   {}
 
-  //! This explicit constructor copies the value of a given \c Iterator and creates this \p transform_iterator's \c
-  //! AdaptableUnaryFunction using its null constructor.
-  //!
-  //! \param x An \c Iterator to copy.
+  /*! This explicit constructor copies the value of a given \c Iterator and creates
+   *  this \p transform_iterator's \c AdaptableUnaryFunction using its null constructor.
+   *
+   *  \param x An \c Iterator to copy.
+   */
   THRUST_HOST_DEVICE explicit transform_iterator(Iterator const& x)
       : super_t(x)
   {}
 
-  //! This copy constructor creates a new \p transform_iterator from another \p transform_iterator.
-  //!
-  //! \param other The \p transform_iterator to copy.
+  /*! This copy constructor creates a new \p transform_iterator from another
+   *  \p transform_iterator.
+   *
+   *  \param other The \p transform_iterator to copy.
+   */
   template <typename OtherAdaptableUnaryFunction, typename OtherIterator, typename OtherReference, typename OtherValue>
   THRUST_HOST_DEVICE transform_iterator(
     const transform_iterator<OtherAdaptableUnaryFunction, OtherIterator, OtherReference, OtherValue>& other,
-    detail::enable_if_convertible_t<OtherIterator, Iterator>*                             = 0,
-    detail::enable_if_convertible_t<OtherAdaptableUnaryFunction, AdaptableUnaryFunction>* = 0)
+    thrust::detail::enable_if_convertible_t<OtherIterator, Iterator>*                             = 0,
+    thrust::detail::enable_if_convertible_t<OtherAdaptableUnaryFunction, AdaptableUnaryFunction>* = 0)
       : super_t(other.base())
       , m_f(other.functor())
   {}
 
-  THRUST_HOST_DEVICE transform_iterator& operator=(transform_iterator const& other)
+  /*! Copy assignment operator copies from another \p transform_iterator.
+   *  \p other The other \p transform_iterator to copy
+   *  \return <tt>*this</tt>
+   *
+   *  \note If the type of this \p transform_iterator's functor is not copy assignable
+   *        (for example, if it is a lambda) it is not an error to call this function.
+   *        In this case, however, the functor will not be modified.
+   *
+   *        In any case, this \p transform_iterator's underlying iterator will be copy assigned.
+   */
+  THRUST_HOST_DEVICE transform_iterator& operator=(const transform_iterator& other)
   {
-    super_t::operator=(other);
-    if constexpr (THRUST_TRAIT(_THRUST_STD::is_copy_assignable, AdaptableUnaryFunction))
-    {
-      m_f = other.m_f;
-    }
-    else if constexpr (THRUST_TRAIT(_THRUST_STD::is_copy_constructible, AdaptableUnaryFunction))
-    {
-      ::internal::__destroy_at(&m_f);
-      ::internal::__construct_at(&m_f, other.m_f);
-    }
-    else
-    {
-      static_assert(THRUST_TRAIT(_THRUST_STD::is_copy_constructible, AdaptableUnaryFunction),
-                    "Cannot use thrust::transform_iterator with a functor that is neither copy constructible nor "
-                    "copy assignable");
-    }
-    return *this;
+    return do_assign(other, _THRUST_STD::is_copy_assignable<AdaptableUnaryFunction>());
   }
 
-  //! This method returns a copy of this \p transform_iterator's \c AdaptableUnaryFunction.
-  //! \return A copy of this \p transform_iterator's \c AdaptableUnaryFunction.
+  /*! This method returns a copy of this \p transform_iterator's \c AdaptableUnaryFunction.
+   *  \return A copy of this \p transform_iterator's \c AdaptableUnaryFunction.
+   */
   THRUST_HOST_DEVICE AdaptableUnaryFunction functor() const
   {
     return m_f;
   }
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
-  // MSVC 2013 and 2015 incorrectly warning about returning a reference to
-  // a local/temporary here.
-  // See goo.gl/LELTNp
+  THRUST_HOST_DEVICE transform_iterator& do_assign(const transform_iterator& other, thrust::detail::true_type)
+  {
+    super_t::operator=(other);
+
+    // do assign to m_f
+    m_f = other.functor();
+
+    return *this;
+  }
+
+  THRUST_HOST_DEVICE transform_iterator& do_assign(const transform_iterator& other, thrust::detail::false_type)
+  {
+    super_t::operator=(other);
+
+    // don't assign to m_f
+
+    return *this;
+  }
+
+// MSVC 2013 and 2015 incorrectly warning about returning a reference to
+// a local/temporary here.
+// See goo.gl/LELTNp
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
+  THRUST_DIAG_PUSH
+  THRUST_DIAG_SUPPRESS_MSVC(4172)
+#endif // (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
 
   THRUST_EXEC_CHECK_DISABLE
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
@@ -339,27 +327,36 @@ class transform_iterator
     // The workaround is to create a temporary to allow iterators with wrapped/proxy references to convert to their
     // value type before calling m_f. This also loads values from a different memory space (cf. `device_reference`).
     // Note that this disallows mutable operations through m_f.
-    detail::it_value_t<Iterator> const& x = *this->base();
+    iterator_value_t<Iterator> const& x = *this->base();
     // FIXME(bgruber): x may be a reference to a temporary (e.g. if the base iterator is a counting_iterator). If `m_f`
     // does not produce an independent copy and super_t::reference is a reference, we return a dangling reference (e.g.
-    // for any `[thrust|_THRUST_STD]::identity` functor).
+    // for any `[thrust|::cuda::std]::identity` functor).
     return m_f(x);
   }
 
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
+  THRUST_DIAG_POP
+#endif // (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC) && (THRUST_MSVC_VERSION < 1920)
+
   // tag this as mutable per Dave Abrahams in this thread:
   // http://lists.boost.org/Archives/boost/2004/05/65332.php
   mutable AdaptableUnaryFunction m_f;
 
-  //! \endcond
-};
+  /*! \endcond
+   */
+}; // end transform_iterator
 
-//! \p make_transform_iterator creates a \p transform_iterator from an \c Iterator and \c AdaptableUnaryFunction.
-//!
-//! \param it The \c Iterator pointing to the input range of the newly created \p transform_iterator.
-//! \param fun The \c AdaptableUnaryFunction used to transform the range pointed to by \p it in the newly created \p
-//!            transform_iterator.
-//! \return A new \p transform_iterator which transforms the range at \p it by \p fun.
-//! \see transform_iterator
+/*! \p make_transform_iterator creates a \p transform_iterator
+ *  from an \c Iterator and \c AdaptableUnaryFunction.
+ *
+ *  \param it The \c Iterator pointing to the input range of the
+ *            newly created \p transform_iterator.
+ *  \param fun The \c AdaptableUnaryFunction used to transform the range pointed
+ *             to by \p it in the newly created \p transform_iterator.
+ *  \return A new \p transform_iterator which transforms the range at
+ *          \p it by \p fun.
+ *  \see transform_iterator
+ */
 template <class AdaptableUnaryFunction, class Iterator>
 inline THRUST_HOST_DEVICE transform_iterator<AdaptableUnaryFunction, Iterator>
 make_transform_iterator(Iterator it, AdaptableUnaryFunction fun)
@@ -367,7 +364,10 @@ make_transform_iterator(Iterator it, AdaptableUnaryFunction fun)
   return transform_iterator<AdaptableUnaryFunction, Iterator>(it, fun);
 } // end make_transform_iterator
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/transform_output_iterator.h b/projects/rocthrust/thrust/iterator/transform_output_iterator.h
index 327f331e1531..08a605eaa04c 100644
--- a/projects/rocthrust/thrust/iterator/transform_output_iterator.h
+++ b/projects/rocthrust/thrust/iterator/transform_output_iterator.h
@@ -14,9 +14,10 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/transform_output_iterator.h
-//! \brief An output iterator which adapts another output iterator by applying a function to the result of its
-//! dereference before writing it.
+/*! \file thrust/iterator/transform_output_iterator.h
+ *  \brief An output iterator which adapts another output iterator by applying a
+ *         function to the result of its dereference before writing it.
+ */
 
 #pragma once
 
@@ -29,137 +30,100 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
-#include <thrust/iterator/iterator_adaptor.h>
-#include <thrust/iterator/transform_output_iterator.h>
+#include <thrust/iterator/detail/transform_output_iterator.inl>
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename UnaryFunction, typename OutputIterator>
-class transform_output_iterator;
-
-namespace detail
-{
-// Proxy reference that uses Unary Function to transform the rhs of assignment
-// operator before writing the result to OutputIterator
-template <typename UnaryFunction, typename OutputIterator>
-class transform_output_iterator_proxy
-{
-public:
-  THRUST_HOST_DEVICE transform_output_iterator_proxy(const OutputIterator& out, UnaryFunction fun)
-      : out(out)
-      , fun(fun)
-  {}
+/*! \addtogroup iterators
+ *  \{
+ */
 
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T>
-  THRUST_HOST_DEVICE transform_output_iterator_proxy operator=(const T& x)
-  {
-    *out = fun(x);
-    return *this;
-  }
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-private:
-  OutputIterator out;
-  UnaryFunction fun;
-};
+/*! \p transform_output_iterator is a special kind of output iterator which
+ * transforms a value written upon dereference. This iterator is useful
+ * for transforming an output from algorithms without explicitly storing the
+ * intermediate result in the memory and applying subsequent transformation,
+ * thereby avoiding wasting memory capacity and bandwidth.
+ * Using \p transform_iterator facilitates kernel fusion by deferring execution
+ * of transformation until the value is written while saving both memory
+ * capacity and bandwidth.
+ *
+ * The following code snippet demonstrated how to create a
+ * \p transform_output_iterator which applies \c sqrtf to the assigning value.
+ *
+ * \code
+ * #include <thrust/iterator/transform_output_iterator.h>
+ * #include <thrust/device_vector.h>
+ *
+ * // note: functor inherits form unary function
+ *  // note: functor inherits from unary_function
+ *  struct square_root : public thrust::unary_function<float,float>
+ *  {
+ *    __host__ __device__
+ *    float operator()(float x) const
+ *    {
+ *      return sqrtf(x);
+ *    }
+ *  };
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<float> v(4);
+ *
+ *    using FloatIterator = thrust::device_vector<float>::iterator;
+ *    thrust::transform_output_iterator<square_root, FloatIterator> iter(v.begin(), square_root());
+ *
+ *    iter[0] =  1.0f;    // stores sqrtf( 1.0f)
+ *    iter[1] =  4.0f;    // stores sqrtf( 4.0f)
+ *    iter[2] =  9.0f;    // stores sqrtf( 9.0f)
+ *    iter[3] = 16.0f;    // stores sqrtf(16.0f)
+ *    // iter[4] is an out-of-bounds error
+ *
+ *    v[0]; // returns 1.0f;
+ *    v[1]; // returns 2.0f;
+ *    v[2]; // returns 3.0f;
+ *    v[3]; // returns 4.0f;
+ *
+ *  }
+ *  \endcode
+ *
+ *  \see make_transform_output_iterator
+ */
 
-// Compute the iterator_adaptor instantiation to be used for transform_output_iterator
-template <typename UnaryFunction, typename OutputIterator>
-struct transform_output_iterator_base
-{
-  using type =
-    iterator_adaptor<transform_output_iterator<UnaryFunction, OutputIterator>,
-                     OutputIterator,
-                     use_default,
-                     use_default,
-                     use_default,
-                     transform_output_iterator_proxy<UnaryFunction, OutputIterator>>;
-};
-
-// Register transform_output_iterator_proxy with 'is_proxy_reference' from type_traits to enable its use with
-// algorithms.
-template <class UnaryFunction, class OutputIterator>
-struct is_proxy_reference<transform_output_iterator_proxy<UnaryFunction, OutputIterator>> : true_type
-{};
-} // namespace detail
-
-//! \addtogroup iterators
-//! \{
-
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
-
-//! \p transform_output_iterator is a special kind of output iterator which transforms a value written upon dereference.
-//! This iterator is useful for transforming an output from algorithms without explicitly storing the intermediate
-//! result in the memory and applying subsequent transformation, thereby avoiding wasting memory capacity and bandwidth.
-//! Using \p transform_iterator facilitates kernel fusion by deferring execution of transformation until the value is
-//! written while saving both memory capacity and bandwidth.
-//!
-//! The following code snippet demonstrated how to create a \p transform_output_iterator which applies \c sqrtf to the
-//! assigning value.
-//!
-//! \code
-//! #include <thrust/iterator/transform_output_iterator.h>
-//! #include <thrust/device_vector.h>
-//!
-//! struct square_root
-//! {
-//!   __host__ __device__
-//!   float operator()(float x) const
-//!   {
-//!     return sqrtf(x);
-//!   }
-//! };
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<float> v(4);
-//!
-//!   using FloatIterator = thrust::device_vector<float>::iterator;
-//!   thrust::transform_output_iterator<square_root, FloatIterator> iter(v.begin(), square_root());
-//!
-//!   iter[0] =  1.0f;    // stores sqrtf( 1.0f)
-//!   iter[1] =  4.0f;    // stores sqrtf( 4.0f)
-//!   iter[2] =  9.0f;    // stores sqrtf( 9.0f)
-//!   iter[3] = 16.0f;    // stores sqrtf(16.0f)
-//!   // iter[4] is an out-of-bounds error
-//!
-//!   v[0]; // returns 1.0f;
-//!   v[1]; // returns 2.0f;
-//!   v[2]; // returns 3.0f;
-//!   v[3]; // returns 4.0f;
-//!
-//! }
-//! \endcode
-//!
-//! \see make_transform_output_iterator
 template <typename UnaryFunction, typename OutputIterator>
 class transform_output_iterator : public detail::transform_output_iterator_base<UnaryFunction, OutputIterator>::type
 {
-  //! \cond
+  /*! \cond
+   */
 
 public:
   using super_t = typename detail::transform_output_iterator_base<UnaryFunction, OutputIterator>::type;
 
   friend class iterator_core_access;
-  //! \endcond
+  /*! \endcond
+   */
 
   transform_output_iterator() = default;
 
-  //! This constructor takes as argument an \c OutputIterator and an \c UnaryFunction and copies them to a new \p
-  //! transform_output_iterator
-  //!
-  //! \param out An \c OutputIterator pointing to the output range whereto the result of \p transform_output_iterator's
-  //!            \c UnaryFunction will be written.
-  //! \param fun An \c UnaryFunction used to transform the objects assigned to this \p transform_output_iterator.
+  /*! This constructor takes as argument an \c OutputIterator and an \c
+   * UnaryFunction and copies them to a new \p transform_output_iterator
+   *
+   * \param out An \c OutputIterator pointing to the output range whereto the result of
+   *            \p transform_output_iterator's \c UnaryFunction will be written.
+   * \param fun An \c UnaryFunction used to transform the objects assigned to
+   *            this \p transform_output_iterator.
+   */
   THRUST_HOST_DEVICE transform_output_iterator(OutputIterator const& out, UnaryFunction fun)
       : super_t(out)
       , fun(fun)
   {}
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
   THRUST_HOST_DEVICE typename super_t::reference dereference() const
@@ -168,24 +132,31 @@ class transform_output_iterator : public detail::transform_output_iterator_base<
   }
 
   UnaryFunction fun;
-  //! \endcond
-};
-
-//! \p make_transform_output_iterator creates a \p transform_output_iterator from an \c OutputIterator and \c
-//! UnaryFunction.
-//!
-//! \param out The \c OutputIterator pointing to the output range of the newly created \p transform_output_iterator
-//! \param fun The \c UnaryFunction transform the object before assigning it to \c out by the newly created \p
-//! transform_output_iterator
-//! \see transform_output_iterator
+
+  /*! \endcond
+   */
+}; // end transform_output_iterator
+
+/*! \p make_transform_output_iterator creates a \p transform_output_iterator from
+ *  an \c OutputIterator and \c UnaryFunction.
+ *
+ *  \param out The \c OutputIterator pointing to the output range of the newly
+ *            created \p transform_output_iterator
+ *  \param fun The \c UnaryFunction transform the object before assigning it to
+ *            \c out by the newly created \p transform_output_iterator
+ *  \see transform_output_iterator
+ */
 template <typename UnaryFunction, typename OutputIterator>
 transform_output_iterator<UnaryFunction, OutputIterator> THRUST_HOST_DEVICE
 make_transform_output_iterator(OutputIterator out, UnaryFunction fun)
 {
   return transform_output_iterator<UnaryFunction, OutputIterator>(out, fun);
-}
+} // end make_transform_output_iterator
+
+/*! \} // end fancyiterators
+ */
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/iterator/zip_iterator.h b/projects/rocthrust/thrust/iterator/zip_iterator.h
index 1f267ff23cdd..8c854d46fdc6 100644
--- a/projects/rocthrust/thrust/iterator/zip_iterator.h
+++ b/projects/rocthrust/thrust/iterator/zip_iterator.h
@@ -14,8 +14,10 @@
  *  limitations under the License.
  */
 
-//! \file thrust/iterator/zip_iterator.h
-//! \brief An iterator which returns a tuple of the result of dereferencing a tuple of iterators when dereferenced
+/*! \file thrust/iterator/zip_iterator.h
+ *  \brief An iterator which returns a tuple of the result of dereferencing
+ *         a tuple of iterators when dereferenced
+ */
 
 /*
  * Copyright David Abrahams and Thomas Becker 2000-2006.
@@ -28,9 +30,6 @@
 
 #pragma once
 
-// TODO(libhipcxx): remove all the code in the path of !_THRUST_HAS_DEVICE_SYSTEM_STD
-// once libhipcxx gets ready
-
 #include <thrust/detail/config.h>
 
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
@@ -40,646 +39,207 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
-#include <thrust/advance.h>
+#include <thrust/detail/attributes.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/iterator/detail/minimum_system.h>
-#include <thrust/iterator/detail/tuple_of_iterator_references.h>
+#include <thrust/iterator/detail/zip_iterator_base.h>
 #include <thrust/iterator/iterator_facade.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/type_traits/integer_sequence.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/tuple_meta_transform.h>
-#  include <thrust/iterator/iterator_categories.h>
-#  include <thrust/tuple.h>
-#endif
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(tuple)
-#endif
 
 THRUST_NAMESPACE_BEGIN
 
-template <typename IteratorTuple>
-class zip_iterator;
-
-namespace detail
-{
-template <typename... Ts>
-using minimum_category = minimum_type<Ts...>;
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-template <typename IteratorTuple>
-struct make_zip_iterator_base
-{
-  static_assert(!sizeof(IteratorTuple), "thrust::zip_iterator only supports cuda::std::tuple");
-};
-
-template <typename... Its>
-struct make_zip_iterator_base<_THRUST_STD::tuple<Its...>>
-{
-  // reference type is the type of the tuple obtained from the iterator's reference types.
-  using reference = tuple_of_iterator_references<it_reference_t<Its>...>;
-
-  // Boost's Value type is the same as reference type. using value_type = reference;
-  using value_type = _THRUST_STD::tuple<it_value_t<Its>...>;
-
-  // Difference type is the first iterator's difference type
-  using difference_type = it_difference_t<_THRUST_STD::tuple_element_t<0, _THRUST_STD::tuple<Its...>>>;
-
-  // Iterator system is the minimum system tag in the iterator tuple
-  using system = _THRUST_STD::__type_fold_left<_THRUST_STD::__type_list<iterator_system_t<Its>...>,
-                                               any_system_tag,
-                                               _THRUST_STD::__type_quote_trait<minimum_system>>;
-
-  // Traversal category is the minimum traversal category in the iterator tuple
-  using traversal_category =
-    _THRUST_STD::__type_fold_left<_THRUST_STD::__type_list<iterator_traversal_t<Its>...>,
-                                  random_access_traversal_tag,
-                                  _THRUST_STD::__type_quote_trait<minimum_category>>;
-
-  // The iterator facade type from which the zip iterator will be derived.
-  using type =
-    iterator_facade<zip_iterator<_THRUST_STD::tuple<Its...>>,
-                    value_type,
-                    system,
-                    traversal_category,
-                    reference,
-                    difference_type>;
-};
-#else
-// Functors to be used with tuple algorithms
-//
-template <typename DiffType>
-class advance_iterator
-{
-public:
-  inline THRUST_HOST_DEVICE advance_iterator(DiffType step)
-      : m_step(step)
-  {}
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it) const
-  {
-    thrust::advance(it, m_step);
-  }
-
-private:
-  DiffType m_step;
-}; // end advance_iterator
-
-struct increment_iterator
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
-  {
-    ++it;
-  }
-}; // end increment_iterator
-
-struct decrement_iterator
-{
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  inline THRUST_HOST_DEVICE void operator()(Iterator& it)
-  {
-    --it;
-  }
-}; // end decrement_iterator
-
-struct dereference_iterator
-{
-  template <typename Iterator>
-  struct apply
-  {
-    using type = thrust::detail::it_reference_t<Iterator>;
-  }; // end apply
-
-  // XXX silence warnings of the form "calling a __host__ function from a __host__ __device__ function is not allowed
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename Iterator>
-  THRUST_HOST_DEVICE typename apply<Iterator>::type operator()(Iterator const& it)
-  {
-    return *it;
-  }
-}; // end dereference_iterator
-
-// The namespace tuple_impl_specific provides two meta-
-// algorithms and two algorithms for tuples.
-namespace tuple_impl_specific
-{
-
-// define apply1 for tuple_meta_transform_impl
-template <typename UnaryMetaFunctionClass, class Arg>
-struct apply1 : UnaryMetaFunctionClass::template apply<Arg>
-{}; // end apply1
-
-// define apply2 for tuple_meta_accumulate_impl
-template <typename UnaryMetaFunctionClass, class Arg1, class Arg2>
-struct apply2 : UnaryMetaFunctionClass::template apply<Arg1, Arg2>
-{}; // end apply2
-
-// Meta-accumulate algorithm for tuples. Note: The template
-// parameter StartType corresponds to the initial value in
-// ordinary accumulation.
-//
-template <class Tuple, class BinaryMetaFun, class StartType>
-struct tuple_meta_accumulate;
-
-template <class BinaryMetaFun, typename StartType>
-struct tuple_meta_accumulate<thrust::tuple<>, BinaryMetaFun, StartType>
-{
-  using type = typename thrust::detail::identity_<StartType>::type;
-};
-
-template <class BinaryMetaFun, typename StartType, typename T, typename... Ts>
-struct tuple_meta_accumulate<thrust::tuple<T, Ts...>, BinaryMetaFun, StartType>
-{
-  using type =
-    typename apply2<BinaryMetaFun,
-                    T,
-                    typename tuple_meta_accumulate<thrust::tuple<Ts...>, BinaryMetaFun, StartType>::type>::type;
-};
-
-template <typename Fun>
-inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f)
-{
-  return f;
-}
-
-template <typename Fun, typename T, typename... Ts>
-inline THRUST_HOST_DEVICE Fun tuple_for_each_helper(Fun f, T& t, Ts&... ts)
-{
-  f(t);
-  return tuple_for_each_helper(f, ts...);
-}
-
-// for_each algorithm for tuples.
-
-template <typename Fun, typename... Ts, size_t... Is>
-inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f, thrust::index_sequence<Is...>)
-{
-  return tuple_for_each_helper(f, thrust::get<Is>(t)...);
-} // end tuple_for_each()
-
-// for_each algorithm for tuples.
-template <typename Fun, typename... Ts>
-inline THRUST_HOST_DEVICE Fun tuple_for_each(thrust::tuple<Ts...>& t, Fun f)
-{
-  return tuple_for_each(t, f, thrust::make_index_sequence<thrust::tuple_size<thrust::tuple<Ts...>>::value>{});
-}
-
-} // namespace tuple_impl_specific
-
-namespace internal
-{
-
-template <typename Iterator>
-struct iterator_value
-{
-  using type = thrust::detail::it_value_t<Iterator>;
-};
-
-} // namespace internal
-
-// Metafunction to obtain the type of the tuple whose element types
-// are the value_types of an iterator tuple.
-//
-template <typename IteratorTuple>
-struct tuple_of_value_types : tuple_meta_transform<IteratorTuple, internal::iterator_value>
-{}; // end tuple_of_value_types
-
-struct minimum_category_lambda
-{
-  template <typename T1, typename T2>
-  struct apply : minimum_category<T1, T2>
-  {};
-};
-
-// Metafunction to obtain the minimal traversal tag in a tuple
-// of iterators.
-//
-template <typename IteratorTuple>
-struct minimum_traversal_category_in_iterator_tuple
-{
-  using tuple_of_traversal_tags = typename tuple_meta_transform<IteratorTuple, thrust::iterator_traversal>::type;
-
-  using type = typename tuple_impl_specific::
-    tuple_meta_accumulate<tuple_of_traversal_tags, minimum_category_lambda, thrust::random_access_traversal_tag>::type;
-};
-
-struct minimum_system_lambda
-{
-  template <typename T1, typename T2>
-  struct apply : minimum_system<T1, T2>
-  {};
-};
-
-// Metafunction to obtain the minimal system tag in a tuple
-// of iterators.
-template <typename IteratorTuple>
-struct minimum_system_in_iterator_tuple
-{
-  using tuple_of_system_tags =
-    typename thrust::detail::tuple_meta_transform<IteratorTuple, thrust::iterator_system>::type;
-
-  using type = typename tuple_impl_specific::
-    tuple_meta_accumulate<tuple_of_system_tags, minimum_system_lambda, thrust::any_system_tag>::type;
-};
-
-namespace zip_iterator_base_ns
-{
-
-template <typename Tuple, typename IndexSequence>
-struct tuple_of_iterator_references_helper;
-
-template <typename Tuple, size_t... Is>
-struct tuple_of_iterator_references_helper<Tuple, thrust::index_sequence<Is...>>
-{
-  using type = thrust::detail::tuple_of_iterator_references<typename thrust::tuple_element<Is, Tuple>::type...>;
-};
-
-template <typename Iterator>
-struct iterator_reference
-{
-  using type = typename ::std::iterator_traits<Iterator>::reference;
-};
-
-template <typename IteratorTuple>
-struct tuple_of_iterator_references
-{
-  // get a thrust::tuple of the iterators' references
-  using tuple_of_references = typename tuple_meta_transform<IteratorTuple, iterator_reference>::type;
-
-  // map thrust::tuple<T...> to tuple_of_iterator_references<T...>
-  using type = typename tuple_of_iterator_references_helper<
-    tuple_of_references,
-    thrust::make_index_sequence<thrust::tuple_size<tuple_of_references>::value>>::type;
-};
-
-} // namespace zip_iterator_base_ns
-
-///////////////////////////////////////////////////////////////////
-//
-// Class make_zip_iterator_base
-//
-// Builds and exposes the iterator facade type from which the zip
-// iterator will be derived.
-//
-template <typename IteratorTuple>
-struct make_zip_iterator_base
-{
-  // private:
-  //  reference type is the type of the tuple obtained from the
-  //  iterators' reference types.
-  using reference = typename zip_iterator_base_ns::tuple_of_iterator_references<IteratorTuple>::type;
-
-  // Boost's Value type is the same as reference type.
-  // using value_type = reference;
-  using value_type = typename tuple_of_value_types<IteratorTuple>::type;
-
-  // Difference type is the first iterator's difference type
-  using difference_type = thrust::detail::it_difference_t<typename thrust::tuple_element<0, IteratorTuple>::type>;
-
-  // Iterator system is the minimum system tag in the
-  // iterator tuple
-  using system = typename minimum_system_in_iterator_tuple<IteratorTuple>::type;
-
-  // Traversal category is the minimum traversal category in the
-  // iterator tuple
-  using traversal_category = typename minimum_traversal_category_in_iterator_tuple<IteratorTuple>::type;
-
-public:
-  // The iterator facade type from which the zip iterator will
-  // be derived.
-  using type = thrust::
-    iterator_facade<zip_iterator<IteratorTuple>, value_type, system, traversal_category, reference, difference_type>;
-}; // end make_zip_iterator_base
-
-namespace internal
-{
-
-template <typename Tuple,
-          template <typename>
-          class UnaryMetaFunction,
-          typename UnaryFunction,
-          typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
-struct tuple_transform_functor;
-
-template <typename Tuple, template <typename> class UnaryMetaFunction, typename UnaryFunction, size_t... Is>
-struct tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction, thrust::index_sequence<Is...>>
-{
-  static THRUST_HOST_DEVICE typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple& t, UnaryFunction f)
-  {
-    using XfrmTuple = typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type;
-
-    return XfrmTuple(f(thrust::get<Is>(t))...);
-  }
-};
-
-template <template <typename> class UnaryMetaFunction, typename Tuple, typename UnaryFunction>
-typename tuple_meta_transform<Tuple, UnaryMetaFunction>::type THRUST_HOST_DEVICE
-tuple_host_device_transform(const Tuple& t, UnaryFunction f)
-{
-  return tuple_transform_functor<Tuple, UnaryMetaFunction, UnaryFunction>::do_it_on_the_host_or_device(t, f);
-}
-
-} // namespace internal
-#endif
-} // namespace detail
+/*! \addtogroup iterators
+ *  \{
+ */
 
-//! \addtogroup iterators
-//! \{
+/*! \addtogroup fancyiterator Fancy Iterators
+ *  \ingroup iterators
+ *  \{
+ */
 
-//! \addtogroup fancyiterator Fancy Iterators
-//! \ingroup iterators
-//! \{
+/*! \p zip_iterator is an iterator which represents a pointer into a range
+ *  of \p tuples whose elements are themselves taken from a \p tuple of input
+ *  iterators. This iterator is useful for creating a virtual array of structures
+ *  while achieving the same performance and bandwidth as the structure of arrays
+ *  idiom. \p zip_iterator also facilitates kernel fusion by providing a convenient
+ *  means of amortizing the execution of the same operation over multiple ranges.
+ *
+ *  The following code snippet demonstrates how to create a \p zip_iterator
+ *  which represents the result of "zipping" multiple ranges together.
+ *
+ *  \code
+ *  #include <thrust/iterator/zip_iterator.h>
+ *  #include <thrust/tuple.h>
+ *  #include <thrust/device_vector.h>
+ *  ...
+ *  thrust::device_vector<int> int_v{0, 1, 2};
+ *  thrust::device_vector<float> float_v{0.0f, 1.0f, 2.0f};
+ *  thrust::device_vector<char> char_v{'a', 'b', 'c'};
+ *
+ *  // aliases for iterators
+ *  using IntIterator = thrust::device_vector<int>::iterator;
+ *  using FloatIterator = thrust::device_vector<float>::iterator;
+ *  using CharIterator = thrust::device_vector<char>::iterator;
+ *
+ *  // alias for a tuple of these iterators
+ *  using IteratorTuple = thrust::tuple<IntIterator, FloatIterator, CharIterator>;
+ *
+ *  // alias the zip_iterator of this tuple
+ *  using ZipIterator = thrust::zip_iterator<IteratorTuple>;
+ *
+ *  // finally, create the zip_iterator
+ *  ZipIterator iter(thrust::make_tuple(int_v.begin(), float_v.begin(), char_v.begin()));
+ *
+ *  *iter;   // returns (0, 0.0f, 'a')
+ *  iter[0]; // returns (0, 0.0f, 'a')
+ *  iter[1]; // returns (1, 1.0f, 'b')
+ *  iter[2]; // returns (2, 2.0f, 'c')
+ *
+ *  thrust::get<0>(iter[2]); // returns 2
+ *  thrust::get<1>(iter[0]); // returns 0.0f
+ *  thrust::get<2>(iter[1]); // returns 'b'
+ *
+ *  // iter[3] is an out-of-bounds error
+ *  \endcode
+ *
+ *  Defining the type of a \p zip_iterator can be complex. The next code example demonstrates
+ *  how to use the \p make_zip_iterator function with the \p make_tuple function to avoid
+ *  explicitly specifying the type of the \p zip_iterator. This example shows how to use
+ *  \p zip_iterator to copy multiple ranges with a single call to \p thrust::copy.
+ *
+ *  \code
+ *  #include <thrust/zip_iterator.h>
+ *  #include <thrust/tuple.h>
+ *  #include <thrust/device_vector.h>
+ *
+ *  int main()
+ *  {
+ *    thrust::device_vector<int> int_in{0, 1, 2}, int_out(3);
+ *    thrust::device_vector<float> float_in{0.0f, 10.0f, 20.0f}, float_out(3);
+ *
+ *    thrust::copy(thrust::make_zip_iterator(thrust::make_tuple(int_in.begin(), float_in.begin())),
+ *                 thrust::make_zip_iterator(thrust::make_tuple(int_in.end(),   float_in.end())),
+ *                 thrust::make_zip_iterator(thrust::make_tuple(int_out.begin(),float_out.begin())));
+ *
+ *    // int_out is now [0, 1, 2]
+ *    // float_out is now [0.0f, 10.0f, 20.0f]
+ *
+ *    return 0;
+ *  }
+ *  \endcode
+ *
+ *  \see make_zip_iterator
+ *  \see make_tuple
+ *  \see tuple
+ *  \see get
+ */
 
-//! \p zip_iterator is an iterator which represents a pointer into a range of \p tuples whose elements are themselves
-//! taken from a \p tuple of input iterators. This iterator is useful for creating a virtual array of structures while
-//! achieving the same performance and bandwidth as the structure of arrays idiom. \p zip_iterator also facilitates
-//! kernel fusion by providing a convenient means of amortizing the execution of the same operation over multiple
-//! ranges.
-//!
-//! The following code snippet demonstrates how to create a \p zip_iterator which represents the result of "zipping"
-//! multiple ranges together.
-//!
-//! \code
-//! #include <thrust/iterator/zip_iterator.h>
-//! #include <thrust/tuple.h>
-//! #include <thrust/device_vector.h>
-//! ...
-//! thrust::device_vector<int> int_v{0, 1, 2};
-//! thrust::device_vector<float> float_v{0.0f, 1.0f, 2.0f};
-//! thrust::device_vector<char> char_v{'a', 'b', 'c'};
-//!
-//! // aliases for iterators
-//! using IntIterator = thrust::device_vector<int>::iterator;
-//! using FloatIterator = thrust::device_vector<float>::iterator;
-//! using CharIterator = thrust::device_vector<char>::iterator;
-//!
-//! // alias for a tuple of these iterators
-//! using IteratorTuple = thrust::tuple<IntIterator, FloatIterator, CharIterator>;
-//!
-//! // alias the zip_iterator of this tuple
-//! using ZipIterator = thrust::zip_iterator<IteratorTuple>;
-//!
-//! // finally, create the zip_iterator
-//! ZipIterator iter(thrust::make_tuple(int_v.begin(), float_v.begin(), char_v.begin()));
-//!
-//! *iter;   // returns (0, 0.0f, 'a')
-//! iter[0]; // returns (0, 0.0f, 'a')
-//! iter[1]; // returns (1, 1.0f, 'b')
-//! iter[2]; // returns (2, 2.0f, 'c')
-//!
-//! thrust::get<0>(iter[2]); // returns 2
-//! thrust::get<1>(iter[0]); // returns 0.0f
-//! thrust::get<2>(iter[1]); // returns 'b'
-//!
-//! // iter[3] is an out-of-bounds error
-//! \endcode
-//!
-//! Defining the type of a \p zip_iterator can be complex. The next code example demonstrates how to use the \p
-//! make_zip_iterator function with the \p make_tuple function to avoid explicitly specifying the type of the \p
-//! zip_iterator. This example shows how to use \p zip_iterator to copy multiple ranges with a single call to \p
-//! thrust::copy.
-//!
-//! \code
-//! #include <thrust/zip_iterator.h>
-//! #include <thrust/tuple.h>
-//! #include <thrust/device_vector.h>
-//!
-//! int main()
-//! {
-//!   thrust::device_vector<int> int_in{0, 1, 2}, int_out(3);
-//!   thrust::device_vector<float> float_in{0.0f, 10.0f, 20.0f}, float_out(3);
-//!
-//!   thrust::copy(thrust::make_zip_iterator(int_in.begin(), float_in.begin()),
-//!                thrust::make_zip_iterator(int_in.end(),   float_in.end()),
-//!                thrust::make_zip_iterator(int_out.begin(),float_out.begin()));
-//!
-//!   // int_out is now [0, 1, 2]
-//!   // float_out is now [0.0f, 10.0f, 20.0f]
-//!
-//!   return 0;
-//! }
-//! \endcode
-//!
-//! \see make_zip_iterator
-//! \see make_tuple
-//! \see tuple
-//! \see get
 template <typename IteratorTuple>
-class THRUST_DECLSPEC_EMPTY_BASES zip_iterator : public detail::make_zip_iterator_base<IteratorTuple>::type
+class THRUST_DECLSPEC_EMPTY_BASES zip_iterator : public detail::zip_iterator_base<IteratorTuple>::type
 {
 public:
-  //! The underlying iterator tuple type. Alias to zip_iterator's first template argument.
+  /*! The underlying iterator tuple type. Alias to zip_iterator's first template argument.
+   */
   using iterator_tuple = IteratorTuple;
 
-  //! Default constructor does nothing.
+  /*! Default constructor does nothing.
+   */
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && THRUST_MSVC_VERSION < 1920
+  inline THRUST_HOST_DEVICE zip_iterator() {}
+#else
   zip_iterator() = default;
+#endif
 
-  //! This constructor creates a new \p zip_iterator from a \p tuple of iterators.
-  //!
-  //! \param iterator_tuple The \p tuple of iterators to copy from.
-  inline THRUST_HOST_DEVICE zip_iterator(IteratorTuple iterator_tuple)
-      : m_iterator_tuple(iterator_tuple)
-  {}
-
-  //! This copy constructor creates a new \p zip_iterator from another \p zip_iterator.
-  //!
-  //! \param other The \p zip_iterator to copy.
+  /*! This constructor creates a new \p zip_iterator from a
+   *  \p tuple of iterators.
+   *
+   *  \param iterator_tuple The \p tuple of iterators to copy from.
+   */
+  inline THRUST_HOST_DEVICE zip_iterator(IteratorTuple iterator_tuple);
+
+  /*! This copy constructor creates a new \p zip_iterator from another
+   *  \p zip_iterator.
+   *
+   *  \param other The \p zip_iterator to copy.
+   */
   template <typename OtherIteratorTuple, detail::enable_if_convertible_t<OtherIteratorTuple, IteratorTuple, int> = 0>
   inline THRUST_HOST_DEVICE zip_iterator(const zip_iterator<OtherIteratorTuple>& other)
       : m_iterator_tuple(other.get_iterator_tuple())
   {}
 
-  //! This method returns a \c const reference to this \p zip_iterator's
-  //! \p tuple of iterators.
-  //!
-  //! \return A \c const reference to this \p zip_iterator's \p tuple  of iterators.
-  inline THRUST_HOST_DEVICE const IteratorTuple& get_iterator_tuple() const
-  {
-    return m_iterator_tuple;
-  }
+  /*! This method returns a \c const reference to this \p zip_iterator's
+   *  \p tuple of iterators.
+   *
+   *  \return A \c const reference to this \p zip_iterator's \p tuple
+   *          of iterators.
+   */
+  inline THRUST_HOST_DEVICE const IteratorTuple& get_iterator_tuple() const;
 
-  //! \cond
+  /*! \cond
+   */
 
 private:
-  using super_t = typename detail::make_zip_iterator_base<IteratorTuple>::type;
+  using super_t = typename detail::zip_iterator_base<IteratorTuple>::type;
 
   friend class iterator_core_access;
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  using index_seq = make_index_sequence<_THRUST_STD::tuple_size_v<IteratorTuple>>;
-
-  THRUST_EXEC_CHECK_DISABLE
-  template <size_t... Is>
-  THRUST_HOST_DEVICE typename super_t::reference dereference_impl(index_sequence<Is...>) const
-  {
-    return {*_THRUST_STD::get<Is>(m_iterator_tuple)...};
-  }
-#endif
-
-  // Dereferencing returns a tuple built from the dereferenced iterators in the iterator tuple.
-  THRUST_HOST_DEVICE typename super_t::reference dereference() const
-  {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    return dereference_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
+  // Dereferencing returns a tuple built from the dereferenced
+  // iterators in the iterator tuple.
+  THRUST_HOST_DEVICE typename super_t::reference dereference() const;
 
-    return thrust::detail::internal::tuple_host_device_transform<detail::dereference_iterator::template apply>(
-      get_iterator_tuple(), detail::dereference_iterator());
-#endif
-  }
-
-  // Two zip_iterators are equal if the two first iterators of the tuple are equal. Note this differs from Boost's
-  // implementation, which considers the entire tuple.
-  THRUST_EXEC_CHECK_DISABLE
+  // Two zip_iterators are equal if the two first iterators of the
+  // tuple are equal. Note this differs from Boost's implementation, which
+  // considers the entire tuple.
   template <typename OtherIteratorTuple>
-  inline THRUST_HOST_DEVICE bool equal(const zip_iterator<OtherIteratorTuple>& other) const
-  {
-    return get<0>(get_iterator_tuple()) == get<0>(other.get_iterator_tuple());
-  }
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  THRUST_EXEC_CHECK_DISABLE
-  template <size_t... Is>
-  inline THRUST_HOST_DEVICE void advance_impl(typename super_t::difference_type n, index_sequence<Is...>)
-  {
-    (..., thrust::advance(_THRUST_STD::get<Is>(m_iterator_tuple), n));
-  }
-#endif
+  inline THRUST_HOST_DEVICE bool equal(const zip_iterator<OtherIteratorTuple>& other) const;
 
   // Advancing a zip_iterator means to advance all iterators in the tuple
-  inline THRUST_HOST_DEVICE void advance(typename super_t::difference_type n)
-  {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    advance_impl(n, index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::advance_iterator<typename super_t::difference_type>(n));
-#endif
-  }
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  THRUST_EXEC_CHECK_DISABLE
-  template <size_t... Is>
-  inline THRUST_HOST_DEVICE void increment_impl(index_sequence<Is...>)
-  {
-    (..., ++_THRUST_STD::get<Is>(m_iterator_tuple));
-  }
-#endif
+  inline THRUST_HOST_DEVICE void advance(typename super_t::difference_type n);
 
   // Incrementing a zip iterator means to increment all iterators in the tuple
-  inline THRUST_HOST_DEVICE void increment()
-  {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    increment_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::increment_iterator());
-#endif
-  }
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  THRUST_EXEC_CHECK_DISABLE
-  template <size_t... Is>
-  inline THRUST_HOST_DEVICE void decrement_impl(index_sequence<Is...>)
-  {
-    (..., --_THRUST_STD::get<Is>(m_iterator_tuple));
-  }
-#endif
+  inline THRUST_HOST_DEVICE void increment();
 
   // Decrementing a zip iterator means to decrement all iterators in the tuple
-  inline THRUST_HOST_DEVICE void decrement()
-  {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-    decrement_impl(index_seq{});
-#else
-    using namespace detail::tuple_impl_specific;
-    tuple_for_each(m_iterator_tuple, detail::decrement_iterator());
-#endif
-  }
+  inline THRUST_HOST_DEVICE void decrement();
 
   // Distance is calculated using the first iterator in the tuple.
   template <typename OtherIteratorTuple>
   inline THRUST_HOST_DEVICE typename super_t::difference_type
-  distance_to(const zip_iterator<OtherIteratorTuple>& other) const
-  {
-    return get<0>(other.get_iterator_tuple()) - get<0>(get_iterator_tuple());
-  }
+  distance_to(const zip_iterator<OtherIteratorTuple>& other) const;
 
   // The iterator tuple.
   IteratorTuple m_iterator_tuple;
 
-  //! \endcond
-};
+  /*! \endcond
+   */
+}; // end zip_iterator
 
-//! \p make_zip_iterator creates a \p zip_iterator from a \p tuple of iterators.
-//!
-//! \param t The \p tuple of iterators to copy.
-//! \return A newly created \p zip_iterator which zips the iterators encapsulated in \p t.
-//! \see zip_iterator
+/*! \p make_zip_iterator creates a \p zip_iterator from a \p tuple
+ *  of iterators.
+ *
+ *  \param t The \p tuple of iterators to copy.
+ *  \return A newly created \p zip_iterator which zips the iterators encapsulated in \p t.
+ *
+ *  \see zip_iterator
+ */
 template <typename... Iterators>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-inline THRUST_HOST_DEVICE zip_iterator<_THRUST_STD::tuple<Iterators...>>
-make_zip_iterator(_THRUST_STD::tuple<Iterators...> t)
-#else
-inline THRUST_HOST_DEVICE zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(thrust::tuple<Iterators...> t)
-#endif
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  return zip_iterator<_THRUST_STD::tuple<Iterators...>>(t);
-#else
-  return zip_iterator<thrust::tuple<Iterators...>>(t);
-#endif
-}
+inline THRUST_HOST_DEVICE zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(thrust::tuple<Iterators...> t);
 
-//! \p make_zip_iterator creates a \p zip_iterator from
-//! iterators.
-//!
-//! \param its The iterators to copy.
-//! \return A newly created \p zip_iterator which zips the iterators.
-//!
-//! \see zip_iterator
+/*! \p make_zip_iterator creates a \p zip_iterator from
+ *  iterators.
+ *
+ *  \param its The iterators to copy.
+ *  \return A newly created \p zip_iterator which zips the iterators.
+ *
+ *  \see zip_iterator
+ */
 template <typename... Iterators>
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-inline THRUST_HOST_DEVICE zip_iterator<_THRUST_STD::tuple<Iterators...>> make_zip_iterator(Iterators... its)
-#else
-inline THRUST_HOST_DEVICE zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(Iterators... its)
-#endif
-{
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-  return make_zip_iterator(_THRUST_STD::make_tuple(its...));
-#else
-  return make_zip_iterator(thrust::make_tuple(its...));
-#endif
-}
+inline THRUST_HOST_DEVICE zip_iterator<thrust::tuple<Iterators...>> make_zip_iterator(Iterators... its);
 
-//! \} // end fancyiterators
-//! \} // end iterators
+/*! \} // end fancyiterators
+ */
+
+/*! \} // end iterators
+ */
 
 THRUST_NAMESPACE_END
 
-// libcu++ iterator traits fail for complex zip_iterators in C++17, see e.g.: https://godbolt.org/z/7jb4qG3bb
-// The reason is that libcu++ backported the C++20 range iterator machinery to C++17, but C++17 has slightly different
-// language rules, especially regarding `void`. We deemed to it too hard to work around the issues.
-#if THRUST_STD_VER < 2020 && !defined(THRUST_DOXYGEN_INVOKED)
-_THRUST_STD_NAMESPACE_BEGIN
-template <typename IteratorTuple>
-struct iterator_traits<THRUST_NS_QUALIFIER::zip_iterator<IteratorTuple>>
-{
-  using It                = THRUST_NS_QUALIFIER::zip_iterator<IteratorTuple>;
-  using value_type        = typename It::value_type;
-  using reference         = typename It::reference;
-  using pointer           = void;
-  using iterator_category = typename It::iterator_category;
-  using difference_type   = typename It::difference_type;
-};
-_THRUST_STD_NAMESPACE_END
-#endif // THRUST_STD_VER < 2020 && !defined(THRUST_DOXYGEN_INVOKED)
+#include <thrust/iterator/detail/zip_iterator.inl>
diff --git a/projects/rocthrust/thrust/limits.h b/projects/rocthrust/thrust/limits.h
new file mode 100644
index 000000000000..83231b5ff634
--- /dev/null
+++ b/projects/rocthrust/thrust/limits.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2018 NVIDIA Corporation
+// Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
+//
+// Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#include <thrust/detail/config.h>
+
+#include <thrust/detail/type_traits.h>
+
+#include <limits>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename T>
+struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::numeric_limits") numeric_limits : std::numeric_limits<T>
+{};
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/logical.h b/projects/rocthrust/thrust/logical.h
index 5c18fcfe854d..931718776073 100644
--- a/projects/rocthrust/thrust/logical.h
+++ b/projects/rocthrust/thrust/logical.h
@@ -69,7 +69,7 @@ THRUST_NAMESPACE_BEGIN
  *  thrust::all_of(thrust::host, A, A + 3, ::internal::identity{}); // returns false
  *
  *  // empty range
- *  thrust::all_of(thrust::host, A, A, ::internal::identity{}); // returns true
+ *  thrust::all_of(thrust::host, A, A, ::internal::identity{}); // returns false
  *
  *  \endcode
  *
@@ -108,7 +108,7 @@ all_of(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  thrust::all_of(A, A + 3, ::internal::identity{}); // returns false
  *
  *  // empty range
- *  thrust::all_of(A, A, ::internal::identity{}); // returns true
+ *  thrust::all_of(A, A, ::internal::identity{}); // returns false
  *
  *  \endcode
  *
diff --git a/projects/rocthrust/thrust/merge.h b/projects/rocthrust/thrust/merge.h
index 3a805adee45e..288cee670e40 100644
--- a/projects/rocthrust/thrust/merge.h
+++ b/projects/rocthrust/thrust/merge.h
@@ -197,10 +197,10 @@ merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputI
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
@@ -268,10 +268,10 @@ THRUST_HOST_DEVICE OutputIterator merge(
  *  \return The end of the output range.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
@@ -549,10 +549,10 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator1's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator1's set of \c
  * value_types. \tparam InputIterator3 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator3's \c
@@ -653,10 +653,10 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
  *          and such that <tt>p.second</tt> is the end of the output range of values.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator1's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator1's set of \c
  * value_types. \tparam InputIterator3 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator3's \c
diff --git a/projects/rocthrust/thrust/mismatch.h b/projects/rocthrust/thrust/mismatch.h
index 7c06a3db9605..859b4d662c9e 100644
--- a/projects/rocthrust/thrust/mismatch.h
+++ b/projects/rocthrust/thrust/mismatch.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/pair.h>
 
diff --git a/projects/rocthrust/thrust/mr/allocator.h b/projects/rocthrust/thrust/mr/allocator.h
index 863f2555b6f4..cb4684ee2482 100644
--- a/projects/rocthrust/thrust/mr/allocator.h
+++ b/projects/rocthrust/thrust/mr/allocator.h
@@ -22,16 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/config.h>
-
 #include <thrust/detail/config/memory_resource.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/mr/polymorphic_adaptor.h>
@@ -93,7 +83,7 @@ class allocator : private validator<MR>
   template <typename U>
   struct rebind
   {
-    /*! The alias \p other gives the type of the rebound \p allocator.
+    /*! The typedef \p other gives the type of the rebound \p allocator.
      */
     using other = allocator<U, MR>;
   };
@@ -197,7 +187,7 @@ class stateless_resource_allocator : public thrust::mr::allocator<T, Upstream>
   template <typename U>
   struct rebind
   {
-    /*! The alias \p other gives the type of the rebound \p stateless_resource_allocator.
+    /*! The typedef \p other gives the type of the rebound \p stateless_resource_allocator.
      */
     using other = stateless_resource_allocator<U, Upstream>;
   };
diff --git a/projects/rocthrust/thrust/mr/device_memory_resource.h b/projects/rocthrust/thrust/mr/device_memory_resource.h
index 056f798ea544..d8f7239ded27 100644
--- a/projects/rocthrust/thrust/mr/device_memory_resource.h
+++ b/projects/rocthrust/thrust/mr/device_memory_resource.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // #include the device system's memory_resource header
 #define __THRUST_DEVICE_SYSTEM_MEMORY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/memory_resource.h>
 #include __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
diff --git a/projects/rocthrust/thrust/mr/disjoint_pool.h b/projects/rocthrust/thrust/mr/disjoint_pool.h
index 85a4c7184fa4..db265b45cd0f 100644
--- a/projects/rocthrust/thrust/mr/disjoint_pool.h
+++ b/projects/rocthrust/thrust/mr/disjoint_pool.h
@@ -23,16 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/config.h>
-
 #include <thrust/binary_search.h>
 #include <thrust/detail/algorithm_wrapper.h>
 #include <thrust/detail/seq.h>
@@ -41,8 +31,6 @@
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/pool_options.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 #include <cassert>
 
 THRUST_NAMESPACE_BEGIN
@@ -242,7 +230,6 @@ class disjoint_unsynchronized_pool_resource final
         , previous_allocated_count(other.previous_allocated_count)
     {}
 
-    THRUST_EXEC_CHECK_DISABLE
     pool& operator=(const pool&) = default;
 
     THRUST_HOST ~pool() {}
@@ -424,7 +411,7 @@ class disjoint_unsynchronized_pool_resource final
     assert(detail::is_power_of_2(alignment));
 
     // verify that the pointer is at least as aligned as claimed
-    assert(reinterpret_cast<_THRUST_STD::intmax_t>(detail::pointer_traits<void_ptr>::get(p)) % alignment == 0);
+    assert(reinterpret_cast<detail::intmax_t>(detail::pointer_traits<void_ptr>::get(p)) % alignment == 0);
 
     // the deallocated block is oversized and/or overaligned
     if (n > m_options.largest_block_size || alignment > m_options.alignment)
diff --git a/projects/rocthrust/thrust/mr/disjoint_sync_pool.h b/projects/rocthrust/thrust/mr/disjoint_sync_pool.h
index edd21a654117..b72617a22537 100644
--- a/projects/rocthrust/thrust/mr/disjoint_sync_pool.h
+++ b/projects/rocthrust/thrust/mr/disjoint_sync_pool.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/mr/disjoint_pool.h>
 
 #include <mutex>
@@ -49,14 +42,12 @@ namespace mr
  * user \tparam Bookkeeper the type of memory resources that will be used for allocating bookkeeping memory
  */
 template <typename Upstream, typename Bookkeeper>
-struct disjoint_synchronized_pool_resource : public memory_resource<typename Upstream::pointer>
+class disjoint_synchronized_pool_resource : public memory_resource<typename Upstream::pointer>
 {
-#ifndef THRUST_DOXYGEN_INVOKED
   using unsync_pool = disjoint_unsynchronized_pool_resource<Upstream, Bookkeeper>;
   using lock_t      = std::lock_guard<std::mutex>;
 
   using void_ptr = typename Upstream::pointer;
-#endif
 
 public:
   /*! Get the default options for a disjoint pool. These are meant to be a sensible set of values for many use cases,
@@ -102,13 +93,11 @@ struct disjoint_synchronized_pool_resource : public memory_resource<typename Ups
     return upstream_pool.do_allocate(bytes, alignment);
   }
 
-#ifndef THRUST_DOXYGEN_INVOKED
   virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     lock_t lock(mtx);
     upstream_pool.do_deallocate(p, n, alignment);
   }
-#endif
 
 private:
   std::mutex mtx;
diff --git a/projects/rocthrust/thrust/mr/disjoint_tls_pool.h b/projects/rocthrust/thrust/mr/disjoint_tls_pool.h
index d1079c8e04b9..ba23f66a19bf 100644
--- a/projects/rocthrust/thrust/mr/disjoint_tls_pool.h
+++ b/projects/rocthrust/thrust/mr/disjoint_tls_pool.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/mr/disjoint_pool.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/mr/fancy_pointer_resource.h b/projects/rocthrust/thrust/mr/fancy_pointer_resource.h
index c476b7965c0b..6218cdba012f 100644
--- a/projects/rocthrust/thrust/mr/fancy_pointer_resource.h
+++ b/projects/rocthrust/thrust/mr/fancy_pointer_resource.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/validator.h>
diff --git a/projects/rocthrust/thrust/mr/host_memory_resource.h b/projects/rocthrust/thrust/mr/host_memory_resource.h
index 82b5225f0c04..4e957dce22c2 100644
--- a/projects/rocthrust/thrust/mr/host_memory_resource.h
+++ b/projects/rocthrust/thrust/mr/host_memory_resource.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // #include the host system's memory_resource header
 #define __THRUST_HOST_SYSTEM_MEMORY_HEADER <__THRUST_HOST_SYSTEM_ROOT/memory_resource.h>
 #include __THRUST_HOST_SYSTEM_MEMORY_HEADER
diff --git a/projects/rocthrust/thrust/mr/memory_resource.h b/projects/rocthrust/thrust/mr/memory_resource.h
index 6893f0932589..1a94527d7b57 100644
--- a/projects/rocthrust/thrust/mr/memory_resource.h
+++ b/projects/rocthrust/thrust/mr/memory_resource.h
@@ -133,7 +133,10 @@ class memory_resource
   }
 };
 
-#ifndef THRUST_DOXYGEN_INVOKED
+/*! \cond
+ *  skip void specialized implementation
+ */
+
 template <>
 class memory_resource<void*>
 #ifdef THRUST_STD_MR_NS
@@ -182,7 +185,9 @@ class memory_resource<void*>
   }
 #endif
 };
-#endif
+
+/*! \endcond
+ */
 
 /*! Compares the memory resources for equality, first by identity, then by \p is_equal.
  */
diff --git a/projects/rocthrust/thrust/mr/new.h b/projects/rocthrust/thrust/mr/new.h
index 3021f45578bb..30ef20ea0819 100644
--- a/projects/rocthrust/thrust/mr/new.h
+++ b/projects/rocthrust/thrust/mr/new.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2018 NVIDIA Corporation
- *  Modifications Copyright 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ namespace mr
  *  \{
  */
 
-#ifndef THRUST_DOXYGEN_INVOKED
+#if !THRUST_DOXYGEN_INVOKED
 class new_delete_resource_base : public memory_resource<>
 {
 public:
@@ -87,7 +87,7 @@ class new_delete_resource_base : public memory_resource<>
 #  endif
   }
 };
-#endif
+#endif // !THRUST_DOXYGEN_INVOKED
 
 /*! A memory resource that uses global operators new and delete to allocate and deallocate memory. Uses
  * alignment-enabled overloads when available, otherwise uses regular overloads and implements alignment requirements by
diff --git a/projects/rocthrust/thrust/mr/polymorphic_adaptor.h b/projects/rocthrust/thrust/mr/polymorphic_adaptor.h
index 2f6ae4a9f0bc..14e43ee6ee03 100644
--- a/projects/rocthrust/thrust/mr/polymorphic_adaptor.h
+++ b/projects/rocthrust/thrust/mr/polymorphic_adaptor.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/mr/memory_resource.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/mr/pool.h b/projects/rocthrust/thrust/mr/pool.h
index 519f63b0f706..094e646909ac 100644
--- a/projects/rocthrust/thrust/mr/pool.h
+++ b/projects/rocthrust/thrust/mr/pool.h
@@ -24,22 +24,12 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/algorithm_wrapper.h>
 #include <thrust/host_vector.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/mr/memory_resource.h>
 #include <thrust/mr/pool_options.h>
 
-#include _THRUST_STD_INCLUDE(cstdint)
-
 #include <cassert>
 
 THRUST_NAMESPACE_BEGIN
@@ -443,7 +433,7 @@ class unsynchronized_pool_resource final
     assert(detail::is_power_of_2(alignment));
 
     // verify that the pointer is at least as aligned as claimed
-    assert(reinterpret_cast<_THRUST_STD::intmax_t>(void_ptr_traits::get(p)) % alignment == 0);
+    assert(reinterpret_cast<detail::intmax_t>(void_ptr_traits::get(p)) % alignment == 0);
 
     // the deallocated block is oversized and/or overaligned
     if (n > m_options.largest_block_size || alignment > m_options.alignment)
diff --git a/projects/rocthrust/thrust/mr/sync_pool.h b/projects/rocthrust/thrust/mr/sync_pool.h
index 94891c8c6dc1..390d9ea4c838 100644
--- a/projects/rocthrust/thrust/mr/sync_pool.h
+++ b/projects/rocthrust/thrust/mr/sync_pool.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/mr/pool.h>
 
 #include <mutex>
@@ -47,14 +40,12 @@ namespace mr
  *  \tparam Upstream the type of memory resources that will be used for allocating memory
  */
 template <typename Upstream>
-struct synchronized_pool_resource : public memory_resource<typename Upstream::pointer>
+class synchronized_pool_resource : public memory_resource<typename Upstream::pointer>
 {
-#ifndef THRUST_DOXYGEN_INVOKED
   using unsync_pool = unsynchronized_pool_resource<Upstream>;
   using lock_t      = std::lock_guard<std::mutex>;
 
   using void_ptr = typename Upstream::pointer;
-#endif
 
 public:
   /*! Get the default options for a pool. These are meant to be a sensible set of values for many use cases,
@@ -98,13 +89,11 @@ struct synchronized_pool_resource : public memory_resource<typename Upstream::po
     return upstream_pool.do_allocate(bytes, alignment);
   }
 
-#ifndef THRUST_DOXYGEN_INVOKED
   virtual void do_deallocate(void_ptr p, std::size_t n, std::size_t alignment = THRUST_MR_DEFAULT_ALIGNMENT) override
   {
     lock_t lock(mtx);
     upstream_pool.do_deallocate(p, n, alignment);
   }
-#endif
 
 private:
   std::mutex mtx;
diff --git a/projects/rocthrust/thrust/mr/tls_pool.h b/projects/rocthrust/thrust/mr/tls_pool.h
index 590b8ca252d2..66e4915dbbcb 100644
--- a/projects/rocthrust/thrust/mr/tls_pool.h
+++ b/projects/rocthrust/thrust/mr/tls_pool.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/mr/pool.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/mr/universal_memory_resource.h b/projects/rocthrust/thrust/mr/universal_memory_resource.h
index 1d38638c093f..74a2cb8dc11d 100644
--- a/projects/rocthrust/thrust/mr/universal_memory_resource.h
+++ b/projects/rocthrust/thrust/mr/universal_memory_resource.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/mr/device_memory_resource.h>
diff --git a/projects/rocthrust/thrust/mr/validator.h b/projects/rocthrust/thrust/mr/validator.h
index 57987a4ae71a..dc0458690478 100644
--- a/projects/rocthrust/thrust/mr/validator.h
+++ b/projects/rocthrust/thrust/mr/validator.h
@@ -18,19 +18,9 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/config/memory_resource.h>
 #include <thrust/mr/memory_resource.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
-
 THRUST_NAMESPACE_BEGIN
 namespace mr
 {
@@ -38,7 +28,7 @@ namespace mr
 template <typename MR>
 struct validator
 {
-  static_assert(_THRUST_STD::is_base_of<memory_resource<typename MR::pointer>, MR>::value,
+  static_assert(std::is_base_of<memory_resource<typename MR::pointer>, MR>::value,
                 "a type used as a memory resource must derive from memory_resource");
 };
 
diff --git a/projects/rocthrust/thrust/optional.h b/projects/rocthrust/thrust/optional.h
new file mode 100644
index 000000000000..433a0ac849df
--- /dev/null
+++ b/projects/rocthrust/thrust/optional.h
@@ -0,0 +1,2879 @@
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+///
+// optional - An implementation of std::optional with extensions
+// Written in 2017 by Sy Brand (@TartanLlama)
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any warranty.
+//
+// You should have received a copy of the CC0 Public Domain Dedication
+// along with this software. If not, see
+// <http://creativecommons.org/publicdomain/zero/1.0/>.
+///
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/addressof.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/swap.h>
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__type_traits/void_t.h)
+// clang-format on
+#endif
+
+#define THRUST_OPTIONAL_VERSION_MAJOR 0
+#define THRUST_OPTIONAL_VERSION_MINOR 2
+
+#include <exception>
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && _MSC_VER == 1900
+#  define THRUST_OPTIONAL_MSVC2015
+#endif
+
+#if THRUST_CPP_DIALECT > 2011
+#  define THRUST_OPTIONAL_CPP14
+#endif
+
+// constexpr implies const in C++11, not C++14
+#if (THRUST_CPP_DIALECT == 2011 || defined(THRUST_OPTIONAL_MSVC2015) || defined(THRUST_OPTIONAL_GCC49))
+/// \exclude
+#  define THRUST_OPTIONAL_CPP11_CONSTEXPR
+#else
+/// \exclude
+#  define THRUST_OPTIONAL_CPP11_CONSTEXPR constexpr
+#endif
+
+THRUST_NAMESPACE_BEGIN
+
+#ifndef THRUST_MONOSTATE_INPLACE_MUTEX
+#  define THRUST_MONOSTATE_INPLACE_MUTEX
+/// \brief Used to represent an optional with no data; essentially a bool
+class THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::monostate instead") monostate
+{};
+
+/// \brief A tag type to tell optional to construct its value in-place
+struct THRUST_DEPRECATED in_place_t
+{
+  explicit in_place_t() = default;
+};
+/// \brief A tag to tell optional to construct its value in-place
+static constexpr in_place_t in_place{};
+#endif
+
+template <class T>
+class THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::optional") optional;
+
+/// \exclude
+namespace detail
+{
+#ifndef THRUST_TRAITS_MUTEX
+#  define THRUST_TRAITS_MUTEX
+// C++14-style aliases for brevity
+template <class T>
+using remove_const_t = typename std::remove_const<T>::type;
+template <class T>
+using remove_reference_t = typename std::remove_reference<T>::type;
+template <class T>
+using decay_t = typename std::decay<T>::type;
+template <bool E, class T = void>
+using enable_if_t = typename std::enable_if<E, T>::type;
+template <bool B, class T, class F>
+using conditional_t = typename std::conditional<B, T, F>::type;
+
+// std::conjunction from C++17
+template <class...>
+struct conjunction : std::true_type
+{};
+template <class B>
+struct conjunction<B> : B
+{};
+template <class B, class... Bs>
+struct conjunction<B, Bs...> : std::conditional<bool(B::value), conjunction<Bs...>, B>::type
+{};
+
+#  if defined(_LIBCPP_VERSION) && THRUST_CPP_DIALECT == 2011
+#    define THRUST_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+#  endif
+
+// In C++11 mode, there's an issue in libc++'s std::mem_fn
+// which results in a hard-error when using it in a noexcept expression
+// in some cases. This is a check to workaround the common failing case.
+#  ifdef THRUST_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+template <class T>
+struct is_pointer_to_non_const_member_func : std::false_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)> : std::true_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...)&> : std::true_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) &&> : std::true_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile> : std::true_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&> : std::true_type
+{};
+template <class T, class Ret, class... Args>
+struct is_pointer_to_non_const_member_func<Ret (T::*)(Args...) volatile&&> : std::true_type
+{};
+
+template <class T>
+struct is_const_or_const_ref : std::false_type
+{};
+template <class T>
+struct is_const_or_const_ref<T const&> : std::true_type
+{};
+template <class T>
+struct is_const_or_const_ref<T const> : std::true_type
+{};
+#  endif
+
+// std::invoke from C++17
+// https://stackoverflow.com/questions/38288042/c11-14-invoke-workaround
+THRUST_EXEC_CHECK_DISABLE
+template <
+  typename Fn,
+  typename... Args,
+#  ifdef THRUST_OPTIONAL_LIBCXX_MEM_FN_WORKAROUND
+  typename = enable_if_t<!(is_pointer_to_non_const_member_func<Fn>::value && is_const_or_const_ref<Args...>::value)>,
+#  endif
+  typename = enable_if_t<std::is_member_pointer<decay_t<Fn>>::value>,
+  int      = 0>
+THRUST_HOST_DEVICE constexpr auto
+invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::mem_fn(f)(std::forward<Args>(args)...)))
+  -> decltype(std::mem_fn(f)(std::forward<Args>(args)...))
+{
+  return std::mem_fn(f)(std::forward<Args>(args)...);
+}
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename Fn, typename... Args, typename = enable_if_t<!std::is_member_pointer<decay_t<Fn>>::value>>
+THRUST_HOST_DEVICE constexpr auto
+invoke(Fn&& f, Args&&... args) noexcept(noexcept(std::forward<Fn>(f)(std::forward<Args>(args)...)))
+  -> decltype(std::forward<Fn>(f)(std::forward<Args>(args)...))
+{
+  return std::forward<Fn>(f)(std::forward<Args>(args)...);
+}
+#endif
+
+// Trait for checking if a type is a thrust::optional
+template <class T>
+struct is_optional_impl : std::false_type
+{};
+template <class T>
+struct is_optional_impl<optional<T>> : std::true_type
+{};
+template <class T>
+using is_optional = is_optional_impl<decay_t<T>>;
+
+// Change void to thrust::monostate
+template <class U>
+using fixup_void = conditional_t<std::is_void<U>::value, monostate, U>;
+
+template <class F, class U, class = invoke_result_t<F, U>>
+using get_map_return = optional<fixup_void<invoke_result_t<F, U>>>;
+
+// Check if invoking F for some Us returns void
+template <class F, class = void, class... U>
+struct returns_void_impl;
+template <class F, class... U>
+struct returns_void_impl<F, _THRUST_STD::void_t<invoke_result_t<F, U...>>, U...>
+    : std::is_void<invoke_result_t<F, U...>>
+{};
+template <class F, class... U>
+using returns_void = returns_void_impl<F, void, U...>;
+
+template <class T, class... U>
+using enable_if_ret_void = enable_if_t<returns_void<T&&, U...>::value>;
+
+template <class T, class... U>
+using disable_if_ret_void = enable_if_t<!returns_void<T&&, U...>::value>;
+
+template <class T, class U>
+using enable_forward_value =
+  detail::enable_if_t<std::is_constructible<T, U&&>::value && !std::is_same<detail::decay_t<U>, in_place_t>::value
+                      && !std::is_same<optional<T>, detail::decay_t<U>>::value>;
+
+template <class T, class U, class Other>
+using enable_from_other = detail::enable_if_t<
+  std::is_constructible<T, Other>::value && !std::is_constructible<T, optional<U>&>::value
+  && !std::is_constructible<T, optional<U>&&>::value && !std::is_constructible<T, const optional<U>&>::value
+  && !std::is_constructible<T, const optional<U>&&>::value && !std::is_convertible<optional<U>&, T>::value
+  && !std::is_convertible<optional<U>&&, T>::value && !std::is_convertible<const optional<U>&, T>::value
+  && !std::is_convertible<const optional<U>&&, T>::value>;
+
+template <class T, class U>
+using enable_assign_forward =
+  detail::enable_if_t<!std::is_same<optional<T>, detail::decay_t<U>>::value
+                      && !detail::conjunction<std::is_scalar<T>, std::is_same<T, detail::decay_t<U>>>::value
+                      && std::is_constructible<T, U>::value && std::is_assignable<T&, U>::value>;
+
+template <class T, class U, class Other>
+using enable_assign_from_other = detail::enable_if_t<
+  std::is_constructible<T, Other>::value && std::is_assignable<T&, Other>::value
+  && !std::is_constructible<T, optional<U>&>::value && !std::is_constructible<T, optional<U>&&>::value
+  && !std::is_constructible<T, const optional<U>&>::value && !std::is_constructible<T, const optional<U>&&>::value
+  && !std::is_convertible<optional<U>&, T>::value && !std::is_convertible<optional<U>&&, T>::value
+  && !std::is_convertible<const optional<U>&, T>::value && !std::is_convertible<const optional<U>&&, T>::value
+  && !std::is_assignable<T&, optional<U>&>::value && !std::is_assignable<T&, optional<U>&&>::value
+  && !std::is_assignable<T&, const optional<U>&>::value && !std::is_assignable<T&, const optional<U>&&>::value>;
+
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+// TODO make a version which works with MSVC
+template <class T, class U = T>
+struct is_swappable : std::true_type
+{};
+
+template <class T, class U = T>
+struct is_nothrow_swappable : std::true_type
+{};
+#else
+// https://stackoverflow.com/questions/26744589/what-is-a-proper-way-to-implement-is-swappable-to-test-for-the-swappable-concept
+namespace swap_adl_tests
+{
+// if swap ADL finds this then it would call std::swap otherwise (same
+// signature)
+struct tag
+{};
+
+template <class T>
+tag swap(T&, T&);
+template <class T, std::size_t N>
+tag swap(T (&a)[N], T (&b)[N]);
+
+// helper functions to test if an unqualified swap is possible, and if it
+// becomes std::swap
+template <class, class>
+std::false_type can_swap(...) noexcept(false);
+template <class T, class U, class = decltype(swap(std::declval<T&>(), std::declval<U&>()))>
+std::true_type can_swap(int) noexcept(noexcept(swap(std::declval<T&>(), std::declval<U&>())));
+
+template <class, class>
+std::false_type uses_std(...);
+template <class T, class U>
+std::is_same<decltype(swap(std::declval<T&>(), std::declval<U&>())), tag> uses_std(int);
+
+template <class T>
+struct is_std_swap_noexcept
+    : std::integral_constant<bool,
+                             std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value>
+{};
+
+template <class T, std::size_t N>
+struct is_std_swap_noexcept<T[N]> : is_std_swap_noexcept<T>
+{};
+
+template <class T, class U>
+struct is_adl_swap_noexcept : std::integral_constant<bool, noexcept(can_swap<T, U>(0))>
+{};
+} // namespace swap_adl_tests
+
+template <class T, class U = T>
+struct is_swappable
+    : std::integral_constant<bool,
+                             decltype(detail::swap_adl_tests::can_swap<T, U>(0))::value
+                               && (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+                                   || (std::is_move_assignable<T>::value && std::is_move_constructible<T>::value))>
+{};
+
+template <class T, std::size_t N>
+struct is_swappable<T[N], T[N]>
+    : std::integral_constant<
+        bool,
+        decltype(detail::swap_adl_tests::can_swap<T[N], T[N]>(0))::value
+          && (!decltype(detail::swap_adl_tests::uses_std<T[N], T[N]>(0))::value || is_swappable<T, T>::value)>
+{};
+
+template <class T, class U = T>
+struct is_nothrow_swappable
+    : std::integral_constant<bool,
+                             is_swappable<T, U>::value
+                               && ((decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+                                    && detail::swap_adl_tests::is_std_swap_noexcept<T>::value)
+                                   || (!decltype(detail::swap_adl_tests::uses_std<T, U>(0))::value
+                                       && detail::swap_adl_tests::is_adl_swap_noexcept<T, U>::value))>
+{};
+#endif
+
+// The storage base manages the actual storage, and correctly propagates
+// trivial destruction from T. This case is for when T is not trivially
+// destructible.
+template <class T, bool = ::std::is_trivially_destructible<T>::value>
+struct optional_storage_base
+{
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional_storage_base() noexcept
+      : m_dummy()
+      , m_has_value(false)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <class... U>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional_storage_base(in_place_t, U&&... u)
+      : m_value(std::forward<U>(u)...)
+      , m_has_value(true)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE ~optional_storage_base()
+  {
+    if (m_has_value)
+    {
+      m_value.~T();
+      m_has_value = false;
+    }
+  }
+
+  struct dummy
+  {};
+  union
+  {
+    dummy m_dummy;
+    T m_value;
+  };
+
+  bool m_has_value;
+};
+
+// This case is for when T is trivially destructible.
+template <class T>
+struct optional_storage_base<T, true>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional_storage_base() noexcept
+      : m_dummy()
+      , m_has_value(false)
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <class... U>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional_storage_base(in_place_t, U&&... u)
+      : m_value(std::forward<U>(u)...)
+      , m_has_value(true)
+  {}
+
+  // No destructor, so this class is trivially destructible
+
+  struct dummy
+  {};
+  union
+  {
+    dummy m_dummy;
+    T m_value;
+  };
+
+  bool m_has_value = false;
+};
+
+// This base class provides some handy member functions which can be used in
+// further derived classes
+template <class T>
+struct optional_operations_base : optional_storage_base<T>
+{
+  using optional_storage_base<T>::optional_storage_base;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE void hard_reset() noexcept
+  {
+    get().~T();
+    this->m_has_value = false;
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <class... Args>
+  THRUST_HOST_DEVICE void construct(Args&&... args) noexcept
+  {
+    new (thrust::addressof(this->m_value)) T(std::forward<Args>(args)...);
+    this->m_has_value = true;
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  template <class Opt>
+  THRUST_HOST_DEVICE void assign(Opt&& rhs)
+  {
+    if (this->has_value())
+    {
+      if (rhs.has_value())
+      {
+        this->m_value = std::forward<Opt>(rhs).get();
+      }
+      else
+      {
+        this->m_value.~T();
+        this->m_has_value = false;
+      }
+    }
+
+    if (rhs.has_value())
+    {
+      construct(std::forward<Opt>(rhs).get());
+    }
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE bool has_value() const
+  {
+    return this->m_has_value;
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T& get() &
+  {
+    return this->m_value;
+  }
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR const T& get() const&
+  {
+    return this->m_value;
+  }
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T&& get() &&
+  {
+    return std::move(this->m_value);
+  }
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T&& get() const&&
+  {
+    return std::move(this->m_value);
+  }
+#endif
+};
+
+// This class manages conditionally having a trivial copy constructor
+// This specialization is for when T is trivially copy constructible
+template <class T, bool = _THRUST_STD::is_trivially_copy_constructible<T>::value>
+struct optional_copy_base : optional_operations_base<T>
+{
+  using optional_operations_base<T>::optional_operations_base;
+};
+
+// This specialization is for when T is not trivially copy constructible
+template <class T>
+struct optional_copy_base<T, false> : optional_operations_base<T>
+{
+  using optional_operations_base<T>::optional_operations_base;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional_copy_base(const optional_copy_base& rhs)
+  {
+    if (rhs.has_value())
+    {
+      this->construct(rhs.get());
+    }
+    else
+    {
+      this->m_has_value = false;
+    }
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_base(optional_copy_base&& rhs) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_base& operator=(const optional_copy_base& rhs) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_base& operator=(optional_copy_base&& rhs) = default;
+};
+
+template <class T, bool = _THRUST_STD::is_trivially_move_constructible<T>::value>
+struct optional_move_base : optional_copy_base<T>
+{
+  using optional_copy_base<T>::optional_copy_base;
+};
+template <class T>
+struct optional_move_base<T, false> : optional_copy_base<T>
+{
+  using optional_copy_base<T>::optional_copy_base;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_base(const optional_move_base& rhs) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional_move_base(optional_move_base&& rhs) noexcept(std::is_nothrow_move_constructible<T>::value)
+  {
+    if (rhs.has_value())
+    {
+      this->construct(std::move(rhs.get()));
+    }
+    else
+    {
+      this->m_has_value = false;
+    }
+  }
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_base& operator=(const optional_move_base& rhs) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_base& operator=(optional_move_base&& rhs) = default;
+};
+
+// This class manages conditionally having a trivial copy assignment operator
+template <class T,
+          bool = _THRUST_STD::is_trivially_copy_assignable<T>::value
+              && _THRUST_STD::is_trivially_copy_constructible<T>::value
+              && _THRUST_STD::is_trivially_destructible<T>::value>
+struct optional_copy_assign_base : optional_move_base<T>
+{
+  using optional_move_base<T>::optional_move_base;
+};
+
+template <class T>
+struct optional_copy_assign_base<T, false> : optional_move_base<T>
+{
+  using optional_move_base<T>::optional_move_base;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_assign_base(const optional_copy_assign_base& rhs) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_assign_base(optional_copy_assign_base&& rhs) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional_copy_assign_base& operator=(const optional_copy_assign_base& rhs)
+  {
+    this->assign(rhs);
+    return *this;
+  }
+  THRUST_EXEC_CHECK_DISABLE
+  optional_copy_assign_base& operator=(optional_copy_assign_base&& rhs) = default;
+};
+
+template <class T,
+          bool = _THRUST_STD::is_trivially_destructible<T>::value
+              && _THRUST_STD::is_trivially_move_constructible<T>::value
+              && _THRUST_STD::is_trivially_move_assignable<T>::value>
+struct optional_move_assign_base : optional_copy_assign_base<T>
+{
+  using optional_copy_assign_base<T>::optional_copy_assign_base;
+};
+
+template <class T>
+struct optional_move_assign_base<T, false> : optional_copy_assign_base<T>
+{
+  using optional_copy_assign_base<T>::optional_copy_assign_base;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_assign_base(const optional_move_assign_base& rhs) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_assign_base(optional_move_assign_base&& rhs) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  optional_move_assign_base& operator=(const optional_move_assign_base& rhs) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional_move_assign_base& operator=(optional_move_assign_base&& rhs) noexcept(
+    std::is_nothrow_move_constructible<T>::value && std::is_nothrow_move_assignable<T>::value)
+  {
+    this->assign(std::move(rhs));
+    return *this;
+  }
+};
+
+// optional_delete_ctor_base will conditionally delete copy and move
+// constructors depending on whether T is copy/move constructible
+template <class T,
+          bool EnableCopy = std::is_copy_constructible<T>::value,
+          bool EnableMove = std::is_move_constructible<T>::value>
+struct optional_delete_ctor_base
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+};
+
+template <class T>
+struct optional_delete_ctor_base<T, true, false>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+};
+
+template <class T>
+struct optional_delete_ctor_base<T, false, true>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+};
+
+template <class T>
+struct optional_delete_ctor_base<T, false, false>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(const optional_delete_ctor_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_ctor_base& operator=(optional_delete_ctor_base&&) noexcept = default;
+};
+
+// optional_delete_assign_base will conditionally delete copy and move
+// constructors depending on whether T is copy/move constructible + assignable
+template <class T,
+          bool EnableCopy = (std::is_copy_constructible<T>::value && std::is_copy_assignable<T>::value),
+          bool EnableMove = (std::is_move_constructible<T>::value && std::is_move_assignable<T>::value)>
+struct optional_delete_assign_base
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+};
+
+template <class T>
+struct optional_delete_assign_base<T, true, false>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+};
+
+template <class T>
+struct optional_delete_assign_base<T, false, true>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = default;
+};
+
+template <class T>
+struct optional_delete_assign_base<T, false, false>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base() = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(const optional_delete_assign_base&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(const optional_delete_assign_base&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  optional_delete_assign_base& operator=(optional_delete_assign_base&&) noexcept = delete;
+};
+
+} // namespace detail
+
+/// \brief A tag type to represent an empty optional
+struct THRUST_DEPRECATED nullopt_t
+{
+  struct do_not_use
+  {};
+  THRUST_HOST_DEVICE constexpr explicit nullopt_t(do_not_use, do_not_use) noexcept {}
+};
+/// \brief Represents an empty optional
+/// \synopsis static constexpr nullopt_t nullopt;
+///
+/// *Examples*:
+/// ```
+/// thrust::optional<int> a = thrust::nullopt;
+/// void foo (thrust::optional<int>);
+/// foo(thrust::nullopt); //pass an empty optional
+/// ```
+#if defined(__CUDA_ARCH__) && defined(_CCCL_CONSTEXPR_GLOBAL)
+__device__ static _CCCL_CONSTEXPR_GLOBAL
+#elif defined(__HIP_DEVICE_COMPILE__)
+THRUST_DEVICE static constexpr
+#else
+static constexpr
+#endif // __CUDA_ARCH__
+  nullopt_t nullopt{nullopt_t::do_not_use{}, nullopt_t::do_not_use{}};
+
+class THRUST_DEPRECATED bad_optional_access : public std::exception
+{
+public:
+  bad_optional_access() = default;
+  THRUST_HOST const char* what() const noexcept
+  {
+    return "Optional has no value";
+  }
+};
+
+/// An optional object is an object that contains the storage for another
+/// object and manages the lifetime of this contained object, if any. The
+/// contained object may be initialized after the optional object has been
+/// initialized, and may be destroyed before the optional object has been
+/// destroyed. The initialization state of the contained object is tracked by
+/// the optional object.
+template <class T>
+class optional
+    : private detail::optional_move_assign_base<T>
+    , private detail::optional_delete_ctor_base<T>
+    , private detail::optional_delete_assign_base<T>
+{
+  using base = detail::optional_move_assign_base<T>;
+
+  static_assert(!std::is_same<T, in_place_t>::value, "instantiation of optional with in_place_t is ill-formed");
+  static_assert(!std::is_same<detail::decay_t<T>, nullopt_t>::value,
+                "instantiation of optional with nullopt_t is ill-formed");
+
+public:
+// The different versions for C++14 and 11 are needed because deduced return
+// types are not SFINAE-safe. This provides better support for things like
+// generic lambdas. C.f.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0826r0
+#if defined(THRUST_OPTIONAL_CPP14) && !defined(THRUST_OPTIONAL_GCC49) && !defined(THRUST_OPTIONAL_GCC54) \
+  && !defined(THRUST_OPTIONAL_GCC55)
+  /// \group and_then
+  /// Carries out some operation which returns an optional on the stored
+  /// object if there is one. \requires `std::invoke(std::forward<F>(f),
+  /// value())` returns a `std::optional<U>` for some `U`. \return Let `U` be
+  /// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+  /// `std::optional<U>`. The return value is empty if `*this` is empty,
+  /// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+  /// is returned.
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto and_then(F&& f) &
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto and_then(F&& f) &&
+  {
+    using result = detail::invoke_result_t<F, T&&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto and_then(F&& f) const&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto and_then(F&& f) const&&
+  {
+    using result = detail::invoke_result_t<F, const T&&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+  }
+#  endif
+#else
+  /// \group and_then
+  /// Carries out some operation which returns an optional on the stored
+  /// object if there is one. \requires `std::invoke(std::forward<F>(f),
+  /// value())` returns a `std::optional<U>` for some `U`.
+  /// \return Let `U` be the result of `std::invoke(std::forward<F>(f),
+  /// value())`. Returns a `std::optional<U>`. The return value is empty if
+  /// `*this` is empty, otherwise the return value of
+  /// `std::invoke(std::forward<F>(f), value())` is returned.
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) &
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR detail::invoke_result_t<F, T&&> and_then(F&& f) &&
+  {
+    using result = detail::invoke_result_t<F, T&&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr detail::invoke_result_t<F, const T&&> and_then(F&& f) const&&
+  {
+    using result = detail::invoke_result_t<F, const T&&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : result(nullopt);
+  }
+#  endif
+#endif
+
+#if defined(THRUST_OPTIONAL_CPP14) && !defined(THRUST_OPTIONAL_GCC49) && !defined(THRUST_OPTIONAL_GCC54) \
+  && !defined(THRUST_OPTIONAL_GCC55)
+  /// \brief Carries out some operation on the stored object if there is one.
+  /// \return Let `U` be the result of `std::invoke(std::forward<F>(f),
+  /// value())`. Returns a `std::optional<U>`. The return value is empty if
+  /// `*this` is empty, otherwise an `optional<U>` is constructed from the
+  /// return value of `std::invoke(std::forward<F>(f), value())` and is
+  /// returned.
+  ///
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto map(F&& f) &
+  {
+    return optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto map(F&& f) &&
+  {
+    return optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) const&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto map(F&& f) const&
+  {
+    return optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto map(F&& f) const&&
+  {
+    return optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+#else
+  /// \brief Carries out some operation on the stored object if there is one.
+  /// \return Let `U` be the result of `std::invoke(std::forward<F>(f),
+  /// value())`. Returns a `std::optional<U>`. The return value is empty if
+  /// `*this` is empty, otherwise an `optional<U>` is constructed from the
+  /// return value of `std::invoke(std::forward<F>(f), value())` and is
+  /// returned.
+  ///
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE
+    THRUST_OPTIONAL_CPP11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&>(), std::declval<F&&>()))
+    map(F&& f) &
+  {
+    return optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE
+    THRUST_OPTIONAL_CPP11_CONSTEXPR decltype(optional_map_impl(std::declval<optional&&>(), std::declval<F&&>()))
+    map(F&& f) &&
+  {
+    return optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) const&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr decltype(optional_map_impl(std::declval<const optional&>(), std::declval<F&&>()))
+  map(F&& f) const&
+  {
+    return optional_map_impl(*this, std::forward<F>(f));
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) const&&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr decltype(optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>()))
+  map(F&& f) const&&
+  {
+    return optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+#  endif
+#endif
+
+  /// \brief Calls `f` if the optional is empty
+  /// \requires `std::invoke_result_t<F>` must be void or convertible to
+  /// `optional<T>`.
+  /// \effects If `*this` has a value, returns `*this`.
+  /// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+  /// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+  ///
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &
+  {
+    if (has_value())
+    {
+      return *this;
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &
+  {
+    return has_value() ? *this : std::forward<F>(f)();
+  }
+
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) &&
+  {
+    if (has_value())
+    {
+      return std::move(*this);
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &&
+  {
+    return has_value() ? std::move(*this) : std::forward<F>(f)();
+  }
+
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&
+  {
+    if (has_value())
+    {
+      return *this;
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) const&
+  {
+    return has_value() ? *this : std::forward<F>(f)();
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&&
+  {
+    if (has_value())
+    {
+      return std::move(*this);
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&&
+  {
+    return has_value() ? std::move(*this) : std::forward<F>(f)();
+  }
+#endif
+
+  /// \brief Maps the stored value with `f` if there is one, otherwise returns
+  /// `u`.
+  ///
+  /// \details If there is a value stored, then `f` is called with `**this`
+  /// and the value is returned. Otherwise `u` is returned.
+  ///
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) &
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+  }
+
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) &&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+  }
+
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) const&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) const&&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+  }
+#endif
+
+  /// \brief Maps the stored value with `f` if there is one, otherwise calls
+  /// `u` and returns the result.
+  ///
+  /// \details If there is a value stored, then `f` is
+  /// called with `**this` and the value is returned. Otherwise
+  /// `std::forward<U>(u)()` is returned.
+  ///
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) &
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+  }
+
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) &&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+  }
+
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+  }
+#endif
+
+  /// \return `u` if `*this` has a value, otherwise an empty optional.
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const
+  {
+    using result = optional<detail::decay_t<U>>;
+    return has_value() ? result{u} : result{nullopt};
+  }
+
+  /// \return `rhs` if `*this` is empty, otherwise the current value.
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(const optional& rhs) &
+  {
+    return has_value() ? *this : rhs;
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(const optional& rhs) const&
+  {
+    return has_value() ? *this : rhs;
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(const optional& rhs) &&
+  {
+    return has_value() ? std::move(*this) : rhs;
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(const optional& rhs) const&&
+  {
+    return has_value() ? std::move(*this) : rhs;
+  }
+#endif
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(optional&& rhs) &
+  {
+    return has_value() ? *this : std::move(rhs);
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(optional&& rhs) const&
+  {
+    return has_value() ? *this : std::move(rhs);
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(optional&& rhs) &&
+  {
+    return has_value() ? std::move(*this) : std::move(rhs);
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(optional&& rhs) const&&
+  {
+    return has_value() ? std::move(*this) : std::move(rhs);
+  }
+#endif
+
+  /// Takes the value out of the optional, leaving it empty
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() &
+  {
+    optional ret = *this;
+    reset();
+    return ret;
+  }
+
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() const&
+  {
+    optional ret = *this;
+    reset();
+    return ret;
+  }
+
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() &&
+  {
+    optional ret = std::move(*this);
+    reset();
+    return ret;
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() const&&
+  {
+    optional ret = std::move(*this);
+    reset();
+    return ret;
+  }
+#endif
+
+  using value_type = T;
+
+  /// Constructs an optional that does not contain a value.
+  /// \group ctor_empty
+  THRUST_EXEC_CHECK_DISABLE
+  constexpr optional() noexcept = default;
+
+  /// \group ctor_empty
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional(nullopt_t) noexcept {}
+
+  /// Copy constructor
+  ///
+  /// If `rhs` contains a value, the stored value is direct-initialized with
+  /// it. Otherwise, the constructed optional is empty.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_OPTIONAL_CPP11_CONSTEXPR optional(const optional& rhs) = default;
+
+  /// Move constructor
+  ///
+  /// If `rhs` contains a value, the stored value is direct-initialized with
+  /// it. Otherwise, the constructed optional is empty.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_OPTIONAL_CPP11_CONSTEXPR optional(optional&& rhs) = default;
+
+  /// Constructs the stored value in-place using the given arguments.
+  /// \group in_place
+  /// \synopsis template <class... Args> constexpr explicit optional(in_place_t, Args&&... args);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class... Args>
+  THRUST_HOST_DEVICE constexpr explicit optional(
+    detail::enable_if_t<std::is_constructible<T, Args...>::value, in_place_t>, Args&&... args)
+      : base(in_place, std::forward<Args>(args)...)
+  {}
+
+  /// \group in_place
+  /// \synopsis template <class U, class... Args>\nconstexpr explicit optional(in_place_t, std::initializer_list<U>&,
+  /// Args&&... args);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U, class... Args>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR explicit optional(
+    detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, in_place_t>,
+    std::initializer_list<U> il,
+    Args&&... args)
+  {
+    this->construct(il, std::forward<Args>(args)...);
+  }
+
+  /// Constructs the stored value with `u`.
+  /// \synopsis template <class U=T> constexpr optional(U &&u);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U                                                  = T,
+            detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr,
+            detail::enable_forward_value<T, U>*                      = nullptr>
+  THRUST_HOST_DEVICE constexpr optional(U&& u)
+      : base(in_place, std::forward<U>(u))
+  {}
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U                                                   = T,
+            detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr,
+            detail::enable_forward_value<T, U>*                       = nullptr>
+  THRUST_HOST_DEVICE constexpr explicit optional(U&& u)
+      : base(in_place, std::forward<U>(u))
+  {}
+
+  /// Converting copy constructor.
+  /// \synopsis template <class U> optional(const optional<U> &rhs);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U,
+            detail::enable_from_other<T, U, const U&>*                    = nullptr,
+            detail::enable_if_t<std::is_convertible<const U&, T>::value>* = nullptr>
+  THRUST_HOST_DEVICE optional(const optional<U>& rhs)
+  {
+    this->construct(*rhs);
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U,
+            detail::enable_from_other<T, U, const U&>*                     = nullptr,
+            detail::enable_if_t<!std::is_convertible<const U&, T>::value>* = nullptr>
+  THRUST_HOST_DEVICE explicit optional(const optional<U>& rhs)
+  {
+    this->construct(*rhs);
+  }
+
+  /// Converting move constructor.
+  /// \synopsis template <class U> optional(optional<U> &&rhs);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U,
+            detail::enable_from_other<T, U, U&&>*                    = nullptr,
+            detail::enable_if_t<std::is_convertible<U&&, T>::value>* = nullptr>
+  THRUST_HOST_DEVICE optional(optional<U>&& rhs)
+  {
+    this->construct(std::move(*rhs));
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U,
+            detail::enable_from_other<T, U, U&&>*                     = nullptr,
+            detail::enable_if_t<!std::is_convertible<U&&, T>::value>* = nullptr>
+  THRUST_HOST_DEVICE explicit optional(optional<U>&& rhs)
+  {
+    this->construct(std::move(*rhs));
+  }
+
+  /// Destroys the stored value if there is one.
+  THRUST_EXEC_CHECK_DISABLE
+  ~optional() = default;
+
+  /// Assignment to empty.
+  ///
+  /// Destroys the current value if there is one.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional& operator=(nullopt_t) noexcept
+  {
+    if (has_value())
+    {
+      this->m_value.~T();
+      this->m_has_value = false;
+    }
+
+    return *this;
+  }
+
+  /// Copy assignment.
+  ///
+  /// Copies the value from `rhs` if there is one. Otherwise resets the stored
+  /// value in `*this`.
+  THRUST_EXEC_CHECK_DISABLE
+  optional& operator=(const optional& rhs) = default;
+
+  /// Move assignment.
+  ///
+  /// Moves the value from `rhs` if there is one. Otherwise resets the stored
+  /// value in `*this`.
+  THRUST_EXEC_CHECK_DISABLE
+  optional& operator=(optional&& rhs) = default;
+
+  /// Assigns the stored value from `u`, destroying the old value if there was
+  /// one.
+  /// \synopsis optional &operator=(U &&u);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U = T, detail::enable_assign_forward<T, U>* = nullptr>
+  THRUST_HOST_DEVICE optional& operator=(U&& u)
+  {
+    if (has_value())
+    {
+      this->m_value = std::forward<U>(u);
+    }
+    else
+    {
+      this->construct(std::forward<U>(u));
+    }
+
+    return *this;
+  }
+
+  /// Converting copy assignment operator.
+  ///
+  /// Copies the value from `rhs` if there is one. Otherwise resets the stored
+  /// value in `*this`.
+  /// \synopsis optional &operator=(const optional<U> & rhs);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U, detail::enable_assign_from_other<T, U, const U&>* = nullptr>
+  THRUST_HOST_DEVICE optional& operator=(const optional<U>& rhs)
+  {
+    if (has_value())
+    {
+      if (rhs.has_value())
+      {
+        this->m_value = *rhs;
+      }
+      else
+      {
+        this->hard_reset();
+      }
+    }
+
+    if (rhs.has_value())
+    {
+      this->construct(*rhs);
+    }
+
+    return *this;
+  }
+
+  // TODO check exception guarantee
+  /// Converting move assignment operator.
+  ///
+  /// Moves the value from `rhs` if there is one. Otherwise resets the stored
+  /// value in `*this`.
+  /// \synopsis optional &operator=(optional<U> && rhs);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U, detail::enable_assign_from_other<T, U, U>* = nullptr>
+  THRUST_HOST_DEVICE optional& operator=(optional<U>&& rhs)
+  {
+    if (has_value())
+    {
+      if (rhs.has_value())
+      {
+        this->m_value = std::move(*rhs);
+      }
+      else
+      {
+        this->hard_reset();
+      }
+    }
+
+    if (rhs.has_value())
+    {
+      this->construct(std::move(*rhs));
+    }
+
+    return *this;
+  }
+
+  /// Constructs the value in-place, destroying the current one if there is
+  /// one.
+  /// \group emplace
+  THRUST_EXEC_CHECK_DISABLE
+  template <class... Args>
+  THRUST_HOST_DEVICE T& emplace(Args&&... args)
+  {
+    static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+
+    *this = nullopt;
+    this->construct(std::forward<Args>(args)...);
+    return this->m_value;
+  }
+
+  /// \group emplace
+  /// \synopsis template <class U, class... Args>\nT& emplace(std::initializer_list<U> il, Args &&... args);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U, class... Args>
+  THRUST_HOST_DEVICE detail::enable_if_t<std::is_constructible<T, std::initializer_list<U>&, Args&&...>::value, T&>
+  emplace(std::initializer_list<U> il, Args&&... args)
+  {
+    *this = nullopt;
+    this->construct(il, std::forward<Args>(args)...);
+    return this->m_value;
+  }
+
+  /// Swaps this optional with the other.
+  ///
+  /// If neither optionals have a value, nothing happens.
+  /// If both have a value, the values are swapped.
+  /// If one has a value, it is moved to the other and the movee is left
+  /// valueless.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE void
+  swap(optional& rhs) noexcept(std::is_nothrow_move_constructible<T>::value && detail::is_nothrow_swappable<T>::value)
+  {
+    if (has_value())
+    {
+      if (rhs.has_value())
+      {
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+        using _THRUST_STD::swap;
+#else
+        using thrust::swap;
+#endif
+        swap(**this, *rhs);
+      }
+      else
+      {
+        new (thrust::addressof(rhs.m_value)) T(std::move(this->m_value));
+        this->m_value.T::~T();
+      }
+    }
+    else if (rhs.has_value())
+    {
+      new (thrust::addressof(this->m_value)) T(std::move(rhs.m_value));
+      rhs.m_value.T::~T();
+    }
+  }
+
+  /// \return a pointer to the stored value
+  /// \requires a value is stored
+  /// \group pointer
+  /// \synopsis constexpr const T *operator->() const;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T* operator->() const
+  {
+    return thrust::addressof(this->m_value);
+  }
+
+  /// \group pointer
+  /// \synopsis constexpr T *operator->();
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T* operator->()
+  {
+    return thrust::addressof(this->m_value);
+  }
+
+  /// \return the stored value
+  /// \requires a value is stored
+  /// \group deref
+  /// \synopsis constexpr T &operator*();
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T& operator*() &
+  {
+    return this->m_value;
+  }
+
+  /// \group deref
+  /// \synopsis constexpr const T &operator*() const;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T& operator*() const&
+  {
+    return this->m_value;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T&& operator*() &&
+  {
+    return std::move(this->m_value);
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T&& operator*() const&&
+  {
+    return std::move(this->m_value);
+  }
+#endif
+
+  /// \return whether or not the optional has a value
+  /// \group has_value
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr bool has_value() const noexcept
+  {
+    return this->m_has_value;
+  }
+
+  /// \group has_value
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr explicit operator bool() const noexcept
+  {
+    return this->m_has_value;
+  }
+
+  /// \return the contained value if there is one, otherwise throws
+  /// [bad_optional_access]
+  /// \group value
+  /// \synopsis constexpr T &value();
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR T& value() &
+  {
+    if (has_value())
+    {
+      return this->m_value;
+    }
+    throw bad_optional_access();
+  }
+  /// \group value
+  /// \synopsis constexpr const T &value() const;
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR const T& value() const&
+  {
+    if (has_value())
+    {
+      return this->m_value;
+    }
+    throw bad_optional_access();
+  }
+  /// \exclude
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR T&& value() &&
+  {
+    if (has_value())
+    {
+      return std::move(this->m_value);
+    }
+    throw bad_optional_access();
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \exclude
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR const T&& value() const&&
+  {
+    if (has_value())
+    {
+      return std::move(this->m_value);
+    }
+    throw bad_optional_access();
+  }
+#endif
+
+  /// \return the stored value if there is one, otherwise returns `u`
+  /// \group value_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE constexpr T value_or(U&& u) const&
+  {
+    static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value,
+                  "T must be copy constructible and convertible from U");
+    return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+  }
+
+  /// \group value_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T value_or(U&& u) &&
+  {
+    static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value,
+                  "T must be move constructible and convertible from U");
+    return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+  }
+
+  /// Destroys the stored value if one exists, making the optional empty
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE void reset() noexcept
+  {
+    if (has_value())
+    {
+      this->m_value.~T();
+      this->m_has_value = false;
+    }
+  }
+};
+
+/// \group relop
+/// \brief Compares two optional objects
+/// \details If both optionals contain a value, they are compared with `T`s
+/// relational operators. Otherwise `lhs` and `rhs` are equal only if they are
+/// both empty, and `lhs` is less than `rhs` only if `rhs` is empty and `lhs`
+/// is not.
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator==(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return lhs.has_value() == rhs.has_value() && (!lhs.has_value() || *lhs == *rhs);
+}
+/// \group relop
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator!=(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return lhs.has_value() != rhs.has_value() || (lhs.has_value() && *lhs != *rhs);
+}
+/// \group relop
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return rhs.has_value() && (!lhs.has_value() || *lhs < *rhs);
+}
+/// \group relop
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return lhs.has_value() && (!rhs.has_value() || *lhs > *rhs);
+}
+/// \group relop
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<=(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return !lhs.has_value() || (rhs.has_value() && *lhs <= *rhs);
+}
+/// \group relop
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>=(const optional<T>& lhs, const optional<U>& rhs)
+{
+  return !rhs.has_value() || (lhs.has_value() && *lhs >= *rhs);
+}
+
+/// \group relop_nullopt
+/// \brief Compares an optional to a `nullopt`
+/// \details Equivalent to comparing the optional to an empty optional
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator==(const optional<T>& lhs, nullopt_t) noexcept
+{
+  return !lhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator==(nullopt_t, const optional<T>& rhs) noexcept
+{
+  return !rhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator!=(const optional<T>& lhs, nullopt_t) noexcept
+{
+  return lhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator!=(nullopt_t, const optional<T>& rhs) noexcept
+{
+  return rhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator<(const optional<T>&, nullopt_t) noexcept
+{
+  return false;
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator<(nullopt_t, const optional<T>& rhs) noexcept
+{
+  return rhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator<=(const optional<T>& lhs, nullopt_t) noexcept
+{
+  return !lhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept
+{
+  return true;
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator>(const optional<T>& lhs, nullopt_t) noexcept
+{
+  return lhs.has_value();
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator>(nullopt_t, const optional<T>&) noexcept
+{
+  return false;
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept
+{
+  return true;
+}
+/// \group relop_nullopt
+THRUST_EXEC_CHECK_DISABLE
+template <class T>
+THRUST_HOST_DEVICE inline constexpr bool operator>=(nullopt_t, const optional<T>& rhs) noexcept
+{
+  return !rhs.has_value();
+}
+
+/// \group relop_t
+/// \brief Compares the optional with a value.
+/// \details If the optional has a value, it is compared with the other value
+/// using `T`s relational operators. Otherwise, the optional is considered
+/// less than the value.
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator==(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs == rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator==(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs == *rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator!=(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs != rhs : true;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator!=(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs != *rhs : true;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs < rhs : true;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs < *rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<=(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs <= rhs : true;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator<=(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs <= *rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs > rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs > *rhs : true;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>=(const optional<T>& lhs, const U& rhs)
+{
+  return lhs.has_value() ? *lhs >= rhs : false;
+}
+/// \group relop_t
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U>
+THRUST_HOST_DEVICE inline constexpr bool operator>=(const U& lhs, const optional<T>& rhs)
+{
+  return rhs.has_value() ? lhs >= *rhs : true;
+}
+
+/// \synopsis template <class T>\nvoid swap(optional<T> &lhs, optional<T> &rhs);
+THRUST_EXEC_CHECK_DISABLE
+template <class T,
+          detail::enable_if_t<std::is_move_constructible<T>::value>* = nullptr,
+          detail::enable_if_t<detail::is_swappable<T>::value>*       = nullptr>
+THRUST_HOST_DEVICE void swap(optional<T>& lhs, optional<T>& rhs) noexcept(noexcept(lhs.swap(rhs)))
+{
+  return lhs.swap(rhs);
+}
+
+namespace detail
+{
+struct i_am_secret
+{};
+} // namespace detail
+
+THRUST_EXEC_CHECK_DISABLE
+template <class T = detail::i_am_secret,
+          class U,
+          class Ret = detail::conditional_t<std::is_same<T, detail::i_am_secret>::value, detail::decay_t<U>, T>>
+THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::make_optional")
+THRUST_HOST_DEVICE inline constexpr optional<Ret> make_optional(U&& v)
+{
+  return optional<Ret>(std::forward<U>(v));
+}
+
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class... Args>
+THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::make_optional")
+THRUST_HOST_DEVICE inline constexpr optional<T> make_optional(Args&&... args)
+{
+  return optional<T>(in_place, std::forward<Args>(args)...);
+}
+THRUST_EXEC_CHECK_DISABLE
+template <class T, class U, class... Args>
+THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::make_optional")
+THRUST_HOST_DEVICE inline constexpr optional<T> make_optional(std::initializer_list<U> il, Args&&... args)
+{
+  return optional<T>(in_place, il, std::forward<Args>(args)...);
+}
+
+#if THRUST_CPP_DIALECT >= 2017
+template <class T>
+optional(T) -> optional<T>;
+#endif
+
+// Doxygen chokes on the trailing return types used below.
+#if !defined(THRUST_DOXYGEN_INVOKED)
+/// \exclude
+namespace detail
+{
+#  ifdef THRUST_OPTIONAL_CPP14
+THRUST_EXEC_CHECK_DISABLE
+template <class Opt,
+          class F,
+          class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+          detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+THRUST_HOST_DEVICE constexpr auto optional_map_impl(Opt&& opt, F&& f)
+{
+  return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+}
+
+THRUST_EXEC_CHECK_DISABLE
+template <class Opt,
+          class F,
+          class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+          detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+THRUST_HOST_DEVICE auto optional_map_impl(Opt&& opt, F&& f)
+{
+  if (opt.has_value())
+  {
+    detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+#    if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC
+    // MSVC fails to suppress the warning on make_optional
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    return optional<monostate>(monostate{});
+    THRUST_SUPPRESS_DEPRECATED_POP
+#    elif THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVHPC
+    // NVHPC cannot have a diagnostic pop after a return statement
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    auto o = optional<monostate>(monostate{});
+    THRUST_SUPPRESS_DEPRECATED_POP
+    return _THRUST_STD::move(o);
+#    else
+    THRUST_SUPPRESS_DEPRECATED_PUSH
+    return make_optional(monostate{});
+    THRUST_SUPPRESS_DEPRECATED_POP
+#    endif
+  }
+
+  return optional<monostate>(nullopt);
+}
+#  else
+THRUST_EXEC_CHECK_DISABLE
+template <class Opt,
+          class F,
+          class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+          detail::enable_if_t<!std::is_void<Ret>::value>* = nullptr>
+THRUST_HOST_DEVICE constexpr optional<Ret> optional_map_impl(Opt&& opt, F&& f)
+{
+  return opt.has_value() ? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt)) : optional<Ret>(nullopt);
+}
+
+THRUST_EXEC_CHECK_DISABLE
+template <class Opt,
+          class F,
+          class Ret = decltype(detail::invoke(std::declval<F>(), *std::declval<Opt>())),
+          detail::enable_if_t<std::is_void<Ret>::value>* = nullptr>
+THRUST_HOST_DEVICE auto optional_map_impl(Opt&& opt, F&& f) -> optional<monostate>
+{
+  if (opt.has_value())
+  {
+    detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt));
+    return monostate{};
+  }
+
+  return nullopt;
+}
+#  endif
+} // namespace detail
+#endif // !defined(THRUST_DOXYGEN_INVOKED)
+
+/// Specialization for when `T` is a reference. `optional<T&>` acts similarly
+/// to a `T*`, but provides more operations and shows intent more clearly.
+///
+/// *Examples*:
+///
+/// ```
+/// int i = 42;
+/// thrust::optional<int&> o = i;
+/// *o == 42; //true
+/// i = 12;
+/// *o = 12; //true
+/// &*o == &i; //true
+/// ```
+///
+/// Assignment has rebind semantics rather than assign-through semantics:
+///
+/// ```
+/// int j = 8;
+/// o = j;
+///
+/// &*o == &j; //true
+/// ```
+template <class T>
+class optional<T&>
+{
+public:
+// The different versions for C++14 and 11 are needed because deduced return
+// types are not SFINAE-safe. This provides better support for things like
+// generic lambdas. C.f.
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0826r0
+#if defined(THRUST_OPTIONAL_CPP14) && !defined(THRUST_OPTIONAL_GCC49) && !defined(THRUST_OPTIONAL_GCC54) \
+  && !defined(THRUST_OPTIONAL_GCC55)
+  /// \group and_then
+  /// Carries out some operation which returns an optional on the stored
+  /// object if there is one. \requires `std::invoke(std::forward<F>(f),
+  /// value())` returns a `std::optional<U>` for some `U`. \return Let `U` be
+  /// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+  /// `std::optional<U>`. The return value is empty if `*this` is empty,
+  /// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+  /// is returned.
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto and_then(F&& f) &
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto and_then(F&& f) &&
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto and_then(F&& f) const&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto and_then(F&& f) const&&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+#  endif
+#else
+  /// \group and_then
+  /// Carries out some operation which returns an optional on the stored
+  /// object if there is one. \requires `std::invoke(std::forward<F>(f),
+  /// value())` returns a `std::optional<U>` for some `U`. \return Let `U` be
+  /// the result of `std::invoke(std::forward<F>(f), value())`. Returns a
+  /// `std::optional<U>`. The return value is empty if `*this` is empty,
+  /// otherwise the return value of `std::invoke(std::forward<F>(f), value())`
+  /// is returned.
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) &
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR detail::invoke_result_t<F, T&> and_then(F&& f) &&
+  {
+    using result = detail::invoke_result_t<F, T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group and_then
+  /// \synopsis template <class F>\nconstexpr auto and_then(F &&f) const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr detail::invoke_result_t<F, const T&> and_then(F&& f) const&&
+  {
+    using result = detail::invoke_result_t<F, const T&>;
+    static_assert(detail::is_optional<result>::value, "F must return an optional");
+
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
+  }
+#  endif
+#endif
+
+#if defined(THRUST_OPTIONAL_CPP14) && !defined(THRUST_OPTIONAL_GCC49) && !defined(THRUST_OPTIONAL_GCC54) \
+  && !defined(THRUST_OPTIONAL_GCC55)
+  /// \brief Carries out some operation on the stored object if there is one.
+  /// \return Let `U` be the result of `std::invoke(std::forward<F>(f),
+  /// value())`. Returns a `std::optional<U>`. The return value is empty if
+  /// `*this` is empty, otherwise an `optional<U>` is constructed from the
+  /// return value of `std::invoke(std::forward<F>(f), value())` and is
+  /// returned.
+  ///
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto map(F&& f) &
+  {
+    return detail::optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR auto map(F&& f) &&
+  {
+    return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) const&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto map(F&& f) const&
+  {
+    return detail::optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> constexpr auto map(F &&f) const&&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr auto map(F&& f) const&&
+  {
+    return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+#else
+  /// \brief Carries out some operation on the stored object if there is one.
+  /// \return Let `U` be the result of `std::invoke(std::forward<F>(f),
+  /// value())`. Returns a `std::optional<U>`. The return value is empty if
+  /// `*this` is empty, otherwise an `optional<U>` is constructed from the
+  /// return value of `std::invoke(std::forward<F>(f), value())` and is
+  /// returned.
+  ///
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE
+    THRUST_OPTIONAL_CPP11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&>(), std::declval<F&&>()))
+    map(F&& f) &
+  {
+    return detail::optional_map_impl(*this, std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE
+    THRUST_OPTIONAL_CPP11_CONSTEXPR decltype(detail::optional_map_impl(std::declval<optional&&>(), std::declval<F&&>()))
+    map(F&& f) &&
+  {
+    return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) const&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr decltype(detail::optional_map_impl(std::declval<const optional&>(), std::declval<F&&>()))
+  map(F&& f) const&
+  {
+    return detail::optional_map_impl(*this, std::forward<F>(f));
+  }
+
+#  ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map
+  /// \synopsis template <class F> auto map(F &&f) const&&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F>
+  THRUST_HOST_DEVICE constexpr decltype(detail::optional_map_impl(std::declval<const optional&&>(), std::declval<F&&>()))
+  map(F&& f) const&&
+  {
+    return detail::optional_map_impl(std::move(*this), std::forward<F>(f));
+  }
+#  endif
+#endif
+
+  /// \brief Calls `f` if the optional is empty
+  /// \requires `std::invoke_result_t<F>` must be void or convertible to
+  /// `optional<T>`. \effects If `*this` has a value, returns `*this`.
+  /// Otherwise, if `f` returns `void`, calls `std::forward<F>(f)` and returns
+  /// `std::nullopt`. Otherwise, returns `std::forward<F>(f)()`.
+  ///
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &
+  {
+    if (has_value())
+    {
+      return *this;
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &
+  {
+    return has_value() ? *this : std::forward<F>(f)();
+  }
+
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) &&
+  {
+    if (has_value())
+    {
+      return std::move(*this);
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) &&
+  {
+    return has_value() ? std::move(*this) : std::forward<F>(f)();
+  }
+
+  /// \group or_else
+  /// \synopsis template <class F> optional<T> or_else (F &&f) const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&
+  {
+    if (has_value())
+    {
+      return *this;
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> THRUST_OPTIONAL_CPP11_CONSTEXPR or_else(F&& f) const&
+  {
+    return has_value() ? *this : std::forward<F>(f)();
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::enable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&&
+  {
+    if (has_value())
+    {
+      return std::move(*this);
+    }
+
+    std::forward<F>(f)();
+    return nullopt;
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, detail::disable_if_ret_void<F>* = nullptr>
+  THRUST_HOST_DEVICE optional<T> or_else(F&& f) const&&
+  {
+    return has_value() ? std::move(*this) : std::forward<F>(f)();
+  }
+#endif
+
+  /// \brief Maps the stored value with `f` if there is one, otherwise returns
+  /// `u`.
+  ///
+  /// \details If there is a value stored, then `f` is called with `**this`
+  /// and the value is returned. Otherwise `u` is returned.
+  ///
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) &
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+  }
+
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) &&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+  }
+
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) const&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u);
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE U map_or(F&& f, U&& u) const&&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u);
+  }
+#endif
+
+  /// \brief Maps the stored value with `f` if there is one, otherwise calls
+  /// `u` and returns the result.
+  ///
+  /// \details If there is a value stored, then `f` is
+  /// called with `**this` and the value is returned. Otherwise
+  /// `std::forward<U>(u)()` is returned.
+  ///
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u) &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) &
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+  }
+
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) &&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+  }
+
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// const &;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), **this) : std::forward<U>(u)();
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group map_or_else
+  /// \synopsis template <class F, class U>\nauto map_or_else(F &&f, U &&u)
+  /// const &&;
+  THRUST_EXEC_CHECK_DISABLE
+  template <class F, class U>
+  THRUST_HOST_DEVICE detail::invoke_result_t<U> map_or_else(F&& f, U&& u) const&&
+  {
+    return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) : std::forward<U>(u)();
+  }
+#endif
+
+  /// \return `u` if `*this` has a value, otherwise an empty optional.
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE constexpr optional<typename std::decay<U>::type> conjunction(U&& u) const
+  {
+    using result = optional<detail::decay_t<U>>;
+    return has_value() ? result{u} : result{nullopt};
+  }
+
+  /// \return `rhs` if `*this` is empty, otherwise the current value.
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(const optional& rhs) &
+  {
+    return has_value() ? *this : rhs;
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(const optional& rhs) const&
+  {
+    return has_value() ? *this : rhs;
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(const optional& rhs) &&
+  {
+    return has_value() ? std::move(*this) : rhs;
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(const optional& rhs) const&&
+  {
+    return has_value() ? std::move(*this) : rhs;
+  }
+#endif
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(optional&& rhs) &
+  {
+    return has_value() ? *this : std::move(rhs);
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(optional&& rhs) const&
+  {
+    return has_value() ? *this : std::move(rhs);
+  }
+
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR optional disjunction(optional&& rhs) &&
+  {
+    return has_value() ? std::move(*this) : std::move(rhs);
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group disjunction
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional disjunction(optional&& rhs) const&&
+  {
+    return has_value() ? std::move(*this) : std::move(rhs);
+  }
+#endif
+
+  /// Takes the value out of the optional, leaving it empty
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() &
+  {
+    optional ret = *this;
+    reset();
+    return ret;
+  }
+
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() const&
+  {
+    optional ret = *this;
+    reset();
+    return ret;
+  }
+
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() &&
+  {
+    optional ret = std::move(*this);
+    reset();
+    return ret;
+  }
+
+#ifndef THRUST_OPTIONAL_NO_CONSTRR
+  /// \group take
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional take() const&&
+  {
+    optional ret = std::move(*this);
+    reset();
+    return ret;
+  }
+#endif
+
+  using value_type = T&;
+
+  /// Constructs an optional that does not contain a value.
+  /// \group ctor_empty
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional() noexcept
+      : m_value(nullptr)
+  {}
+
+  /// \group ctor_empty
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr optional(nullopt_t) noexcept
+      : m_value(nullptr)
+  {}
+
+  /// Copy constructor
+  ///
+  /// If `rhs` contains a value, the stored value is direct-initialized with
+  /// it. Otherwise, the constructed optional is empty.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_OPTIONAL_CPP11_CONSTEXPR optional(const optional& rhs) noexcept = default;
+
+  /// Move constructor
+  ///
+  /// If `rhs` contains a value, the stored value is direct-initialized with
+  /// it. Otherwise, the constructed optional is empty.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_OPTIONAL_CPP11_CONSTEXPR optional(optional&& rhs) = default;
+
+  /// Constructs the stored value with `u`.
+  /// \synopsis template <class U=T> constexpr optional(U &&u);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+  THRUST_HOST_DEVICE constexpr optional(U&& u)
+      : m_value(thrust::addressof(u))
+  {
+    static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+  }
+
+  /// \exclude
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE constexpr explicit optional(const optional<U>& rhs)
+      : optional(*rhs)
+  {}
+
+  /// No-op
+  THRUST_EXEC_CHECK_DISABLE
+  ~optional() = default;
+
+  /// Assignment to empty.
+  ///
+  /// Destroys the current value if there is one.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE optional& operator=(nullopt_t) noexcept
+  {
+    m_value = nullptr;
+    return *this;
+  }
+
+  /// Copy assignment.
+  ///
+  /// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+  /// resets the stored value in `*this`.
+  THRUST_EXEC_CHECK_DISABLE
+  optional& operator=(const optional& rhs) = default;
+
+  /// Rebinds this optional to `u`.
+  ///
+  /// \requires `U` must be an lvalue reference.
+  /// \synopsis optional &operator=(U &&u);
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U = T, detail::enable_if_t<!detail::is_optional<detail::decay_t<U>>::value>* = nullptr>
+  THRUST_HOST_DEVICE optional& operator=(U&& u)
+  {
+    static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+    m_value = thrust::addressof(u);
+    return *this;
+  }
+
+  /// Converting copy assignment operator.
+  ///
+  /// Rebinds this optional to the referee of `rhs` if there is one. Otherwise
+  /// resets the stored value in `*this`.
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE optional& operator=(const optional<U>& rhs)
+  {
+    m_value = thrust::addressof(rhs.value());
+    return *this;
+  }
+
+  /// Constructs the value in-place, destroying the current one if there is
+  /// one.
+  ///
+  /// \group emplace
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE T& emplace(U& u) noexcept
+  {
+    m_value = thrust::addressof(u);
+    return *m_value;
+  }
+
+  /// Swaps this optional with the other.
+  ///
+  /// If neither optionals have a value, nothing happens.
+  /// If both have a value, the values are swapped.
+  /// If one has a value, it is moved to the other and the movee is left
+  /// valueless.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE void swap(optional& rhs) noexcept
+  {
+    std::swap(m_value, rhs.m_value);
+  }
+
+  /// \return a pointer to the stored value
+  /// \requires a value is stored
+  /// \group pointer
+  /// \synopsis constexpr const T *operator->() const;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T* operator->() const
+  {
+    return m_value;
+  }
+
+  /// \group pointer
+  /// \synopsis constexpr T *operator->();
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T* operator->()
+  {
+    return m_value;
+  }
+
+  /// \return the stored value
+  /// \requires a value is stored
+  /// \group deref
+  /// \synopsis constexpr T &operator*();
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_OPTIONAL_CPP11_CONSTEXPR T& operator*()
+  {
+    return *m_value;
+  }
+
+  /// \group deref
+  /// \synopsis constexpr const T &operator*() const;
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr const T& operator*() const
+  {
+    return *m_value;
+  }
+
+  /// \return whether or not the optional has a value
+  /// \group has_value
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr bool has_value() const noexcept
+  {
+    return m_value != nullptr;
+  }
+
+  /// \group has_value
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE constexpr explicit operator bool() const noexcept
+  {
+    return m_value != nullptr;
+  }
+
+  /// \return the contained value if there is one, otherwise throws
+  /// [bad_optional_access]
+  /// \group value
+  /// synopsis constexpr T &value();
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR T& value()
+  {
+    if (has_value())
+    {
+      return *m_value;
+    }
+    throw bad_optional_access();
+  }
+  /// \group value
+  /// \synopsis constexpr const T &value() const;
+  THRUST_HOST THRUST_OPTIONAL_CPP11_CONSTEXPR const T& value() const
+  {
+    if (has_value())
+    {
+      return *m_value;
+    }
+    throw bad_optional_access();
+  }
+
+  /// \return the stored value if there is one, otherwise returns `u`
+  /// \group value_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE constexpr T value_or(U&& u) const&
+  {
+    static_assert(std::is_copy_constructible<T>::value && std::is_convertible<U&&, T>::value,
+                  "T must be copy constructible and convertible from U");
+    return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+  }
+
+  /// \group value_or
+  THRUST_EXEC_CHECK_DISABLE
+  template <class U>
+  THRUST_HOST_DEVICE THRUST_OPTIONAL_CPP11_CONSTEXPR T value_or(U&& u) &&
+  {
+    static_assert(std::is_move_constructible<T>::value && std::is_convertible<U&&, T>::value,
+                  "T must be move constructible and convertible from U");
+    return has_value() ? **this : static_cast<T>(std::forward<U>(u));
+  }
+
+  /// Destroys the stored value if one exists, making the optional empty
+  THRUST_EXEC_CHECK_DISABLE
+  void reset() noexcept
+  {
+    m_value = nullptr;
+  }
+
+private:
+  T* m_value;
+};
+
+THRUST_NAMESPACE_END
+
+namespace std
+{
+// TODO SFINAE
+template <class T>
+struct hash<THRUST_NS_QUALIFIER::optional<T>>
+{
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST_DEVICE ::std::size_t operator()(const THRUST_NS_QUALIFIER::optional<T>& o) const
+  {
+    if (!o.has_value())
+    {
+      return 0;
+    }
+
+    return std::hash<_THRUST_STD::remove_const_t<T>>()(*o);
+  }
+};
+} // namespace std
+
+THRUST_SUPPRESS_DEPRECATED_POP
diff --git a/projects/rocthrust/thrust/pair.h b/projects/rocthrust/thrust/pair.h
index 0eb9d3101d64..377af3a36f34 100644
--- a/projects/rocthrust/thrust/pair.h
+++ b/projects/rocthrust/thrust/pair.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright (c) 2024-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Modifications Copyright (c) 2024-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ using _THRUST_STD::make_pair;
 
 THRUST_NAMESPACE_END
 
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
+#else // !_THRUST_HAS_DEVICE_SYSTEM_STD
 
 THRUST_NAMESPACE_BEGIN
 
@@ -298,7 +298,7 @@ inline THRUST_HOST_DEVICE pair<T1, T2> make_pair(T1 x, T2 y);
  *  \tparam N This parameter selects the member of interest.
  *  \tparam T A \c pair type of interest.
  */
-template <::std::size_t N, class T>
+template <_THRUST_STD::size_t N, class T>
 struct tuple_element;
 
 /*! This convenience metafunction is included for compatibility with
diff --git a/projects/rocthrust/thrust/partition.h b/projects/rocthrust/thrust/partition.h
index ce15ff0081ce..79e744e5e76b 100644
--- a/projects/rocthrust/thrust/partition.h
+++ b/projects/rocthrust/thrust/partition.h
@@ -66,7 +66,7 @@ THRUST_NAMESPACE_BEGIN
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type, and \p
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type, and \p
  * ForwardIterator is mutable. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -125,7 +125,7 @@ THRUST_HOST_DEVICE ForwardIterator partition(
  *          the sequence of the elements which do not satisfy \p pred.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type, and \p
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type, and \p
  * ForwardIterator is mutable. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -186,7 +186,7 @@ ForwardIterator partition(ForwardIterator first, ForwardIterator last, Predicate
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The ranges <tt>[first,last)</tt> and <tt>[stencil, stencil + (last - first))</tt> shall not overlap.
@@ -251,7 +251,7 @@ THRUST_HOST_DEVICE ForwardIterator partition(
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The ranges <tt>[first,last)</tt> and <tt>[stencil, stencil + (last - first))</tt> shall not overlap.
@@ -309,7 +309,7 @@ ForwardIterator partition(ForwardIterator first, ForwardIterator last, InputIter
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type and \p
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type and \p
  * InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c value_types. \tparam
  * OutputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam OutputIterator2 is a model of <a
@@ -387,7 +387,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy
  *          \p out_false.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type and \p
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type and \p
  * InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c value_types. \tparam
  * OutputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam OutputIterator2 is a model of <a
@@ -463,7 +463,7 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
  * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator1 is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -540,7 +540,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy
  * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator1 is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -616,7 +616,7 @@ thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type, and \p
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type, and \p
  * ForwardIterator is mutable. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -678,7 +678,7 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
  *          the sequence of the elements which do not satisfy pred.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type, and \p
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type, and \p
  * ForwardIterator is mutable. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -741,7 +741,7 @@ ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, Pr
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall not overlap with the range <tt>[stencil, stencil + (last - first))</tt>.
@@ -808,7 +808,7 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall not overlap with the range <tt>[stencil, stencil + (last - first))</tt>.
@@ -872,7 +872,7 @@ ForwardIterator stable_partition(ForwardIterator first, ForwardIterator last, In
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type and \p
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type and \p
  * InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c value_types. \tparam
  * OutputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam OutputIterator2 is a model of <a
@@ -952,7 +952,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
  *          \p out_false.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type and \p
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type and \p
  * InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c value_types. \tparam
  * OutputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam OutputIterator2 is a model of <a
@@ -1030,7 +1030,7 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
  * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator1 is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -1109,7 +1109,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
  * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p OutputIterator1 and \p OutputIterator2's \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator1 is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -1178,7 +1178,7 @@ thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall be partitioned by \p pred.
@@ -1230,7 +1230,7 @@ THRUST_HOST_DEVICE ForwardIterator partition_point(
  *          and <tt>none_of(mid, last, pred)</tt> are both true.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall be partitioned by \p pred.
@@ -1293,7 +1293,7 @@ ForwardIterator partition_point(ForwardIterator first, ForwardIterator last, Pre
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \code
@@ -1342,7 +1342,7 @@ THRUST_HOST_DEVICE bool is_partitioned(
  *          to \p pred, or if <tt>[first, last)</tt> is empty. \c false, otherwise.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's argument type. \tparam
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type. \tparam
  * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \code
diff --git a/projects/rocthrust/thrust/per_device_resource.h b/projects/rocthrust/thrust/per_device_resource.h
index 29dd45b8692a..09aec0de9ad1 100644
--- a/projects/rocthrust/thrust/per_device_resource.h
+++ b/projects/rocthrust/thrust/per_device_resource.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/mr/allocator.h>
 #include <thrust/system/detail/adl/per_device_resource.h>
@@ -68,7 +61,7 @@ class per_device_allocator : public thrust::mr::allocator<T, Upstream>
   template <typename U>
   struct rebind
   {
-    /*! The alias \p other gives the type of the rebound \p per_device_allocator.
+    /*! The typedef \p other gives the type of the rebound \p per_device_allocator.
      */
     using other = per_device_allocator<U, Upstream, ExecutionPolicy>;
   };
diff --git a/projects/rocthrust/thrust/random.h b/projects/rocthrust/thrust/random.h
index d6c4e3149851..8921facd14a8 100644
--- a/projects/rocthrust/thrust/random.h
+++ b/projects/rocthrust/thrust/random.h
@@ -22,15 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <cstdint>
-
 // RNGs
 #include <thrust/random/discard_block_engine.h>
 #include <thrust/random/linear_congruential_engine.h>
@@ -43,6 +34,8 @@
 #include <thrust/random/uniform_int_distribution.h>
 #include <thrust/random/uniform_real_distribution.h>
 
+#include <cstdint>
+
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup random Random Number Generation
diff --git a/projects/rocthrust/thrust/random/detail/discard_block_engine.inl b/projects/rocthrust/thrust/random/detail/discard_block_engine.inl
index ec2db486d0e1..c82961d5d32e 100644
--- a/projects/rocthrust/thrust/random/detail/discard_block_engine.inl
+++ b/projects/rocthrust/thrust/random/detail/discard_block_engine.inl
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/random/discard_block_engine.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -33,47 +25,62 @@ THRUST_NAMESPACE_BEGIN
 namespace random
 {
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE discard_block_engine<Engine, p, r>::discard_block_engine()
-    : m_e()
-    , m_n(0)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  discard_block_engine<Engine,p,r>
+    ::discard_block_engine()
+      : m_e(), m_n(0)
 {}
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE discard_block_engine<Engine, p, r>::discard_block_engine(result_type s)
-    : m_e(s)
-    , m_n(0)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  discard_block_engine<Engine,p,r>
+    ::discard_block_engine(result_type s)
+      : m_e(s), m_n(0)
 {}
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE discard_block_engine<Engine, p, r>::discard_block_engine(const base_type& urng)
-    : m_e(urng)
-    , m_n(0)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  discard_block_engine<Engine,p,r>
+    ::discard_block_engine(const base_type &urng)
+      : m_e(urng), m_n(0)
 {}
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE void discard_block_engine<Engine, p, r>::seed()
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  void discard_block_engine<Engine,p,r>
+    ::seed(void)
 {
   m_e.seed();
   m_n = 0;
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE void discard_block_engine<Engine, p, r>::seed(result_type s)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  void discard_block_engine<Engine,p,r>
+    ::seed(result_type s)
 {
   m_e.seed(s);
   m_n = 0;
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE typename discard_block_engine<Engine, p, r>::result_type
-discard_block_engine<Engine, p, r>::operator()(void)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  typename discard_block_engine<Engine,p,r>::result_type
+    discard_block_engine<Engine,p,r>
+      ::operator()(void)
 {
-  if (m_n >= used_block)
+  if(m_n >= used_block)
   {
     m_e.discard(block_size - m_n);
-    //    for(; m_n < block_size; ++m_n)
-    //      m_e();
+//    for(; m_n < block_size; ++m_n)
+//      m_e();
     m_n = 0;
   }
 
@@ -82,34 +89,41 @@ discard_block_engine<Engine, p, r>::operator()(void)
   return m_e();
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE void discard_block_engine<Engine, p, r>::discard(unsigned long long z)
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  void discard_block_engine<Engine,p,r>
+    ::discard(unsigned long long z)
 {
   // XXX this should be accelerated
-  for (; z > 0; --z)
+  for(; z > 0; --z)
   {
     this->operator()();
   } // end for
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE const typename discard_block_engine<Engine, p, r>::base_type&
-discard_block_engine<Engine, p, r>::base() const
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  const typename discard_block_engine<Engine,p,r>::base_type &
+    discard_block_engine<Engine,p,r>
+      ::base(void) const
 {
   return m_e;
 }
 
-template <typename Engine, size_t p, size_t r>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-discard_block_engine<Engine, p, r>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename Engine, size_t p, size_t r>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>& discard_block_engine<Engine,p,r>
+      ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags & fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   const CharT space = os.widen(' ');
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
@@ -125,9 +139,11 @@ discard_block_engine<Engine, p, r>::stream_out(std::basic_ostream<CharT, Traits>
   return os;
 }
 
-template <typename Engine, size_t p, size_t r>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>& discard_block_engine<Engine, p, r>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename Engine, size_t p, size_t r>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>& discard_block_engine<Engine,p,r>
+      ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -145,40 +161,54 @@ std::basic_istream<CharT, Traits>& discard_block_engine<Engine, p, r>::stream_in
   return is;
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE bool discard_block_engine<Engine, p, r>::equal(const discard_block_engine<Engine, p, r>& rhs) const
+
+template<typename Engine, size_t p, size_t r>
+  THRUST_HOST_DEVICE
+  bool discard_block_engine<Engine,p,r>
+    ::equal(const discard_block_engine<Engine,p,r> &rhs) const
 {
   return (m_e == rhs.m_e) && (m_n == rhs.m_n);
 }
 
-template <typename Engine, size_t p, size_t r, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const discard_block_engine<Engine, p, r>& e)
+
+template<typename Engine, size_t p, size_t r,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const discard_block_engine<Engine,p,r> &e)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, e);
+  return thrust::random::detail::random_core_access::stream_out(os,e);
 }
 
-template <typename Engine, size_t p, size_t r, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, discard_block_engine<Engine, p, r>& e)
+
+template<typename Engine, size_t p, size_t r,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           discard_block_engine<Engine,p,r> &e)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, e);
+  return thrust::random::detail::random_core_access::stream_in(is,e);
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE bool
-operator==(const discard_block_engine<Engine, p, r>& lhs, const discard_block_engine<Engine, p, r>& rhs)
+
+template<typename Engine, size_t p, size_t r>
+THRUST_HOST_DEVICE
+bool operator==(const discard_block_engine<Engine,p,r> &lhs,
+                const discard_block_engine<Engine,p,r> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename Engine, size_t p, size_t r>
-THRUST_HOST_DEVICE bool
-operator!=(const discard_block_engine<Engine, p, r>& lhs, const discard_block_engine<Engine, p, r>& rhs)
+
+template<typename Engine, size_t p, size_t r>
+THRUST_HOST_DEVICE
+bool operator!=(const discard_block_engine<Engine,p,r> &lhs,
+                const discard_block_engine<Engine,p,r> &rhs)
 {
   return !(lhs == rhs);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/linear_congruential_engine.inl b/projects/rocthrust/thrust/random/detail/linear_congruential_engine.inl
index 4db6a00f15ff..9f75bdd43a26 100644
--- a/projects/rocthrust/thrust/random/detail/linear_congruential_engine.inl
+++ b/projects/rocthrust/thrust/random/detail/linear_congruential_engine.inl
@@ -18,67 +18,69 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
+#include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/detail/mod.h>
 #include <thrust/random/detail/random_core_access.h>
-#include <thrust/random/linear_congruential_engine.h>
 
 THRUST_NAMESPACE_BEGIN
 
 namespace random
 {
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE linear_congruential_engine<UIntType, a, c, m>::linear_congruential_engine(result_type s)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  THRUST_HOST_DEVICE
+  linear_congruential_engine<UIntType,a,c,m>
+    ::linear_congruential_engine(result_type s)
 {
   seed(s);
 } // end linear_congruential_engine::linear_congruential_engine()
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE void linear_congruential_engine<UIntType, a, c, m>::seed(result_type s)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  THRUST_HOST_DEVICE
+  void linear_congruential_engine<UIntType,a,c,m>
+    ::seed(result_type s)
 {
-  if ((detail::mod<UIntType, 1, 0, m>(c) == 0) && (detail::mod<UIntType, 1, 0, m>(s) == 0))
-  {
+  if((detail::mod<UIntType, 1, 0, m>(c) == 0) &&
+     (detail::mod<UIntType, 1, 0, m>(s) == 0))
     m_x = detail::mod<UIntType, 1, 0, m>(1);
-  }
   else
-  {
     m_x = detail::mod<UIntType, 1, 0, m>(s);
-  }
 } // end linear_congruential_engine::seed()
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE typename linear_congruential_engine<UIntType, a, c, m>::result_type
-linear_congruential_engine<UIntType, a, c, m>::operator()(void)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  THRUST_HOST_DEVICE
+  typename linear_congruential_engine<UIntType,a,c,m>::result_type
+    linear_congruential_engine<UIntType,a,c,m>
+      ::operator()(void)
 {
-  m_x = detail::mod<UIntType, a, c, m>(m_x);
+  m_x = detail::mod<UIntType,a,c,m>(m_x);
   return m_x;
 } // end linear_congruential_engine::operator()()
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE void linear_congruential_engine<UIntType, a, c, m>::discard(unsigned long long z)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  THRUST_HOST_DEVICE
+  void linear_congruential_engine<UIntType,a,c,m>
+    ::discard(unsigned long long z)
 {
-  thrust::random::detail::linear_congruential_engine_discard::discard(*this, z);
+  thrust::random::detail::linear_congruential_engine_discard::discard(*this,z);
 } // end linear_congruential_engine::discard()
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-linear_congruential_engine<UIntType, a, c, m>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>& linear_congruential_engine<UIntType,a,c,m>
+      ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags & fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
   os.fill(os.widen(' '));
@@ -93,10 +95,11 @@ linear_congruential_engine<UIntType, a, c, m>::stream_out(std::basic_ostream<Cha
   return os;
 }
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-linear_congruential_engine<UIntType, a, c, m>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>& linear_congruential_engine<UIntType,a,c,m>
+      ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -115,41 +118,54 @@ linear_congruential_engine<UIntType, a, c, m>::stream_in(std::basic_istream<Char
   return is;
 }
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE bool
-linear_congruential_engine<UIntType, a, c, m>::equal(const linear_congruential_engine<UIntType, a, c, m>& rhs) const
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+THRUST_HOST_DEVICE
+bool linear_congruential_engine<UIntType,a,c,m>
+  ::equal(const linear_congruential_engine<UIntType,a,c,m> &rhs) const
 {
   return m_x == rhs.m_x;
 }
 
-template <typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_>
-THRUST_HOST_DEVICE bool operator==(const linear_congruential_engine<UIntType_, a_, c_, m_>& lhs,
-                                   const linear_congruential_engine<UIntType_, a_, c_, m_>& rhs)
+
+template<typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_>
+THRUST_HOST_DEVICE
+bool operator==(const linear_congruential_engine<UIntType_,a_,c_,m_> &lhs,
+                const linear_congruential_engine<UIntType_,a_,c_,m_> &rhs)
 {
-  return detail::random_core_access::equal(lhs, rhs);
+  return detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename UIntType, UIntType a, UIntType c, UIntType m>
-THRUST_HOST_DEVICE bool operator!=(const linear_congruential_engine<UIntType, a, c, m>& lhs,
-                                   const linear_congruential_engine<UIntType, a, c, m>& rhs)
+
+template<typename UIntType, UIntType a, UIntType c, UIntType m>
+THRUST_HOST_DEVICE
+bool operator!=(const linear_congruential_engine<UIntType,a,c,m> &lhs,
+                const linear_congruential_engine<UIntType,a,c,m> &rhs)
 {
   return !(lhs == rhs);
 }
 
-template <typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const linear_congruential_engine<UIntType_, a_, c_, m_>& e)
+
+template<typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const linear_congruential_engine<UIntType_,a_,c_,m_> &e)
 {
-  return detail::random_core_access::stream_out(os, e);
+  return detail::random_core_access::stream_out(os,e);
 }
 
-template <typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, linear_congruential_engine<UIntType_, a_, c_, m_>& e)
+
+template<typename UIntType_, UIntType_ a_, UIntType_ c_, UIntType_ m_,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           linear_congruential_engine<UIntType_,a_,c_,m_> &e)
 {
-  return detail::random_core_access::stream_in(is, e);
+  return detail::random_core_access::stream_in(is,e);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine.inl b/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine.inl
index 44ccf39f0125..bc593c6c4cb0 100644
--- a/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine.inl
+++ b/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine.inl
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/random/linear_feedback_shift_engine.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -33,48 +25,58 @@ THRUST_NAMESPACE_BEGIN
 namespace random
 {
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE linear_feedback_shift_engine<UIntType, w, k, q, s>::linear_feedback_shift_engine(result_type value)
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  THRUST_HOST_DEVICE
+  linear_feedback_shift_engine<UIntType,w,k,q,s>
+    ::linear_feedback_shift_engine(result_type value)
 {
   seed(value);
 } // end linear_feedback_shift_engine::linear_feedback_shift_engine()
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE void linear_feedback_shift_engine<UIntType, w, k, q, s>::seed(result_type value)
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  THRUST_HOST_DEVICE
+  void linear_feedback_shift_engine<UIntType,w,k,q,s>
+    ::seed(result_type value)
 {
   m_value = value;
 } // end linear_feedback_shift_engine::seed()
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE typename linear_feedback_shift_engine<UIntType, w, k, q, s>::result_type
-linear_feedback_shift_engine<UIntType, w, k, q, s>::operator()(void)
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  THRUST_HOST_DEVICE
+  typename linear_feedback_shift_engine<UIntType,w,k,q,s>::result_type
+    linear_feedback_shift_engine<UIntType,w,k,q,s>
+      ::operator()(void)
 {
-  const UIntType b    = (((m_value << q) ^ m_value) & wordmask) >> (k - s);
-  const UIntType mask = ((~static_cast<UIntType>(0)) << (w - k)) & wordmask;
-  m_value             = ((m_value & mask) << s) ^ b;
+  const UIntType b = (((m_value << q) ^ m_value) & wordmask) >> (k-s);
+  const UIntType mask = ( (~static_cast<UIntType>(0)) << (w-k) ) & wordmask;
+  m_value = ((m_value & mask) << s) ^ b;
   return m_value;
 } // end linear_feedback_shift_engine::operator()()
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE void linear_feedback_shift_engine<UIntType, w, k, q, s>::discard(unsigned long long z)
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  THRUST_HOST_DEVICE
+  void linear_feedback_shift_engine<UIntType,w,k,q,s>
+    ::discard(unsigned long long z)
 {
-  for (; z > 0; --z)
+  for(; z > 0; --z)
   {
     this->operator()();
   } // end for
 } // end linear_feedback_shift_engine::discard()
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-linear_feedback_shift_engine<UIntType, w, k, q, s>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>& linear_feedback_shift_engine<UIntType,w,k,q,s>
+      ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags & fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
   os.fill(os.widen(' '));
@@ -89,10 +91,11 @@ linear_feedback_shift_engine<UIntType, w, k, q, s>::stream_out(std::basic_ostrea
   return os;
 }
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-linear_feedback_shift_engine<UIntType, w, k, q, s>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>& linear_feedback_shift_engine<UIntType,w,k,q,s>
+      ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -111,41 +114,54 @@ linear_feedback_shift_engine<UIntType, w, k, q, s>::stream_in(std::basic_istream
   return is;
 }
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE bool linear_feedback_shift_engine<UIntType, w, k, q, s>::equal(
-  const linear_feedback_shift_engine<UIntType, w, k, q, s>& rhs) const
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+  THRUST_HOST_DEVICE
+  bool linear_feedback_shift_engine<UIntType,w,k,q,s>
+    ::equal(const linear_feedback_shift_engine<UIntType,w,k,q,s> &rhs) const
 {
   return m_value == rhs.m_value;
 }
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE bool operator==(const linear_feedback_shift_engine<UIntType, w, k, q, s>& lhs,
-                                   const linear_feedback_shift_engine<UIntType, w, k, q, s>& rhs)
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+THRUST_HOST_DEVICE
+bool operator==(const linear_feedback_shift_engine<UIntType,w,k,q,s> &lhs,
+                const linear_feedback_shift_engine<UIntType,w,k,q,s> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename UIntType, size_t w, size_t k, size_t q, size_t s>
-THRUST_HOST_DEVICE bool operator!=(const linear_feedback_shift_engine<UIntType, w, k, q, s>& lhs,
-                                   const linear_feedback_shift_engine<UIntType, w, k, q, s>& rhs)
+
+template<typename UIntType, size_t w, size_t k, size_t q, size_t s>
+THRUST_HOST_DEVICE
+bool operator!=(const linear_feedback_shift_engine<UIntType,w,k,q,s> &lhs,
+                const linear_feedback_shift_engine<UIntType,w,k,q,s> &rhs)
 {
   return !(lhs == rhs);
 }
 
-template <typename UIntType_, size_t w_, size_t k_, size_t q_, size_t s_, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const linear_feedback_shift_engine<UIntType_, w_, k_, q_, s_>& e)
+
+template<typename UIntType_, size_t w_, size_t k_, size_t q_, size_t s_,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const linear_feedback_shift_engine<UIntType_,w_,k_,q_,s_> &e)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, e);
+  return thrust::random::detail::random_core_access::stream_out(os,e);
 }
 
-template <typename UIntType_, size_t w_, size_t k_, size_t q_, size_t s_, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, linear_feedback_shift_engine<UIntType_, w_, k_, q_, s_>& e)
+
+template<typename UIntType_, size_t w_, size_t k_, size_t q_, size_t s_,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           linear_feedback_shift_engine<UIntType_,w_,k_,q_,s_> &e)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, e);
+  return thrust::random::detail::random_core_access::stream_in(is,e);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine_wordmask.h b/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine_wordmask.h
index 7a22a6c4fa95..a4c482811989 100644
--- a/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine_wordmask.h
+++ b/projects/rocthrust/thrust/random/detail/linear_feedback_shift_engine_wordmask.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 namespace random
diff --git a/projects/rocthrust/thrust/random/detail/mod.h b/projects/rocthrust/thrust/random/detail/mod.h
index ac1fb6ff20fc..ce7e503ef6f1 100644
--- a/projects/rocthrust/thrust/random/detail/mod.h
+++ b/projects/rocthrust/thrust/random/detail/mod.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 namespace random
@@ -42,7 +34,7 @@ struct static_mod
 
   THRUST_HOST_DEVICE T operator()(T x) const
   {
-    if constexpr (a == 1)
+    THRUST_IF_CONSTEXPR (a == 1)
     {
       x %= m;
     }
@@ -60,7 +52,7 @@ struct static_mod
       }
     }
 
-    if constexpr (c != 0)
+    THRUST_IF_CONSTEXPR (c != 0)
     {
       const T d = m - x;
       if (d > c)
diff --git a/projects/rocthrust/thrust/random/detail/normal_distribution.inl b/projects/rocthrust/thrust/random/detail/normal_distribution.inl
index 0713eaa8bd3c..2fc230e99d4e 100644
--- a/projects/rocthrust/thrust/random/detail/normal_distribution.inl
+++ b/projects/rocthrust/thrust/random/detail/normal_distribution.inl
@@ -26,6 +26,7 @@
 #  pragma system_header
 #endif // no system header
 
+#include <thrust/detail/integer_traits.h>
 #include <thrust/random/normal_distribution.h>
 #include <thrust/random/uniform_real_distribution.h>
 
diff --git a/projects/rocthrust/thrust/random/detail/normal_distribution_base.h b/projects/rocthrust/thrust/random/detail/normal_distribution_base.h
index d6662a7ecccc..99cb3a6641b9 100644
--- a/projects/rocthrust/thrust/random/detail/normal_distribution_base.h
+++ b/projects/rocthrust/thrust/random/detail/normal_distribution_base.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 #include <cmath>
 #include <limits>
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/random/detail/erfcinv.h>
 #endif
 
@@ -153,7 +153,9 @@ class normal_distribution_portable
 template <typename RealType>
 struct normal_distribution_base
 {
-#if THRUST_HAS_CUDA_COMPILER() && !THRUST_CUDA_COMPILER(NVHPC)
+#if (defined(__NVCC__) || (defined(__CUDA__) && THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_CLANG) \
+     || THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_NVRTC)                                         \
+  || (THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP)
   using type = normal_distribution_nvcc<RealType>;
 #else
   using type = normal_distribution_portable<RealType>;
diff --git a/projects/rocthrust/thrust/random/detail/random_core_access.h b/projects/rocthrust/thrust/random/detail/random_core_access.h
index 1e90bb86f798..cca760a08072 100644
--- a/projects/rocthrust/thrust/random/detail/random_core_access.h
+++ b/projects/rocthrust/thrust/random/detail/random_core_access.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 namespace random
diff --git a/projects/rocthrust/thrust/random/detail/subtract_with_carry_engine.inl b/projects/rocthrust/thrust/random/detail/subtract_with_carry_engine.inl
index c23051da5687..d37e1c45cfe1 100644
--- a/projects/rocthrust/thrust/random/detail/subtract_with_carry_engine.inl
+++ b/projects/rocthrust/thrust/random/detail/subtract_with_carry_engine.inl
@@ -18,108 +18,107 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/random/detail/mod.h>
-#include <thrust/random/detail/random_core_access.h>
 #include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/subtract_with_carry_engine.h>
+#include <thrust/random/detail/mod.h>
+#include <thrust/random/detail/random_core_access.h>
 
 THRUST_NAMESPACE_BEGIN
 
 namespace random
 {
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE subtract_with_carry_engine<UIntType, w, s, r>::subtract_with_carry_engine(result_type value)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  subtract_with_carry_engine<UIntType,w,s,r>
+    ::subtract_with_carry_engine(result_type value)
 {
   seed(value);
 } // end subtract_with_carry_engine::subtract_with_carry_engine()
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE void subtract_with_carry_engine<UIntType, w, s, r>::seed(result_type value)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  void subtract_with_carry_engine<UIntType,w,s,r>
+    ::seed(result_type value)
 {
-  thrust::random::linear_congruential_engine<result_type, 40014u, 0u, 2147483563u> e(
-    value == 0u ? default_seed : value);
+  thrust::random::linear_congruential_engine<result_type,
+    40014u, 0u, 2147483563u> e(value == 0u ? default_seed : value);
 
   // initialize state
-  for (size_t i = 0; i < long_lag; ++i)
+  for(size_t i = 0; i < long_lag; ++i)
   {
     m_x[i] = detail::mod<UIntType, 1, 0, modulus>(e());
   } // end for i
 
-  m_carry = (m_x[long_lag - 1] == 0);
-  m_k     = 0;
+  m_carry = (m_x[long_lag-1] == 0);
+  m_k = 0;
 } // end subtract_with_carry_engine::seed()
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE typename subtract_with_carry_engine<UIntType, w, s, r>::result_type
-subtract_with_carry_engine<UIntType, w, s, r>::operator()(void)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  typename subtract_with_carry_engine<UIntType,w,s,r>::result_type
+    subtract_with_carry_engine<UIntType,w,s,r>
+      ::operator()(void)
 {
   // XXX we probably need to cache these m_x[m_k] in a register
   //     maybe we need to cache the use of all member variables
   int short_index = m_k - short_lag;
-  if (short_index < 0)
-  {
+  if(short_index < 0)
     short_index += long_lag;
-  }
   result_type xi;
   if (m_x[short_index] >= m_x[m_k] + m_carry)
   {
     // x(n) >= 0
-    xi      = m_x[short_index] - m_x[m_k] - m_carry;
+    xi =  m_x[short_index] - m_x[m_k] - m_carry;
     m_carry = 0;
   }
   else
   {
     // x(n) < 0
-    xi      = modulus - m_x[m_k] - m_carry + m_x[short_index];
+    xi = modulus - m_x[m_k] - m_carry + m_x[short_index];
     m_carry = 1;
   }
   m_x[m_k] = xi;
   ++m_k;
-  if (m_k >= long_lag)
-  {
+  if(m_k >= long_lag)
     m_k = 0;
-  }
   return xi;
 } // end subtract_with_carry_engine::operator()()
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE void subtract_with_carry_engine<UIntType, w, s, r>::discard(unsigned long long z)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  void subtract_with_carry_engine<UIntType,w,s,r>
+    ::discard(unsigned long long z)
 {
-  for (; z > 0; --z)
+  for(; z > 0; --z)
   {
     this->operator()();
   } // end for
 } // end subtract_with_carry_engine::discard()
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-subtract_with_carry_engine<UIntType, w, s, r>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>& subtract_with_carry_engine<UIntType,w,s,r>
+      ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
-  const CharT space                       = os.widen(' ');
+  const CharT fill  = os.fill();
+  const CharT space = os.widen(' ');
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
   os.fill(space);
 
   const UIntType long_lag_ = r;
 
-  for (size_t i = 0; i < r; ++i)
-  {
+  for(size_t i = 0; i < r; ++i)
     os << m_x[(i + m_k) % long_lag_] << space;
-  }
   os << m_carry;
 
   os.flags(flags);
@@ -127,10 +126,11 @@ subtract_with_carry_engine<UIntType, w, s, r>::stream_out(std::basic_ostream<Cha
   return os;
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-template <typename CharType, typename Traits>
-std::basic_istream<CharType, Traits>&
-subtract_with_carry_engine<UIntType, w, s, r>::stream_in(std::basic_istream<CharType, Traits>& is)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  template<typename CharType, typename Traits>
+    std::basic_istream<CharType,Traits>& subtract_with_carry_engine<UIntType,w,s,r>
+      ::stream_in(std::basic_istream<CharType,Traits> &is)
 {
   using istream_type = std::basic_istream<CharType, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -138,10 +138,8 @@ subtract_with_carry_engine<UIntType, w, s, r>::stream_in(std::basic_istream<Char
   const typename ios_base::fmtflags flags = is.flags();
   is.flags(ios_base::dec | ios_base::skipws);
 
-  for (size_t i = 0; i < r; ++i)
-  {
+  for(size_t i = 0; i < r; ++i)
     is >> m_x[i];
-  }
   is >> m_carry;
 
   m_k = 0;
@@ -150,14 +148,16 @@ subtract_with_carry_engine<UIntType, w, s, r>::stream_in(std::basic_istream<Char
   return is;
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE bool
-subtract_with_carry_engine<UIntType, w, s, r>::equal(const subtract_with_carry_engine<UIntType, w, s, r>& rhs) const
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  bool subtract_with_carry_engine<UIntType,w,s,r>
+    ::equal(const subtract_with_carry_engine<UIntType,w,s,r> &rhs) const
 {
   const UIntType long_lag_ = r;
 
   bool result = true;
-  for (size_t i = 0; i < r; ++i)
+  for(size_t i = 0; i < r; ++i)
   {
     result &= (m_x[(i + m_k) % long_lag_] == rhs.m_x[(i + rhs.m_k) % long_lag_]);
   }
@@ -168,34 +168,45 @@ subtract_with_carry_engine<UIntType, w, s, r>::equal(const subtract_with_carry_e
   return result;
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const subtract_with_carry_engine<UIntType, w, s, r>& e)
+
+template<typename UIntType, size_t w, size_t s, size_t r,
+         typename CharT, typename Traits>
+  std::basic_ostream<CharT,Traits>&
+    operator<<(std::basic_ostream<CharT,Traits> &os,
+               const subtract_with_carry_engine<UIntType,w,s,r> &e)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, e);
+  return thrust::random::detail::random_core_access::stream_out(os,e);
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r, typename CharType, typename Traits>
-std::basic_istream<CharType, Traits>&
-operator>>(std::basic_istream<CharType, Traits>& is, subtract_with_carry_engine<UIntType, w, s, r>& e)
+
+template<typename UIntType, size_t w, size_t s, size_t r,
+         typename CharType, typename Traits>
+  std::basic_istream<CharType,Traits>&
+    operator>>(std::basic_istream<CharType,Traits> &is,
+               subtract_with_carry_engine<UIntType,w,s,r> &e)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, e);
+  return thrust::random::detail::random_core_access::stream_in(is,e);
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE bool operator==(const subtract_with_carry_engine<UIntType, w, s, r>& lhs,
-                                   const subtract_with_carry_engine<UIntType, w, s, r>& rhs)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  bool operator==(const subtract_with_carry_engine<UIntType,w,s,r> &lhs,
+                  const subtract_with_carry_engine<UIntType,w,s,r> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename UIntType, size_t w, size_t s, size_t r>
-THRUST_HOST_DEVICE bool operator!=(const subtract_with_carry_engine<UIntType, w, s, r>& lhs,
-                                   const subtract_with_carry_engine<UIntType, w, s, r>& rhs)
+
+template<typename UIntType, size_t w, size_t s, size_t r>
+  THRUST_HOST_DEVICE
+  bool operator!=(const subtract_with_carry_engine<UIntType,w,s,r> &lhs,
+                  const subtract_with_carry_engine<UIntType,w,s,r> &rhs)
 {
   return !(lhs == rhs);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/uniform_int_distribution.inl b/projects/rocthrust/thrust/random/detail/uniform_int_distribution.inl
index 4cc033b22d62..fd075f8ab9c9 100644
--- a/projects/rocthrust/thrust/random/detail/uniform_int_distribution.inl
+++ b/projects/rocthrust/thrust/random/detail/uniform_int_distribution.inl
@@ -18,49 +18,59 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/type_traits.h>
 #include <thrust/random/uniform_int_distribution.h>
 #include <thrust/random/uniform_real_distribution.h>
+#include <thrust/detail/type_traits.h>
 
 THRUST_NAMESPACE_BEGIN
 
 namespace random
 {
 
-template <typename IntType>
-THRUST_HOST_DEVICE uniform_int_distribution<IntType>::uniform_int_distribution(IntType a, IntType b)
-    : m_param(a, b)
-{} // end uniform_int_distribution::uniform_int_distribution()
 
-template <typename IntType>
-THRUST_HOST_DEVICE uniform_int_distribution<IntType>::uniform_int_distribution(const param_type& parm)
-    : m_param(parm)
-{} // end uniform_int_distribution::uniform_int_distribution()
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  uniform_int_distribution<IntType>
+    ::uniform_int_distribution(IntType a, IntType b)
+      :m_param(a,b)
+{
+} // end uniform_int_distribution::uniform_int_distribution()
+
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  uniform_int_distribution<IntType>
+    ::uniform_int_distribution(const param_type &parm)
+      :m_param(parm)
+{
+} // end uniform_int_distribution::uniform_int_distribution()
 
-template <typename IntType>
-THRUST_HOST_DEVICE void uniform_int_distribution<IntType>::reset()
-{} // end uniform_int_distribution::reset()
 
-template <typename IntType>
-template <typename UniformRandomNumberGenerator>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type
-uniform_int_distribution<IntType>::operator()(UniformRandomNumberGenerator& urng)
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  void uniform_int_distribution<IntType>
+    ::reset(void)
+{
+} // end uniform_int_distribution::reset()
+
+
+template<typename IntType>
+  template<typename UniformRandomNumberGenerator>
+    THRUST_HOST_DEVICE
+    typename uniform_int_distribution<IntType>::result_type
+      uniform_int_distribution<IntType>
+        ::operator()(UniformRandomNumberGenerator &urng)
 {
   return operator()(urng, m_param);
 } // end uniform_int_distribution::operator()()
 
-template <typename IntType>
-template <typename UniformRandomNumberGenerator>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type
-uniform_int_distribution<IntType>::operator()(UniformRandomNumberGenerator& urng, const param_type& parm)
+
+template<typename IntType>
+  template<typename UniformRandomNumberGenerator>
+    THRUST_HOST_DEVICE
+    typename uniform_int_distribution<IntType>::result_type
+      uniform_int_distribution<IntType>
+        ::operator()(UniformRandomNumberGenerator &urng, const param_type &parm)
 {
   // XXX this implementation is somewhat hacky and will skip
   //     values if the range of the RNG is smaller than the range of the distribution
@@ -78,61 +88,87 @@ uniform_int_distribution<IntType>::operator()(UniformRandomNumberGenerator& urng
   return static_cast<result_type>(real_dist(urng));
 } // end uniform_int_distribution::operator()()
 
-template <typename IntType>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type uniform_int_distribution<IntType>::a() const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  typename uniform_int_distribution<IntType>::result_type
+    uniform_int_distribution<IntType>
+      ::a(void) const
 {
   return m_param.first;
 } // end uniform_int_distribution<IntType>::a()
 
-template <typename IntType>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type uniform_int_distribution<IntType>::b() const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  typename uniform_int_distribution<IntType>::result_type
+    uniform_int_distribution<IntType>
+      ::b(void) const
 {
   return m_param.second;
 } // end uniform_int_distribution::b()
 
-template <typename IntType>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::param_type uniform_int_distribution<IntType>::param() const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  typename uniform_int_distribution<IntType>::param_type
+    uniform_int_distribution<IntType>
+      ::param(void) const
 {
   return m_param;
 } // end uniform_int_distribution::param()
 
-template <typename IntType>
-THRUST_HOST_DEVICE void uniform_int_distribution<IntType>::param(const param_type& parm)
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  void uniform_int_distribution<IntType>
+    ::param(const param_type &parm)
 {
   m_param = parm;
 } // end uniform_int_distribution::param()
 
-template <typename IntType>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type uniform_int_distribution<IntType>::min
-THRUST_PREVENT_MACRO_SUBSTITUTION() const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  typename uniform_int_distribution<IntType>::result_type
+    uniform_int_distribution<IntType>
+      ::min THRUST_PREVENT_MACRO_SUBSTITUTION (void) const
 {
   return a();
 } // end uniform_int_distribution::min()
 
-template <typename IntType>
-THRUST_HOST_DEVICE typename uniform_int_distribution<IntType>::result_type uniform_int_distribution<IntType>::max
-THRUST_PREVENT_MACRO_SUBSTITUTION() const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  typename uniform_int_distribution<IntType>::result_type
+    uniform_int_distribution<IntType>
+      ::max THRUST_PREVENT_MACRO_SUBSTITUTION (void) const
 {
   return b();
 } // end uniform_int_distribution::max()
 
-template <typename IntType>
-THRUST_HOST_DEVICE bool uniform_int_distribution<IntType>::equal(const uniform_int_distribution& rhs) const
+
+template<typename IntType>
+  THRUST_HOST_DEVICE
+  bool uniform_int_distribution<IntType>
+    ::equal(const uniform_int_distribution &rhs) const
 {
   return param() == rhs.param();
 }
 
-template <typename IntType>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-uniform_int_distribution<IntType>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename IntType>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>&
+      uniform_int_distribution<IntType>
+        ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags and fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   const CharT space = os.widen(' ');
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
@@ -146,9 +182,12 @@ uniform_int_distribution<IntType>::stream_out(std::basic_ostream<CharT, Traits>&
   return os;
 }
 
-template <typename IntType>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>& uniform_int_distribution<IntType>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename IntType>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>&
+      uniform_int_distribution<IntType>
+        ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -165,34 +204,45 @@ std::basic_istream<CharT, Traits>& uniform_int_distribution<IntType>::stream_in(
   return is;
 }
 
-template <typename IntType>
-THRUST_HOST_DEVICE bool
-operator==(const uniform_int_distribution<IntType>& lhs, const uniform_int_distribution<IntType>& rhs)
+
+template<typename IntType>
+THRUST_HOST_DEVICE
+bool operator==(const uniform_int_distribution<IntType> &lhs,
+                const uniform_int_distribution<IntType> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename IntType>
-THRUST_HOST_DEVICE bool
-operator!=(const uniform_int_distribution<IntType>& lhs, const uniform_int_distribution<IntType>& rhs)
+
+template<typename IntType>
+THRUST_HOST_DEVICE
+bool operator!=(const uniform_int_distribution<IntType> &lhs,
+                const uniform_int_distribution<IntType> &rhs)
 {
   return !(lhs == rhs);
 }
 
-template <typename IntType, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const uniform_int_distribution<IntType>& d)
+
+template<typename IntType,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const uniform_int_distribution<IntType> &d)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, d);
+  return thrust::random::detail::random_core_access::stream_out(os,d);
 }
 
-template <typename IntType, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, uniform_int_distribution<IntType>& d)
+
+template<typename IntType,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           uniform_int_distribution<IntType> &d)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, d);
+  return thrust::random::detail::random_core_access::stream_in(is,d);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/uniform_real_distribution.inl b/projects/rocthrust/thrust/random/detail/uniform_real_distribution.inl
index b2bd8eb5fb79..c2ffbe7aa0a4 100644
--- a/projects/rocthrust/thrust/random/detail/uniform_real_distribution.inl
+++ b/projects/rocthrust/thrust/random/detail/uniform_real_distribution.inl
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/random/uniform_real_distribution.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -33,32 +25,47 @@ THRUST_NAMESPACE_BEGIN
 namespace random
 {
 
-template <typename RealType>
-THRUST_HOST_DEVICE uniform_real_distribution<RealType>::uniform_real_distribution(RealType a, RealType b)
-    : m_param(a, b)
-{} // end uniform_real_distribution::uniform_real_distribution()
 
-template <typename RealType>
-THRUST_HOST_DEVICE uniform_real_distribution<RealType>::uniform_real_distribution(const param_type& parm)
-    : m_param(parm)
-{} // end uniform_real_distribution::uniform_real_distribution()
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  uniform_real_distribution<RealType>
+    ::uniform_real_distribution(RealType a, RealType b)
+      :m_param(a,b)
+{
+} // end uniform_real_distribution::uniform_real_distribution()
 
-template <typename RealType>
-THRUST_HOST_DEVICE void uniform_real_distribution<RealType>::reset()
-{} // end uniform_real_distribution::reset()
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  uniform_real_distribution<RealType>
+    ::uniform_real_distribution(const param_type &parm)
+      :m_param(parm)
+{
+} // end uniform_real_distribution::uniform_real_distribution()
 
-template <typename RealType>
-template <typename UniformRandomNumberGenerator>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type
-uniform_real_distribution<RealType>::operator()(UniformRandomNumberGenerator& urng)
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  void uniform_real_distribution<RealType>
+    ::reset(void)
+{
+} // end uniform_real_distribution::reset()
+
+template<typename RealType>
+  template<typename UniformRandomNumberGenerator>
+    THRUST_HOST_DEVICE
+    typename uniform_real_distribution<RealType>::result_type
+      uniform_real_distribution<RealType>
+        ::operator()(UniformRandomNumberGenerator &urng)
 {
   return operator()(urng, m_param);
 } // end uniform_real::operator()()
 
-template <typename RealType>
-template <typename UniformRandomNumberGenerator>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type
-uniform_real_distribution<RealType>::operator()(UniformRandomNumberGenerator& urng, const param_type& parm)
+template<typename RealType>
+  template<typename UniformRandomNumberGenerator>
+    THRUST_HOST_DEVICE
+    typename uniform_real_distribution<RealType>::result_type
+      uniform_real_distribution<RealType>
+        ::operator()(UniformRandomNumberGenerator &urng,
+                     const param_type &parm)
 {
   // call the urng & map its result to [0,1)
   result_type result = static_cast<result_type>(urng() - UniformRandomNumberGenerator::min);
@@ -66,73 +73,87 @@ uniform_real_distribution<RealType>::operator()(UniformRandomNumberGenerator& ur
   // adding one to the denominator ensures that the interval is half-open at 1.0
   // XXX adding 1.0 to a potentially large floating point number seems like a bad idea
   // XXX OTOH adding 1 to what is potentially UINT_MAX also seems like a bad idea
-  // XXX we could statically check if 1u + (max - min) is representable and do that, otherwise use the current
-  // implementation
-  result /=
-    (result_type(1) + static_cast<result_type>(UniformRandomNumberGenerator::max - UniformRandomNumberGenerator::min));
+  // XXX we could statically check if 1u + (max - min) is representable and do that, otherwise use the current implementation
+  result /= (result_type(1) + static_cast<result_type>(UniformRandomNumberGenerator::max - UniformRandomNumberGenerator::min));
 
   return (result * (parm.second - parm.first)) + parm.first;
 } // end uniform_real::operator()()
 
-template <typename RealType>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type
-uniform_real_distribution<RealType>::a() const
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  typename uniform_real_distribution<RealType>::result_type
+    uniform_real_distribution<RealType>
+      ::a(void) const
 {
   return m_param.first;
 } // end uniform_real::a()
 
-template <typename RealType>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type
-uniform_real_distribution<RealType>::b() const
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  typename uniform_real_distribution<RealType>::result_type
+    uniform_real_distribution<RealType>
+      ::b(void) const
 {
   return m_param.second;
 } // end uniform_real_distribution::b()
 
-template <typename RealType>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::param_type
-uniform_real_distribution<RealType>::param() const
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  typename uniform_real_distribution<RealType>::param_type
+    uniform_real_distribution<RealType>
+      ::param(void) const
 {
-  return m_param;
-  ;
+  return m_param;;
 } // end uniform_real_distribution::param()
 
-template <typename RealType>
-THRUST_HOST_DEVICE void uniform_real_distribution<RealType>::param(const param_type& parm)
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  void uniform_real_distribution<RealType>
+    ::param(const param_type &parm)
 {
   m_param = parm;
 } // end uniform_real_distribution::param()
 
-template <typename RealType>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type uniform_real_distribution<RealType>::min
-THRUST_PREVENT_MACRO_SUBSTITUTION() const
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  typename uniform_real_distribution<RealType>::result_type
+    uniform_real_distribution<RealType>
+      ::min THRUST_PREVENT_MACRO_SUBSTITUTION (void) const
 {
   return a();
 } // end uniform_real_distribution::min()
 
-template <typename RealType>
-THRUST_HOST_DEVICE typename uniform_real_distribution<RealType>::result_type uniform_real_distribution<RealType>::max
-THRUST_PREVENT_MACRO_SUBSTITUTION() const
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  typename uniform_real_distribution<RealType>::result_type
+    uniform_real_distribution<RealType>
+      ::max THRUST_PREVENT_MACRO_SUBSTITUTION (void) const
 {
   return b();
 } // end uniform_real_distribution::max()
 
-template <typename RealType>
-THRUST_HOST_DEVICE bool uniform_real_distribution<RealType>::equal(const uniform_real_distribution& rhs) const
+
+template<typename RealType>
+  THRUST_HOST_DEVICE
+  bool uniform_real_distribution<RealType>
+    ::equal(const uniform_real_distribution &rhs) const
 {
   return m_param == rhs.param();
 }
 
-template <typename RealType>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-uniform_real_distribution<RealType>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename RealType>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>&
+      uniform_real_distribution<RealType>
+        ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags and fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   const CharT space = os.widen(' ');
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
@@ -146,9 +167,12 @@ uniform_real_distribution<RealType>::stream_out(std::basic_ostream<CharT, Traits
   return os;
 }
 
-template <typename RealType>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>& uniform_real_distribution<RealType>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename RealType>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>&
+      uniform_real_distribution<RealType>
+        ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -165,34 +189,45 @@ std::basic_istream<CharT, Traits>& uniform_real_distribution<RealType>::stream_i
   return is;
 }
 
-template <typename RealType>
-THRUST_HOST_DEVICE bool
-operator==(const uniform_real_distribution<RealType>& lhs, const uniform_real_distribution<RealType>& rhs)
+
+template<typename RealType>
+THRUST_HOST_DEVICE
+bool operator==(const uniform_real_distribution<RealType> &lhs,
+                const uniform_real_distribution<RealType> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename RealType>
-THRUST_HOST_DEVICE bool
-operator!=(const uniform_real_distribution<RealType>& lhs, const uniform_real_distribution<RealType>& rhs)
+
+template<typename RealType>
+THRUST_HOST_DEVICE
+bool operator!=(const uniform_real_distribution<RealType> &lhs,
+                const uniform_real_distribution<RealType> &rhs)
 {
   return !(lhs == rhs);
 }
 
-template <typename RealType, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const uniform_real_distribution<RealType>& d)
+
+template<typename RealType,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const uniform_real_distribution<RealType> &d)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, d);
+  return thrust::random::detail::random_core_access::stream_out(os,d);
 }
 
-template <typename RealType, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, uniform_real_distribution<RealType>& d)
+
+template<typename RealType,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           uniform_real_distribution<RealType> &d)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, d);
+  return thrust::random::detail::random_core_access::stream_in(is,d);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/xor_combine_engine.inl b/projects/rocthrust/thrust/random/detail/xor_combine_engine.inl
index 8c90953fba70..8ec8901708af 100644
--- a/projects/rocthrust/thrust/random/detail/xor_combine_engine.inl
+++ b/projects/rocthrust/thrust/random/detail/xor_combine_engine.inl
@@ -18,96 +18,116 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/random/detail/random_core_access.h>
 #include <thrust/random/xor_combine_engine.h>
+#include <thrust/random/detail/random_core_access.h>
 
 THRUST_NAMESPACE_BEGIN
 
 namespace random
 {
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE xor_combine_engine<Engine1, s1, Engine2, s2>::xor_combine_engine()
-    : m_b1()
-    , m_b2()
-{} // end xor_combine_engine::xor_combine_engine()
-
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE
-xor_combine_engine<Engine1, s1, Engine2, s2>::xor_combine_engine(const base1_type& urng1, const base2_type& urng2)
-    : m_b1(urng1)
-    , m_b2(urng2)
-{} // end xor_combine_engine::xor_combine_engine()
-
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE xor_combine_engine<Engine1, s1, Engine2, s2>::xor_combine_engine(result_type s)
-    : m_b1(s)
-    , m_b2(s)
-{} // end xor_combine_engine::xor_combine_engine()
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::xor_combine_engine(void)
+      :m_b1(),m_b2()
+{
+} // end xor_combine_engine::xor_combine_engine()
+
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::xor_combine_engine(const base1_type &urng1, const base2_type &urng2)
+      :m_b1(urng1),m_b2(urng2)
+{
+} // end xor_combine_engine::xor_combine_engine()
+
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::xor_combine_engine(result_type s)
+      :m_b1(s),m_b2(s)
+{
+} // end xor_combine_engine::xor_combine_engine()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE void xor_combine_engine<Engine1, s1, Engine2, s2>::seed()
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  void xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::seed(void)
 {
   m_b1.seed();
   m_b2.seed();
 } // end xor_combine_engine::seed()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE void xor_combine_engine<Engine1, s1, Engine2, s2>::seed(result_type s)
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  void xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::seed(result_type s)
 {
   m_b1.seed(s);
   m_b2.seed(s);
 } // end xor_combine_engine::seed()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE const typename xor_combine_engine<Engine1, s1, Engine2, s2>::base1_type&
-xor_combine_engine<Engine1, s1, Engine2, s2>::base1() const
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  const typename xor_combine_engine<Engine1,s1,Engine2,s2>::base1_type &
+    xor_combine_engine<Engine1,s1,Engine2,s2>
+      ::base1(void) const
 {
   return m_b1;
 } // end xor_combine_engine::base1()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE const typename xor_combine_engine<Engine1, s1, Engine2, s2>::base2_type&
-xor_combine_engine<Engine1, s1, Engine2, s2>::base2() const
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  const typename xor_combine_engine<Engine1,s1,Engine2,s2>::base2_type &
+    xor_combine_engine<Engine1,s1,Engine2,s2>
+      ::base2(void) const
 {
   return m_b2;
 } // end xor_combine_engine::base2()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE typename xor_combine_engine<Engine1, s1, Engine2, s2>::result_type
-xor_combine_engine<Engine1, s1, Engine2, s2>::operator()(void)
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  typename xor_combine_engine<Engine1,s1,Engine2,s2>::result_type
+    xor_combine_engine<Engine1,s1,Engine2,s2>
+      ::operator()(void)
 {
-  return (result_type(m_b1() - base1_type::min) << shift1) ^ (result_type(m_b2() - base2_type::min) << shift2);
+  return (result_type(m_b1() - base1_type::min) << shift1) ^
+         (result_type(m_b2() - base2_type::min) << shift2);
 } // end xor_combine_engine::operator()()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE void xor_combine_engine<Engine1, s1, Engine2, s2>::discard(unsigned long long z)
+template<typename Engine1, size_t s1,
+         typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  void xor_combine_engine<Engine1, s1, Engine2, s2>
+    ::discard(unsigned long long z)
 {
-  for (; z > 0; --z)
+  for(; z > 0; --z)
   {
     this->operator()();
   } // end for
 } // end xor_combine_engine::discard()
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-template <typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-xor_combine_engine<Engine1, s1, Engine2, s2>::stream_out(std::basic_ostream<CharT, Traits>& os) const
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2>
+  template<typename CharT, typename Traits>
+    std::basic_ostream<CharT,Traits>& xor_combine_engine<Engine1,s1,Engine2,s2>
+      ::stream_out(std::basic_ostream<CharT,Traits> &os) const
 {
   using ostream_type = std::basic_ostream<CharT, Traits>;
   using ios_base     = typename ostream_type::ios_base;
 
   // save old flags and fill character
   const typename ios_base::fmtflags flags = os.flags();
-  const CharT fill                        = os.fill();
+  const CharT fill = os.fill();
 
   const CharT space = os.widen(' ');
   os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
@@ -122,10 +142,11 @@ xor_combine_engine<Engine1, s1, Engine2, s2>::stream_out(std::basic_ostream<Char
   return os;
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-template <typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-xor_combine_engine<Engine1, s1, Engine2, s2>::stream_in(std::basic_istream<CharT, Traits>& is)
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2>
+  template<typename CharT, typename Traits>
+    std::basic_istream<CharT,Traits>& xor_combine_engine<Engine1,s1,Engine2,s2>
+      ::stream_in(std::basic_istream<CharT,Traits> &is)
 {
   using istream_type = std::basic_istream<CharT, Traits>;
   using ios_base     = typename istream_type::ios_base;
@@ -143,41 +164,54 @@ xor_combine_engine<Engine1, s1, Engine2, s2>::stream_in(std::basic_istream<CharT
   return is;
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE bool
-xor_combine_engine<Engine1, s1, Engine2, s2>::equal(const xor_combine_engine<Engine1, s1, Engine2, s2>& rhs) const
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2>
+  THRUST_HOST_DEVICE
+  bool xor_combine_engine<Engine1,s1,Engine2,s2>
+    ::equal(const xor_combine_engine<Engine1,s1,Engine2,s2> &rhs) const
 {
   return (m_b1 == rhs.m_b1) && (m_b2 == rhs.m_b2);
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2, typename CharT, typename Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const xor_combine_engine<Engine1, s1, Engine2, s2>& e)
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2,
+         typename CharT, typename Traits>
+std::basic_ostream<CharT,Traits>&
+operator<<(std::basic_ostream<CharT,Traits> &os,
+           const xor_combine_engine<Engine1,s1,Engine2,s2> &e)
 {
-  return thrust::random::detail::random_core_access::stream_out(os, e);
+  return thrust::random::detail::random_core_access::stream_out(os,e);
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2, typename CharT, typename Traits>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is, xor_combine_engine<Engine1, s1, Engine2, s2>& e)
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2,
+         typename CharT, typename Traits>
+std::basic_istream<CharT,Traits>&
+operator>>(std::basic_istream<CharT,Traits> &is,
+           xor_combine_engine<Engine1,s1,Engine2,s2> &e)
 {
-  return thrust::random::detail::random_core_access::stream_in(is, e);
+  return thrust::random::detail::random_core_access::stream_in(is,e);
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE bool operator==(const xor_combine_engine<Engine1, s1, Engine2, s2>& lhs,
-                                   const xor_combine_engine<Engine1, s1, Engine2, s2>& rhs)
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2>
+THRUST_HOST_DEVICE
+bool operator==(const xor_combine_engine<Engine1,s1,Engine2,s2> &lhs,
+                const xor_combine_engine<Engine1,s1,Engine2,s2> &rhs)
 {
-  return thrust::random::detail::random_core_access::equal(lhs, rhs);
+  return thrust::random::detail::random_core_access::equal(lhs,rhs);
 }
 
-template <typename Engine1, size_t s1, typename Engine2, size_t s2>
-THRUST_HOST_DEVICE bool operator!=(const xor_combine_engine<Engine1, s1, Engine2, s2>& lhs,
-                                   const xor_combine_engine<Engine1, s1, Engine2, s2>& rhs)
+
+template<typename Engine1, size_t s1, typename Engine2, size_t s2>
+THRUST_HOST_DEVICE
+bool operator!=(const xor_combine_engine<Engine1,s1,Engine2,s2> &lhs,
+                const xor_combine_engine<Engine1,s1,Engine2,s2> &rhs)
 {
   return !(lhs == rhs);
 }
 
-} // namespace random
+
+} // end random
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/random/detail/xor_combine_engine_max.h b/projects/rocthrust/thrust/random/detail/xor_combine_engine_max.h
index f232d26288a3..24ee67f45845 100644
--- a/projects/rocthrust/thrust/random/detail/xor_combine_engine_max.h
+++ b/projects/rocthrust/thrust/random/detail/xor_combine_engine_max.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/mpl/math.h>
 #include <thrust/detail/type_traits.h>
 
diff --git a/projects/rocthrust/thrust/random/normal_distribution.h b/projects/rocthrust/thrust/random/normal_distribution.h
index ef300bca34e9..173a42098f73 100644
--- a/projects/rocthrust/thrust/random/normal_distribution.h
+++ b/projects/rocthrust/thrust/random/normal_distribution.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/random/detail/normal_distribution_base.h>
 #include <thrust/random/detail/random_core_access.h>
@@ -58,7 +51,7 @@ namespace random
  *  #include <thrust/random/linear_congruential_engine.h>
  *  #include <thrust/random/normal_distribution.h>
  *
- *  int main()
+ *  int main(void)
  *  {
  *    // create a minstd_rand object to act as our source of randomness
  *    thrust::minstd_rand rng;
@@ -125,7 +118,7 @@ class normal_distribution : public detail::normal_distribution_base<RealType>::t
    *  \p normal_distribution do not depend on values produced by any random
    *  number generator prior to invoking this function.
    */
-  THRUST_HOST_DEVICE void reset();
+  THRUST_HOST_DEVICE void reset(void);
 
   // generating functions
 
@@ -155,14 +148,14 @@ class normal_distribution : public detail::normal_distribution_base<RealType>::t
    *
    *  \return The mean (expected value) of this \p normal_distribution's output.
    */
-  THRUST_HOST_DEVICE result_type mean() const;
+  THRUST_HOST_DEVICE result_type mean(void) const;
 
   /*! This method returns the value of the parameter with which this \p normal_distribution
    *  was constructed.
    *
    *  \return The standard deviation of this \p uniform_real_distribution's output.
    */
-  THRUST_HOST_DEVICE result_type stddev() const;
+  THRUST_HOST_DEVICE result_type stddev(void) const;
 
   /*! This method returns a \p param_type object encapsulating the parameters with which this
    *  \p normal_distribution was constructed.
@@ -170,7 +163,7 @@ class normal_distribution : public detail::normal_distribution_base<RealType>::t
    *  \return A \p param_type object encapsulating the parameters (i.e., the mean and standard deviation) of this \p
    * normal_distribution.
    */
-  THRUST_HOST_DEVICE param_type param() const;
+  THRUST_HOST_DEVICE param_type param(void) const;
 
   /*! This method changes the parameters of this \p normal_distribution using the values encapsulated
    *  in a given \p param_type object.
@@ -184,14 +177,14 @@ class normal_distribution : public detail::normal_distribution_base<RealType>::t
    *
    *  \return The lower bound of this \p normal_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! This method returns the smallest number larger than largest floating point number this \p
    * uniform_real_distribution can potentially produce.
    *
    *  \return The upper bound of this \p normal_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! \cond
    */
diff --git a/projects/rocthrust/thrust/random/uniform_int_distribution.h b/projects/rocthrust/thrust/random/uniform_int_distribution.h
index 11ed61dab350..59fc018cd91d 100644
--- a/projects/rocthrust/thrust/random/uniform_int_distribution.h
+++ b/projects/rocthrust/thrust/random/uniform_int_distribution.h
@@ -22,18 +22,10 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/integer_traits.h>
 #include <thrust/pair.h>
 #include <thrust/random/detail/random_core_access.h>
 
-#include _THRUST_STD_INCLUDE(limits)
-
 #include <iostream>
 
 THRUST_NAMESPACE_BEGIN
@@ -59,7 +51,7 @@ namespace random
  *  #include <thrust/random/linear_congruential_engine.h>
  *  #include <thrust/random/uniform_int_distribution.h>
  *
- *  int main()
+ *  int main(void)
  *  {
  *    // create a minstd_rand object to act as our source of randomness
  *    thrust::minstd_rand rng;
@@ -118,7 +110,7 @@ class uniform_int_distribution
    *           the platform.
    */
   THRUST_HOST_DEVICE explicit uniform_int_distribution(
-    IntType a = 0, IntType b = _THRUST_STD::numeric_limits<IntType>::max());
+    IntType a = 0, IntType b = THRUST_NS_QUALIFIER::detail::integer_traits<IntType>::const_max);
 
   /*! This constructor creates a new \p uniform_int_distribution from a \p param_type object
    *  encapsulating the range of the distribution.
@@ -129,7 +121,7 @@ class uniform_int_distribution
 
   /*! This does nothing.  It is included to conform to the requirements of the RandomDistribution concept.
    */
-  THRUST_HOST_DEVICE void reset();
+  THRUST_HOST_DEVICE void reset(void);
 
   // generating functions
 
@@ -159,21 +151,21 @@ class uniform_int_distribution
    *
    *  \return The lower bound of this \p uniform_int_distribution's range.
    */
-  THRUST_HOST_DEVICE result_type a() const;
+  THRUST_HOST_DEVICE result_type a(void) const;
 
   /*! This method returns the value of the parameter with which this \p uniform_int_distribution
    *  was constructed.
    *
    *  \return The upper bound of this \p uniform_int_distribution's range.
    */
-  THRUST_HOST_DEVICE result_type b() const;
+  THRUST_HOST_DEVICE result_type b(void) const;
 
   /*! This method returns a \p param_type object encapsulating the parameters with which this
    *  \p uniform_int_distribution was constructed.
    *
    *  \return A \p param_type object enapsulating the range of this \p uniform_int_distribution.
    */
-  THRUST_HOST_DEVICE param_type param() const;
+  THRUST_HOST_DEVICE param_type param(void) const;
 
   /*! This method changes the parameters of this \p uniform_int_distribution using the values encapsulated
    *  in a given \p param_type object.
@@ -186,13 +178,13 @@ class uniform_int_distribution
    *
    *  \return The lower bound of this \p uniform_int_distribution's range.
    */
-  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! This method returns the largest integer this \p uniform_int_distribution can potentially produce.
    *
    *  \return The upper bound of this \p uniform_int_distribution's range.
    */
-  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! \cond
    */
diff --git a/projects/rocthrust/thrust/random/uniform_real_distribution.h b/projects/rocthrust/thrust/random/uniform_real_distribution.h
index f1d985bf4232..c5b19015a5a8 100644
--- a/projects/rocthrust/thrust/random/uniform_real_distribution.h
+++ b/projects/rocthrust/thrust/random/uniform_real_distribution.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/random/detail/random_core_access.h>
 
@@ -56,7 +49,7 @@ namespace random
  *  #include <thrust/random/linear_congruential_engine.h>
  *  #include <thrust/random/uniform_real_distribution.h>
  *
- *  int main()
+ *  int main(void)
  *  {
  *    // create a minstd_rand object to act as our source of randomness
  *    thrust::minstd_rand rng;
@@ -125,7 +118,7 @@ class uniform_real_distribution
 
   /*! This does nothing.  It is included to conform to the requirements of the RandomDistribution concept.
    */
-  THRUST_HOST_DEVICE void reset();
+  THRUST_HOST_DEVICE void reset(void);
 
   // generating functions
 
@@ -155,21 +148,21 @@ class uniform_real_distribution
    *
    *  \return The lower bound of this \p uniform_real_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type a() const;
+  THRUST_HOST_DEVICE result_type a(void) const;
 
   /*! This method returns the value of the parameter with which this \p uniform_real_distribution
    *  was constructed.
    *
    *  \return The upper bound of this \p uniform_real_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type b() const;
+  THRUST_HOST_DEVICE result_type b(void) const;
 
   /*! This method returns a \p param_type object encapsulating the parameters with which this
    *  \p uniform_real_distribution was constructed.
    *
    *  \return A \p param_type object enapsulating the half-open interval of this \p uniform_real_distribution.
    */
-  THRUST_HOST_DEVICE param_type param() const;
+  THRUST_HOST_DEVICE param_type param(void) const;
 
   /*! This method changes the parameters of this \p uniform_real_distribution using the values encapsulated
    *  in a given \p param_type object.
@@ -182,14 +175,14 @@ class uniform_real_distribution
    *
    *  \return The lower bound of this \p uniform_real_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type min THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! This method returns the smallest number larger than largest floating point number this \p
    * uniform_real_distribution can potentially produce.
    *
    *  \return The upper bound of this \p uniform_real_distribution's half-open interval.
    */
-  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION() const;
+  THRUST_HOST_DEVICE result_type max THRUST_PREVENT_MACRO_SUBSTITUTION(void) const;
 
   /*! \cond
    */
diff --git a/projects/rocthrust/thrust/reduce.h b/projects/rocthrust/thrust/reduce.h
index 59538bd444c3..66268411163f 100644
--- a/projects/rocthrust/thrust/reduce.h
+++ b/projects/rocthrust/thrust/reduce.h
@@ -83,7 +83,7 @@ THRUST_NAMESPACE_BEGIN
  *  \see https://en.cppreference.com/w/cpp/algorithm/accumulate
  */
 template <typename DerivedPolicy, typename InputIterator>
-THRUST_HOST_DEVICE detail::it_value_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::value_type
 reduce(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIterator first, InputIterator last);
 
 /*! \p reduce is a generalization of summation: it computes the sum (or some
@@ -125,7 +125,7 @@ reduce(const thrust::detail::execution_policy_base<DerivedPolicy>& exec, InputIt
  *  \see https://en.cppreference.com/w/cpp/algorithm/accumulate
  */
 template <typename InputIterator>
-detail::it_value_t<InputIterator> reduce(InputIterator first, InputIterator last);
+typename thrust::iterator_traits<InputIterator>::value_type reduce(InputIterator first, InputIterator last);
 
 /*! \p reduce is a generalization of summation: it computes the sum (or some
  *  other binary operation) of all the elements in the range <tt>[first,
@@ -242,10 +242,11 @@ T reduce(InputIterator first, InputIterator last, T init);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator's \c value_type is convertible to \c T.
- *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is
- * convertible to \p BinaryFunction's first and second argument type.
- *  \tparam BinaryFunction The function's return type must be convertible to \p OutputType.
+ * Iterator</a> and \c InputIterator's \c value_type is convertible to \c T. \tparam T is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is convertible to \p
+ * BinaryFunction's \c first_argument_type and \c second_argument_type. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction's \c result_type is convertible to \p OutputType.
  *
  *  The following code snippet demonstrates how to use \p reduce to
  *  compute the maximum value of a sequence of integers using the \p thrust::host execution policy
@@ -297,10 +298,11 @@ THRUST_HOST_DEVICE T reduce(
  *  \return The result of the reduction.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator's \c value_type is convertible to \c T.
- *  \tparam T is a model of <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is
- * convertible to \p BinaryFunction's first and second argument type.
- *  \tparam BinaryFunction The function's return type must be convertible to \p OutputType.
+ * Iterator</a> and \c InputIterator's \c value_type is convertible to \c T. \tparam T is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is convertible to \p
+ * BinaryFunction's \c first_argument_type and \c second_argument_type. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction's \c result_type is convertible to \p OutputType.
  *
  *  The following code snippet demonstrates how to use \p reduce to
  *  compute the maximum value of a sequence of integers.
@@ -626,8 +628,9 @@ thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  * InputIterator1's \c value_type is convertible to \c OutputIterator1's \c value_type. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a> and and \p
  * InputIterator2's \c value_type is convertible to \c OutputIterator2's \c value_type. \tparam BinaryPredicate is a
- * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
- *  \tparam BinaryFunction The function's return type must be convertible to \c OutputIterator2's \c value_type.
+ * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam
+ * BinaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary
+ * Function</a> and \c BinaryFunction's \c result_type is convertible to \c OutputIterator2's \c value_type.
  *
  *  \pre The input ranges shall not overlap either output range.
  *
@@ -705,8 +708,9 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
  * InputIterator1's \c value_type is convertible to \c OutputIterator1's \c value_type. \tparam OutputIterator2 is a
  * model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a> and and \p
  * InputIterator2's \c value_type is convertible to \c OutputIterator2's \c value_type. \tparam BinaryPredicate is a
- * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
- * \tparam BinaryFunction The function's return type must be convertible to \c OutputIterator2's \c value_type.
+ * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam
+ * BinaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary
+ * Function</a> and \c BinaryFunction's \c result_type is convertible to \c OutputIterator2's \c value_type.
  *
  *  \pre The input ranges shall not overlap either output range.
  *
diff --git a/projects/rocthrust/thrust/remove.h b/projects/rocthrust/thrust/remove.h
index 9d226fb5d21f..b77a6be6a7be 100644
--- a/projects/rocthrust/thrust/remove.h
+++ b/projects/rocthrust/thrust/remove.h
@@ -281,7 +281,7 @@ OutputIterator remove_copy(InputIterator first, InputIterator last, OutputIterat
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p Predicate's
- * argument type. \tparam Predicate is a model of <a
+ * \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p remove_if to remove
@@ -353,7 +353,7 @@ THRUST_HOST_DEVICE ForwardIterator remove_if(
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p Predicate's
- * argument type. \tparam Predicate is a model of <a
+ * \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p remove_if to remove
@@ -422,7 +422,7 @@ ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, Predicate
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>, \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types,
- *          and \p InputIterator's \c value_type is convertible to \p Predicate's argument type.
+ *          and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -484,7 +484,7 @@ THRUST_HOST_DEVICE OutputIterator remove_copy_if(
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>, \p InputIterator's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types,
- *          and \p InputIterator's \c value_type is convertible to \p Predicate's argument type.
+ *          and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -546,7 +546,7 @@ OutputIterator remove_copy_if(InputIterator first, InputIterator last, OutputIte
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a> and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall not overlap the range <tt>[result, result + (last - first))</tt>.
@@ -606,7 +606,7 @@ THRUST_HOST_DEVICE ForwardIterator remove_if(
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a> and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre The range <tt>[first, last)</tt> shall not overlap the range <tt>[result, result + (last - first))</tt>.
@@ -664,7 +664,7 @@ ForwardIterator remove_if(ForwardIterator first, ForwardIterator last, InputIter
  * Iterator</a>, \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -728,7 +728,7 @@ THRUST_HOST_DEVICE OutputIterator remove_copy_if(
  * Iterator</a>, \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c
  * value_types. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
diff --git a/projects/rocthrust/thrust/replace.h b/projects/rocthrust/thrust/replace.h
index 16de0f6de4ad..82b11a9df1b2 100644
--- a/projects/rocthrust/thrust/replace.h
+++ b/projects/rocthrust/thrust/replace.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -155,7 +148,7 @@ void replace(ForwardIterator first, ForwardIterator last, const T& old_value, co
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p Predicate's
- * argument type. \tparam Predicate is a model of <a
+ * \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
  * ForwardIterator's \c value_type.
@@ -171,7 +164,7 @@ void replace(ForwardIterator first, ForwardIterator last, const T& old_value, co
  *  ...
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -218,7 +211,7 @@ THRUST_HOST_DEVICE void replace_if(
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p Predicate's
- * argument type. \tparam Predicate is a model of <a
+ * \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
  * ForwardIterator's \c value_type.
@@ -232,7 +225,7 @@ THRUST_HOST_DEVICE void replace_if(
  *  ...
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -281,7 +274,7 @@ void replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, con
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
  * ForwardIterator's \c value_type.
@@ -297,7 +290,7 @@ void replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, con
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -353,7 +346,7 @@ THRUST_HOST_DEVICE void replace_if(
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable. \tparam InputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>, and \p InputIterator's \c
- * value_type is convertible to \p Predicate's argument type. \tparam Predicate is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam Predicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
  * ForwardIterator's \c value_type.
@@ -367,7 +360,7 @@ THRUST_HOST_DEVICE void replace_if(
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -537,7 +530,7 @@ replace_copy(InputIterator first, InputIterator last, OutputIterator result, con
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  Iterator</a>,
- *          and \p InputIterator's \c value_type is convertible to \p Predicate's argument type.
+ *          and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  Iterator</a>.
  *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -554,7 +547,7 @@ replace_copy(InputIterator first, InputIterator last, OutputIterator result, con
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -608,7 +601,7 @@ THRUST_HOST_DEVICE OutputIterator replace_copy_if(
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  Iterator</a>,
- *          and \p InputIterator's \c value_type is convertible to \p Predicate's argument type.
+ *          and \p InputIterator's \c value_type is convertible to \p Predicate's \c argument_type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  Iterator</a>.
  *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
@@ -624,7 +617,7 @@ THRUST_HOST_DEVICE OutputIterator replace_copy_if(
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -679,7 +672,7 @@ replace_copy_if(InputIterator first, InputIterator last, OutputIterator result,
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
@@ -696,7 +689,7 @@ replace_copy_if(InputIterator first, InputIterator last, OutputIterator result,
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
@@ -762,7 +755,7 @@ THRUST_HOST_DEVICE OutputIterator replace_copy_if(
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a>. \tparam InputIterator2 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \p InputIterator2's \c
- * value_type is convertible to \p Predicate's argument type. \tparam OutputIterator is a model of <a
+ * value_type is convertible to \p Predicate's \c argument_type. \tparam OutputIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam Predicate is a model
  * of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>. \tparam T is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and \p T is convertible to \p
@@ -778,7 +771,7 @@ THRUST_HOST_DEVICE OutputIterator replace_copy_if(
  *
  *  struct is_less_than_zero
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return x < 0;
diff --git a/projects/rocthrust/thrust/reverse.h b/projects/rocthrust/thrust/reverse.h
index 7395e2313a31..761f215460b5 100644
--- a/projects/rocthrust/thrust/reverse.h
+++ b/projects/rocthrust/thrust/reverse.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/scan.h b/projects/rocthrust/thrust/scan.h
index 5dbd7e19562d..62a41242518f 100644
--- a/projects/rocthrust/thrust/scan.h
+++ b/projects/rocthrust/thrust/scan.h
@@ -180,8 +180,11 @@ OutputIterator inclusive_scan(InputIterator first, InputIterator last, OutputIte
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
  *                         and \c OutputIterator's \c value_type is convertible to
- *                         both \c AssociativeOperator's first and second argument type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *                         both \c AssociativeOperator's \c first_argument_type and
+ *                         \c second_argument_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range
  *  <tt>[result, result + (last - first))</tt> shall not overlap otherwise.
@@ -233,8 +236,11 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan(
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
  *                         and \c OutputIterator's \c value_type is convertible to
- *                         both \c AssociativeOperator's first and second argument type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *                         both \c AssociativeOperator's \c first_argument_type and
+ *                         \c second_argument_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range
  *  <tt>[result, result + (last - first))</tt> shall not overlap otherwise.
@@ -283,9 +289,12 @@ inclusive_scan(InputIterator first, InputIterator last, OutputIterator result, A
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
- * and \c OutputIterator's \c value_type is convertible to both \c AssociativeOperator's first and second argument type.
+ * and \c OutputIterator's \c value_type is convertible to both \c AssociativeOperator's \c first_argument_type and
+ * \c second_argument_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -332,9 +341,12 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan(
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
- * and \c OutputIterator's \c value_type is convertible to both \c AssociativeOperator's first and second argument type.
+ * and \c OutputIterator's \c value_type is convertible to both \c AssociativeOperator's \c first_argument_type and
+ * \c second_argument_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -582,9 +594,12 @@ OutputIterator exclusive_scan(InputIterator first, InputIterator last, OutputIte
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
  *                         and \c OutputIterator's \c value_type is convertible to
- *                         both \c AssociativeOperator's first and second argument type.
+ *                         both \c AssociativeOperator's \c first_argument_type and
+ *                         \c second_argument_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range
  *  <tt>[result, result + (last - first))</tt> shall not overlap otherwise.
@@ -642,9 +657,12 @@ THRUST_HOST_DEVICE OutputIterator exclusive_scan(
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c OutputIterator's \c value_type. \tparam
  * OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>
  *                         and \c OutputIterator's \c value_type is convertible to
- *                         both \c AssociativeOperator's first and second argument type.
+ *                         both \c AssociativeOperator's \c first_argument_type and
+ *                         \c second_argument_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result but the range <tt>[first, last)</tt> and the range
  *  <tt>[result, result + (last - first))</tt> shall not overlap otherwise.
@@ -996,7 +1014,9 @@ OutputIterator inclusive_scan_by_key(
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>, and if \c x and \c y are
  * objects of \c OutputIterator's \c value_type, then <tt>binary_op(x,y)</tt> is defined. \tparam BinaryPredicate is a
  * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam
- * AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first1 may equal \p result but the range <tt>[first1, last1)</tt> and the range
  *  <tt>[result, result + (last1 - first1))</tt> shall not overlap otherwise.
@@ -1078,7 +1098,9 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>, and if \c x and \c y are
  * objects of \c OutputIterator's \c value_type, then <tt>binary_op(x,y)</tt> is defined. \tparam BinaryPredicate is a
  * model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam
- * AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first1 may equal \p result but the range <tt>[first1, last1)</tt> and the range
  *  <tt>[result, result + (last1 - first1))</tt> shall not overlap otherwise.
@@ -1523,8 +1545,9 @@ OutputIterator exclusive_scan_by_key(
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>, and if \c x and \c y are
  * objects of \c OutputIterator's \c value_type, then <tt>binary_op(x,y)</tt> is defined. \tparam T is convertible to \c
  * OutputIterator's \c value_type. \tparam BinaryPredicate is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam AssociativeOperator
+ * is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and
+ * \c AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first1 may equal \p result but the range <tt>[first1, last1)</tt> and the range
  *  <tt>[result, result + (last1 - first1))</tt> shall not overlap otherwise.
@@ -1614,8 +1637,9 @@ THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
  * href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>, and if \c x and \c y are
  * objects of \c OutputIterator's \c value_type, then <tt>binary_op(x,y)</tt> is defined. \tparam T is convertible to \c
  * OutputIterator's \c value_type. \tparam BinaryPredicate is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
- *  \tparam AssociativeOperator The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>. \tparam AssociativeOperator
+ * is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and
+ * \c AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first1 may equal \p result but the range <tt>[first1, last1)</tt> and the range
  *  <tt>[result, result + (last1 - first1))</tt> shall not overlap otherwise.
diff --git a/projects/rocthrust/thrust/scatter.h b/projects/rocthrust/thrust/scatter.h
index 8c19644aa16b..f75a06f6be26 100644
--- a/projects/rocthrust/thrust/scatter.h
+++ b/projects/rocthrust/thrust/scatter.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -303,7 +296,7 @@ void scatter_if(
  * Iterator</a> and \c InputIterator2's \c value_type must be convertible to \c RandomAccessIterator's \c
  * difference_type. \tparam InputIterator3 must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \c InputIterator3's \c
- * value_type must be convertible to \c Predicate's argument type. \tparam RandomAccessIterator must be a model of <a
+ * value_type must be convertible to \c Predicate's \c argument_type. \tparam RandomAccessIterator must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access iterator</a>. \tparam
  * Predicate must be a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -311,7 +304,7 @@ void scatter_if(
  * `[first,last)` for all iterators `i` in the range `[map,map + (last - first))`.
  *
  *  \pre The iterator `result + i` shall not refer to any element referenced by any iterator `j` in the range
- *  `[map,map + (last - first))` for all iterators `i` in the range `[map,map + (last - first))`.
+ * `[map,map + (last - first))` for all iterators `i` in the range `[map,map + (last - first))`.
  *
  *  \pre The iterator `result + i` shall not refer to any element referenced by any iterator `j` in the range
  * `[stencil,stencil + (last - first))` for all iterators `i` in the range `[map,map + (last - first))`.
@@ -325,7 +318,7 @@ void scatter_if(
  *
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return (x % 2) == 0;
@@ -383,7 +376,7 @@ THRUST_HOST_DEVICE void scatter_if(
  * Iterator</a> and \c InputIterator2's \c value_type must be convertible to \c RandomAccessIterator's \c
  * difference_type. \tparam InputIterator3 must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a> and \c InputIterator3's \c
- * value_type must be convertible to \c Predicate's argument type. \tparam RandomAccessIterator must be a model of <a
+ * value_type must be convertible to \c Predicate's \c argument_type. \tparam RandomAccessIterator must be a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access iterator</a>. \tparam
  * Predicate must be a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
@@ -404,7 +397,7 @@ THRUST_HOST_DEVICE void scatter_if(
  *
  *  struct is_even
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    bool operator()(int x)
  *    {
  *      return (x % 2) == 0;
diff --git a/projects/rocthrust/thrust/sequence.h b/projects/rocthrust/thrust/sequence.h
index 4db6b30b391d..ac9922ad9be7 100644
--- a/projects/rocthrust/thrust/sequence.h
+++ b/projects/rocthrust/thrust/sequence.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/sequence_access.h b/projects/rocthrust/thrust/sequence_access.h
new file mode 100644
index 000000000000..7e0c0ba57a6e
--- /dev/null
+++ b/projects/rocthrust/thrust/sequence_access.h
@@ -0,0 +1,82 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef THRUST_SEQUENCE_ACCESS_H
+#define THRUST_SEQUENCE_ACCESS_H
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// We need to define hidden friends for {cr,r,}{begin,end} of our containers as we will otherwise encounter ambiguities
+#define THRUST_SYNTHESIZE_SEQUENCE_ACCESS(_ClassName, _ConstIter)                                                      \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE iterator begin(_ClassName& __sequence) noexcept(                          \
+    noexcept(__sequence.begin()))                                                                                      \
+  {                                                                                                                    \
+    return __sequence.begin();                                                                                         \
+  }                                                                                                                    \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter begin(const _ClassName& __sequence) noexcept(                  \
+    noexcept(__sequence.begin()))                                                                                      \
+  {                                                                                                                    \
+    return __sequence.begin();                                                                                         \
+  }                                                                                                                    \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE iterator end(_ClassName& __sequence) noexcept(noexcept(__sequence.end())) \
+  {                                                                                                                    \
+    return __sequence.end();                                                                                           \
+  }                                                                                                                    \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter end(const _ClassName& __sequence) noexcept(                    \
+    noexcept(__sequence.end()))                                                                                        \
+  {                                                                                                                    \
+    return __sequence.end();                                                                                           \
+  }                                                                                                                    \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter cbegin(const _ClassName& __sequence) noexcept(                 \
+    noexcept(__sequence.begin()))                                                                                      \
+  {                                                                                                                    \
+    return __sequence.begin();                                                                                         \
+  }                                                                                                                    \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstIter cend(const _ClassName& __sequence) noexcept(                   \
+    noexcept(__sequence.end()))                                                                                        \
+  {                                                                                                                    \
+    return __sequence.end();                                                                                           \
+  }
+#define THRUST_SYNTHESIZE_SEQUENCE_REVERSE_ACCESS(_ClassName, _ConstRevIter)                               \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE reverse_iterator rbegin(_ClassName& __sequence) noexcept(     \
+    noexcept(__sequence.rbegin()))                                                                         \
+  {                                                                                                        \
+    return __sequence.rbegin();                                                                            \
+  }                                                                                                        \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter rbegin(const _ClassName& __sequence) noexcept(  \
+    noexcept(__sequence.rbegin()))                                                                         \
+  {                                                                                                        \
+    return __sequence.rbegin();                                                                            \
+  }                                                                                                        \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE reverse_iterator rend(_ClassName& __sequence) noexcept(       \
+    noexcept(__sequence.rend()))                                                                           \
+  {                                                                                                        \
+    return __sequence.rend();                                                                              \
+  }                                                                                                        \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter rend(const _ClassName& __sequence) noexcept(    \
+    noexcept(__sequence.rend()))                                                                           \
+  {                                                                                                        \
+    return __sequence.rend();                                                                              \
+  }                                                                                                        \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter crbegin(const _ClassName& __sequence) noexcept( \
+    noexcept(__sequence.rbegin()))                                                                         \
+  {                                                                                                        \
+    return __sequence.rbegin();                                                                            \
+  }                                                                                                        \
+  THRUST_NODISCARD_FRIEND THRUST_HOST_DEVICE _ConstRevIter crend(const _ClassName& __sequence) noexcept(   \
+    noexcept(__sequence.rend()))                                                                           \
+  {                                                                                                        \
+    return __sequence.rend();                                                                              \
+  }
+
+#endif // THRUST_SEQUENCE_ACCESS_H
diff --git a/projects/rocthrust/thrust/set_operations.h b/projects/rocthrust/thrust/set_operations.h
index 8e1fab18d998..a9a391a6ec26 100644
--- a/projects/rocthrust/thrust/set_operations.h
+++ b/projects/rocthrust/thrust/set_operations.h
@@ -214,10 +214,10 @@ OutputIterator set_difference(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
@@ -290,10 +290,10 @@ THRUST_HOST_DEVICE OutputIterator set_difference(
  *  \return The end of the output range.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
@@ -1169,10 +1169,10 @@ OutputIterator set_union(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
@@ -1247,10 +1247,10 @@ THRUST_HOST_DEVICE OutputIterator set_union(
  *  \return The end of the output range.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's first argument type. and
+ * Iterator</a>, \p InputIterator1's \c value_type is convertible to \p StrictWeakCompare's \c first_argument_type. and
  * \p InputIterator1's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>,
- *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's second argument type.
+ *          \p InputIterator2's \c value_type is convertible to \p StrictWeakCompare's \c second_argument_type.
  *          and \p InputIterator2's \c value_type is convertible to a type in \p OutputIterator's set of \c value_types.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  * Iterator</a>. \tparam StrictWeakCompare is a model of <a
diff --git a/projects/rocthrust/thrust/shuffle.h b/projects/rocthrust/thrust/shuffle.h
index 2ddf40015d87..174407fe815e 100644
--- a/projects/rocthrust/thrust/shuffle.h
+++ b/projects/rocthrust/thrust/shuffle.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/sort.h b/projects/rocthrust/thrust/sort.h
index bca16bda8e85..129c0e5745e7 100644
--- a/projects/rocthrust/thrust/sort.h
+++ b/projects/rocthrust/thrust/sort.h
@@ -145,7 +145,7 @@ void sort(RandomAccessIterator first, RandomAccessIterator last);
  *  \tparam RandomAccessIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator is mutable, and \p RandomAccessIterator's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam StrictWeakOrdering is a model of <a
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code demonstrates how to sort integers in descending order
@@ -191,7 +191,7 @@ sort(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \tparam RandomAccessIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator is mutable, and \p RandomAccessIterator's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam StrictWeakOrdering is a model of <a
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code demonstrates how to sort integers in descending order
@@ -333,7 +333,7 @@ void stable_sort(RandomAccessIterator first, RandomAccessIterator last);
  *  \tparam RandomAccessIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator is mutable, and \p RandomAccessIterator's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam StrictWeakOrdering is a model of <a
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code demonstrates how to sort integers in descending order
@@ -383,7 +383,7 @@ THRUST_HOST_DEVICE void stable_sort(
  *  \tparam RandomAccessIterator is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator is mutable, and \p RandomAccessIterator's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam StrictWeakOrdering is a model of <a
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code demonstrates how to sort integers in descending order
@@ -555,7 +555,7 @@ void sort_by_key(RandomAccessIterator1 keys_first, RandomAccessIterator1 keys_la
  *  \tparam RandomAccessIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator1 is mutable, and \p RandomAccessIterator1's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam RandomAccessIterator2 is a model of
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam RandomAccessIterator2 is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/RandomAccessIterator">Random Access Iterator</a>, and \p
  * RandomAccessIterator2 is mutable. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
@@ -619,7 +619,7 @@ THRUST_HOST_DEVICE void sort_by_key(
  *  \tparam RandomAccessIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator1 is mutable, and \p RandomAccessIterator1's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam RandomAccessIterator2 is a model of
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam RandomAccessIterator2 is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/RandomAccessIterator">Random Access Iterator</a>, and \p
  * RandomAccessIterator2 is mutable. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
@@ -804,7 +804,7 @@ void stable_sort_by_key(
  *  \tparam RandomAccessIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator1 is mutable, and \p RandomAccessIterator1's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam RandomAccessIterator2 is a model of
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam RandomAccessIterator2 is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/RandomAccessIterator">Random Access Iterator</a>, and \p
  * RandomAccessIterator2 is mutable. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
@@ -871,7 +871,7 @@ THRUST_HOST_DEVICE void stable_sort_by_key(
  *  \tparam RandomAccessIterator1 is a model of <a
  * href="https://en.cppreference.com/w/cpp/iterator/random_access_iterator">Random Access Iterator</a>, \p
  * RandomAccessIterator1 is mutable, and \p RandomAccessIterator1's \c value_type is convertible to \p
- * StrictWeakOrdering's first argument type and second argument type. \tparam RandomAccessIterator2 is a model of
+ * StrictWeakOrdering's \c first_argument_type and \c second_argument_type. \tparam RandomAccessIterator2 is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/RandomAccessIterator">Random Access Iterator</a>, and \p
  * RandomAccessIterator2 is mutable. \tparam StrictWeakOrdering is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
@@ -1043,8 +1043,8 @@ bool is_sorted(ForwardIterator first, ForwardIterator last);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \c StrictWeakOrdering's first and second
- * argument type. \tparam Compare is a model of <a
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \c StrictWeakOrdering's \c
+ * first_argument_type and \c second_argument_type. \tparam Compare is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code snippet demonstrates how to use \p is_sorted to test whether the
@@ -1100,9 +1100,8 @@ is_sorted(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \return \c true, if the sequence is sorted according to comp; \c false, otherwise.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \c StrictWeakOrdering's first and second
- * argument type.
- *  \tparam Compare is a model of <a
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to both \c StrictWeakOrdering's \c
+ * first_argument_type and \c second_argument_type. \tparam Compare is a model of <a
  * href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code snippet demonstrates how to use \p is_sorted to test whether the
@@ -1235,7 +1234,7 @@ ForwardIterator is_sorted_until(ForwardIterator first, ForwardIterator last);
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a> and \p ForwardIterator's \c value_type is convertible to \p Compare's argument type. \tparam Compare
+ * Iterator</a> and \p ForwardIterator's \c value_type is convertible to \p Compare's \c argument_type. \tparam Compare
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code snippet demonstrates how to use \p is_sorted_until to find the first position
@@ -1281,7 +1280,7 @@ THRUST_HOST_DEVICE ForwardIterator is_sorted_until(
  *  \return The last iterator in the input range for which it is sorted.
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a> and \p ForwardIterator's \c value_type is convertible to \p Compare's argument type. \tparam Compare
+ * Iterator</a> and \p ForwardIterator's \c value_type is convertible to \p Compare's \c argument_type. \tparam Compare
  * is a model of <a href="https://en.cppreference.com/w/cpp/concepts/strict_weak_order">Strict Weak Ordering</a>.
  *
  *  The following code snippet demonstrates how to use \p is_sorted_until to find the first position
diff --git a/projects/rocthrust/thrust/system/cpp/detail/adjacent_difference.h b/projects/rocthrust/thrust/system/cpp/detail/adjacent_difference.h
index 6bf8bb3c7b28..665d8a380960 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/adjacent_difference.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits adjacent_difference
 #include <thrust/system/detail/sequential/adjacent_difference.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/assign_value.h b/projects/rocthrust/thrust/system/cpp/detail/assign_value.h
index ae23da2846c0..a6dfceaf00b2 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/assign_value.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/assign_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits assign_value
 #include <thrust/system/detail/sequential/assign_value.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/binary_search.h b/projects/rocthrust/thrust/system/cpp/detail/binary_search.h
index 14d2b2625107..9680f4ee4eb1 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/binary_search.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/binary_search.h
@@ -16,16 +16,6 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/system/cpp/detail/execution_policy.h>
 
 // this system inherits the binary search algorithms
diff --git a/projects/rocthrust/thrust/system/cpp/detail/copy.h b/projects/rocthrust/thrust/system/cpp/detail/copy.h
index 8c1d331b6629..b1b659687b31 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/copy.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/copy.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits copy
 #include <thrust/system/detail/sequential/copy.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/copy_if.h b/projects/rocthrust/thrust/system/cpp/detail/copy_if.h
index c5f0ddc4a442..0775e7486e3b 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/copy_if.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/copy_if.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits copy_if
 #include <thrust/system/detail/sequential/copy_if.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/count.h b/projects/rocthrust/thrust/system/cpp/detail/count.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/count.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/count.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/equal.h b/projects/rocthrust/thrust/system/cpp/detail/equal.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/equal.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/equal.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/extrema.h b/projects/rocthrust/thrust/system/cpp/detail/extrema.h
index 170f9530908f..7c428705575d 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/extrema.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/extrema.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits extrema algorithms
 #include <thrust/system/detail/sequential/extrema.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/fill.h b/projects/rocthrust/thrust/system/cpp/detail/fill.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/fill.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/fill.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/find.h b/projects/rocthrust/thrust/system/cpp/detail/find.h
index 66ce8b958317..24403d357f1f 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/find.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/find.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits find
 #include <thrust/system/detail/sequential/find.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/for_each.h b/projects/rocthrust/thrust/system/cpp/detail/for_each.h
index e0052f8bd99c..14170ce51850 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/for_each.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/for_each.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits for_each
 #include <thrust/system/detail/sequential/for_each.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/gather.h b/projects/rocthrust/thrust/system/cpp/detail/gather.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/gather.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/gather.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/generate.h b/projects/rocthrust/thrust/system/cpp/detail/generate.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/generate.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/generate.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/get_value.h b/projects/rocthrust/thrust/system/cpp/detail/get_value.h
index ff57b0a7a6f5..41e98022d1b1 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/get_value.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/get_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits get_value
 #include <thrust/system/detail/sequential/get_value.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/inner_product.h b/projects/rocthrust/thrust/system/cpp/detail/inner_product.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/inner_product.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/inner_product.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/iter_swap.h b/projects/rocthrust/thrust/system/cpp/detail/iter_swap.h
index 32f367e7990a..c08532f425b3 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/iter_swap.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/iter_swap.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits iter_swap
 #include <thrust/system/detail/sequential/iter_swap.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/logical.h b/projects/rocthrust/thrust/system/cpp/detail/logical.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/logical.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/logical.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/malloc_and_free.h b/projects/rocthrust/thrust/system/cpp/detail/malloc_and_free.h
index ca4fa977f936..14a90a9efe77 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/malloc_and_free.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits malloc & free
 #include <thrust/system/detail/sequential/malloc_and_free.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/memory.inl b/projects/rocthrust/thrust/system/cpp/detail/memory.inl
index ab6976b48a7e..f72463142dfb 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/memory.inl
+++ b/projects/rocthrust/thrust/system/cpp/detail/memory.inl
@@ -17,17 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/cpp/detail/malloc_and_free.h>
 #include <thrust/system/cpp/memory.h>
-
+#include <thrust/system/cpp/detail/malloc_and_free.h>
 #include <limits>
 
 THRUST_NAMESPACE_BEGIN
@@ -42,7 +33,7 @@ pointer<void> malloc(std::size_t n)
   return pointer<void>(thrust::system::detail::sequential::malloc(t, n));
 } // end malloc()
 
-template <typename T>
+template<typename T>
 pointer<T> malloc(std::size_t n)
 {
   pointer<void> raw_ptr = thrust::system::cpp::malloc(sizeof(T) * n);
@@ -55,6 +46,6 @@ void free(pointer<void> ptr)
   return thrust::system::detail::sequential::free(t, ptr);
 } // end free()
 
-} // namespace cpp
-} // namespace system
+} // end cpp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cpp/detail/merge.h b/projects/rocthrust/thrust/system/cpp/detail/merge.h
index e900f2c6ee11..30809cdbb259 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/merge.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/merge.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits merge
 #include <thrust/system/detail/sequential/merge.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/mismatch.h b/projects/rocthrust/thrust/system/cpp/detail/mismatch.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/mismatch.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/mismatch.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/par.h b/projects/rocthrust/thrust/system/cpp/detail/par.h
index ca343d879b5c..fbc259d0b43c 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/par.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/par.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
 
@@ -47,7 +40,7 @@ struct par_t
 
 } // namespace detail
 
-THRUST_GLOBAL_CONSTANT detail::par_t par;
+THRUST_INLINE_CONSTANT detail::par_t par;
 
 } // namespace cpp
 } // namespace system
diff --git a/projects/rocthrust/thrust/system/cpp/detail/partition.h b/projects/rocthrust/thrust/system/cpp/detail/partition.h
index a381d1afe876..6de5fdfb5322 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/partition.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/partition.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits partition
 #include <thrust/system/detail/sequential/partition.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/per_device_resource.h b/projects/rocthrust/thrust/system/cpp/detail/per_device_resource.h
index f02fcfcdc3ff..8c4a903cd16b 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/per_device_resource.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special per device resource functions
diff --git a/projects/rocthrust/thrust/system/cpp/detail/reduce.h b/projects/rocthrust/thrust/system/cpp/detail/reduce.h
index afb98555d9ce..abceb327027a 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/reduce.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/reduce.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits reduce
 #include <thrust/system/detail/sequential/reduce.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/reduce_by_key.h b/projects/rocthrust/thrust/system/cpp/detail/reduce_by_key.h
index f08d9e6c05b0..ef7a688964a7 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/reduce_by_key.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits reduce_by_key
 #include <thrust/system/detail/sequential/reduce_by_key.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/remove.h b/projects/rocthrust/thrust/system/cpp/detail/remove.h
index fb230bd4814b..c11c80867513 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/remove.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/remove.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits remove
 #include <thrust/system/detail/sequential/remove.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/replace.h b/projects/rocthrust/thrust/system/cpp/detail/replace.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/replace.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/replace.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/reverse.h b/projects/rocthrust/thrust/system/cpp/detail/reverse.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/reverse.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/reverse.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/scan.h b/projects/rocthrust/thrust/system/cpp/detail/scan.h
index 0fb9cb32ae79..c4c43f64132b 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/scan.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/scan.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits scan
 #include <thrust/system/detail/sequential/scan.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/scan_by_key.h b/projects/rocthrust/thrust/system/cpp/detail/scan_by_key.h
index 301675dacf5e..4dd6a39bd9e0 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/scan_by_key.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits the scan_by_key algorithms
 #include <thrust/system/detail/sequential/scan_by_key.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/scatter.h b/projects/rocthrust/thrust/system/cpp/detail/scatter.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/scatter.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/scatter.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/sequence.h b/projects/rocthrust/thrust/system/cpp/detail/sequence.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/sequence.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/sequence.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/set_operations.h b/projects/rocthrust/thrust/system/cpp/detail/set_operations.h
index d18a986852ad..c4577bdfbc64 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/set_operations.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/set_operations.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits the set operations
 #include <thrust/system/detail/sequential/set_operations.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/sort.h b/projects/rocthrust/thrust/system/cpp/detail/sort.h
index 6aa946c6f1da..5d9b60e19c6b 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/sort.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/sort.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits sort
 #include <thrust/system/detail/sequential/sort.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/swap_ranges.h b/projects/rocthrust/thrust/system/cpp/detail/swap_ranges.h
index a0469f4e16a8..8741b7587058 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/swap_ranges.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // cpp has no special swap_ranges
diff --git a/projects/rocthrust/thrust/system/cpp/detail/tabulate.h b/projects/rocthrust/thrust/system/cpp/detail/tabulate.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/tabulate.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/tabulate.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/temporary_buffer.h b/projects/rocthrust/thrust/system/cpp/detail/temporary_buffer.h
index 8da64673cb33..a32c5aed28de 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/temporary_buffer.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/cpp/detail/transform.h b/projects/rocthrust/thrust/system/cpp/detail/transform.h
index 4368a4f348a3..a986116158e2 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/transform.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/transform.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // cpp has no special transform
diff --git a/projects/rocthrust/thrust/system/cpp/detail/transform_reduce.h b/projects/rocthrust/thrust/system/cpp/detail/transform_reduce.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/transform_reduce.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/transform_scan.h b/projects/rocthrust/thrust/system/cpp/detail/transform_scan.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/transform_scan.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/transform_scan.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/uninitialized_copy.h b/projects/rocthrust/thrust/system/cpp/detail/uninitialized_copy.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/uninitialized_copy.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/uninitialized_fill.h b/projects/rocthrust/thrust/system/cpp/detail/uninitialized_fill.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/uninitialized_fill.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cpp/detail/unique.h b/projects/rocthrust/thrust/system/cpp/detail/unique.h
index be9596962712..8d7791dfdaff 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/unique.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/unique.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits unique
 #include <thrust/system/detail/sequential/unique.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/unique_by_key.h b/projects/rocthrust/thrust/system/cpp/detail/unique_by_key.h
index 5f4b9efc9ce7..b11cbe83a530 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/cpp/detail/unique_by_key.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits unique_by_key
 #include <thrust/system/detail/sequential/unique_by_key.h>
diff --git a/projects/rocthrust/thrust/system/cpp/detail/vector.inl b/projects/rocthrust/thrust/system/cpp/detail/vector.inl
index 0e3c2626ec0b..d84a494f7289 100644
--- a/projects/rocthrust/thrust/system/cpp/detail/vector.inl
+++ b/projects/rocthrust/thrust/system/cpp/detail/vector.inl
@@ -17,16 +17,7 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/cpp/vector.h>
-
 #include <utility>
 
 THRUST_NAMESPACE_BEGIN
@@ -35,96 +26,116 @@ namespace system
 namespace cpp
 {
 
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector()
-    : super_t()
-{}
-
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(size_type n)
-    : super_t(n)
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector()
+      : super_t()
 {}
 
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(size_type n, const value_type& value)
-    : super_t(n, value)
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(size_type n)
+      : super_t(n)
 {}
 
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(const vector& x)
-    : super_t(x)
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(size_type n, const value_type &value)
+      : super_t(n,value)
 {}
 
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(vector&& x)
-    : super_t(std::move(x))
+template<typename T, typename Allocator>
+  vector<T,Allocator>
+    ::vector(const vector &x)
+      : super_t(x)
 {}
 
-template <typename T, typename Allocator>
-template <typename OtherT, typename OtherAllocator>
-vector<T, Allocator>::vector(const thrust::detail::vector_base<OtherT, OtherAllocator>& x)
-    : super_t(x)
+  template<typename T, typename Allocator>
+    vector<T,Allocator>
+      ::vector(vector &&x)
+        : super_t(std::move(x))
+  {}
+
+template<typename T, typename Allocator>
+  template<typename OtherT, typename OtherAllocator>
+    vector<T,Allocator>
+      ::vector(const thrust::detail::vector_base<OtherT,OtherAllocator> &x)
+        : super_t(x)
 {}
 
-template <typename T, typename Allocator>
-template <typename OtherT, typename OtherAllocator>
-vector<T, Allocator>::vector(const std::vector<OtherT, OtherAllocator>& x)
-    : super_t(x)
+template<typename T, typename Allocator>
+  template<typename OtherT, typename OtherAllocator>
+    vector<T,Allocator>
+      ::vector(const std::vector<OtherT,OtherAllocator> &x)
+        : super_t(x)
 {}
 
-template <typename T, typename Allocator>
-template <typename InputIterator>
-vector<T, Allocator>::vector(InputIterator first, InputIterator last)
-    : super_t(first, last)
+template<typename T, typename Allocator>
+  template<typename InputIterator>
+    vector<T,Allocator>
+      ::vector(InputIterator first, InputIterator last)
+        : super_t(first,last)
 {}
 
-template <typename T, typename Allocator>
-vector<T, Allocator>& vector<T, Allocator>::operator=(const vector& x)
+template<typename T, typename Allocator>
+  vector<T,Allocator> &
+    vector<T,Allocator>
+      ::operator=(const vector &x)
 {
   super_t::operator=(x);
   return *this;
 }
 
-template <typename T, typename Allocator>
-vector<T, Allocator>& vector<T, Allocator>::operator=(vector&& x)
-{
-  super_t::operator=(std::move(x));
-  return *this;
-}
-
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(std::initializer_list<T> il)
-    : super_t(il)
-{}
-
-template <typename T, typename Allocator>
-vector<T, Allocator>::vector(std::initializer_list<T> il, const Allocator& alloc)
-    : super_t(il, alloc)
-{}
-
-template <typename T, typename Allocator>
-vector<T, Allocator>& vector<T, Allocator>::operator=(std::initializer_list<T> il)
-{
-  super_t::operator=(il);
-  return *this;
-}
-
-template <typename T, typename Allocator>
-template <typename OtherT, typename OtherAllocator>
-vector<T, Allocator>& vector<T, Allocator>::operator=(const std::vector<OtherT, OtherAllocator>& x)
+  template<typename T, typename Allocator>
+    vector<T,Allocator> &
+      vector<T,Allocator>
+        ::operator=(vector &&x)
+  {
+    super_t::operator=(std::move(x));
+    return *this;
+  }
+
+  template<typename T, typename Allocator>
+    vector<T,Allocator>
+      ::vector(std::initializer_list<T> il)
+        : super_t(il)
+  {}
+
+  template<typename T, typename Allocator>
+    vector<T,Allocator>
+      ::vector(std::initializer_list<T> il, const Allocator& alloc)
+        : super_t(il, alloc)
+  {}
+
+  template<typename T, typename Allocator>
+    vector<T,Allocator> &
+      vector<T,Allocator>
+        ::operator=(std::initializer_list<T> il)
+  {
+    super_t::operator=(il);
+    return *this;
+  }
+
+template<typename T, typename Allocator>
+  template<typename OtherT, typename OtherAllocator>
+    vector<T,Allocator> &
+      vector<T,Allocator>
+        ::operator=(const std::vector<OtherT,OtherAllocator> &x)
 {
   super_t::operator=(x);
   return *this;
 }
 
-template <typename T, typename Allocator>
-template <typename OtherT, typename OtherAllocator>
-vector<T, Allocator>& vector<T, Allocator>::operator=(const thrust::detail::vector_base<OtherT, OtherAllocator>& x)
+template<typename T, typename Allocator>
+  template<typename OtherT, typename OtherAllocator>
+    vector<T,Allocator> &
+      vector<T,Allocator>
+        ::operator=(const thrust::detail::vector_base<OtherT,OtherAllocator> &x)
 {
   super_t::operator=(x);
   return *this;
 }
 
-} // namespace cpp
-} // namespace system
+} // end cpp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cpp/execution_policy.h b/projects/rocthrust/thrust/system/cpp/execution_policy.h
index 4a6e3c94255c..c4a64bc62644 100644
--- a/projects/rocthrust/thrust/system/cpp/execution_policy.h
+++ b/projects/rocthrust/thrust/system/cpp/execution_policy.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // get the execution policies definitions first
 #include <thrust/system/cpp/detail/execution_policy.h>
 
@@ -133,7 +125,7 @@ struct tag : thrust::system::cpp::execution_policy<tag> { unspecified };
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
  *      printf("%d\n", x);
diff --git a/projects/rocthrust/thrust/system/cpp/memory_resource.h b/projects/rocthrust/thrust/system/cpp/memory_resource.h
index 799e2244c132..32ff764b494b 100644
--- a/projects/rocthrust/thrust/system/cpp/memory_resource.h
+++ b/projects/rocthrust/thrust/system/cpp/memory_resource.h
@@ -62,9 +62,9 @@ using memory_resource = detail::native_resource;
  *  \p mr::new_delete_resource and tags it with \p cpp::universal_pointer.
  */
 using universal_memory_resource = detail::universal_native_resource;
-
+// FIXME(bgruber): comment below is wrong or alias should be to universal_memory_resource
 /*! An alias for \p cpp::universal_memory_resource. */
-using universal_host_pinned_memory_resource = universal_memory_resource;
+using universal_host_pinned_memory_resource = detail::native_resource;
 
 /*! \} // memory_resources
  */
diff --git a/projects/rocthrust/thrust/system/cpp/vector.h b/projects/rocthrust/thrust/system/cpp/vector.h
index b0c7180ac8af..0b79480fad6a 100644
--- a/projects/rocthrust/thrust/system/cpp/vector.h
+++ b/projects/rocthrust/thrust/system/cpp/vector.h
@@ -77,14 +77,11 @@ using vector = thrust::detail::vector_base<T, Allocator>;
  *  \see host_vector For the documentation of the complete interface which is
  *                   shared by \p cpp::universal_vector
  *  \see device_vector
- *  \see universal_host_pinned_vector
+ *  \see universal_vector
  */
 template <typename T, typename Allocator = thrust::system::cpp::universal_allocator<T>>
 using universal_vector = thrust::detail::vector_base<T, Allocator>;
 
-//! Like \ref universal_vector but uses pinned memory when the system supports it.
-//! \see device_vector
-//! \see universal_vector
 template <typename T>
 using universal_host_pinned_vector = thrust::detail::vector_base<T, universal_host_pinned_allocator<T>>;
 } // namespace cpp
diff --git a/projects/rocthrust/thrust/system/cuda/config.h b/projects/rocthrust/thrust/system/cuda/config.h
index f25345eb615d..029e7c63e410 100644
--- a/projects/rocthrust/thrust/system/cuda/config.h
+++ b/projects/rocthrust/thrust/system/cuda/config.h
@@ -33,21 +33,13 @@
 #  define THRUST_DEBUG_SYNC_FLAG false
 #endif
 
-#include <thrust/detail/config.h> // IWYU pragma: export
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/config.h>
 
 // We don't directly include <cub/version.cuh> since it doesn't exist in
 // older releases. This header will always pull in version info:
-#include <cub/detail/detect_cuda_runtime.cuh> // IWYU pragma: export
-#include <cub/util_debug.cuh> // IWYU pragma: export
-#include <cub/util_namespace.cuh> // IWYU pragma: export
+#include <cub/detail/detect_cuda_runtime.cuh>
+#include <cub/util_debug.cuh>
+#include <cub/util_namespace.cuh>
 
 /**
  * \def THRUST_RUNTIME_FUNCTION
@@ -66,6 +58,37 @@
 #  define THRUST_RDC_ENABLED
 #endif
 
+/**
+ * \def __THRUST_HAS_CUDART__
+ *
+ * Whether or not the active compiler pass is allowed to invoke device kernels
+ * or methods from the CUDA runtime API.
+ *
+ * This macro should not be used in Thrust, as it depends on `__CUDA_ARCH__`
+ * and is not compatible with `NV_IF_TARGET`. It is provided for legacy
+ * purposes only.
+ *
+ * Replace any usages with `THRUST_RDC_ENABLED` and `NV_IF_TARGET`.
+ */
+#ifdef CUB_RUNTIME_ENABLED
+#  define __THRUST_HAS_CUDART__ 1
+#else
+#  define __THRUST_HAS_CUDART__ 0
+#endif
+
+// These definitions were intended for internal use only and are now obsolete.
+// If you relied on them, consider porting your code to use the functionality
+// in libcu++'s <nv/target> header.
+//
+// For a temporary workaround, define THRUST_PROVIDE_LEGACY_ARCH_MACROS to make
+// them available again. These should be considered deprecated and will be
+// fully removed in a future version.
+#ifdef THRUST_PROVIDE_LEGACY_ARCH_MACROS
+#  ifdef __CUDA_ARCH__
+#    define THRUST_DEVICE_CODE
+#  endif // __CUDA_ARCH__
+#endif // THRUST_PROVIDE_LEGACY_ARCH_MACROS
+
 #ifdef THRUST_AGENT_ENTRY_NOINLINE
 #  define THRUST_AGENT_ENTRY_INLINE_ATTR __noinline__
 #else
@@ -92,7 +115,7 @@
 #  endif
 
 // Make sure the CUB namespace has been declared using the modern macros:
-CUB_NAMESPACE_BEGIN
+CUB_NAMESPACE_BEGIN // cppcheck-suppress unknownMacro
 CUB_NAMESPACE_END
 
 #else // THRUST_IGNORE_CUB_VERSION_CHECK
diff --git a/projects/rocthrust/thrust/system/cuda/detail/adjacent_difference.h b/projects/rocthrust/thrust/system/cuda/detail/adjacent_difference.h
index 4830f7fd3f32..7d74e0b3c963 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/adjacent_difference.h
@@ -36,13 +36,14 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/device_adjacent_difference.cuh>
 #  include <cub/util_math.cuh>
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/functional.h>
@@ -51,7 +52,6 @@
 #  include <thrust/system/cuda/detail/par_to_seq.h>
 #  include <thrust/system/cuda/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
-#  include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
 #  include <cuda/std/type_traits>
 
@@ -73,7 +73,7 @@ namespace cuda_cub
 namespace __adjacent_difference
 {
 
-template <cub::MayAlias AliasOpt, class InputIt, class OutputIt, class BinaryOp>
+template <bool MayAlias, class InputIt, class OutputIt, class BinaryOp>
 cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   void* d_temp_storage,
   size_t& temp_storage_bytes,
@@ -88,10 +88,11 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     return cudaSuccess;
   }
 
-  constexpr cub::ReadOption read_left = cub::ReadOption::Left;
+  constexpr bool may_alias = MayAlias;
+  constexpr bool read_left = true;
 
-  using Dispatch32 = cub::DispatchAdjacentDifference<InputIt, OutputIt, BinaryOp, std::int32_t, AliasOpt, read_left>;
-  using Dispatch64 = cub::DispatchAdjacentDifference<InputIt, OutputIt, BinaryOp, std::int64_t, AliasOpt, read_left>;
+  using Dispatch32 = cub::DispatchAdjacentDifference<InputIt, OutputIt, BinaryOp, std::int32_t, may_alias, read_left>;
+  using Dispatch64 = cub::DispatchAdjacentDifference<InputIt, OutputIt, BinaryOp, std::int64_t, may_alias, read_left>;
 
   cudaError_t status;
   THRUST_INDEX_TYPE_DISPATCH2(
@@ -114,7 +115,8 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   cudaStream_t stream,
   thrust::detail::integral_constant<bool, false> /* comparable */)
 {
-  return doit_step<cub::MayAlias::Yes>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
+  constexpr bool may_alias = true;
+  return doit_step<may_alias>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
 }
 
 template <class InputIt, class OutputIt, class BinaryOp>
@@ -133,10 +135,12 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   // `num_items`. In the latter case, we use an optimized version.
   if (first != result)
   {
-    return doit_step<cub::MayAlias::No>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
+    constexpr bool may_alias = false;
+    return doit_step<may_alias>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
   }
 
-  return doit_step<cub::MayAlias::Yes>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
+  constexpr bool may_alias = true;
+  return doit_step<may_alias>(d_temp_storage, temp_storage_bytes, first, result, binary_op, num_items, stream);
 }
 
 template <typename Derived, typename InputIt, typename OutputIt, typename BinaryOp>
@@ -150,8 +154,8 @@ adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt la
   using UnwrapInputIt  = thrust::try_unwrap_contiguous_iterator_t<InputIt>;
   using UnwrapOutputIt = thrust::try_unwrap_contiguous_iterator_t<OutputIt>;
 
-  using InputValueT  = thrust::detail::it_value_t<UnwrapInputIt>;
-  using OutputValueT = thrust::detail::it_value_t<UnwrapOutputIt>;
+  using InputValueT  = thrust::iterator_value_t<UnwrapInputIt>;
+  using OutputValueT = thrust::iterator_value_t<UnwrapOutputIt>;
 
   constexpr bool can_compare_iterators =
     ::cuda::std::is_pointer<UnwrapInputIt>::value && ::cuda::std::is_pointer<UnwrapOutputIt>::value
@@ -207,7 +211,7 @@ template <class Derived, class InputIt, class OutputIt>
 OutputIt _CCCL_HOST_DEVICE
 adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using input_type = thrust::detail::it_value_t<InputIt>;
+  using input_type = typename iterator_traits<InputIt>::value_type;
   return cuda_cub::adjacent_difference(policy, first, last, result, minus<input_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/assign_value.h b/projects/rocthrust/thrust/system/cuda/detail/assign_value.h
index 6965db5c4f54..395dce9341f9 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/assign_value.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/assign_value.h
@@ -26,7 +26,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
@@ -38,47 +38,60 @@
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
+
 template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
-_CCCL_HOST_DEVICE void assign_value(execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
+inline _CCCL_HOST_DEVICE void
+assign_value(thrust::cuda::execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    _CCCL_HOST auto operator()(execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
+    _CCCL_HOST inline static void
+    host_path(thrust::cuda::execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
     {
       cuda_cub::copy(exec, src, src + 1, dst);
     }
+
+    _CCCL_DEVICE inline static void
+    device_path(thrust::cuda::execution_policy<DerivedPolicy>&, Pointer1 dst, Pointer2 src)
+    {
+      *thrust::raw_pointer_cast(dst) = *thrust::raw_pointer_cast(src);
+    }
   };
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST, (HostPath{}(exec, dst, src);), *thrust::raw_pointer_cast(dst) = *thrust::raw_pointer_cast(src););
-}
+
+  NV_IF_TARGET(
+    NV_IS_HOST, (war_nvbugs_881631::host_path(exec, dst, src);), (war_nvbugs_881631::device_path(exec, dst, src);));
+
+} // end assign_value()
 
 template <typename System1, typename System2, typename Pointer1, typename Pointer2>
-_CCCL_HOST_DEVICE void assign_value(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
+inline _CCCL_HOST_DEVICE void assign_value(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    _CCCL_HOST auto operator()(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
+    _CCCL_HOST inline static void host_path(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
     {
-      // rotate the systems so that they are ordered the same as (src, dst) for the call to thrust::copy
+      // rotate the systems so that they are ordered the same as (src, dst)
+      // for the call to thrust::copy
       cross_system<System2, System1> rotated_systems = systems.rotate();
       cuda_cub::copy(rotated_systems, src, src + 1, dst);
     }
+
+    _CCCL_DEVICE inline static void device_path(cross_system<System1, System2>&, Pointer1 dst, Pointer2 src)
+    {
+      // XXX forward the true cuda::execution_policy inside systems here
+      //     instead of materializing a tag
+      thrust::cuda::tag cuda_tag;
+      thrust::cuda_cub::assign_value(cuda_tag, dst, src);
+    }
   };
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (HostPath{}(systems, dst, src);),
-    (
-      // XXX forward the true cuda::execution_policy inside systems here instead of materializing a tag
-      cuda::tag cuda_tag; cuda_cub::assign_value(cuda_tag, dst, src);));
-}
+
+  NV_IF_TARGET(NV_IS_HOST,
+               (war_nvbugs_881631::host_path(systems, dst, src);),
+               (war_nvbugs_881631::device_path(systems, dst, src);));
+} // end assign_value()
+
 } // namespace cuda_cub
 THRUST_NAMESPACE_END
 #endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/copy.h b/projects/rocthrust/thrust/system/cuda/detail/async/copy.h
new file mode 100644
index 000000000000..d9a94c5d4a25
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/copy.h
@@ -0,0 +1,362 @@
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/advance.h>
+#    include <thrust/detail/static_assert.h>
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/async/transform.h>
+#    include <thrust/system/cuda/detail/cross_system.h>
+#    include <thrust/system/cuda/future.h>
+#    include <thrust/type_traits/is_contiguous_iterator.h>
+#    include <thrust/type_traits/is_trivially_relocatable.h>
+#    include <thrust/type_traits/logical_metafunctions.h>
+#    include <thrust/uninitialized_copy.h>
+
+#    include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+// ContiguousIterator input and output iterators
+// TriviallyCopyable elements
+// Host to device, device to host, device to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<is_indirectly_trivially_relocatable_to<ForwardIt, OutputIt>::value, unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(select_device_system(from_exec, to_exec));
+
+  using pointer =
+    typename thrust::detail::allocator_traits<decltype(device_alloc)>::template rebind_traits<void>::pointer;
+
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(select_device_system(from_exec, to_exec));
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+      extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+      extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+  }
+
+  // Run copy.
+
+  thrust::cuda_cub::throw_on_error(
+    cudaMemcpyAsync(thrust::raw_pointer_cast(&*output),
+                    thrust::raw_pointer_cast(&*first),
+                    sizeof(T) * n,
+                    direction_of_copy(from_exec, to_exec),
+                    e.stream().native_handle()),
+    "after copy launch");
+
+  return e;
+}
+
+// Non-ContiguousIterator input or output, or non-TriviallyRelocatable value type
+// Device to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(thrust::cuda::execution_policy<FromPolicy>& from_exec,
+                  thrust::cuda::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Size n,
+                  OutputIt output) ->
+  typename std::enable_if<conjunction<negation<is_indirectly_trivially_relocatable_to<ForwardIt, OutputIt>>,
+                                      decltype(is_device_to_device_copy(from_exec, to_exec))>::value,
+                          unique_eager_event>::type
+{
+  return async_transform_n(select_device_system(from_exec, to_exec), first, n, output, ::cuda::std::identity{});
+}
+
+template <typename OutputIt>
+void async_copy_n_compile_failure_no_cuda_to_non_contiguous_output()
+{
+  THRUST_STATIC_ASSERT_MSG(
+    (negation<is_contiguous_iterator<OutputIt>>::value),
+    "copying to non-ContiguousIterators in another system from the CUDA system "
+    "is not supported; use `THRUST_PROCLAIM_CONTIGUOUS_ITERATOR(Iterator)` to "
+    "indicate that an iterator points to elements that are contiguous in memory.");
+}
+
+// Non-ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Device to host, host to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<conjunction<negation<is_contiguous_iterator<OutputIt>>,
+                                      is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                  typename iterator_traits<OutputIt>::value_type>,
+                                      disjunction<decltype(is_host_to_device_copy(from_exec, to_exec)),
+                                                  decltype(is_device_to_host_copy(from_exec, to_exec))>>::value,
+                          unique_eager_event>::type
+{
+  async_copy_n_compile_failure_no_cuda_to_non_contiguous_output<OutputIt>();
+
+  return {};
+}
+
+// Workaround for MSVC's lack of expression SFINAE and also for an NVCC bug.
+// In NVCC, when two SFINAE-enabled overloads are only distinguishable by a
+// part of a SFINAE condition that is in a `decltype`, NVCC thinks they are the
+// same overload and emits an error.
+template <typename FromPolicy,
+          typename ToPolicy,
+          typename ForwardIt,
+          typename OutputIt
+          // MSVC2015 WAR: doesn't like decltype(...)::value in superclass definition
+          ,
+          typename IsH2DCopy =
+            decltype(is_host_to_device_copy(std::declval<FromPolicy const&>(), std::declval<ToPolicy const&>()))>
+struct is_buffered_trivially_relocatable_host_to_device_copy
+    : thrust::integral_constant<bool,
+                                !is_contiguous_iterator<ForwardIt>::value && is_contiguous_iterator<OutputIt>::value
+                                  && is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                 typename iterator_traits<OutputIt>::value_type>::value
+                                  && IsH2DCopy::value>
+{};
+
+// Non-ContiguousIterator input iterator, ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Host to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(
+  FromPolicy& from_exec, thrust::cuda::execution_policy<ToPolicy>& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<is_buffered_trivially_relocatable_host_to_device_copy<FromPolicy,
+                                                                                thrust::cuda::execution_policy<ToPolicy>,
+                                                                                ForwardIt,
+                                                                                OutputIt>::value,
+                          unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const host_alloc = get_async_host_allocator(from_exec);
+
+  // Create host-side buffer.
+
+  auto buffer = uninitialized_allocate_unique_n<T>(host_alloc, n);
+
+  auto const buffer_ptr = buffer.get();
+
+  // Copy into host-side buffer.
+
+  // TODO: Switch to an async call once we have async interfaces for host
+  // systems and support for cross system dependencies.
+  uninitialized_copy_n(from_exec, first, n, buffer_ptr);
+
+  // Run device-side copy.
+
+  auto new_to_exec = thrust::detail::derived_cast(to_exec).rebind_after(std::tuple_cat(
+    std::make_tuple(std::move(buffer)),
+    extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+    extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(to_exec))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_to_exec))>::value));
+
+  return async_copy_n(
+    from_exec
+    // TODO: We have to cast back to the right execution_policy class. Ideally,
+    // we should be moving here.
+    ,
+    new_to_exec,
+    buffer_ptr,
+    n,
+    output);
+}
+
+// Workaround for MSVC's lack of expression SFINAE and also for an NVCC bug.
+// In NVCC, when two SFINAE-enabled overloads are only distinguishable by a
+// part of a SFINAE condition that is in a `decltype`, NVCC thinks they are the
+// same overload and emits an error.
+template <typename FromPolicy,
+          typename ToPolicy,
+          typename ForwardIt,
+          typename OutputIt
+          // MSVC2015 WAR: doesn't like decltype(...)::value in superclass definition
+          ,
+          typename IsD2HCopy =
+            decltype(is_device_to_host_copy(std::declval<FromPolicy const&>(), std::declval<ToPolicy const&>()))>
+struct is_buffered_trivially_relocatable_device_to_host_copy
+    : thrust::integral_constant<bool,
+                                !is_contiguous_iterator<ForwardIt>::value && is_contiguous_iterator<OutputIt>::value
+                                  && is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                 typename iterator_traits<OutputIt>::value_type>::value
+                                  && IsD2HCopy::value>
+{};
+
+// Non-ContiguousIterator input iterator, ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Device to host
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(
+  thrust::cuda::execution_policy<FromPolicy>& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<
+    is_buffered_trivially_relocatable_device_to_host_copy<thrust::cuda::execution_policy<FromPolicy>,
+                                                          ToPolicy,
+                                                          ForwardIt,
+                                                          OutputIt>::value,
+    unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(from_exec);
+
+  // Create device-side buffer.
+
+  auto buffer = uninitialized_allocate_unique_n<T>(device_alloc, n);
+
+  auto const buffer_ptr = buffer.get();
+
+  // Run device-side copy.
+
+  auto f0 = async_copy_n(from_exec, from_exec, first, n, buffer_ptr);
+
+  // Run copy back to host.
+
+  auto new_from_exec = thrust::detail::derived_cast(from_exec).rebind_after(std::move(buffer), std::move(f0));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(from_exec))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_from_exec))>::value));
+
+  return async_copy_n(new_from_exec, to_exec, buffer_ptr, n, output);
+}
+
+template <typename InputType, typename OutputType>
+void async_copy_n_compile_failure_non_trivially_relocatable_elements()
+{
+  THRUST_STATIC_ASSERT_MSG(
+    (is_trivially_relocatable_to<OutputType, InputType>::value),
+    "only sequences of TriviallyRelocatable elements can be copied to and from "
+    "the CUDA system; use `THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(T)` to "
+    "indicate that a type can be copied by bitwise (e.g. by `memcpy`)");
+}
+
+// Non-TriviallyRelocatable value type
+// Host to device, device to host
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<
+    conjunction<negation<is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                     typename iterator_traits<OutputIt>::value_type>>,
+                disjunction<decltype(is_host_to_device_copy(from_exec, to_exec)),
+                            decltype(is_device_to_host_copy(from_exec, to_exec))>>::value,
+    unique_eager_event>::type
+{
+  // TODO: We could do more here with cudaHostRegister.
+
+  async_copy_n_compile_failure_non_trivially_relocatable_elements<
+    typename thrust::iterator_traits<ForwardIt>::value_type,
+    typename std::add_lvalue_reference<typename thrust::iterator_traits<OutputIt>::value_type>::type>();
+
+  return {};
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+auto async_copy(thrust::cuda::execution_policy<FromPolicy>& from_exec,
+                thrust::cpp::execution_policy<ToPolicy>& to_exec,
+                ForwardIt first,
+                Sentinel last,
+                OutputIt output)
+  THRUST_RETURNS(
+    thrust::system::cuda::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+  // ADL entry point.
+  template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+  auto async_copy(thrust::cpp::execution_policy<FromPolicy>& from_exec,
+                  thrust::cuda::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Sentinel last,
+                  OutputIt output)
+    THRUST_RETURNS(
+      thrust::system::cuda::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+  // ADL entry point.
+  template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+  auto async_copy(thrust::cuda::execution_policy<FromPolicy>& from_exec,
+                  thrust::cuda::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Sentinel last,
+                  OutputIt output)
+    THRUST_RETURNS(
+      thrust::system::cuda::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/customization.h b/projects/rocthrust/thrust/system/cuda/detail/async/customization.h
new file mode 100644
index 000000000000..ae1bd4185308
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/customization.h
@@ -0,0 +1,113 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#include "cuda/std/__cccl/diagnostic.h"
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/detail/execute_with_allocator.h>
+#    include <thrust/detail/type_deduction.h>
+#    include <thrust/mr/allocator.h>
+#    include <thrust/mr/disjoint_sync_pool.h>
+#    include <thrust/mr/host_memory_resource.h>
+#    include <thrust/mr/sync_pool.h>
+#    include <thrust/per_device_resource.h>
+#    include <thrust/system/cuda/memory_resource.h>
+
+#    include <cstdint>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+using default_async_host_resource = thrust::mr::synchronized_pool_resource<thrust::host_memory_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_host_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::mr::stateless_resource_allocator<std::uint8_t, default_async_host_resource>{})
+
+  ///////////////////////////////////////////////////////////////////////////////
+
+  using default_async_device_resource =
+    thrust::mr::disjoint_synchronized_pool_resource<thrust::system::cuda::memory_resource,
+                                                    thrust::mr::new_delete_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_device_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::per_device_allocator<std::uint8_t, default_async_device_resource, par_t>{})
+
+    template <typename Allocator, template <typename> class BaseSystem>
+    auto get_async_device_allocator(thrust::detail::execute_with_allocator<Allocator, BaseSystem>& exec)
+      THRUST_RETURNS(exec.get_allocator())
+
+        _CCCL_SUPPRESS_DEPRECATED_PUSH template <typename Allocator, template <typename> class BaseSystem>
+        CCCL_DEPRECATED
+  auto get_async_device_allocator(thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem>& exec)
+    THRUST_RETURNS(exec.get_allocator()) _CCCL_SUPPRESS_DEPRECATED_POP
+
+  ///////////////////////////////////////////////////////////////////////////////
+
+  using default_async_universal_host_pinned_resource =
+    thrust::mr::synchronized_pool_resource<thrust::system::cuda::universal_host_pinned_memory_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_universal_host_pinned_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::mr::stateless_resource_allocator<std::uint8_t, default_async_universal_host_pinned_resource>{})
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/exclusive_scan.h b/projects/rocthrust/thrust/system/cuda/detail/async/exclusive_scan.h
new file mode 100644
index 000000000000..e22433b9b3b5
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/exclusive_scan.h
@@ -0,0 +1,166 @@
+/******************************************************************************
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/util.h>
+#    include <thrust/system/cuda/future.h>
+
+#    include <cuda/std/type_traits>
+
+#    include <type_traits>
+
+// TODO specialize for thrust::plus to use e.g. ExclusiveSum instead of ExcScan
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Size,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+unique_eager_event async_exclusive_scan_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, InitialValueType init, BinaryOp op)
+{
+  using InputValueT = cub::detail::InputValue<InitialValueType>;
+  using Dispatch32  = cub::DispatchScan<ForwardIt, OutputIt, BinaryOp, InputValueT, std::int32_t, InitialValueType>;
+  using Dispatch64  = cub::DispatchScan<ForwardIt, OutputIt, BinaryOp, InputValueT, std::int64_t, InitialValueType>;
+
+  InputValueT init_value(init);
+
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  cudaError_t status;
+  size_t tmp_size = 0;
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (nullptr, tmp_size, first, out, op, init_value, n_fixed, nullptr));
+    thrust::cuda_cub::throw_on_error(
+      status,
+      "after determining tmp storage "
+      "requirements for exclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (tmp_ptr, tmp_size, first, out, op, init_value, n_fixed, user_raw_stream));
+    thrust::cuda_cub::throw_on_error(status, "after dispatching exclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Sentinel,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+auto async_exclusive_scan(
+  execution_policy<DerivedPolicy>& policy,
+  ForwardIt first,
+  Sentinel&& last,
+  OutputIt&& out,
+  InitialValueType&& init,
+  BinaryOp&& op)
+  THRUST_RETURNS(thrust::system::cuda::detail::async_exclusive_scan_n(
+    policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/for_each.h b/projects/rocthrust/thrust/system/cuda/detail/async/for_each.h
new file mode 100644
index 000000000000..939ae39d5856
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/for_each.h
@@ -0,0 +1,136 @@
+
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <cub/device/device_for.cuh>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/future.h>
+
+#    include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename ForwardIt, typename UnaryFunction>
+struct async_for_each_fn
+{
+  ForwardIt first;
+  UnaryFunction f;
+
+  _CCCL_HOST_DEVICE async_for_each_fn(ForwardIt&& first_, UnaryFunction&& f_)
+      : first(std::move(first_))
+      , f(std::move(f_))
+  {}
+
+  template <typename Index>
+  _CCCL_HOST_DEVICE void operator()(Index idx)
+  {
+    f(thrust::raw_reference_cast(first[idx]));
+  }
+};
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename UnaryFunction>
+unique_eager_event async_for_each_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, UnaryFunction func)
+{
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(extract_dependencies(std::move(thrust::detail::derived_cast(policy))));
+  }
+
+  // Run for_each.
+
+  async_for_each_fn<ForwardIt, UnaryFunction> wrapped(std::move(first), std::move(func));
+
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceFor::Bulk(n, std::move(wrapped), e.stream().native_handle()), "after for_each launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
+auto async_for_each(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, UnaryFunction&& func)
+  THRUST_RETURNS(
+    thrust::system::cuda::detail::async_for_each_n(policy, first, thrust::distance(first, last), THRUST_FWD(func)));
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/inclusive_scan.h b/projects/rocthrust/thrust/system/cuda/detail/async/inclusive_scan.h
new file mode 100644
index 000000000000..463a5b2a9ba3
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/inclusive_scan.h
@@ -0,0 +1,255 @@
+/******************************************************************************
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/util.h>
+#    include <thrust/system/cuda/future.h>
+
+#    include <cuda/std/type_traits>
+
+#    include <type_traits>
+
+// TODO specialize for thrust::plus to use e.g. InclusiveSum instead of IncScan
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename BinaryOp>
+unique_eager_event
+async_inclusive_scan_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, BinaryOp op)
+{
+  using AccumT     = typename thrust::iterator_traits<ForwardIt>::value_type;
+  using Dispatch32 = cub::DispatchScan<ForwardIt, OutputIt, BinaryOp, cub::NullType, std::int32_t, AccumT>;
+  using Dispatch64 = cub::DispatchScan<ForwardIt, OutputIt, BinaryOp, cub::NullType, std::int64_t, AccumT>;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  cudaError_t status;
+  size_t tmp_size = 0;
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (nullptr, tmp_size, first, out, op, cub::NullType{}, n_fixed, nullptr));
+    thrust::cuda_cub::throw_on_error(
+      status,
+      "after determining tmp storage "
+      "requirements for inclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (tmp_ptr, tmp_size, first, out, op, cub::NullType{}, n_fixed, user_raw_stream));
+    thrust::cuda_cub::throw_on_error(status, "after dispatching inclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Size,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+unique_eager_event async_inclusive_scan_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, InitialValueType init, BinaryOp op)
+{
+  using InputValueT = cub::detail::InputValue<InitialValueType>;
+  using AccumT      = typename ::cuda::std::
+    __accumulator_t<BinaryOp, typename ::cuda::std::iterator_traits<ForwardIt>::value_type, InitialValueType>;
+  constexpr bool ForceInclusive = true;
+
+  using Dispatch32 = cub::DispatchScan<
+    ForwardIt,
+    OutputIt,
+    BinaryOp,
+    InputValueT,
+    std::int32_t,
+    AccumT,
+    cub::detail::scan::
+      policy_hub<cub::detail::value_t<ForwardIt>, cub::detail::value_t<OutputIt>, AccumT, std::int32_t, BinaryOp>,
+    ForceInclusive>;
+  using Dispatch64 = cub::DispatchScan<
+    ForwardIt,
+    OutputIt,
+    BinaryOp,
+    InputValueT,
+    std::int64_t,
+    AccumT,
+    cub::detail::scan::
+      policy_hub<cub::detail::value_t<ForwardIt>, cub::detail::value_t<OutputIt>, AccumT, std::int64_t, BinaryOp>,
+    ForceInclusive>;
+
+  InputValueT init_value(init);
+
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  cudaError_t status;
+  size_t tmp_size = 0;
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (nullptr, tmp_size, first, out, op, init_value, n_fixed, nullptr));
+    thrust::cuda_cub::throw_on_error(
+      status,
+      "after determining tmp storage "
+      "requirements for inclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    THRUST_INDEX_TYPE_DISPATCH2(
+      status,
+      Dispatch32::Dispatch,
+      Dispatch64::Dispatch,
+      n,
+      (tmp_ptr, tmp_size, first, out, op, init_value, n_fixed, user_raw_stream));
+    thrust::cuda_cub::throw_on_error(status, "after dispatching inclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
+auto async_inclusive_scan(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel&& last, OutputIt&& out, BinaryOp&& op)
+  THRUST_RETURNS(thrust::system::cuda::detail::async_inclusive_scan_n(
+    policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(op)))
+
+  // ADL entry point.
+  template <typename DerivedPolicy,
+            typename ForwardIt,
+            typename Sentinel,
+            typename OutputIt,
+            typename InitialValueType,
+            typename BinaryOp>
+  auto async_inclusive_scan(
+    execution_policy<DerivedPolicy>& policy,
+    ForwardIt first,
+    Sentinel&& last,
+    OutputIt&& out,
+    InitialValueType&& init,
+    BinaryOp&& op)
+    THRUST_RETURNS(thrust::system::cuda::detail::async_inclusive_scan_n(
+      policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/reduce.h b/projects/rocthrust/thrust/system/cuda/detail/async/reduce.h
new file mode 100644
index 000000000000..9e52d4325390
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/reduce.h
@@ -0,0 +1,236 @@
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Optimize for thrust::plus
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/reduce.h>
+#    include <thrust/system/cuda/future.h>
+
+#    include <cuda/std/type_traits>
+
+#    include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename T, typename BinaryOp>
+unique_eager_future<::cuda::std::remove_cvref_t<T>>
+async_reduce_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, T init, BinaryOp op)
+{
+  using U = ::cuda::std::remove_cvref_t<T>;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  using pointer = typename thrust::detail::allocator_traits<decltype(device_alloc)>::template rebind_traits<U>::pointer;
+
+  unique_eager_future_promise_pair<U, pointer> fp;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceReduce::Reduce(nullptr, tmp_size, first, static_cast<U*>(nullptr), n, op, init, nullptr // Null stream,
+                                                                                                       // just for
+                                                                                                       // sizing.
+                              ),
+    "after reduction sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, sizeof(U) + tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`cudaMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+  U* const ret_ptr       = thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(content_ptr));
+  void* const tmp_ptr    = static_cast<void*>(raw_pointer_cast(content_ptr + sizeof(U)));
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    fp = make_dependent_future<U, pointer>(
+      [](decltype(content) const& c) {
+        return pointer(thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(c.get())));
+      },
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    fp = make_dependent_future<U, pointer>(
+      [](decltype(content) const& c) {
+        return pointer(thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(c.get())));
+      },
+      std::tuple_cat(std::make_tuple(std::move(content)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run reduction.
+
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceReduce::Reduce(tmp_ptr, tmp_size, first, ret_ptr, n, op, init, fp.future.stream().native_handle()),
+    "after reduction launch");
+
+  return std::move(fp.future);
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
+auto async_reduce(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, T init, BinaryOp op)
+  THRUST_RETURNS(thrust::system::cuda::detail::async_reduce_n(policy, first, thrust::distance(first, last), init, op))
+
+} // namespace cuda_cub
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename T, typename BinaryOp>
+unique_eager_event async_reduce_into_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt output, T init, BinaryOp op)
+{
+  using U = ::cuda::std::remove_cvref_t<T>;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceReduce::Reduce(nullptr, tmp_size, first, static_cast<U*>(nullptr), n, op, init, nullptr // Null stream,
+                                                                                                       // just for
+                                                                                                       // sizing.
+                              ),
+    "after reduction sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`cudaMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr));
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run reduction.
+
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceReduce::Reduce(tmp_ptr, tmp_size, first, output, n, op, init, e.stream().native_handle()),
+    "after reduction launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
+auto async_reduce_into(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, OutputIt output, T init, BinaryOp op)
+  THRUST_RETURNS(
+    thrust::system::cuda::detail::async_reduce_into_n(policy, first, thrust::distance(first, last), output, init, op))
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/core/load_iterator.h b/projects/rocthrust/thrust/system/cuda/detail/async/scan.h
similarity index 66%
rename from projects/rocthrust/thrust/system/cuda/detail/core/load_iterator.h
rename to projects/rocthrust/thrust/system/cuda/detail/async/scan.h
index cf3a114c1f9f..e141bbe20a53 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/core/load_iterator.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/scan.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -24,34 +24,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#include <cub/iterator/cache_modified_input_iterator.cuh>
-
-#include <thrust/type_traits/is_contiguous_iterator.h>
 
-THRUST_NAMESPACE_BEGIN
-
-namespace cuda_cub::core::detail
-{
-
-// LoadIterator
-// ------------
-// if trivial iterator is passed, wrap loads into LDG
-//
-template <class PtxPlan, class It>
-struct LoadIterator
-{
-  using value_type = thrust::detail::it_value_t<It>;
-  using size_type  = thrust::detail::it_difference_t<It>;
-
-  using type =
-    ::cuda::std::conditional_t<is_contiguous_iterator_v<It>,
-                               cub::CacheModifiedInputIterator<PtxPlan::LOAD_MODIFIER, value_type, size_type>,
-                               It>;
-}; // struct Iterator
-} // namespace cuda_cub::core::detail
+#pragma once
 
-THRUST_NAMESPACE_END
+#include <thrust/detail/cpp_version_check.h>
+#include <thrust/system/cuda/detail/async/exclusive_scan.h>
+#include <thrust/system/cuda/detail/async/inclusive_scan.h>
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/sort.h b/projects/rocthrust/thrust/system/cuda/detail/async/sort.h
new file mode 100644
index 000000000000..4d50c039a56c
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/sort.h
@@ -0,0 +1,328 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <thrust/detail/alignment.h>
+#    include <thrust/detail/static_assert.h>
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/copy.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/sort.h>
+#    include <thrust/system/cuda/future.h>
+#    include <thrust/type_traits/is_contiguous_iterator.h>
+#    include <thrust/type_traits/is_operator_less_or_greater_function_object.h>
+#    include <thrust/type_traits/is_trivially_relocatable.h>
+#    include <thrust/type_traits/logical_metafunctions.h>
+
+#    include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+// Non-ContiguousIterator input and output iterators
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<negation<is_contiguous_iterator<ForwardIt>>::value, unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  // Create device-side buffer.
+
+  // FIXME: Combine this temporary allocation with the main one for CUB.
+  auto device_buffer = uninitialized_allocate_unique_n<T>(device_alloc, n);
+
+  auto const device_buffer_ptr = device_buffer.get();
+
+  // Synthesize a suitable new execution policy, because we don't want to
+  // try and extract twice from the one we were passed.
+  typename ::cuda::std::remove_cvref_t<decltype(policy)>::tag_type tag_policy{};
+
+  // Copy from the input into the buffer.
+
+  auto new_policy0 = thrust::detail::derived_cast(policy).rebind_after(std::move(device_buffer));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy0))>::value));
+
+  auto f0 = async_copy_n(new_policy0, tag_policy, first, n, device_buffer_ptr);
+
+  // Sort the buffer.
+
+  auto new_policy1 = thrust::detail::derived_cast(policy).rebind_after(std::move(f0));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy1))>::value));
+
+  auto f1 = async_sort_n(new_policy1, tag_policy, device_buffer_ptr, n, comp);
+
+  // Copy from the buffer into the input.
+  // FIXME: Combine this with the potential memcpy at the end of the main sort
+  // routine.
+
+  auto new_policy2 = thrust::detail::derived_cast(policy).rebind_after(std::move(f1));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy2))>::value));
+
+  return async_copy_n(new_policy2, tag_policy, device_buffer_ptr, n, first);
+}
+
+// ContiguousIterator iterators
+// Non-Scalar value type or user-defined StrictWeakOrdering
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<
+    conjunction<is_contiguous_iterator<ForwardIt>,
+                disjunction<negation<std::is_scalar<typename iterator_traits<ForwardIt>::value_type>>,
+                            negation<is_operator_less_or_greater_function_object<StrictWeakOrdering>>>>::value,
+    unique_eager_event>::type
+{
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::cuda_cub::throw_on_error(
+    thrust::cuda_cub::__merge_sort::doit_step<
+      /* Sort items? */ std::false_type,
+      /* Stable? */ std::true_type>(
+      nullptr,
+      tmp_size,
+      first,
+      static_cast<std::uint8_t*>(nullptr) // Items.
+      ,
+      n,
+      comp,
+      nullptr // Null stream, just for sizing.
+      ),
+    "after merge sort sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`cudaMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr));
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run merge sort.
+
+  thrust::cuda_cub::throw_on_error(
+    thrust::cuda_cub::__merge_sort::doit_step<
+      /* Sort items? */ std::false_type,
+      /* Stable? */ std::true_type>(
+      tmp_ptr,
+      tmp_size,
+      first,
+      static_cast<std::uint8_t*>(nullptr) // Items.
+      ,
+      n,
+      comp,
+      e.stream().native_handle()),
+    "after merge sort sizing");
+
+  return e;
+}
+
+template <typename T, typename Size, typename StrictWeakOrdering>
+typename std::enable_if<is_operator_less_function_object<StrictWeakOrdering>::value, cudaError_t>::type
+invoke_radix_sort(
+  cudaStream_t stream, void* tmp_ptr, std::size_t& tmp_size, cub::DoubleBuffer<T>& keys, Size& n, StrictWeakOrdering)
+{
+  return cub::DeviceRadixSort::SortKeys(tmp_ptr, tmp_size, keys, n, 0, sizeof(T) * 8, stream);
+}
+
+template <typename T, typename Size, typename StrictWeakOrdering>
+typename std::enable_if<is_operator_greater_function_object<StrictWeakOrdering>::value, cudaError_t>::type
+invoke_radix_sort(
+  cudaStream_t stream, void* tmp_ptr, std::size_t& tmp_size, cub::DoubleBuffer<T>& keys, Size& n, StrictWeakOrdering)
+{
+  return cub::DeviceRadixSort::SortKeysDescending(tmp_ptr, tmp_size, keys, n, 0, sizeof(T) * 8, stream);
+}
+
+// ContiguousIterator iterators
+// Scalar value type
+// operator< or operator>
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<conjunction<is_contiguous_iterator<ForwardIt>,
+                                      std::is_scalar<typename iterator_traits<ForwardIt>::value_type>,
+                                      is_operator_less_or_greater_function_object<StrictWeakOrdering>>::value,
+                          unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  cub::DoubleBuffer<T> keys(raw_pointer_cast(&*first), nullptr);
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::cuda_cub::throw_on_error(
+    invoke_radix_sort(
+      nullptr // Null stream, just for sizing.
+      ,
+      nullptr,
+      tmp_size,
+      keys,
+      n,
+      comp),
+    "after radix sort sizing");
+
+  // Allocate temporary storage.
+
+  size_t keys_temp_storage = thrust::detail::aligned_storage_size(sizeof(T) * n, 128);
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, keys_temp_storage + tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`cudaMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  keys.d_buffers[1] = thrust::detail::aligned_reinterpret_cast<T*>(raw_pointer_cast(content_ptr));
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr + keys_temp_storage));
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run radix sort.
+
+  thrust::cuda_cub::throw_on_error(
+    invoke_radix_sort(e.stream().native_handle(), tmp_ptr, tmp_size, keys, n, comp), "after radix sort launch");
+
+  if (0 != keys.selector)
+  {
+    auto new_policy0 = thrust::detail::derived_cast(policy).rebind_after(std::move(e));
+
+    THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                          <= std::tuple_size<decltype(extract_dependencies(new_policy0))>::value));
+
+    // Synthesize a suitable new execution policy, because we don't want to
+    // try and extract twice from the one we were passed.
+    typename ::cuda::std::remove_cvref_t<decltype(policy)>::tag_type tag_policy{};
+
+    using return_future = decltype(e);
+    return return_future(async_copy_n(new_policy0, tag_policy, keys.d_buffers[1], n, keys.d_buffers[0]));
+  }
+  else
+  {
+    return e;
+  }
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+auto async_stable_sort(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, StrictWeakOrdering comp)
+  // A GCC 5 bug requires an explicit trailing return type here, so stick with
+  // THRUST_DECLTYPE_RETURNS for now.
+  THRUST_DECLTYPE_RETURNS(
+    thrust::system::cuda::detail::async_stable_sort_n(policy, first, thrust::distance(first, last), comp))
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/async/transform.h b/projects/rocthrust/thrust/system/cuda/detail/async/transform.h
new file mode 100644
index 000000000000..69b52ebb6663
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/async/transform.h
@@ -0,0 +1,141 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::cuda
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  if _CCCL_HAS_CUDA_COMPILER
+
+#    include <thrust/system/cuda/config.h>
+
+#    include <cub/device/device_for.cuh>
+
+#    include <thrust/advance.h>
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/cuda/detail/async/customization.h>
+#    include <thrust/system/cuda/detail/parallel_for.h>
+#    include <thrust/system/cuda/future.h>
+
+#    include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+template <typename ForwardIt, typename OutputIt, typename UnaryOperation>
+struct async_transform_fn
+{
+  ForwardIt first_;
+  OutputIt output_;
+  UnaryOperation op_;
+
+  _CCCL_HOST_DEVICE async_transform_fn(ForwardIt&& first, OutputIt&& output, UnaryOperation&& op)
+      : first_(std::move(first))
+      , output_(std::move(output))
+      , op_(std::move(op))
+  {}
+
+  template <typename Index>
+  _CCCL_HOST_DEVICE void operator()(Index idx)
+  {
+    output_[idx] = op_(thrust::raw_reference_cast(first_[idx]));
+  }
+};
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename UnaryOperation>
+unique_eager_event
+async_transform_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt output, UnaryOperation op)
+{
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  cudaStream_t const user_raw_stream = thrust::cuda_cub::stream(policy);
+
+  if (thrust::cuda_cub::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(extract_dependencies(std::move(thrust::detail::derived_cast(policy))));
+  }
+
+  // Run transform.
+
+  async_transform_fn<ForwardIt, OutputIt, UnaryOperation> wrapped(std::move(first), std::move(output), std::move(op));
+
+  thrust::cuda_cub::throw_on_error(
+    cub::DeviceFor::Bulk(n, std::move(wrapped), e.stream().native_handle()), "after transform launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace cuda
+} // namespace system
+
+namespace cuda_cub
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>
+auto async_transform(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, OutputIt output, UnaryOperation&& op)
+  THRUST_RETURNS(thrust::system::cuda::detail::async_transform_n(
+    policy, first, thrust::distance(first, last), output, THRUST_FWD(op)));
+
+} // namespace cuda_cub
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // _CCCL_CUDA_COMPILER
+
+#endif
diff --git a/projects/rocthrust/thrust/system/cuda/detail/binary_search.h b/projects/rocthrust/thrust/system/cuda/detail/binary_search.h
index 5193bbce77fc..7a26cbf23289 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/binary_search.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/binary_search.h
@@ -16,14 +16,4 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cuda/detail/cdp_dispatch.h b/projects/rocthrust/thrust/system/cuda/detail/cdp_dispatch.h
index dbdbefe0d82e..48c5dd0c8dba 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/cdp_dispatch.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/cdp_dispatch.h
@@ -21,16 +21,6 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <cub/config.cuh>
 
 #include <cub/detail/detect_cuda_runtime.cuh>
@@ -46,27 +36,52 @@
  * the device.
  *
  * `par_impl` and `seq_impl` are blocks of C++ statements enclosed in
- * parentheses, similar to _THRUST_IF_TARGET blocks:
+ * parentheses, similar to NV_IF_TARGET blocks:
  *
  * \code
  * THRUST_CDP_DISPATCH((launch_parallel_kernel();), (run_serial_impl();));
  * \endcode
  */
 
+#if defined(CUB_DETAIL_CDPv1)
+
+// Special case for NVCC -- need to inform the device path about the kernels
+// that are launched from the host path.
+#  if defined(__CUDACC__) && defined(__CUDA_ARCH__)
+
+// seq_impl only used on platforms that do not support device synchronization.
+#    define THRUST_CDP_DISPATCH(par_impl, seq_impl)                    \
+      if (false)                                                       \
+      { /* Without this, the device pass won't compile any kernels. */ \
+        NV_IF_TARGET(NV_ANY_TARGET, par_impl);                         \
+      }                                                                \
+      NV_IF_TARGET(NV_PROVIDES_SM_90, seq_impl, par_impl)
+
+#  else // NVCC device pass
+
+// seq_impl only used on platforms that do not support device synchronization.
+#    define THRUST_CDP_DISPATCH(par_impl, seq_impl) NV_IF_TARGET(NV_PROVIDES_SM_90, seq_impl, par_impl)
+
+#  endif // NVCC device pass
+
+#else // CDPv1 unavailable. Always fallback to serial on device:
+
 // Special case for NVCC -- need to inform the device path about the kernels
 // that are launched from the host path.
-#if defined(__CUDACC__) && defined(__CUDA_ARCH__)
+#  if defined(__CUDACC__) && defined(__CUDA_ARCH__)
 
 // Device-side launch not supported, fallback to sequential in device code.
-#  define THRUST_CDP_DISPATCH(par_impl, seq_impl)                    \
-    if (false)                                                       \
-    { /* Without this, the device pass won't compile any kernels. */ \
-      _THRUST_IF_TARGET(_THRUST_ANY_TARGET, par_impl);               \
-    }                                                                \
-    _THRUST_IF_TARGET(_THRUST_IS_HOST, par_impl, seq_impl)
+#    define THRUST_CDP_DISPATCH(par_impl, seq_impl)                    \
+      if (false)                                                       \
+      { /* Without this, the device pass won't compile any kernels. */ \
+        NV_IF_TARGET(NV_ANY_TARGET, par_impl);                         \
+      }                                                                \
+      NV_IF_TARGET(NV_IS_HOST, par_impl, seq_impl)
+
+#  else // !(NVCC device pass):
 
-#else // !(NVCC device pass):
+#    define THRUST_CDP_DISPATCH(par_impl, seq_impl) NV_IF_TARGET(NV_IS_HOST, par_impl, seq_impl)
 
-#  define THRUST_CDP_DISPATCH(par_impl, seq_impl) _THRUST_IF_TARGET(_THRUST_IS_HOST, par_impl, seq_impl)
+#  endif // NVCC device pass
 
-#endif // NVCC device pass
+#endif // CDP version
diff --git a/projects/rocthrust/thrust/system/cuda/detail/copy.h b/projects/rocthrust/thrust/system/cuda/detail/copy.h
index 39b8d2ca8815..857af1eceec3 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/copy.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/copy.h
@@ -84,7 +84,7 @@ THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 // D->D copy requires NVCC compiler
 
 _CCCL_EXEC_CHECK_DISABLE
diff --git a/projects/rocthrust/thrust/system/cuda/detail/copy_if.h b/projects/rocthrust/thrust/system/cuda/detail/copy_if.h
index 2ee5bd8947d7..e1cd0b371ebd 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/copy_if.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/copy_if.h
@@ -35,8 +35,7 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -88,7 +87,16 @@ namespace cuda_cub
 namespace detail
 {
 
-template <cub::SelectImpl SelectionOpt,
+/**
+ * Enum class to indicate whether the memory of input and output iterators potentially alias one another.
+ */
+enum class InputMayAliasOutput
+{
+  no,
+  yes
+};
+
+template <InputMayAliasOutput MayAlias,
           typename Derived,
           typename InputIt,
           typename StencilIt,
@@ -116,24 +124,34 @@ struct DispatchCopyIf
     std::size_t allocation_sizes[2] = {0, sizeof(OffsetT)};
     void* allocations[2]            = {nullptr, nullptr};
 
+    // drop rejected items (i.e., this is not a partition, but a selection)
+    constexpr bool keep_rejects = false;
+    constexpr bool may_alias    = (MayAlias == InputMayAliasOutput::yes);
+
     // Query algorithm memory requirements
-    status = cub::
-      DispatchSelectIf<InputIt, StencilIt, OutputIt, num_selected_out_it_t, Predicate, equality_op_t, OffsetT, SelectionOpt>::
-        Dispatch(
-          nullptr,
-          allocation_sizes[0],
-          first,
-          stencil,
-          output,
-          static_cast<num_selected_out_it_t>(nullptr),
-          predicate,
-          equality_op_t{},
-          num_items,
-          stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    status = cub::DispatchSelectIf<
+      InputIt,
+      StencilIt,
+      OutputIt,
+      num_selected_out_it_t,
+      Predicate,
+      equality_op_t,
+      OffsetT,
+      keep_rejects,
+      may_alias>::Dispatch(nullptr,
+                           allocation_sizes[0],
+                           first,
+                           stencil,
+                           output,
+                           static_cast<num_selected_out_it_t>(nullptr),
+                           predicate,
+                           equality_op_t{},
+                           num_items,
+                           stream);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Return if we're only querying temporary storage requirements
     if (d_temp_storage == nullptr)
@@ -151,31 +169,37 @@ struct DispatchCopyIf
     OffsetT* d_num_selected_out = thrust::detail::aligned_reinterpret_cast<OffsetT*>(allocations[1]);
 
     // Run algorithm
-    status = cub::
-      DispatchSelectIf<InputIt, StencilIt, OutputIt, num_selected_out_it_t, Predicate, equality_op_t, OffsetT, SelectionOpt>::
-        Dispatch(
-          allocations[0],
-          allocation_sizes[0],
-          first,
-          stencil,
-          output,
-          d_num_selected_out,
-          predicate,
-          equality_op_t{},
-          num_items,
-          stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    status = cub::DispatchSelectIf<
+      InputIt,
+      StencilIt,
+      OutputIt,
+      num_selected_out_it_t,
+      Predicate,
+      equality_op_t,
+      OffsetT,
+      keep_rejects,
+      may_alias>::Dispatch(allocations[0],
+                           allocation_sizes[0],
+                           first,
+                           stencil,
+                           output,
+                           d_num_selected_out,
+                           predicate,
+                           equality_op_t{},
+                           num_items,
+                           stream);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Get number of selected items
     status = cuda_cub::synchronize(policy);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
     OffsetT num_selected = get_value(policy, d_num_selected_out);
     thrust::advance(output, num_selected);
     return status;
   }
 };
 
-template <cub::SelectImpl SelectionOpt,
+template <InputMayAliasOutput MayAlias,
           typename Derived,
           typename InputIt,
           typename StencilIt,
@@ -189,7 +213,7 @@ THRUST_RUNTIME_FUNCTION OutputIt copy_if(
   OutputIt output,
   Predicate predicate)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
 
   size_type num_items       = static_cast<size_type>(thrust::distance(first, last));
   cudaError_t status        = cudaSuccess;
@@ -200,7 +224,7 @@ THRUST_RUNTIME_FUNCTION OutputIt copy_if(
   // inputs larger than INT_MAX into partitions of up to `INT_MAX` items each, repeatedly invoking the respective
   // algorithm. With that approach, we can always use i64 offset types for DispatchSelectIf, because there's only very
   // limited performance upside for using i32 offset types. This avoids potentially duplicate kernel compilation.
-  using dispatch64_t = DispatchCopyIf<SelectionOpt, Derived, InputIt, StencilIt, OutputIt, Predicate, std::int64_t>;
+  using dispatch64_t = DispatchCopyIf<MayAlias, Derived, InputIt, StencilIt, OutputIt, Predicate, std::int64_t>;
 
   // Query temporary storage requirements
   status = dispatch64_t::dispatch(
@@ -229,7 +253,7 @@ template <class Derived, class InputIterator, class OutputIterator, class Predic
 OutputIterator _CCCL_HOST_DEVICE copy_if(
   execution_policy<Derived>& policy, InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
 {
-  THRUST_CDP_DISPATCH((return detail::copy_if<cub::SelectImpl::Select>(
+  THRUST_CDP_DISPATCH((return detail::copy_if<detail::InputMayAliasOutput::no>(
                                 policy, first, last, static_cast<cub::NullType*>(nullptr), result, pred);),
                       (return thrust::copy_if(cvt_to_seq(derived_cast(policy)), first, last, result, pred);));
 }
@@ -244,8 +268,9 @@ OutputIterator _CCCL_HOST_DEVICE copy_if(
   OutputIterator result,
   Predicate pred)
 {
-  THRUST_CDP_DISPATCH((return detail::copy_if<cub::SelectImpl::Select>(policy, first, last, stencil, result, pred);),
-                      (return thrust::copy_if(cvt_to_seq(derived_cast(policy)), first, last, stencil, result, pred);));
+  THRUST_CDP_DISPATCH(
+    (return detail::copy_if<detail::InputMayAliasOutput::no>(policy, first, last, stencil, result, pred);),
+    (return thrust::copy_if(cvt_to_seq(derived_cast(policy)), first, last, stencil, result, pred);));
 }
 
 } // namespace cuda_cub
diff --git a/projects/rocthrust/thrust/system/cuda/detail/core/agent_launcher.h b/projects/rocthrust/thrust/system/cuda/detail/core/agent_launcher.h
index 914a6caca2cc..a051cd99ac43 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/core/agent_launcher.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/core/agent_launcher.h
@@ -36,7 +36,9 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#include <cub/detail/device_synchronize.cuh>
+
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/detail/core/triple_chevron_launch.h>
 #  include <thrust/system/cuda/detail/core/util.h>
 
@@ -62,8 +64,7 @@ namespace cuda_cub
 {
 namespace core
 {
-namespace detail
-{
+
 #  ifndef THRUST_DETAIL_KERNEL_ATTRIBUTES
 #    define THRUST_DETAIL_KERNEL_ATTRIBUTES CCCL_DETAIL_KERNEL_ATTRIBUTES
 #  endif
@@ -98,7 +99,7 @@ THRUST_DETAIL_KERNEL_ATTRIBUTES void _kernel_agent_vshmem(char*, Args... args)
 template <class Agent>
 struct AgentLauncher : Agent
 {
-  AgentPlan plan;
+  core::AgentPlan plan;
   size_t count;
   cudaStream_t stream;
   char const* name;
@@ -122,7 +123,7 @@ struct AgentLauncher : Agent
       , name(name_)
       , grid(static_cast<unsigned int>((count + plan.items_per_tile - 1) / plan.items_per_tile))
       , vshmem(nullptr)
-      , has_shmem((size_t) get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
+      , has_shmem((size_t) core::get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
       , shmem_size(has_shmem ? plan.shared_memory_size : 0)
   {
     assert(count > 0);
@@ -137,7 +138,7 @@ struct AgentLauncher : Agent
       , name(name_)
       , grid(static_cast<unsigned int>((count + plan.items_per_tile - 1) / plan.items_per_tile))
       , vshmem(vshmem)
-      , has_shmem((size_t) get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
+      , has_shmem((size_t) core::get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
       , shmem_size(has_shmem ? plan.shared_memory_size : 0)
   {
     assert(count > 0);
@@ -150,7 +151,7 @@ struct AgentLauncher : Agent
       , name(name_)
       , grid(plan.grid_size)
       , vshmem(nullptr)
-      , has_shmem((size_t) get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
+      , has_shmem((size_t) core::get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
       , shmem_size(has_shmem ? plan.shared_memory_size : 0)
   {
     assert(plan.grid_size > 0);
@@ -163,18 +164,43 @@ struct AgentLauncher : Agent
       , name(name_)
       , grid(plan.grid_size)
       , vshmem(vshmem)
-      , has_shmem((size_t) get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
+      , has_shmem((size_t) core::get_max_shared_memory_per_block() >= (size_t) plan.shared_memory_size)
       , shmem_size(has_shmem ? plan.shared_memory_size : 0)
   {
     assert(plan.grid_size > 0);
   }
 
-  THRUST_RUNTIME_FUNCTION typename get_plan<Agent>::type static get_plan(cudaStream_t, void* /* d_ptr */ = 0)
+#  if 0
+    THRUST_RUNTIME_FUNCTION
+    AgentPlan static get_plan(cudaStream_t s, void* d_ptr = 0)
+    {
+      // in separable compilation mode, we have no choice
+      // but to call kernel to get agent_plan
+      // otherwise the risk is something may fail
+      // if user mix & match ptx versions in a separably compiled function
+      // http://nvbugs/1772071
+      // XXX may be it is too string of a requirements, consider relaxing it in
+      // the future
+#    ifdef __CUDACC_RDC__
+      return core::get_agent_plan<Agent>(s, d_ptr);
+#    else
+      return get_agent_plan<Agent>(core::get_ptx_version());
+#    endif
+    }
+    THRUST_RUNTIME_FUNCTION
+    AgentPlan static get_plan_default()
+    {
+      return get_agent_plan<Agent>(sm_arch<0>::type::ver);
+    }
+#  endif
+
+  THRUST_RUNTIME_FUNCTION typename core::get_plan<Agent>::type static get_plan(cudaStream_t, void* d_ptr = 0)
   {
-    return get_agent_plan<Agent>(get_ptx_version());
+    THRUST_UNUSED_VAR(d_ptr);
+    return get_agent_plan<Agent>(core::get_ptx_version());
   }
 
-  THRUST_RUNTIME_FUNCTION typename detail::get_plan<Agent>::type static get_plan()
+  THRUST_RUNTIME_FUNCTION typename core::get_plan<Agent>::type static get_plan()
   {
     return get_agent_plan<Agent>(lowest_supported_sm_arch::ver);
   }
@@ -203,7 +229,7 @@ struct AgentLauncher : Agent
   {
 #  if THRUST_DEBUG_SYNC_FLAG
     cuda_optional<int> occ = max_sm_occupancy(k);
-    const int ptx_version  = get_ptx_version();
+    const int ptx_version  = core::get_ptx_version();
     if (count > 0)
     {
       _CubLog(
@@ -282,7 +308,6 @@ struct AgentLauncher : Agent
   }
 };
 
-} // namespace detail
 } // namespace core
 } // namespace cuda_cub
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/core/triple_chevron_launch.h b/projects/rocthrust/thrust/system/cuda/detail/core/triple_chevron_launch.h
index 7c87d677c5e3..cde9219dc7c0 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/core/triple_chevron_launch.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/core/triple_chevron_launch.h
@@ -67,26 +67,10 @@ struct _CCCL_VISIBILITY_HIDDEN triple_chevron
       , stream(stream_)
   {}
 
-  // cudaLaunchKernelEx requires C++11, but unfortunately <cuda_runtime.h> checks this using the __cplusplus macro,
-  // which is reported wrongly for MSVC. CTK 12.3 fixed this by additionally detecting _MSV_VER. As a workaround, we
-  // provide our own copy of cudaLaunchKernelEx when it is not available from the CTK.
-#if _CCCL_COMPILER(MSVC) && _CCCL_CUDACC_BELOW(12, 3)
-  // Copied from <cuda_runtime.h>
-  template <typename... ExpTypes, typename... ActTypes>
-  static cudaError_t _CCCL_HOST
-  cudaLaunchKernelEx_MSVC_workaround(const cudaLaunchConfig_t* config, void (*kernel)(ExpTypes...), ActTypes&&... args)
-  {
-    return [&](ExpTypes... coercedArgs) {
-      void* pArgs[] = {&coercedArgs...};
-      return ::cudaLaunchKernelExC(config, (const void*) kernel, pArgs);
-    }(std::forward<ActTypes>(args)...);
-  }
-#endif
-
   template <class K, class... Args>
   cudaError_t _CCCL_HOST doit_host(K k, Args const&... args) const
   {
-#if _CCCL_HAS_PDL()
+#if _THRUST_HAS_PDL
     if (dependent_launch)
     {
       cudaLaunchAttribute attribute[1];
@@ -100,14 +84,10 @@ struct _CCCL_VISIBILITY_HIDDEN triple_chevron
       config.stream           = stream;
       config.attrs            = attribute;
       config.numAttrs         = 1;
-#  if _CCCL_COMPILER(MSVC) && _CCCL_CUDACC_BELOW(12, 3)
-      cudaLaunchKernelEx_MSVC_workaround(&config, k, args...);
-#  else
       cudaLaunchKernelEx(&config, k, args...);
-#  endif
     }
     else
-#endif // _CCCL_HAS_PDL()
+#endif // _THRUST_HAS_PDL
     {
       k<<<grid, block, shared_mem, stream>>>(args...);
     }
@@ -181,11 +161,16 @@ struct _CCCL_VISIBILITY_HIDDEN triple_chevron
   template <class K, class... Args>
   THRUST_FUNCTION cudaError_t doit(K k, Args const&... args) const
   {
-    _THRUST_IF_TARGET(_THRUST_IS_HOST, (return doit_host(k, args...);), (return doit_device(k, args...);));
+    NV_IF_TARGET(NV_IS_HOST, (return doit_host(k, args...);), (return doit_device(k, args...);));
   }
 
 }; // struct triple_chevron
 } // namespace detail
+
+namespace launcher
+{
+using triple_chevron CCCL_DEPRECATED = detail::triple_chevron;
+} // namespace launcher
 } // namespace cuda_cub
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cuda/detail/core/util.h b/projects/rocthrust/thrust/system/cuda/detail/core/util.h
index 7c6f0aaf6f74..3844e4deb6f7 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/core/util.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/core/util.h
@@ -43,9 +43,8 @@
 #include <cub/util_temporary_storage.cuh>
 
 #include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/system/cuda/detail/core/load_iterator.h>
-#include <thrust/system/cuda/detail/core/make_load_iterator.h>
 #include <thrust/system/cuda/detail/util.h>
+#include <thrust/system/system_error.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
 #include <cuda/std/__type_traits/void_t.h>
@@ -58,8 +57,40 @@ namespace cuda_cub
 {
 namespace core
 {
-namespace detail
-{
+
+#ifdef _NVHPC_CUDA
+#  if (__NVCOMPILER_CUDA_ARCH__ >= 600)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm60
+#  elif (__NVCOMPILER_CUDA_ARCH__ >= 520)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm52
+#  elif (__NVCOMPILER_CUDA_ARCH__ >= 350)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm35
+#  else
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm30
+#  endif
+#else
+#  if (__CUDA_ARCH__ >= 600)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm60
+#  elif (__CUDA_ARCH__ >= 520)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm52
+#  elif (__CUDA_ARCH__ >= 350)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm35
+#  elif (__CUDA_ARCH__ >= 300)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm30
+#  elif !defined(__CUDA_ARCH__)
+// deprecated [since 2.8]
+#    define THRUST_TUNING_ARCH sm30
+#  endif
+#endif
+
 /// Typelist - a container of types
 template <typename...>
 struct typelist;
@@ -68,7 +99,22 @@ struct typelist;
 
 // supported SM arch
 // ---------------------
-
+struct sm30
+{
+  enum
+  {
+    ver      = 300,
+    warpSize = 32
+  };
+};
+struct sm35
+{
+  enum
+  {
+    ver      = 350,
+    warpSize = 32
+  };
+};
 struct sm52
 {
   enum
@@ -89,7 +135,7 @@ struct sm60
 // list of sm, checked from left to right order
 // the rightmost is the lowest sm arch supported
 // --------------------------------------------
-using sm_list = typelist<sm60, sm52>;
+using sm_list = typelist<sm60, sm52, sm35, sm30>;
 
 // lowest supported SM arch
 // --------------------------------------------------------------------------
@@ -156,21 +202,7 @@ struct specialize_plan_impl_match<P, typelist<SM, SMs...>>
     : ::cuda::std::conditional<has_sm_tuning<P, SM>::value, P<SM>, specialize_plan_impl_match<P, typelist<SMs...>>>::type
 {};
 
-#if _CCCL_CUDA_COMPILER(NVHPC)
-#  if (__NVCOMPILER_CUDA_ARCH__ >= 600)
-#    define _THRUST_TUNING_ARCH sm60
-#  else
-#    define _THRUST_TUNING_ARCH sm52
-#  endif
-#else
-#  if (__CUDA_ARCH__ >= 600)
-#    define _THRUST_TUNING_ARCH sm60
-#  else
-#    define _THRUST_TUNING_ARCH sm52
-#  endif
-#endif
-
-template <template <class> class Plan, class SM = _THRUST_TUNING_ARCH>
+template <template <class> class Plan, class SM = THRUST_TUNING_ARCH>
 struct specialize_plan_msvc10_war
 {
   // if Plan has tuning type, this means it has SM-specific tuning
@@ -181,12 +213,10 @@ struct specialize_plan_msvc10_war
                                         Plan<SM>>;
 };
 
-template <template <class> class Plan, class SM = _THRUST_TUNING_ARCH>
+template <template <class> class Plan, class SM = THRUST_TUNING_ARCH>
 struct specialize_plan : specialize_plan_msvc10_war<Plan, SM>::type::type
 {};
 
-#undef _THRUST_TUNING_ARCH
-
 /////////////////////////
 /////////////////////////
 /////////////////////////
@@ -199,13 +229,13 @@ struct specialize_plan : specialize_plan_msvc10_war<Plan, SM>::type::type
 template <class Agent, class = void>
 struct temp_storage_size
 {
-  static constexpr ::cuda::std::size_t value = 0;
+  static constexpr std::size_t value = 0;
 };
 
 template <class Agent>
 struct temp_storage_size<Agent, ::cuda::std::void_t<typename Agent::TempStorage>>
 {
-  static constexpr ::cuda::std::size_t value = sizeof(typename Agent::TempStorage);
+  static constexpr std::size_t value = sizeof(typename Agent::TempStorage);
 };
 
 // check whether all Agents requires < MAX_SHMEM shared memory
@@ -244,7 +274,6 @@ struct has_enough_shmem : has_enough_shmem_impl<true, Agent, MAX_SHMEM, sm_list>
 /////////////////////////
 /////////////////////////
 
-#if !_CCCL_COMPILER(NVRTC)
 // AgentPlan structure and helpers
 // --------------------------------
 
@@ -334,14 +363,96 @@ struct get_agent_plan_impl<Agent, typelist<lowest_supported_sm_arch>>
 };
 
 template <class Agent>
-THRUST_RUNTIME_FUNCTION typename get_plan<Agent>::type get_agent_plan([[maybe_unused]] int ptx_version)
+THRUST_RUNTIME_FUNCTION typename get_plan<Agent>::type get_agent_plan(int ptx_version)
 {
-  _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-                    (using plan_type = typename get_plan<Agent>::type; using ptx_plan = typename Agent::ptx_plan;
-                     return plan_type{ptx_plan{}};), // _THRUST_IS_HOST:
-                    (return get_agent_plan_impl<Agent, sm_list>::get(ptx_version);));
+  NV_IF_TARGET(NV_IS_DEVICE,
+               (THRUST_UNUSED_VAR(ptx_version); using plan_type = typename get_plan<Agent>::type;
+                using ptx_plan                                  = typename Agent::ptx_plan;
+                return plan_type{ptx_plan{}};), // NV_IS_HOST:
+               (return get_agent_plan_impl<Agent, sm_list>::get(ptx_version);));
 }
 
+// XXX keep this dead-code for now as a gentle reminder
+//     that kernel launch which reats plan values is the most robust
+//     mechanism to extract sm-specific tuning parameters
+// TODO: since we are unable to afford kernel launch + cudaMemcpy ON EVERY
+//       algorithm invocation, we need to design a good caching strategy
+//       such that when the algorithm is called multiple times, only the
+//       first invocation will invoke kernel launch + cudaMemcpy, but
+//       the subsequent invocations, will just read cached values from host mem
+//       If launched from device, this is just a device-function call
+//       no caching is required.
+// ----------------------------------------------------------------------------
+// if we don't know ptx version, we can call kernel
+// to retrieve AgentPlan from device code. Slower, but guaranteed to work
+// -----------------------------------------------------------------------
+#if 0
+  template<class Agent>
+  void __global__ get_agent_plan_kernel(AgentPlan *plan);
+
+  static _CCCL_DEVICE AgentPlan agent_plan_device;
+
+  template<class Agent>
+  AgentPlan _CCCL_DEVICE get_agent_plan_dev()
+  {
+    AgentPlan plan;
+    plan.block_threads      = Agent::ptx_plan::BLOCK_THREADS;
+    plan.items_per_thread   = Agent::ptx_plan::ITEMS_PER_THREAD;
+    plan.items_per_tile     = Agent::ptx_plan::ITEMS_PER_TILE;
+    plan.shared_memory_size = temp_storage_size<typename Agent::ptx_plan>::value;
+    return plan;
+  }
+
+  template <class Agent, class F>
+  AgentPlan _CCCL_HOST_DEVICE _CCCL_FORCEINLINE
+  xget_agent_plan_impl(F f, cudaStream_t s, void* d_ptr)
+  {
+    AgentPlan plan;
+#  ifdef __CUDA_ARCH__
+    plan = get_agent_plan_dev<Agent>();
+#  else
+    static cub::Mutex mutex;
+    bool lock = false;
+    if (d_ptr == 0)
+    {
+      lock = true;
+      cudaGetSymbolAddress(&d_ptr, agent_plan_device);
+    }
+    if (lock)
+      mutex.Lock();
+    f<<<1,1,0,s>>>((AgentPlan*)d_ptr);
+    cudaMemcpyAsync((void*)&plan,
+                    d_ptr,
+                    sizeof(AgentPlan),
+                    cudaMemcpyDeviceToHost,
+                    s);
+    if (lock)
+      mutex.Unlock();
+    cudaStreamSynchronize(s);
+#  endif
+    return plan;
+  }
+
+  template <class Agent>
+  AgentPlan THRUST_RUNTIME_FUNCTION
+  get_agent_plan(cudaStream_t s = 0, void *ptr = 0)
+  {
+    return xget_agent_plan_impl<Agent>(get_agent_plan_kernel<Agent>,
+                                        s,
+                                        ptr);
+  }
+
+  template<class Agent>
+  void __global__ get_agent_plan_kernel(AgentPlan *plan)
+  {
+    *plan = get_agent_plan_dev<Agent>();
+  }
+#endif
+
+/////////////////////////
+/////////////////////////
+/////////////////////////
+
 THRUST_RUNTIME_FUNCTION inline int get_sm_count()
 {
   int dev_id;
@@ -375,9 +486,22 @@ THRUST_RUNTIME_FUNCTION inline size_t get_max_shared_memory_per_block()
   return static_cast<size_t>(i32value);
 }
 
+THRUST_RUNTIME_FUNCTION inline size_t virtual_shmem_size(size_t shmem_per_block)
+{
+  size_t max_shmem_per_block = core::get_max_shared_memory_per_block();
+  if (shmem_per_block > max_shmem_per_block)
+  {
+    return shmem_per_block;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
 THRUST_RUNTIME_FUNCTION inline size_t vshmem_size(size_t shmem_per_block, size_t num_blocks)
 {
-  size_t max_shmem_per_block = get_max_shared_memory_per_block();
+  size_t max_shmem_per_block = core::get_max_shared_memory_per_block();
   if (shmem_per_block > max_shmem_per_block)
   {
     return shmem_per_block * num_blocks;
@@ -387,7 +511,42 @@ THRUST_RUNTIME_FUNCTION inline size_t vshmem_size(size_t shmem_per_block, size_t
     return 0;
   }
 }
-#endif // !_CCCL_COMPILER(NVRTC)
+
+// LoadIterator
+// ------------
+// if trivial iterator is passed, wrap loads into LDG
+//
+template <class PtxPlan, class It>
+struct LoadIterator
+{
+  using value_type = typename iterator_traits<It>::value_type;
+  using size_type  = typename iterator_traits<It>::difference_type;
+
+  using type =
+    ::cuda::std::conditional_t<is_contiguous_iterator<It>::value,
+                               cub::CacheModifiedInputIterator<PtxPlan::LOAD_MODIFIER, value_type, size_type>,
+                               It>;
+}; // struct Iterator
+
+template <class PtxPlan, class It>
+typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE
+make_load_iterator_impl(It it, thrust::detail::true_type /* is_trivial */)
+{
+  return raw_pointer_cast(&*it);
+}
+
+template <class PtxPlan, class It>
+typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE
+make_load_iterator_impl(It it, thrust::detail::false_type /* is_trivial */)
+{
+  return it;
+}
+
+template <class PtxPlan, class It>
+typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE make_load_iterator(PtxPlan const&, It it)
+{
+  return make_load_iterator_impl<PtxPlan>(it, typename is_contiguous_iterator<It>::type());
+}
 
 template <class>
 struct get_arch;
@@ -401,10 +560,33 @@ struct get_arch<Plan<Arch>>
 // BlockLoad
 // -----------
 // a helper metaprogram that returns type of a block loader
-template <class PtxPlan, class It, class T = thrust::detail::it_value_t<It>>
+template <class PtxPlan, class It, class T = typename iterator_traits<It>::value_type>
 struct BlockLoad
 {
-  using type = cub::BlockLoad<T, PtxPlan::BLOCK_THREADS, PtxPlan::ITEMS_PER_THREAD, PtxPlan::LOAD_ALGORITHM, 1, 1>;
+  using type =
+    cub::BlockLoad<T,
+                   PtxPlan::BLOCK_THREADS,
+                   PtxPlan::ITEMS_PER_THREAD,
+                   PtxPlan::LOAD_ALGORITHM,
+                   1,
+                   1,
+                   get_arch<PtxPlan>::type::ver>;
+};
+
+// BlockStore
+// -----------
+// a helper metaprogram that returns type of a block loader
+template <class PtxPlan, class It, class T = typename iterator_traits<It>::value_type>
+struct BlockStore
+{
+  using type =
+    cub::BlockStore<T,
+                    PtxPlan::BLOCK_THREADS,
+                    PtxPlan::ITEMS_PER_THREAD,
+                    PtxPlan::STORE_ALGORITHM,
+                    1,
+                    1,
+                    get_arch<PtxPlan>::type::ver>;
 };
 
 // cuda_optional
@@ -447,7 +629,6 @@ class cuda_optional
   }
 };
 
-#if !_CCCL_COMPILER(NVRTC)
 THRUST_RUNTIME_FUNCTION inline int get_ptx_version()
 {
   int ptx_version = 0;
@@ -501,9 +682,19 @@ THRUST_RUNTIME_FUNCTION inline int get_ptx_version()
 
   return ptx_version;
 }
-#endif // !_CCCL_COMPILER(NVRTC)
 
-#define _CUDA_CUB_RET_IF_FAIL(e)               \
+THRUST_RUNTIME_FUNCTION inline cudaError_t sync_stream(cudaStream_t stream)
+{
+  return cub::SyncStream(stream);
+}
+
+inline void _CCCL_DEVICE sync_threadblock()
+{
+  __syncthreads();
+}
+
+// Deprecated [Since 2.8]
+#define CUDA_CUB_RET_IF_FAIL(e)                \
   {                                            \
     auto const error = (e);                    \
     if (cub::Debug(error, __FILE__, __LINE__)) \
@@ -592,7 +783,11 @@ struct uninitialized_array
   }
 };
 
-#if !_CCCL_COMPILER(NVRTC)
+_CCCL_HOST_DEVICE _CCCL_FORCEINLINE size_t align_to(size_t n, size_t align)
+{
+  return ((n + align - 1) / align) * align;
+}
+
 namespace host
 {
 inline cuda_optional<size_t> get_max_shared_memory_per_block()
@@ -621,10 +816,12 @@ THRUST_RUNTIME_FUNCTION cudaError_t alias_storage(
 {
   return cub::detail::AliasTemporaries(storage_ptr, storage_size, allocations, allocation_sizes);
 }
-#endif // !_CCCL_COMPILER(NVRTC)
 
-} // namespace detail
 } // namespace core
+using core::sm30;
+using core::sm35;
+using core::sm52;
+using core::sm60;
 } // namespace cuda_cub
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cuda/detail/count.h b/projects/rocthrust/thrust/system/cuda/detail/count.h
index 20e556a3b9dc..530682ba717d 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/count.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/count.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/distance.h>
@@ -49,10 +49,10 @@ namespace cuda_cub
 {
 
 template <class Derived, class InputIt, class UnaryPred>
-thrust::detail::it_difference_t<InputIt> _CCCL_HOST_DEVICE
+typename iterator_traits<InputIt>::difference_type _CCCL_HOST_DEVICE
 count_if(execution_policy<Derived>& policy, InputIt first, InputIt last, UnaryPred unary_pred)
 {
-  using size_type       = thrust::detail::it_difference_t<InputIt>;
+  using size_type       = typename iterator_traits<InputIt>::difference_type;
   using flag_iterator_t = transform_iterator<UnaryPred, InputIt, size_type, size_type>;
 
   return cuda_cub::reduce_n(
@@ -60,7 +60,7 @@ count_if(execution_policy<Derived>& policy, InputIt first, InputIt last, UnaryPr
 }
 
 template <class Derived, class InputIt, class Value>
-thrust::detail::it_difference_t<InputIt> _CCCL_HOST_DEVICE
+typename iterator_traits<InputIt>::difference_type _CCCL_HOST_DEVICE
 count(execution_policy<Derived>& policy, InputIt first, InputIt last, Value const& value)
 {
   return cuda_cub::count_if(policy, first, last, thrust::detail::equal_to_value<Value>(value));
diff --git a/projects/rocthrust/thrust/system/cuda/detail/cross_system.h b/projects/rocthrust/thrust/system/cuda/detail/cross_system.h
index c95525cc1781..de2af4d4c331 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/cross_system.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/cross_system.h
@@ -36,7 +36,6 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/type_deduction.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
 #include <thrust/system/cuda/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/dispatch.h b/projects/rocthrust/thrust/system/cuda/detail/dispatch.h
index c161d9c3cf15..c05eec2b2ee9 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/dispatch.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/dispatch.h
@@ -18,23 +18,27 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/integer_math.h>
+#include <thrust/detail/integer_traits.h>
 #include <thrust/detail/preprocessor.h>
 
-#include <cuda/std/detail/libcxx/include/stdexcept>
-#include <cuda/std/limits>
-#include <cuda/std/type_traits>
+#ifndef ST_DEVICE_ERROR
+#  if defined(__HIP_DEVICE_COMPILE__)
+#    include <hip/hip_runtime.h>
+#    define THRUST_DEVICE_ERROR(message) (printf("%s\n", (messa
+#  elif defined(__CUDA_ARCH__)
+#    include <cuda/std/detail/libcxx/include/stdexcept>
+#    define THRUST_DEVICE_ERROR(message) ::cuda::std::__throw_runtime_error(message)
+#  else
+#    include <stdexcept>
+#    define THRUST_DEVICE_ERROR(message) throw std::runtime_error(message)
+#  endif
+#endif
 
 #include <cstdint>
+#include <cstdio>
 #include <string>
+#include <type_traits>
 
 #if defined(THRUST_FORCE_32_BIT_OFFSET_TYPE) && defined(THRUST_FORCE_64_BIT_OFFSET_TYPE)
 #  error "Only THRUST_FORCE_32_BIT_OFFSET_TYPE or THRUST_FORCE_64_BIT_OFFSET_TYPE may be defined!"
@@ -53,10 +57,10 @@
     status                              = call arguments;                                 \
   }
 
-#define _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                           \
-  if (thrust::detail::is_negative(count))                                            \
-  {                                                                                  \
-    ::cuda::std::__throw_runtime_error("Invalid input range, passed negative size"); \
+#define _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)            \
+  if (thrust::detail::is_negative(count))                             \
+  {                                                                   \
+    THRUST_DEVICE_ERROR("Invalid input range, passed negative size"); \
   }
 
 #define _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2) \
@@ -94,9 +98,9 @@
 //! @brief Ensures that the size of the input does not overflow the offset type
 #  define _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW(index_type, count)                       \
     if (static_cast<std::uint64_t>(count)                                                     \
-        > static_cast<std::uint64_t>(::cuda::std::numeric_limits<index_type>::max()))         \
+        > static_cast<std::uint64_t>(thrust::detail::integer_traits<index_type>::const_max))  \
     {                                                                                         \
-      ::cuda::std::__throw_runtime_error(                                                     \
+      THRUST_DEVICE_ERROR(                                                                    \
         "Input size exceeds the maximum allowable value for " #index_type                     \
         ". It was used because the macro THRUST_FORCE_32_BIT_OFFSET_TYPE was defined. "       \
         "To handle larger input sizes, either remove this macro to dynamically dispatch "     \
@@ -106,9 +110,9 @@
 //! @brief Ensures that the sizes of the inputs do not overflow the offset type, but two counts
 #  define _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW2(index_type, count1, count2)             \
     if (static_cast<std::uint64_t>(count1) + static_cast<std::uint64_t>(count2)               \
-        > static_cast<std::uint64_t>(::cuda::std::numeric_limits<index_type>::max()))         \
+        > static_cast<std::uint64_t>(thrust::detail::integer_traits<index_type>::const_max))  \
     {                                                                                         \
-      ::cuda::std::__throw_runtime_error(                                                     \
+      THRUST_DEVICE_ERROR(                                                                    \
         "Input size exceeds the maximum allowable value for " #index_type                     \
         ". It was used because the macro THRUST_FORCE_32_BIT_OFFSET_TYPE was defined. "       \
         "To handle larger input sizes, either remove this macro to dynamically dispatch "     \
@@ -148,11 +152,12 @@
 #else // ^^^ THRUST_FORCE_32_BIT_OFFSET_TYPE ^^^ / vvv !THRUST_FORCE_32_BIT_OFFSET_TYPE vvv
 
 #  define _THRUST_INDEX_TYPE_DISPATCH_SELECT(index_type, count) \
-    (static_cast<std::uint64_t>(count) <= static_cast<std::uint64_t>(::cuda::std::numeric_limits<index_type>::max()))
+    (static_cast<std::uint64_t>(count)                          \
+     <= static_cast<std::uint64_t>(thrust::detail::integer_traits<index_type>::const_max))
 
 #  define _THRUST_INDEX_TYPE_DISPATCH_SELECT2(index_type, count1, count2)    \
     (static_cast<std::uint64_t>(count1) + static_cast<std::uint64_t>(count2) \
-     <= static_cast<std::uint64_t>(::cuda::std::numeric_limits<index_type>::max()))
+     <= static_cast<std::uint64_t>(thrust::detail::integer_traits<index_type>::const_max))
 
 //! Dispatch between 32-bit and 64-bit index_type based versions of the same algorithm implementation. This version
 //! assumes that callables for both branches consist of the same tokens, and is intended to be used with Thrust-style
diff --git a/projects/rocthrust/thrust/system/cuda/detail/equal.h b/projects/rocthrust/thrust/system/cuda/detail/equal.h
index 1b4d9cfa79bf..dcff749eaed0 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/equal.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/equal.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/system/cuda/detail/mismatch.h>
@@ -55,7 +55,7 @@ equal(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputI
 template <class Derived, class InputIt1, class InputIt2>
 bool _CCCL_HOST_DEVICE equal(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2)
 {
-  using InputType1 = thrust::detail::it_value_t<InputIt1>;
+  using InputType1 = typename thrust::iterator_value<InputIt1>::type;
   return cuda_cub::equal(policy, first1, last1, first2, equal_to<InputType1>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/error.inl b/projects/rocthrust/thrust/system/cuda/detail/error.inl
index 1b21deaa8ad2..2ce2b6565d88 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/error.inl
+++ b/projects/rocthrust/thrust/system/cuda/detail/error.inl
@@ -14,18 +14,11 @@
  *  limitations under the License.
  */
 
+
 #pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/system/cuda/error.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -33,64 +26,72 @@ THRUST_NAMESPACE_BEGIN
 namespace system
 {
 
+
 error_code make_error_code(cuda::errc::errc_t e)
 {
   return error_code(static_cast<int>(e), cuda_category());
 } // end make_error_code()
 
+
 error_condition make_error_condition(cuda::errc::errc_t e)
 {
   return error_condition(static_cast<int>(e), cuda_category());
 } // end make_error_condition()
 
+
 namespace cuda_cub
 {
 
 namespace detail
 {
 
-class cuda_error_category : public error_category
+
+class cuda_error_category
+  : public error_category
 {
-public:
-  inline cuda_error_category() {}
-
-  inline virtual const char* name() const
-  {
-    return "cuda";
-  }
-
-  inline virtual std::string message(int ev) const
-  {
-    char const* const unknown_str  = "unknown error";
-    char const* const unknown_name = "cudaErrorUnknown";
-    char const* c_str              = ::cudaGetErrorString(static_cast<cudaError_t>(ev));
-    char const* c_name             = ::cudaGetErrorName(static_cast<cudaError_t>(ev));
-    return std::string(c_name ? c_name : unknown_name) + ": " + (c_str ? c_str : unknown_str);
-  }
-
-  inline virtual error_condition default_error_condition(int ev) const
-  {
-    using namespace cuda::errc;
-
-    if (ev < ::cudaErrorUnknown)
+  public:
+    inline cuda_error_category(void) {}
+
+    inline virtual const char *name(void) const
+    {
+      return "cuda";
+    }
+
+    inline virtual std::string message(int ev) const
     {
-      return make_error_condition(static_cast<errc_t>(ev));
+      char const* const unknown_str  = "unknown error";
+      char const* const unknown_name = "cudaErrorUnknown";
+      char const* c_str  = ::cudaGetErrorString(static_cast<cudaError_t>(ev));
+      char const* c_name = ::cudaGetErrorName(static_cast<cudaError_t>(ev));
+      return std::string(c_name ? c_name : unknown_name)
+           + ": " + (c_str ? c_str : unknown_str);
     }
 
-    return system_category().default_error_condition(ev);
-  }
+    inline virtual error_condition default_error_condition(int ev) const
+    {
+      using namespace cuda::errc;
+
+      if(ev < ::cudaErrorUnknown)
+      {
+        return make_error_condition(static_cast<errc_t>(ev));
+      }
+
+      return system_category().default_error_condition(ev);
+    }
 }; // end cuda_error_category
 
-} // namespace detail
+} // end detail
 
 } // end namespace cuda_cub
 
-const error_category& cuda_category()
+
+const error_category &cuda_category(void)
 {
   static const thrust::system::cuda_cub::detail::cuda_error_category result;
   return result;
 }
 
+
 } // end namespace system
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cuda/detail/execution_policy.h b/projects/rocthrust/thrust/system/cuda/detail/execution_policy.h
index 70ac27c036b3..dc17c4391e90 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/execution_policy.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/execution_policy.h
@@ -44,6 +44,10 @@
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/version.h>
 
+#if !_CCCL_COMPILER(NVRTC)
+#  include <thrust/detail/dependencies_aware_execution_policy.h>
+#endif // !_CCCL_COMPILER(NVRTC)
+
 THRUST_NAMESPACE_BEGIN
 
 namespace cuda_cub
@@ -60,10 +64,15 @@ struct execution_policy<tag> : thrust::execution_policy<tag>
   using tag_type = tag;
 };
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 struct tag
     : execution_policy<tag>
-    , detail::allocator_aware_execution_policy<cuda_cub::execution_policy>
+    , thrust::detail::allocator_aware_execution_policy<cuda_cub::execution_policy>
+#if !_CCCL_COMPILER(NVRTC)
+    , thrust::detail::dependencies_aware_execution_policy<cuda_cub::execution_policy>
+#endif // !_CCCL_COMPILER(NVRTC)
 {};
+_CCCL_SUPPRESS_DEPRECATED_POP
 
 template <class Derived>
 struct execution_policy : thrust::execution_policy<Derived>
diff --git a/projects/rocthrust/thrust/system/cuda/detail/extrema.h b/projects/rocthrust/thrust/system/cuda/detail/extrema.h
index 5065ad52f925..358ddf7df48d 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/extrema.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/extrema.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -51,8 +51,6 @@
 #  include <thrust/system/cuda/detail/cdp_dispatch.h>
 #  include <thrust/system/cuda/detail/reduce.h>
 
-#  include <cuda/std/iterator>
-
 #  include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
@@ -186,10 +184,10 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   OutputIt output_it,
   cudaStream_t stream)
 {
-  using core::detail::AgentLauncher;
-  using core::detail::AgentPlan;
-  using core::detail::cuda_optional;
-  using core::detail::get_agent_plan;
+  using core::AgentLauncher;
+  using core::AgentPlan;
+  using core::cuda_optional;
+  using core::get_agent_plan;
 
   using UnsignedSize = typename detail::make_unsigned_special<Size>::type;
 
@@ -206,7 +204,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   if (num_items <= reduce_plan.items_per_tile)
   {
-    size_t vshmem_size = core::detail::vshmem_size(reduce_plan.shared_memory_size, 1);
+    size_t vshmem_size = core::vshmem_size(reduce_plan.shared_memory_size, 1);
 
     // small, single tile size
     if (d_temp_storage == nullptr)
@@ -218,13 +216,13 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
     reduce_agent ra(reduce_plan, num_items, stream, vshmem_ptr, "reduce_agent: single_tile only");
     ra.launch(input_it, output_it, num_items, reduction_op);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   }
   else
   {
     // regular size
-    cuda_optional<int> sm_count = core::detail::get_sm_count();
-    _CUDA_CUB_RET_IF_FAIL(sm_count.status());
+    cuda_optional<int> sm_count = core::get_sm_count();
+    CUDA_CUB_RET_IF_FAIL(sm_count.status());
 
     // reduction will not use more cta counts than requested
     cuda_optional<int> max_blocks_per_sm = reduce_agent::template get_max_blocks_per_sm<
@@ -234,7 +232,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
       cub::GridEvenShare<Size>,
       cub::GridQueue<UnsignedSize>,
       ReductionOp>(reduce_plan);
-    _CUDA_CUB_RET_IF_FAIL(max_blocks_per_sm.status());
+    CUDA_CUB_RET_IF_FAIL(max_blocks_per_sm.status());
 
     int reduce_device_occupancy = (int) max_blocks_per_sm * sm_count;
 
@@ -247,7 +245,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     // we will launch at most "max_blocks" blocks in a grid
     // so preallocate virtual shared memory storage for this if required
     //
-    size_t vshmem_size = core::detail::vshmem_size(reduce_plan.shared_memory_size, max_blocks);
+    size_t vshmem_size = core::vshmem_size(reduce_plan.shared_memory_size, max_blocks);
 
     // Temporary storage allocation requirements
     void* allocations[3]       = {nullptr, nullptr, nullptr};
@@ -257,7 +255,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
       vshmem_size // size of virtualized shared memory storage
     };
     status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
     if (d_temp_storage == nullptr)
     {
       return status;
@@ -288,17 +286,17 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
       drain_plan.grid_size = 1;
       drain_agent da(drain_plan, stream, "__reduce::drain_agent");
       da.launch(queue, num_items);
-      _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+      CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
     }
     else
     {
-      _CUDA_CUB_RET_IF_FAIL(cudaErrorNotSupported);
+      CUDA_CUB_RET_IF_FAIL(cudaErrorNotSupported);
     }
 
     reduce_plan.grid_size = reduce_grid_size;
     reduce_agent ra(reduce_plan, stream, vshmem_ptr, "reduce_agent: regular size reduce");
     ra.launch(input_it, d_block_reductions, num_items, even_share, queue, reduction_op);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
     using reduce_agent_single = AgentLauncher<__reduce::ReduceAgent<T*, OutputIt, T, Size, ReductionOp>>;
 
@@ -306,7 +304,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     reduce_agent_single ra1(reduce_plan, stream, vshmem_ptr, "reduce_agent: single tile reduce");
 
     ra1.launch(d_block_reductions, output_it, reduce_grid_size, reduction_op);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   }
 
   return status;
@@ -333,14 +331,14 @@ extrema(execution_policy<Derived>& policy, InputIt first, Size num_items, Binary
   void* allocations[2]       = {nullptr, nullptr};
 
   size_t storage_size = 0;
-  status              = core::detail::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
+  status              = core::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "extrema failed on 1st alias storage");
 
   // Allocate temporary storage.
   thrust::detail::temporary_array<std::uint8_t, Derived> tmp(policy, storage_size);
   void* ptr = static_cast<void*>(tmp.data().get());
 
-  status = core::detail::alias_storage(ptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(ptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "extrema failed on 2nd alias storage");
 
   T* d_result = thrust::detail::aligned_reinterpret_cast<T*>(allocations[0]);
@@ -369,8 +367,8 @@ element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPr
     return last;
   }
 
-  using InputType = thrust::detail::it_value_t<ItemsIt>;
-  using IndexType = thrust::detail::it_difference_t<ItemsIt>;
+  using InputType = typename iterator_traits<ItemsIt>::value_type;
+  using IndexType = typename iterator_traits<ItemsIt>::difference_type;
 
   IndexType num_items = static_cast<IndexType>(thrust::distance(first, last));
 
@@ -405,7 +403,7 @@ min_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, Bina
 template <class Derived, class ItemsIt>
 ItemsIt _CCCL_HOST_DEVICE min_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return cuda_cub::min_element(policy, first, last, less<value_type>());
 }
 
@@ -424,7 +422,7 @@ max_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, Bina
 template <class Derived, class ItemsIt>
 ItemsIt _CCCL_HOST_DEVICE max_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return cuda_cub::max_element(policy, first, last, less<value_type>());
 }
 
@@ -442,7 +440,8 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
   }
 
   THRUST_CDP_DISPATCH(
-    (using InputType = thrust::detail::it_value_t<ItemsIt>; using IndexType = thrust::detail::it_difference_t<ItemsIt>;
+    (using InputType = typename iterator_traits<ItemsIt>::value_type;
+     using IndexType = typename iterator_traits<ItemsIt>::difference_type;
 
      const auto num_items = static_cast<IndexType>(thrust::distance(first, last));
 
@@ -468,7 +467,7 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
 template <class Derived, class ItemsIt>
 pair<ItemsIt, ItemsIt> _CCCL_HOST_DEVICE minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return cuda_cub::minmax_element(policy, first, last, less<value_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/fill.h b/projects/rocthrust/thrust/system/cuda/detail/fill.h
index e3bb37e14dfa..a31b48674d02 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/fill.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/fill.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/distance.h>
 #  include <thrust/system/cuda/detail/parallel_for.h>
 #  include <thrust/system/cuda/detail/util.h>
diff --git a/projects/rocthrust/thrust/system/cuda/detail/find.h b/projects/rocthrust/thrust/system/cuda/detail/find.h
index a2aa0ceb1231..34cdbd136ff5 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/find.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/find.h
@@ -36,9 +36,10 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/counting_iterator.h>
 #  include <thrust/iterator/transform_iterator.h>
@@ -80,7 +81,7 @@ struct functor
     // select the smallest index among true results
     if (thrust::get<0>(lhs) && thrust::get<0>(rhs))
     {
-      return TupleType(true, (::cuda::std::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
+      return TupleType(true, (thrust::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
     }
     else if (thrust::get<0>(lhs))
     {
@@ -97,7 +98,7 @@ template <class ValueType, class InputIt, class UnaryOp>
 struct transform_input_iterator_t
 {
   using self_t            = transform_input_iterator_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt>;
+  using difference_type   = typename iterator_traits<InputIt>::difference_type;
   using value_type        = ValueType;
   using pointer           = void;
   using reference         = value_type;
@@ -136,13 +137,13 @@ struct transform_input_iterator_t
 
   _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*() const
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
+    typename thrust::iterator_value<InputIt>::type x = *input;
     return op(x);
   }
 
   _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*()
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
+    typename thrust::iterator_value<InputIt>::type x = *input;
     return op(x);
   }
 
@@ -210,7 +211,7 @@ find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Pred
 
   // TODO incorporate sizeof(InputType) into interval_threshold and round to multiple of 32
   const Size interval_threshold = 1 << 20;
-  const Size interval_size      = (::cuda::std::min)(interval_threshold, num_items);
+  const Size interval_size      = (thrust::min)(interval_threshold, num_items);
 
   // FIXME(bgruber): we should also be able to use transform_iterator here, but it makes nvc++ hang. See:
   // https://github.com/NVIDIA/cccl/issues/3594. The problem does not occur with nvcc, so we could not add a test :/
diff --git a/projects/rocthrust/thrust/system/cuda/detail/for_each.h b/projects/rocthrust/thrust/system/cuda/detail/for_each.h
index 03518ef44722..d0a3a65032a2 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/for_each.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/for_each.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/device_for.cuh>
@@ -72,7 +72,7 @@ Input THRUST_FUNCTION for_each_n(execution_policy<Derived>& policy, Input first,
 template <class Derived, class Input, class UnaryOp>
 Input THRUST_FUNCTION for_each(execution_policy<Derived>& policy, Input first, Input last, UnaryOp op)
 {
-  using size_type = thrust::detail::it_difference_t<Input>;
+  using size_type = typename iterator_traits<Input>::difference_type;
   size_type count = static_cast<size_type>(thrust::distance(first, last));
 
   return THRUST_NS_QUALIFIER::cuda_cub::for_each_n(policy, first, count, op);
diff --git a/projects/rocthrust/thrust/system/cuda/detail/future.inl b/projects/rocthrust/thrust/system/cuda/detail/future.inl
new file mode 100644
index 000000000000..0ea4f6505c75
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/detail/future.inl
@@ -0,0 +1,1235 @@
+// Copyright (c) 2018 NVIDIA Corporation
+// Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
+//
+// Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
+
+// TODO: Split into more granular headers (move unique_stream/unique_marker to
+// another header, etc).
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  include <thrust/allocate_unique.h>
+#  include <thrust/detail/event_error.h>
+#  include <thrust/detail/execute_with_dependencies.h>
+#  include <thrust/detail/memory_wrapper.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/tuple_algorithms.h>
+#  include <thrust/detail/type_deduction.h>
+#  include <thrust/detail/type_traits/pointer_traits.h>
+#  include <thrust/optional.h>
+#  include <thrust/system/cuda/detail/get_value.h>
+#  include <thrust/system/cuda/detail/util.h>
+#  include <thrust/system/cuda/future.h>
+#  include <thrust/system/cuda/memory.h>
+#  include <thrust/type_traits/integer_sequence.h>
+
+#  include <cuda/std/__memory/unique_ptr.h>
+#  include <cuda/std/type_traits>
+
+#  include <type_traits>
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+// Forward declaration.
+struct CCCL_DEPRECATED new_stream_t;
+
+namespace system
+{
+namespace cuda
+{
+namespace detail
+{
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct nonowning_t final
+{};
+
+_CCCL_GLOBAL_CONSTANT nonowning_t nonowning{};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct marker_deleter final
+{
+  _CCCL_HOST void operator()(CUevent_st* e) const
+  {
+    if (nullptr != e)
+    {
+      thrust::cuda_cub::throw_on_error(cudaEventDestroy(e));
+    }
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct unique_marker final
+{
+  using native_handle_type = CUevent_st*;
+
+private:
+  std::unique_ptr<CUevent_st, marker_deleter> handle_;
+
+public:
+  /// \brief Create a new stream and construct a handle to it. When the handle
+  ///        is destroyed, the stream is destroyed.
+  _CCCL_HOST unique_marker()
+      : handle_(nullptr, marker_deleter())
+  {
+    native_handle_type e;
+    thrust::cuda_cub::throw_on_error(cudaEventCreateWithFlags(&e, cudaEventDisableTiming));
+    handle_.reset(e);
+  }
+
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_marker(unique_marker const&) = delete;
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_marker(unique_marker&&) = default;
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_marker& operator=(unique_marker const&) = delete;
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_marker& operator=(unique_marker&&) = default;
+
+  _CCCL_EXEC_CHECK_DISABLE
+  ~unique_marker() = default;
+
+  _CCCL_HOST auto get() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+  _CCCL_HOST auto native_handle() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+
+  _CCCL_HOST bool valid() const noexcept
+  {
+    return bool(handle_);
+  }
+
+  _CCCL_HOST bool ready() const
+  {
+    cudaError_t const err = cudaEventQuery(handle_.get());
+
+    if (cudaErrorNotReady == err)
+    {
+      return false;
+    }
+
+    // Throw on any other error.
+    thrust::cuda_cub::throw_on_error(err);
+
+    return true;
+  }
+
+  _CCCL_HOST void wait() const
+  {
+    thrust::cuda_cub::throw_on_error(cudaEventSynchronize(handle_.get()));
+  }
+
+  _CCCL_HOST bool operator==(unique_marker const& other) const
+  {
+    return other.handle_ == handle_;
+  }
+
+  _CCCL_HOST bool operator!=(unique_marker const& other) const
+  {
+    return !(other == *this);
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct stream_deleter final
+{
+  _CCCL_HOST void operator()(CUstream_st* s) const
+  {
+    if (nullptr != s)
+    {
+      thrust::cuda_cub::throw_on_error(cudaStreamDestroy(s));
+    }
+  }
+};
+
+struct stream_conditional_deleter final
+{
+private:
+  bool cond_;
+
+public:
+  _CCCL_HOST constexpr stream_conditional_deleter() noexcept
+      : cond_(true)
+  {}
+
+  _CCCL_HOST explicit constexpr stream_conditional_deleter(nonowning_t) noexcept
+      : cond_(false)
+  {}
+
+  _CCCL_HOST void operator()(CUstream_st* s) const
+  {
+    if (cond_ && nullptr != s)
+    {
+      thrust::cuda_cub::throw_on_error(cudaStreamDestroy(s));
+    }
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct unique_stream final
+{
+  using native_handle_type = CUstream_st*;
+
+private:
+  std::unique_ptr<CUstream_st, stream_conditional_deleter> handle_;
+
+public:
+  /// \brief Create a new stream and construct a handle to it. When the handle
+  ///        is destroyed, the stream is destroyed.
+  _CCCL_HOST unique_stream()
+      : handle_(nullptr, stream_conditional_deleter())
+  {
+    native_handle_type s;
+    thrust::cuda_cub::throw_on_error(cudaStreamCreateWithFlags(&s, cudaStreamNonBlocking));
+    handle_.reset(s);
+  }
+
+  /// \brief Construct a non-owning handle to an existing stream. When the
+  ///        handle is destroyed, the stream is not destroyed.
+  _CCCL_HOST explicit unique_stream(nonowning_t, native_handle_type handle)
+      : handle_(handle, stream_conditional_deleter(nonowning))
+  {}
+
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_stream(unique_stream const&) = delete;
+
+  // GCC 10 complains if this is defaulted. See NVIDIA/thrust#1269.
+  _CCCL_EXEC_CHECK_DISABLE
+  _CCCL_HOST unique_stream(unique_stream&& o) noexcept
+      : handle_(std::move(o.handle_))
+  {}
+
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_stream& operator=(unique_stream const&) = delete;
+  _CCCL_EXEC_CHECK_DISABLE
+  unique_stream& operator=(unique_stream&&) = default;
+
+  _CCCL_EXEC_CHECK_DISABLE
+  ~unique_stream() = default;
+
+  _CCCL_HOST auto get() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+  _CCCL_HOST auto native_handle() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+
+  _CCCL_HOST bool valid() const noexcept
+  {
+    return bool(handle_);
+  }
+
+  _CCCL_HOST bool ready() const
+  {
+    cudaError_t const err = cudaStreamQuery(handle_.get());
+
+    if (cudaErrorNotReady == err)
+    {
+      return false;
+    }
+
+    // Throw on any other error.
+    thrust::cuda_cub::throw_on_error(err);
+
+    return true;
+  }
+
+  _CCCL_HOST void wait() const
+  {
+    thrust::cuda_cub::throw_on_error(cudaStreamSynchronize(handle_.get()));
+  }
+
+  _CCCL_HOST void depend_on(unique_marker& e)
+  {
+    thrust::cuda_cub::throw_on_error(cudaStreamWaitEvent(handle_.get(), e.get(), 0));
+  }
+
+  _CCCL_HOST void depend_on(unique_stream& s)
+  {
+    if (s != *this)
+    {
+      unique_marker e;
+      s.record(e);
+      depend_on(e);
+    }
+  }
+
+  _CCCL_HOST void record(unique_marker& e)
+  {
+    thrust::cuda_cub::throw_on_error(cudaEventRecord(e.get(), handle_.get()));
+  }
+
+  _CCCL_HOST bool operator==(unique_stream const& other) const
+  {
+    return other.handle_ == handle_;
+  }
+
+  _CCCL_HOST bool operator!=(unique_stream const& other) const
+  {
+    return !(other == *this);
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Inheritance hierarchy of future/event shared state types.
+
+struct async_signal;
+
+template <typename KeepAlives>
+struct async_keep_alives /* : virtual async_signal */;
+
+template <typename T>
+struct async_value /* : virtual async_signal */;
+
+template <typename T, typename Pointer, typename KeepAlives>
+struct async_addressable_value_with_keep_alives
+  /* : async_value<T>, async_keep_alives<KeepAlives> */;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename Pointer>
+struct weak_promise;
+
+template <typename X, typename XPointer = pointer<X>>
+struct unique_eager_future_promise_pair final
+{
+  unique_eager_future<X> future;
+  weak_promise<X, XPointer> promise;
+};
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+
+  struct acquired_stream final
+{
+  unique_stream stream;
+  optional<std::size_t> const acquired_from;
+  // `acquired_from` contains the index in the tuple of dependencies from which
+  // the stream was acquired. If `acquired_from` is empty, no stream could be
+  // acquired from a dependency, and then the stream was newly created.
+};
+
+// Precondition: `device` is the current CUDA device.
+template <typename X, typename Y, typename Deleter>
+_CCCL_HOST optional<unique_stream> try_acquire_stream(int device, std::unique_ptr<Y, Deleter>&) noexcept;
+
+// Precondition: `device` is the current CUDA device.
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int, unique_stream& stream) noexcept;
+
+// Precondition: `device` is the current CUDA device.
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int device, ready_event&) noexcept;
+
+// Precondition: `device` is the current CUDA device.
+template <typename X>
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int device, ready_future<X>&) noexcept;
+
+// Precondition: `device` is the current CUDA device.
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int device, unique_eager_event& parent) noexcept;
+
+// Precondition: `device` is the current CUDA device.
+template <typename X>
+_CCCL_HOST optional<unique_stream> try_acquire_stream(int device, unique_eager_future<X>& parent) noexcept;
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+
+template <typename... Dependencies>
+_CCCL_HOST acquired_stream acquire_stream(int device, Dependencies&... deps) noexcept;
+
+template <typename... Dependencies>
+_CCCL_HOST unique_eager_event make_dependent_event(std::tuple<Dependencies...>&& deps);
+
+template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+_CCCL_HOST unique_eager_future_promise_pair<X, XPointer>
+make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct async_signal
+{
+protected:
+  unique_stream stream_;
+
+public:
+  // Constructs an `async_signal` which uses `stream`.
+  _CCCL_HOST explicit async_signal(unique_stream&& stream)
+      : stream_(std::move(stream))
+  {}
+
+  _CCCL_HOST virtual ~async_signal() {}
+
+  unique_stream& stream() noexcept
+  {
+    return stream_;
+  }
+  unique_stream const& stream() const noexcept
+  {
+    return stream_;
+  }
+};
+
+template <typename... KeepAlives>
+struct async_keep_alives<std::tuple<KeepAlives...>> : virtual async_signal
+{
+  using keep_alives_type = std::tuple<KeepAlives...>;
+
+protected:
+  keep_alives_type keep_alives_;
+
+public:
+  // Constructs an `async_keep_alives` which uses `stream`, and keeps the
+  // objects in the tuple `keep_alives` alive until the asynchronous signal is
+  // destroyed.
+  _CCCL_HOST explicit async_keep_alives(unique_stream&& stream, keep_alives_type&& keep_alives)
+      : async_signal(std::move(stream))
+      , keep_alives_(std::move(keep_alives))
+  {}
+
+  _CCCL_HOST virtual ~async_keep_alives() {}
+};
+
+template <typename T>
+struct async_value : virtual async_signal
+{
+  using value_type        = T;
+  using raw_const_pointer = value_type const*;
+
+  // Constructs an `async_value` which uses `stream` and has no content.
+  _CCCL_HOST explicit async_value(unique_stream stream)
+      : async_signal(std::move(stream))
+  {}
+
+  _CCCL_HOST virtual ~async_value() {}
+
+  _CCCL_HOST virtual bool valid_content() const noexcept
+  {
+    return false;
+  }
+
+  _CCCL_HOST virtual value_type get()
+  {
+    throw thrust::event_error(event_errc::no_state);
+  }
+
+  _CCCL_HOST virtual value_type extract()
+  {
+    throw thrust::event_error(event_errc::no_state);
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  _CCCL_HOST virtual raw_const_pointer raw_data() const
+  {
+    return nullptr;
+  }
+#  endif
+};
+
+template <typename T, typename Pointer, typename... KeepAlives>
+struct async_addressable_value_with_keep_alives<T, Pointer, std::tuple<KeepAlives...>> final
+    : async_value<T>
+    , async_keep_alives<std::tuple<KeepAlives...>>
+{
+  using value_type        = typename async_value<T>::value_type;
+  using raw_const_pointer = typename async_value<T>::raw_const_pointer;
+
+  using keep_alives_type = typename async_keep_alives<std::tuple<KeepAlives...>>::keep_alives_type;
+
+  using pointer       = typename thrust::detail::pointer_traits<Pointer>::template rebind<value_type>::other;
+  using const_pointer = typename thrust::detail::pointer_traits<Pointer>::template rebind<value_type const>::other;
+
+private:
+  pointer content_;
+
+public:
+  // Constructs an `async_addressable_value_with_keep_alives` which uses
+  // `stream`, keeps the objects in the tuple `keep_alives` alive until the
+  // asynchronous value is destroyed, and determines the location of its
+  // content by evaluating `compute_content(content_keep_alive)`.
+  // NOTE: The use of a callback idiom is necessary if the content is stored in
+  // place in the content keep alive object, in which case we need to get its
+  // address after its been moved into the new signal we're constructing.
+  // NOTE: NVCC has a bug that causes it to reorder our base class initializers
+  // in generated host code, which leads to -Wreorder warnings.
+  _CCCL_DIAG_PUSH
+  _CCCL_DIAG_SUPPRESS_CLANG("-Wreorder")
+  _CCCL_DIAG_SUPPRESS_GCC("-Wreorder")
+  _CCCL_DIAG_SUPPRESS_ICC(2407)
+  template <typename ComputeContent>
+  _CCCL_HOST explicit async_addressable_value_with_keep_alives(
+    unique_stream&& stream, keep_alives_type&& keep_alives, ComputeContent&& compute_content)
+      : async_signal(std::move(stream))
+      , async_value<T>(std::move(stream))
+      , async_keep_alives<keep_alives_type>(std::move(stream), std::move(keep_alives))
+  {
+    content_ = THRUST_FWD(compute_content)(std::get<0>(this->keep_alives_));
+  }
+  _CCCL_DIAG_POP
+
+  _CCCL_HOST bool valid_content() const noexcept final override
+  {
+    return nullptr != content_;
+  }
+
+  // Precondition: `true == valid_content()`.
+  _CCCL_HOST pointer data()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return content_;
+  }
+
+  // Precondition: `true == valid_content()`.
+  _CCCL_HOST const_pointer data() const
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return content_;
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  _CCCL_HOST value_type get() final override
+  {
+    this->stream().wait();
+    return *data();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  _CCCL_HOST value_type extract() final override
+  {
+    this->stream().wait();
+    return std::move(*data());
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  _CCCL_HOST raw_const_pointer raw_data() const final override
+  {
+    return raw_pointer_cast(content_);
+  }
+#  endif
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename Pointer>
+struct weak_promise final
+{
+  using value_type = typename async_value<T>::value_type;
+
+  using pointer       = typename thrust::detail::pointer_traits<Pointer>::template rebind<T>::other;
+  using const_pointer = typename thrust::detail::pointer_traits<Pointer>::template rebind<T const>::other;
+
+private:
+  int device_ = 0;
+  pointer content_;
+
+  explicit weak_promise(int device_id, pointer content)
+      : device_(device_id)
+      , content_(std::move(content))
+  {}
+
+public:
+  _CCCL_HOST_DEVICE weak_promise()
+      : device_(0)
+      , content_{}
+  {}
+
+  _CCCL_EXEC_CHECK_DISABLE
+  weak_promise(weak_promise const&) = default;
+  _CCCL_EXEC_CHECK_DISABLE
+  weak_promise(weak_promise&&) = default;
+  _CCCL_EXEC_CHECK_DISABLE
+  weak_promise& operator=(weak_promise const&) = default;
+  _CCCL_EXEC_CHECK_DISABLE
+  weak_promise& operator=(weak_promise&&) = default;
+
+  template <typename U>
+  _CCCL_HOST_DEVICE void set_value(U&& value) &&
+  {
+    *content_ = THRUST_FWD(value);
+  }
+
+  template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+  friend _CCCL_HOST unique_eager_future_promise_pair<X, XPointer>
+  thrust::system::cuda::detail::make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace detail
+
+struct CCCL_DEPRECATED ready_event final
+{
+  ready_event() = default;
+
+  template <typename U>
+  _CCCL_HOST_DEVICE explicit ready_event(ready_future<U>)
+  {}
+
+  _CCCL_HOST_DEVICE static constexpr bool valid_content() noexcept
+  {
+    return true;
+  }
+
+  _CCCL_HOST_DEVICE static constexpr bool ready() noexcept
+  {
+    return true;
+  }
+};
+
+template <typename T>
+struct CCCL_DEPRECATED ready_future final
+{
+  using value_type        = T;
+  using raw_const_pointer = T const*;
+
+private:
+  value_type value_;
+
+public:
+  _CCCL_HOST_DEVICE ready_future()
+      : value_{}
+  {}
+
+  ready_future(ready_future&&)                 = default;
+  ready_future(ready_future const&)            = default;
+  ready_future& operator=(ready_future&&)      = default;
+  ready_future& operator=(ready_future const&) = default;
+
+  template <typename U>
+  _CCCL_HOST_DEVICE explicit ready_future(U&& u)
+      : value_(THRUST_FWD(u))
+  {}
+
+  _CCCL_HOST_DEVICE static constexpr bool valid_content() noexcept
+  {
+    return true;
+  }
+
+  _CCCL_HOST_DEVICE static constexpr bool ready() noexcept
+  {
+    return true;
+  }
+
+  _CCCL_HOST_DEVICE value_type get() const
+  {
+    return value_;
+  }
+
+  _CCCL_NODISCARD _CCCL_HOST_DEVICE value_type extract()
+  {
+    return std::move(value_);
+  }
+
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  // For testing only.
+  _CCCL_HOST_DEVICE raw_const_pointer data() const
+  {
+    return addressof(value_);
+  }
+#  endif
+};
+
+struct CCCL_DEPRECATED unique_eager_event final
+{
+protected:
+  int device_ = 0;
+  std::unique_ptr<detail::async_signal> async_signal_;
+
+  _CCCL_HOST explicit unique_eager_event(int device_id, std::unique_ptr<detail::async_signal> async_signal)
+      : device_(device_id)
+      , async_signal_(std::move(async_signal))
+  {}
+
+public:
+  _CCCL_HOST unique_eager_event()
+      : device_(0)
+      , async_signal_()
+  {}
+
+  unique_eager_event(unique_eager_event&&)                 = default;
+  unique_eager_event(unique_eager_event const&)            = delete;
+  unique_eager_event& operator=(unique_eager_event&&)      = default;
+  unique_eager_event& operator=(unique_eager_event const&) = delete;
+
+  // Any `unique_eager_future<T>` can be explicitly converted to a
+  // `unique_eager_event<void>`.
+  template <typename U>
+  _CCCL_HOST explicit unique_eager_event(unique_eager_future<U>&& other)
+      // NOTE: We upcast to `unique_ptr<async_signal>` here.
+      : device_(other.where())
+      , async_signal_(other.async_signal_.release())
+  {}
+
+  _CCCL_HOST
+  // NOTE: We take `new_stream_t` by `const&` because it is incomplete here.
+  explicit unique_eager_event(new_stream_t const&)
+      : device_(0)
+      , async_signal_(new detail::async_signal(detail::unique_stream{}))
+  {
+    thrust::cuda_cub::throw_on_error(cudaGetDevice(&device_));
+  }
+
+  _CCCL_HOST virtual ~unique_eager_event()
+  {
+    // FIXME: If we could asynchronously handle destruction of keep alives, we
+    // could avoid doing this.
+    if (valid_stream())
+    {
+      wait();
+    }
+  }
+
+  _CCCL_HOST bool valid_stream() const noexcept
+  {
+    return bool(async_signal_);
+  }
+
+  _CCCL_HOST bool ready() const noexcept
+  {
+    if (valid_stream())
+    {
+      return stream().ready();
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST detail::unique_stream& stream()
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+  detail::unique_stream const& stream() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+
+  _CCCL_HOST int where() const noexcept
+  {
+    return device_;
+  }
+
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST void wait()
+  {
+    stream().wait();
+  }
+
+  _CCCL_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+    friend _CCCL_HOST optional<detail::unique_stream>
+    thrust::system::cuda::detail::try_acquire_stream(int device_id, unique_eager_event& parent) noexcept;
+  _CCCL_SUPPRESS_DEPRECATED_POP
+
+  template <typename... Dependencies>
+  friend _CCCL_HOST unique_eager_event
+  thrust::system::cuda::detail::make_dependent_event(std::tuple<Dependencies...>&& deps);
+};
+
+template <typename T>
+struct CCCL_DEPRECATED unique_eager_future final
+{
+  THRUST_STATIC_ASSERT_MSG((!std::is_same<T, ::cuda::std::remove_cvref_t<void>>::value),
+                           "`thrust::event` should be used to express valueless futures");
+
+  using value_type        = typename detail::async_value<T>::value_type;
+  using raw_const_pointer = typename detail::async_value<T>::raw_const_pointer;
+
+private:
+  int device_ = 0;
+  ::cuda::std::unique_ptr<detail::async_value<value_type>> async_signal_;
+
+  _CCCL_HOST explicit unique_eager_future(int device_id, std::unique_ptr<detail::async_value<value_type>> async_signal)
+      : device_(device_id)
+      , async_signal_(async_signal.release())
+  {}
+
+public:
+  _CCCL_HOST unique_eager_future()
+      : device_(0)
+      , async_signal_()
+  {}
+
+  unique_eager_future(unique_eager_future&&)                 = default;
+  unique_eager_future(unique_eager_future const&)            = delete;
+  unique_eager_future& operator=(unique_eager_future&&)      = default;
+  unique_eager_future& operator=(unique_eager_future const&) = delete;
+
+  _CCCL_HOST
+  // NOTE: We take `new_stream_t` by `const&` because it is incomplete here.
+  explicit unique_eager_future(new_stream_t const&)
+      : device_(0)
+      , async_signal_(new detail::async_value<value_type>(detail::unique_stream{}))
+  {
+    thrust::cuda_cub::throw_on_error(cudaGetDevice(&device_));
+  }
+
+  _CCCL_HOST ~unique_eager_future()
+  {
+    // FIXME: If we could asynchronously handle destruction of keep alives, we
+    // could avoid doing this.
+    if (valid_stream())
+    {
+      wait();
+    }
+  }
+
+  _CCCL_HOST bool valid_stream() const noexcept
+  {
+    return bool(async_signal_);
+  }
+
+  _CCCL_HOST bool valid_content() const noexcept
+  {
+    if (!valid_stream())
+    {
+      return false;
+    }
+
+    // We might have been constructed with `new_stream_t`, in which case we'd
+    // have an async_value, but it doesn't have content.
+    return async_signal_->valid_content();
+  }
+
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST bool ready() const noexcept
+  {
+    if (valid_stream())
+    {
+      return stream().ready();
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST detail::unique_stream& stream()
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+  _CCCL_HOST detail::unique_stream const& stream() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+
+  _CCCL_HOST int where() const noexcept
+  {
+    return device_;
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST void wait()
+  {
+    stream().wait();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  _CCCL_HOST value_type get()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return async_signal_->get();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  _CCCL_NODISCARD _CCCL_HOST value_type extract()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    value_type tmp(async_signal_->extract());
+    async_signal_.reset();
+    return tmp;
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  // Precondition: `true == valid_stream()`.
+  _CCCL_HOST raw_const_pointer raw_data() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->raw_data();
+  }
+#  endif
+
+  _CCCL_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+    template <typename X>
+    friend _CCCL_HOST optional<detail::unique_stream>
+    thrust::system::cuda::detail::try_acquire_stream(int device_id, unique_eager_future<X>& parent) noexcept;
+  _CCCL_SUPPRESS_DEPRECATED_POP
+
+  template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+  friend _CCCL_HOST detail::unique_eager_future_promise_pair<X, XPointer>
+  thrust::system::cuda::detail::make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+
+  friend struct unique_eager_event;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace detail
+{
+_CCCL_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+
+  template <typename X, typename Deleter>
+  _CCCL_HOST optional<unique_stream> try_acquire_stream(int, std::unique_ptr<X, Deleter>&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int, unique_stream& stream) noexcept
+{
+  return {std::move(stream)};
+}
+
+_CCCL_HOST inline optional<unique_stream> try_acquire_stream(int, ready_event&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+template <typename X>
+_CCCL_HOST optional<unique_stream> try_acquire_stream(int, ready_future<X>&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+_CCCL_HOST optional<unique_stream> try_acquire_stream(int device_id, unique_eager_event& parent) noexcept
+{
+  // We have unique ownership, so we can always steal the stream if the future
+  // has one as long as they are on the same device as us.
+  if (parent.valid_stream())
+  {
+    if (device_id == parent.device_)
+    {
+      return std::move(parent.async_signal_->stream());
+    }
+  }
+
+  return {};
+}
+
+template <typename X>
+_CCCL_HOST optional<unique_stream> try_acquire_stream(int device_id, unique_eager_future<X>& parent) noexcept
+{
+  // We have unique ownership, so we can always steal the stream if the future
+  // has one as long as they are on the same device as us.
+  if (parent.valid_stream())
+  {
+    if (device_id == parent.device_)
+    {
+      return std::move(parent.async_signal_->stream());
+    }
+  }
+
+  return {};
+}
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Dependencies>
+_CCCL_HOST acquired_stream acquire_stream_impl(int, std::tuple<Dependencies...>&, index_sequence<>) noexcept
+{
+  // We tried to take a stream from all of our dependencies and failed every
+  // time, so we need to make a new stream.
+  return {unique_stream{}, {}};
+}
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+_CCCL_HOST acquired_stream
+acquire_stream_impl(int device_id, std::tuple<Dependencies...>& deps, index_sequence<I0, Is...>) noexcept
+{
+  _CCCL_SUPPRESS_DEPRECATED_PUSH // for thrust::optional (MSVC warnings here)
+    auto tr = try_acquire_stream(device_id, std::get<I0>(deps));
+
+  if (tr)
+  {
+    return {std::move(*tr), {I0}};
+  }
+  else
+  {
+    return acquire_stream_impl(device_id, deps, index_sequence<Is...>{});
+  }
+  _CCCL_SUPPRESS_DEPRECATED_POP
+}
+
+template <typename... Dependencies>
+_CCCL_HOST acquired_stream acquire_stream(int device_id, std::tuple<Dependencies...>& deps) noexcept
+{
+  return acquire_stream_impl(device_id, deps, make_index_sequence<sizeof...(Dependencies)>{});
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename X, typename Deleter>
+_CCCL_HOST void create_dependency(unique_stream&, std::unique_ptr<X, Deleter>&) noexcept
+{}
+
+_CCCL_HOST inline void create_dependency(unique_stream&, ready_event&) noexcept {}
+
+template <typename T>
+_CCCL_HOST void create_dependency(unique_stream&, ready_future<T>&) noexcept
+{}
+
+_CCCL_HOST inline void create_dependency(unique_stream& child, unique_stream& parent)
+{
+  child.depend_on(parent);
+}
+
+_CCCL_HOST inline void create_dependency(unique_stream& child, unique_eager_event& parent)
+{
+  child.depend_on(parent.stream());
+}
+
+template <typename X>
+_CCCL_HOST void create_dependency(unique_stream& child, unique_eager_future<X>& parent)
+{
+  child.depend_on(parent.stream());
+}
+
+template <typename... Dependencies>
+_CCCL_HOST void create_dependencies_impl(acquired_stream&, std::tuple<Dependencies...>&, index_sequence<>)
+{}
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+_CCCL_HOST void
+create_dependencies_impl(acquired_stream& as, std::tuple<Dependencies...>& deps, index_sequence<I0, Is...>)
+{
+  // We only need to wait on the current dependency if we didn't steal our
+  // stream from it.
+  _CCCL_SUPPRESS_DEPRECATED_PUSH
+  if (!as.acquired_from || *as.acquired_from != I0)
+  {
+    create_dependency(as.stream, std::get<I0>(deps));
+  }
+  _CCCL_SUPPRESS_DEPRECATED_POP
+
+  create_dependencies_impl(as, deps, index_sequence<Is...>{});
+}
+
+template <typename... Dependencies>
+_CCCL_HOST void create_dependencies(acquired_stream& as, std::tuple<Dependencies...>& deps)
+{
+  create_dependencies_impl(as, deps, make_index_sequence<sizeof...(Dependencies)>{});
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Metafunction that determine which `Dependencies` need to be kept alive.
+// Returns the result as an `index_sequence` of indices into the parameter
+// pack.
+template <typename Tuple, typename Indices>
+struct find_keep_alives_impl;
+template <typename Tuple>
+using find_keep_alives =
+  typename find_keep_alives_impl<Tuple, make_index_sequence<std::tuple_size<Tuple>::value>>::type;
+
+template <>
+struct find_keep_alives_impl<std::tuple<>, index_sequence<>>
+{
+  using type = index_sequence<>;
+};
+
+// User-provided stream.
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_stream, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Nothing to keep alive, skip this index.
+  using type = typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type;
+};
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<ready_event, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Nothing to keep alive, skip this index.
+  using type = typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type;
+};
+
+template <typename T, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<ready_future<T>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_eager_event, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+template <typename X, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_eager_future<X>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+// Content storage.
+template <typename T, typename Deleter, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<std::unique_ptr<T, Deleter>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Dependencies>
+_CCCL_HOST unique_eager_event make_dependent_event(std::tuple<Dependencies...>&& deps)
+{
+  int device_id = 0;
+  thrust::cuda_cub::throw_on_error(cudaGetDevice(&device_id));
+
+  // First, either steal a stream from one of our children or make a new one.
+  auto as = acquire_stream(device_id, deps);
+
+  // Then, make the stream we've acquired asynchronously wait on all of our
+  // dependencies, except the one we stole the stream from.
+  create_dependencies(as, deps);
+
+  // Then, we determine which subset of dependencies need to be kept alive.
+  auto ka = tuple_subset(std::move(deps), find_keep_alives<std::tuple<Dependencies...>>{});
+
+  // Next, we create the asynchronous signal.
+  using async_signal_type = async_keep_alives<decltype(ka)>;
+
+  std::unique_ptr<async_signal_type> sig(new async_signal_type(std::move(as.stream), std::move(ka)));
+
+  // Finally, we create the event object.
+  return unique_eager_event(device_id, std::move(sig));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+_CCCL_HOST unique_eager_future_promise_pair<X, XPointer>
+make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps)
+{
+  int device_id = 0;
+  thrust::cuda_cub::throw_on_error(cudaGetDevice(&device_id));
+
+  // First, either steal a stream from one of our children or make a new one.
+  auto as = acquire_stream(device_id, deps);
+
+  // Then, make the stream we've acquired asynchronously wait on all of our
+  // dependencies, except the one we stole the stream from.
+  create_dependencies(as, deps);
+
+  // Then, we determine which subset of dependencies need to be kept alive.
+  auto ka = tuple_subset(std::move(deps), find_keep_alives<std::tuple<Dependencies...>>{});
+
+  // Next, we create the asynchronous value.
+  using async_signal_type = async_addressable_value_with_keep_alives<X, XPointer, decltype(ka)>;
+
+  std::unique_ptr<async_signal_type> sig(new async_signal_type(std::move(as.stream), std::move(ka), std::move(cc)));
+
+  // Finally, we create the promise and future objects.
+  weak_promise<X, XPointer> child_prom(device_id, sig->data());
+  unique_eager_future<X> child_fut(device_id, std::move(sig));
+
+  return unique_eager_future_promise_pair<X, XPointer>{std::move(child_fut), std::move(child_prom)};
+}
+
+} // namespace detail
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Events>
+CCCL_DEPRECATED _CCCL_HOST unique_eager_event when_all(Events&&... evs)
+// TODO: Constrain to events, futures, and maybe streams (currently allows keep
+// alives).
+{
+  return detail::make_dependent_event(std::make_tuple(std::move(evs)...));
+}
+
+// ADL hook for transparent `.after` move support.
+CCCL_DEPRECATED _CCCL_HOST inline auto capture_as_dependency(unique_eager_event& dependency)
+  THRUST_DECLTYPE_RETURNS(std::move(dependency))
+
+  // ADL hook for transparent `.after` move support.
+  template <typename X>
+  CCCL_DEPRECATED _CCCL_HOST auto capture_as_dependency(unique_eager_future<X>& dependency)
+    THRUST_DECLTYPE_RETURNS(std::move(dependency))
+
+} // namespace cuda
+} // namespace system
+
+_CCCL_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/cuda/detail/gather.h b/projects/rocthrust/thrust/system/cuda/detail/gather.h
index 08244d115db3..8a7f31bbac89 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/gather.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/gather.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/cuda/detail/transform.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/generate.h b/projects/rocthrust/thrust/system/cuda/detail/generate.h
index d2261c1d832b..be891374ab7a 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/generate.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/generate.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/distance.h>
diff --git a/projects/rocthrust/thrust/system/cuda/detail/get_value.h b/projects/rocthrust/thrust/system/cuda/detail/get_value.h
index 8d02550b8da9..5d1bb7e4cb6e 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/get_value.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/get_value.h
@@ -26,7 +26,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
@@ -38,27 +38,51 @@
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
+
+namespace
+{
+
 template <typename DerivedPolicy, typename Pointer>
-_CCCL_HOST_DEVICE thrust::detail::it_value_t<Pointer> get_value(execution_policy<DerivedPolicy>& exec, Pointer ptr)
+inline _CCCL_HOST_DEVICE typename thrust::iterator_value<Pointer>::type
+get_value_msvc2005_war(execution_policy<DerivedPolicy>& exec, Pointer ptr)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  using result_type = typename thrust::iterator_value<Pointer>::type;
+
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    _CCCL_HOST auto operator()(execution_policy<DerivedPolicy>& exec, Pointer ptr)
+    _CCCL_HOST inline static result_type host_path(execution_policy<DerivedPolicy>& exec, Pointer ptr)
     {
-      // implemented with assign_value, which requires a type with a default constructor
-      thrust::detail::it_value_t<Pointer> result;
-      host_system_tag host_tag;
-      cross_system<host_system_tag, DerivedPolicy> systems(host_tag, exec);
+      // when called from host code, implement with assign_value
+      // note that this requires a type with default constructor
+      result_type result;
+
+      thrust::host_system_tag host_tag;
+      cross_system<thrust::host_system_tag, DerivedPolicy> systems(host_tag, exec);
       assign_value(systems, &result, ptr);
+
       return result;
     }
+
+    _CCCL_DEVICE inline static result_type device_path(execution_policy<DerivedPolicy>&, Pointer ptr)
+    {
+      // when called from device code, just do simple deref
+      return *thrust::raw_pointer_cast(ptr);
+    }
   };
-  _THRUST_IF_TARGET(_THRUST_IS_DEVICE, return *thrust::raw_pointer_cast(ptr);, (return HostPath{}(exec, ptr);))
-}
+
+  NV_IF_TARGET(
+    NV_IS_HOST, (return war_nvbugs_881631::host_path(exec, ptr);), (return war_nvbugs_881631::device_path(exec, ptr);))
+} // end get_value_msvc2005_war()
+} // namespace
+
+template <typename DerivedPolicy, typename Pointer>
+inline _CCCL_HOST_DEVICE typename thrust::iterator_value<Pointer>::type
+get_value(execution_policy<DerivedPolicy>& exec, Pointer ptr)
+{
+  return get_value_msvc2005_war(exec, ptr);
+} // end get_value()
+
 } // namespace cuda_cub
 THRUST_NAMESPACE_END
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/inner_product.h b/projects/rocthrust/thrust/system/cuda/detail/inner_product.h
index c5176b2e8535..1c36d5e256fe 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/inner_product.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/inner_product.h
@@ -36,7 +36,8 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
+#  include <thrust/detail/minmax.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/iterator/zip_iterator.h>
diff --git a/projects/rocthrust/thrust/system/cuda/detail/internal/copy_cross_system.h b/projects/rocthrust/thrust/system/cuda/detail/internal/copy_cross_system.h
index 614ed1fd5629..a27e9e48a879 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/internal/copy_cross_system.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/internal/copy_cross_system.h
@@ -85,7 +85,7 @@ OutputIt _CCCL_HOST cross_system_copy_n(
   thrust::detail::true_type) // trivial copy
 
 {
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename iterator_traits<InputIt>::value_type;
   if (n > 0)
   {
     trivial_device_copy(
@@ -110,7 +110,7 @@ OutputIt _CCCL_HOST cross_system_copy_n(
   thrust::detail::false_type) // non-trivial copy
 {
   // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_value<InputIt>::type;
 
   // copy input data into host temp storage
   InputIt last = first;
@@ -137,7 +137,7 @@ OutputIt _CCCL_HOST cross_system_copy_n(
   return ret;
 }
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 // non-trivial copy D->H, only supported with NVCC compiler
 // because copy ctor must have  __device__ annotations, which is nvcc-only
 // feature
@@ -152,7 +152,7 @@ OutputIt _CCCL_HOST cross_system_copy_n(
 
 {
   // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_value<InputIt>::type;
 
   // allocate device temp storage
   thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
diff --git a/projects/rocthrust/thrust/system/cuda/detail/internal/copy_device_to_device.h b/projects/rocthrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
index ff15bb2e357b..ce471ac5174b 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/internal/copy_device_to_device.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/distance.h>
@@ -60,7 +60,7 @@ template <class Derived, class InputIt, class OutputIt>
 OutputIt THRUST_RUNTIME_FUNCTION device_to_device(
   execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, thrust::detail::true_type)
 {
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_traits<InputIt>::value_type;
   const auto n  = thrust::distance(first, last);
   if (n > 0)
   {
diff --git a/projects/rocthrust/thrust/system/cuda/detail/iter_swap.h b/projects/rocthrust/thrust/system/cuda/detail/iter_swap.h
index 3064a4710fb8..2740177ca5ec 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/iter_swap.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/iter_swap.h
@@ -26,7 +26,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -60,7 +60,7 @@ inline _CCCL_HOST_DEVICE void iter_swap(thrust::cuda::execution_policy<DerivedPo
     }
   };
 
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, (war_nvbugs_881631::host_path(a, b);), (war_nvbugs_881631::device_path(a, b);));
+  NV_IF_TARGET(NV_IS_HOST, (war_nvbugs_881631::host_path(a, b);), (war_nvbugs_881631::device_path(a, b);));
 
 } // end iter_swap()
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/logical.h b/projects/rocthrust/thrust/system/cuda/detail/logical.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/logical.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/logical.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cuda/detail/make_unsigned_special.h b/projects/rocthrust/thrust/system/cuda/detail/make_unsigned_special.h
index 7fe7e98c4f84..5a392a0d2f23 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/make_unsigned_special.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/make_unsigned_special.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
diff --git a/projects/rocthrust/thrust/system/cuda/detail/malloc_and_free.h b/projects/rocthrust/thrust/system/cuda/detail/malloc_and_free.h
index f3f596953c52..5b8a7cce3883 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/malloc_and_free.h
@@ -26,6 +26,7 @@
 #  pragma system_header
 #endif // no system header
 
+#include <thrust/detail/config.h>
 #include <thrust/system/cuda/config.h>
 
 #include <thrust/detail/malloc_and_free.h>
@@ -65,29 +66,29 @@ _CCCL_HOST_DEVICE void* malloc(execution_policy<DerivedPolicy>&, std::size_t n)
   void* result = 0;
 
   // need to repeat a lot of code here because we can't use #if inside of the
-  // _THRUST_IF_TARGET macro.
+  // NV_IF_TARGET macro.
   // The device path is the same either way, but the host allocations differ.
 #ifdef __CUB_CACHING_MALLOC
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (cub::CachingDeviceAllocator& alloc = get_allocator(); cudaError_t status = alloc.DeviceAllocate(&result, n);
 
      if (status != cudaSuccess) {
        cudaGetLastError(); // Clear global CUDA error state.
        throw thrust::system::detail::bad_alloc(thrust::cuda_category().message(status).c_str());
      }),
-    ( // _THRUST_IS_DEVICE
+    ( // NV_IS_DEVICE
       result = thrust::raw_pointer_cast(thrust::malloc(thrust::seq, n));));
 #else // not __CUB_CACHING_MALLOC
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (cudaError_t status = cudaMalloc(&result, n);
 
      if (status != cudaSuccess) {
        cudaGetLastError(); // Clear global CUDA error state.
        throw thrust::system::detail::bad_alloc(thrust::cuda_category().message(status).c_str());
      }),
-    ( // _THRUST_IS_DEVICE
+    ( // NV_IS_DEVICE
       result = thrust::raw_pointer_cast(thrust::malloc(thrust::seq, n));));
 #endif
 
@@ -98,23 +99,22 @@ template <typename DerivedPolicy, typename Pointer>
 _CCCL_HOST_DEVICE void free(execution_policy<DerivedPolicy>&, Pointer ptr)
 {
   // need to repeat a lot of code here because we can't use #if inside of the
-  // _THRUST_IF_TARGET macro.
+  // NV_IF_TARGET macro.
   // The device path is the same either way, but the host deallocations differ.
 #ifdef __CUB_CACHING_MALLOC
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (cub::CachingDeviceAllocator& alloc = get_allocator();
      cudaError_t status                 = alloc.DeviceFree(thrust::raw_pointer_cast(ptr));
      cuda_cub::throw_on_error(status, "device free failed");),
-    ( // _THRUST_IS_DEVICE
+    ( // NV_IS_DEVICE
       thrust::free(thrust::seq, ptr);));
 #else // not __CUB_CACHING_MALLOC
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (cudaError_t status = cudaFree(thrust::raw_pointer_cast(ptr));
-     cuda_cub::throw_on_error(status, "device free failed");),
-    ( // _THRUST_IS_DEVICE
-      thrust::free(thrust::seq, ptr);));
+  NV_IF_TARGET(NV_IS_HOST,
+               (cudaError_t status = cudaFree(thrust::raw_pointer_cast(ptr));
+                cuda_cub::throw_on_error(status, "device free failed");),
+               ( // NV_IS_DEVICE
+                 thrust::free(thrust::seq, ptr);));
 #endif
 } // end free()
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/memory.inl b/projects/rocthrust/thrust/system/cuda/detail/memory.inl
index b99cc5744c94..821026bcef57 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/memory.inl
+++ b/projects/rocthrust/thrust/system/cuda/detail/memory.inl
@@ -17,41 +17,35 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/cuda/detail/malloc_and_free.h>
 #include <thrust/system/cuda/memory.h>
-
+#include <thrust/system/cuda/detail/malloc_and_free.h>
 #include <limits>
 
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
 
-_CCCL_HOST_DEVICE pointer<void> malloc(std::size_t n)
+_CCCL_HOST_DEVICE
+pointer<void> malloc(std::size_t n)
 {
   tag cuda_tag;
   return pointer<void>(thrust::cuda_cub::malloc(cuda_tag, n));
 } // end malloc()
 
-template <typename T>
-_CCCL_HOST_DEVICE pointer<T> malloc(std::size_t n)
+template<typename T>
+_CCCL_HOST_DEVICE
+pointer<T> malloc(std::size_t n)
 {
   pointer<void> raw_ptr = thrust::cuda_cub::malloc(sizeof(T) * n);
   return pointer<T>(reinterpret_cast<T*>(raw_ptr.get()));
 } // end malloc()
 
-_CCCL_HOST_DEVICE void free(pointer<void> ptr)
+_CCCL_HOST_DEVICE
+void free(pointer<void> ptr)
 {
   tag cuda_tag;
   return thrust::cuda_cub::free(cuda_tag, ptr.get());
 } // end free()
 
-} // namespace cuda_cub
+} // end cuda_cub
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cuda/detail/merge.h b/projects/rocthrust/thrust/system/cuda/detail/merge.h
index f0b2e21852dd..8e9d29db610c 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/merge.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/merge.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <cub/device/device_merge.cuh>
 
@@ -64,7 +64,7 @@ merge(execution_policy<Derived>& policy,
       CompareOp compare_op = {})
 {
   THRUST_CDP_DISPATCH(
-    (using size_type         = thrust::detail::it_difference_t<KeysIt1>;
+    (using size_type         = typename iterator_traits<KeysIt1>::difference_type;
      const auto num_keys1    = static_cast<size_type>(thrust::distance(keys1_begin, keys1_end));
      const auto num_keys2    = static_cast<size_type>(thrust::distance(keys2_begin, keys2_end));
      const auto num_keys_out = num_keys1 + num_keys2;
@@ -151,12 +151,14 @@ pair<KeysOutputIt, ItemsOutputIt> _CCCL_HOST_DEVICE merge_by_key(
   CompareOp compare_op = {})
 {
   THRUST_CDP_DISPATCH(
-    (using size_type = thrust::detail::it_difference_t<KeysIt1>;
+    (using size_type = typename iterator_traits<KeysIt1>::difference_type;
 
      const auto num_keys1    = static_cast<size_type>(thrust::distance(keys1_begin, keys1_end));
      const auto num_keys2    = static_cast<size_type>(thrust::distance(keys2_begin, keys2_end));
      const auto num_keys_out = num_keys1 + num_keys2;
-     if (num_keys_out == 0) { return {keys_out_begin, items_out_begin}; }
+     if (num_keys_out == 0) {
+       return {keys_out_begin, items_out_begin};
+     }
 
      using dispatch32_t = cub::detail::merge::
        dispatch_t<KeysIt1, ItemsIt1, KeysIt2, ItemsIt2, KeysOutputIt, ItemsOutputIt, std::int32_t, CompareOp>;
diff --git a/projects/rocthrust/thrust/system/cuda/detail/mismatch.h b/projects/rocthrust/thrust/system/cuda/detail/mismatch.h
index d026b973c1c4..63e64b722ecb 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/mismatch.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/mismatch.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/distance.h>
@@ -69,7 +69,7 @@ template <class ValueType, class InputIt1, class InputIt2, class BinaryOp>
 struct transform_pair_of_input_iterators_t
 {
   using self_t            = transform_pair_of_input_iterators_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt1>;
+  using difference_type   = typename iterator_traits<InputIt1>::difference_type;
   using value_type        = ValueType;
   using pointer           = void;
   using reference         = value_type;
@@ -208,7 +208,7 @@ template <class Derived, class InputIt1, class InputIt2>
 pair<InputIt1, InputIt2> _CCCL_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2)
 {
-  using InputType1 = thrust::detail::it_value_t<InputIt1>;
+  using InputType1 = typename thrust::iterator_value<InputIt1>::type;
   return cuda_cub::mismatch(policy, first1, last1, first2, equal_to<InputType1>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/par.h b/projects/rocthrust/thrust/system/cuda/detail/par.h
index b11d266f226d..df248681755d 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/par.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/par.h
@@ -36,6 +36,7 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
+#include <thrust/detail/dependencies_aware_execution_policy.h>
 #include <thrust/system/cuda/detail/execution_policy.h>
 #include <thrust/system/cuda/detail/util.h>
 
@@ -119,9 +120,11 @@ struct execute_on_stream_nosync : execute_on_stream_nosync_base<execute_on_strea
       : base_t(stream){};
 };
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 struct par_t
     : execution_policy<par_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_base>
 {
   using base_t = execution_policy<par_t>;
 
@@ -136,10 +139,13 @@ struct par_t
     return execute_on_stream(stream);
   }
 };
+_CCCL_SUPPRESS_DEPRECATED_POP
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
 struct par_nosync_t
     : execution_policy<par_nosync_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_nosync_base>
 {
   using base_t = execution_policy<par_nosync_t>;
 
@@ -162,6 +168,7 @@ struct par_nosync_t
     return false;
   }
 };
+_CCCL_SUPPRESS_DEPRECATED_POP
 
 _CCCL_GLOBAL_CONSTANT par_t par;
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/par_to_seq.h b/projects/rocthrust/thrust/system/cuda/detail/par_to_seq.h
index 7ba29b14737b..84275d91d41e 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/par_to_seq.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/par_to_seq.h
@@ -28,14 +28,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/seq.h>
 #include <thrust/system/cuda/detail/par.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/parallel_for.h b/projects/rocthrust/thrust/system/cuda/detail/parallel_for.h
index fdac924843fb..cb4e9aac3e8b 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/parallel_for.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/parallel_for.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/partition.h b/projects/rocthrust/thrust/system/cuda/detail/partition.h
index f9117978f27c..3bea6d8f4f1d 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/partition.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/partition.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -87,6 +87,10 @@ struct DispatchPartitionIf
     std::size_t allocation_sizes[2] = {0, sizeof(OffsetT)};
     void* allocations[2]            = {nullptr, nullptr};
 
+    // Partitioning algorithm keeps "rejected" items
+    constexpr bool keep_rejects = true;
+    constexpr bool may_alias    = false;
+
     // Query algorithm memory requirements
     status = cub::DispatchSelectIf<
       InputIt,
@@ -96,20 +100,21 @@ struct DispatchPartitionIf
       Predicate,
       equality_op_t,
       OffsetT,
-      cub::SelectImpl::Partition>::Dispatch(nullptr,
-                                            allocation_sizes[0],
-                                            first,
-                                            stencil,
-                                            output,
-                                            static_cast<num_selected_out_it_t>(nullptr),
-                                            predicate,
-                                            equality_op_t{},
-                                            num_items,
-                                            stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+      keep_rejects,
+      may_alias>::Dispatch(nullptr,
+                           allocation_sizes[0],
+                           first,
+                           stencil,
+                           output,
+                           static_cast<num_selected_out_it_t>(nullptr),
+                           predicate,
+                           equality_op_t{},
+                           num_items,
+                           stream);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Return if we're only querying temporary storage requirements
     if (d_temp_storage == nullptr)
@@ -136,21 +141,22 @@ struct DispatchPartitionIf
       Predicate,
       equality_op_t,
       OffsetT,
-      cub::SelectImpl::Partition>::Dispatch(allocations[0],
-                                            allocation_sizes[0],
-                                            first,
-                                            stencil,
-                                            output,
-                                            d_num_selected_out,
-                                            predicate,
-                                            equality_op_t{},
-                                            num_items,
-                                            stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+      keep_rejects,
+      may_alias>::Dispatch(allocations[0],
+                           allocation_sizes[0],
+                           first,
+                           stencil,
+                           output,
+                           d_num_selected_out,
+                           predicate,
+                           equality_op_t{},
+                           num_items,
+                           stream);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Get number of selected items
     status = cuda_cub::synchronize(policy);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
     num_selected = static_cast<std::size_t>(get_value(policy, d_num_selected_out));
 
     return status;
@@ -166,7 +172,7 @@ THRUST_RUNTIME_FUNCTION std::size_t partition(
   OutputIt output,
   Predicate predicate)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
 
   size_type num_items = thrust::distance(first, last);
   std::size_t num_selected{};
@@ -241,7 +247,7 @@ THRUST_RUNTIME_FUNCTION InputIt inplace_partition(
   }
 
   // Element type of the input iterator
-  using value_t         = thrust::detail::it_value_t<InputIt>;
+  using value_t         = typename iterator_traits<InputIt>::value_type;
   std::size_t num_items = static_cast<std::size_t>(thrust::distance(first, last));
 
   // Allocate temporary storage, which will serve as the input to the partition
diff --git a/projects/rocthrust/thrust/system/cuda/detail/per_device_resource.h b/projects/rocthrust/thrust/system/cuda/detail/per_device_resource.h
index 1e1078e4874c..8cc91a4793a4 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/per_device_resource.h
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/reduce.h b/projects/rocthrust/thrust/system/cuda/detail/reduce.h
index 552e1c2b7a8e..0119ac796261 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/reduce.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/reduce.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -44,8 +44,10 @@
 #  include <cub/util_math.cuh>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
+#  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/cuda/detail/cdp_dispatch.h>
@@ -108,7 +110,7 @@ template <class, class>
 struct Tuning;
 
 template <class T>
-struct Tuning<core::detail::sm52, T>
+struct Tuning<sm30, T>
 {
   enum
   {
@@ -118,6 +120,18 @@ struct Tuning<core::detail::sm52, T>
     SCALE_FACTOR_1B = sizeof(T),
   };
 
+  using type =
+    PtxPolicy<256,
+              (((20 / SCALE_FACTOR_4B) > (1)) ? (20 / SCALE_FACTOR_4B) : (1)),
+              2,
+              cub::BLOCK_REDUCE_WARP_REDUCTIONS,
+              cub::LOAD_DEFAULT,
+              cub::GRID_MAPPING_RAKE>;
+}; // Tuning sm30
+
+template <class T>
+struct Tuning<sm35, T> : Tuning<sm30, T>
+{
   // ReducePolicy1B (GTX Titan: 228.7 GB/s @ 192M 1B items)
   using ReducePolicy1B =
     PtxPolicy<128,
@@ -137,7 +151,7 @@ struct Tuning<core::detail::sm52, T>
               cub::GRID_MAPPING_DYNAMIC>;
 
   using type = ::cuda::std::conditional_t<(sizeof(T) < 4), ReducePolicy1B, ReducePolicy4B>;
-}; // Tuning sm52
+}; // Tuning sm35
 
 template <class InputIt, class OutputIt, class T, class Size, class ReductionOp>
 struct ReduceAgent
@@ -154,8 +168,8 @@ struct ReduceAgent
     using tuning = Tuning<Arch, T>;
 
     using Vector      = typename cub::CubVector<T, PtxPlan::VECTOR_LOAD_LENGTH>;
-    using LoadIt      = typename core::detail::LoadIterator<PtxPlan, InputIt>::type;
-    using BlockReduce = cub::BlockReduce<T, PtxPlan::BLOCK_THREADS, PtxPlan::BLOCK_ALGORITHM, 1, 1>;
+    using LoadIt      = typename core::LoadIterator<PtxPlan, InputIt>::type;
+    using BlockReduce = cub::BlockReduce<T, PtxPlan::BLOCK_THREADS, PtxPlan::BLOCK_ALGORITHM, 1, 1, Arch::ver>;
 
     using VectorLoadIt = cub::CacheModifiedInputIterator<PtxPlan::LOAD_MODIFIER, Vector, Size>;
 
@@ -174,7 +188,7 @@ struct ReduceAgent
   // Other algorithms, e.g. merge, may not need additional information,
   // and may use AgentPlan directly, instead of defining their own Plan type.
   //
-  struct Plan : core::detail::AgentPlan
+  struct Plan : core::AgentPlan
   {
     cub::GridMappingStrategy grid_mapping;
 
@@ -182,7 +196,7 @@ struct ReduceAgent
 
     template <class P>
     THRUST_RUNTIME_FUNCTION Plan(P)
-        : core::detail::AgentPlan(P())
+        : core::AgentPlan(P())
         , grid_mapping(P::GRID_MAPPING)
     {}
   };
@@ -191,7 +205,7 @@ struct ReduceAgent
   // ptx_plan type *must* only be used from device code
   // Its use from host code will result in *undefined behaviour*
   //
-  using ptx_plan = typename core::detail::specialize_plan_msvc10_war<PtxPlan>::type::type;
+  using ptx_plan = typename core::specialize_plan_msvc10_war<PtxPlan>::type::type;
 
   using TempStorage  = typename ptx_plan::TempStorage;
   using Vector       = typename ptx_plan::Vector;
@@ -229,7 +243,7 @@ struct ReduceAgent
     THRUST_DEVICE_FUNCTION impl(TempStorage& storage_, InputIt input_it_, ReductionOp reduction_op_)
         : storage(storage_)
         , input_it(input_it_)
-        , load_it(core::detail::make_load_iterator(ptx_plan(), input_it))
+        , load_it(core::make_load_iterator(ptx_plan(), input_it))
         , reduction_op(reduction_op_)
     {}
 
@@ -303,7 +317,7 @@ struct ReduceAgent
       T* d_in_unqualified = const_cast<T*>(input_it) + block_offset + (threadIdx.x * VECTOR_LOAD_LENGTH);
       VectorLoadIt vec_load_it(reinterpret_cast<Vector*>(d_in_unqualified));
 
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int i = 0; i < WORDS; ++i)
       {
         vec_items[i] = vec_load_it[BLOCK_THREADS * i];
@@ -427,6 +441,8 @@ struct ReduceAgent
     THRUST_DEVICE_FUNCTION T
     consume_tiles_impl(Size num_items, cub::GridQueue<UnsignedSize> queue, CAN_VECTORIZE can_vectorize)
     {
+      using core::sync_threadblock;
+
       // We give each thread block at least one tile of input.
       T thread_aggregate;
       Size block_offset    = blockIdx.x * ITEMS_PER_TILE;
@@ -451,7 +467,7 @@ struct ReduceAgent
           storage.dequeue_offset = queue.Drain(ITEMS_PER_TILE) + even_share_base;
         }
 
-        __syncthreads();
+        sync_threadblock();
 
         // Grab tile offset and check if we're done with full tiles
         block_offset = storage.dequeue_offset;
@@ -462,7 +478,7 @@ struct ReduceAgent
           consume_tile<false>(
             thread_aggregate, block_offset, ITEMS_PER_TILE, thrust::detail::true_type(), can_vectorize);
 
-          __syncthreads();
+          sync_threadblock();
 
           // Dequeue a tile of items
           if (threadIdx.x == 0)
@@ -470,7 +486,7 @@ struct ReduceAgent
             storage.dequeue_offset = queue.Drain(ITEMS_PER_TILE) + even_share_base;
           }
 
-          __syncthreads();
+          sync_threadblock();
 
           // Grab tile offset and check if we're done with full tiles
           block_offset = storage.dequeue_offset;
@@ -583,7 +599,7 @@ struct DrainAgent
   template <class Arch>
   struct PtxPlan : PtxPolicy<1>
   {};
-  using ptx_plan = core::detail::specialize_plan<PtxPlan>;
+  using ptx_plan = core::specialize_plan<PtxPlan>;
 
   //---------------------------------------------------------------------
   // Agent entry point
@@ -606,10 +622,10 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   OutputIt output_it,
   cudaStream_t stream)
 {
-  using core::detail::AgentLauncher;
-  using core::detail::AgentPlan;
-  using core::detail::cuda_optional;
-  using core::detail::get_agent_plan;
+  using core::AgentLauncher;
+  using core::AgentPlan;
+  using core::cuda_optional;
+  using core::get_agent_plan;
 
   using UnsignedSize = typename detail::make_unsigned_special<Size>::type;
 
@@ -626,25 +642,25 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   if (num_items <= reduce_plan.items_per_tile)
   {
-    size_t vshmem_size = core::detail::vshmem_size(reduce_plan.shared_memory_size, 1);
+    size_t vshmem_size = core::vshmem_size(reduce_plan.shared_memory_size, 1);
 
     // small, single tile size
     if (d_temp_storage == nullptr)
     {
-      temp_storage_bytes = ::cuda::std::max<size_t>(1, vshmem_size);
+      temp_storage_bytes = max<size_t>(1, vshmem_size);
       return status;
     }
     char* vshmem_ptr = vshmem_size > 0 ? (char*) d_temp_storage : nullptr;
 
     reduce_agent ra(reduce_plan, num_items, stream, vshmem_ptr, "reduce_agent: single_tile only");
     ra.launch(input_it, output_it, num_items, reduction_op, init);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   }
   else
   {
     // regular size
-    cuda_optional<int> sm_count = core::detail::get_sm_count();
-    _CUDA_CUB_RET_IF_FAIL(sm_count.status());
+    cuda_optional<int> sm_count = core::get_sm_count();
+    CUDA_CUB_RET_IF_FAIL(sm_count.status());
 
     // reduction will not use more cta counts than requested
     cuda_optional<int> max_blocks_per_sm = reduce_agent::template get_max_blocks_per_sm<
@@ -654,7 +670,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
       cub::GridEvenShare<Size>,
       cub::GridQueue<UnsignedSize>,
       ReductionOp>(reduce_plan);
-    _CUDA_CUB_RET_IF_FAIL(max_blocks_per_sm.status());
+    CUDA_CUB_RET_IF_FAIL(max_blocks_per_sm.status());
 
     int reduce_device_occupancy = (int) max_blocks_per_sm * sm_count;
 
@@ -667,7 +683,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     // we will launch at most "max_blocks" blocks in a grid
     // so preallocate virtual shared memory storage for this if required
     //
-    size_t vshmem_size = core::detail::vshmem_size(reduce_plan.shared_memory_size, max_blocks);
+    size_t vshmem_size = core::vshmem_size(reduce_plan.shared_memory_size, max_blocks);
 
     // Temporary storage allocation requirements
     void* allocations[3]       = {nullptr, nullptr, nullptr};
@@ -677,7 +693,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
       vshmem_size // size of virtualized shared memory storage
     };
     status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
     if (d_temp_storage == nullptr)
     {
       return status;
@@ -701,24 +717,24 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
       // if not enough to fill the device with threadblocks
       // then fill the device with threadblocks
-      reduce_grid_size = static_cast<int>((::cuda::std::min)(num_tiles, static_cast<size_t>(reduce_device_occupancy)));
+      reduce_grid_size = static_cast<int>((min) (num_tiles, static_cast<size_t>(reduce_device_occupancy)));
 
       using drain_agent    = AgentLauncher<DrainAgent<Size>>;
       AgentPlan drain_plan = drain_agent::get_plan();
       drain_plan.grid_size = 1;
       drain_agent da(drain_plan, stream, "__reduce::drain_agent");
       da.launch(queue, num_items);
-      _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+      CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
     }
     else
     {
-      _CUDA_CUB_RET_IF_FAIL(cudaErrorNotSupported);
+      CUDA_CUB_RET_IF_FAIL(cudaErrorNotSupported);
     }
 
     reduce_plan.grid_size = reduce_grid_size;
     reduce_agent ra(reduce_plan, stream, vshmem_ptr, "reduce_agent: regular size reduce");
     ra.launch(input_it, d_block_reductions, num_items, even_share, queue, reduction_op);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
     using reduce_agent_single = AgentLauncher<ReduceAgent<T*, OutputIt, T, Size, ReductionOp>>;
 
@@ -726,7 +742,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     reduce_agent_single ra1(reduce_plan, stream, vshmem_ptr, "reduce_agent: single tile reduce");
 
     ra1.launch(d_block_reductions, output_it, reduce_grid_size, reduction_op, init);
-    _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+    CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   }
 
   return status;
@@ -752,14 +768,14 @@ reduce(execution_policy<Derived>& policy, InputIt first, Size num_items, T init,
   void* allocations[2]       = {nullptr, nullptr};
 
   size_t storage_size = 0;
-  status              = core::detail::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
+  status              = core::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "reduce failed on 1st alias_storage");
 
   // Allocate temporary storage.
   thrust::detail::temporary_array<std::uint8_t, Derived> tmp(policy, storage_size);
   void* ptr = static_cast<void*>(tmp.data().get());
 
-  status = core::detail::alias_storage(ptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(ptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "reduce failed on 2nd alias_storage");
 
   T* d_result = thrust::detail::aligned_reinterpret_cast<T*>(allocations[0]);
@@ -856,7 +872,7 @@ reduce_n(execution_policy<Derived>& policy, InputIt first, Size num_items, T ini
 template <class Derived, class InputIt, class T, class BinaryOp>
 _CCCL_HOST_DEVICE T reduce(execution_policy<Derived>& policy, InputIt first, InputIt last, T init, BinaryOp binary_op)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
   // FIXME: Check for RA iterator.
   size_type num_items = static_cast<size_type>(thrust::distance(first, last));
   return cuda_cub::reduce_n(policy, first, num_items, init, binary_op);
@@ -869,10 +885,10 @@ _CCCL_HOST_DEVICE T reduce(execution_policy<Derived>& policy, InputIt first, Inp
 }
 
 template <class Derived, class InputIt>
-_CCCL_HOST_DEVICE thrust::detail::it_value_t<InputIt>
+_CCCL_HOST_DEVICE typename iterator_traits<InputIt>::value_type
 reduce(execution_policy<Derived>& policy, InputIt first, InputIt last)
 {
-  using value_type = thrust::detail::it_value_t<InputIt>;
+  using value_type = typename iterator_traits<InputIt>::value_type;
   return cuda_cub::reduce(policy, first, last, value_type(0));
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/reduce_by_key.h b/projects/rocthrust/thrust/system/cuda/detail/reduce_by_key.h
index fe9a090f492d..67090a23b954 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/reduce_by_key.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -44,6 +44,7 @@
 #  include <cub/util_math.cuh>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/mpl/math.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
@@ -58,8 +59,6 @@
 #  include <thrust/system/cuda/detail/par_to_seq.h>
 #  include <thrust/system/cuda/detail/util.h>
 
-#  include <cuda/std/iterator>
-
 #  include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
@@ -117,7 +116,54 @@ template <class Arch, class Key, class Value>
 struct Tuning;
 
 template <class Key, class Value>
-struct Tuning<core::detail::sm52, Key, Value>
+struct Tuning<sm30, Key, Value>
+{
+  enum
+  {
+    MAX_INPUT_BYTES      = mpl::max<size_t, sizeof(Key), sizeof(Value)>::value,
+    COMBINED_INPUT_BYTES = sizeof(Key) + sizeof(Value),
+
+    NOMINAL_4B_ITEMS_PER_THREAD = 6,
+
+    ITEMS_PER_THREAD =
+      mpl::min<int,
+               NOMINAL_4B_ITEMS_PER_THREAD,
+               mpl::max<int,
+                        1,
+                        static_cast<int>(((NOMINAL_4B_ITEMS_PER_THREAD * 8) + COMBINED_INPUT_BYTES - 1)
+                                         / COMBINED_INPUT_BYTES)>::value>::value,
+  };
+
+  using type =
+    PtxPolicy<128, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_DEFAULT, cub::BLOCK_SCAN_WARP_SCANS>;
+}; // Tuning sm30
+
+template <class Key, class Value>
+struct Tuning<sm35, Key, Value> : Tuning<sm30, Key, Value>
+{
+  enum
+  {
+    MAX_INPUT_BYTES      = mpl::max<size_t, sizeof(Key), sizeof(Value)>::value,
+    COMBINED_INPUT_BYTES = sizeof(Key) + sizeof(Value),
+
+    NOMINAL_4B_ITEMS_PER_THREAD = 6,
+
+    ITEMS_PER_THREAD =
+      (MAX_INPUT_BYTES <= 8)
+        ? 6
+        : mpl::min<
+          int,
+          NOMINAL_4B_ITEMS_PER_THREAD,
+          mpl::max<int, 1, ((NOMINAL_4B_ITEMS_PER_THREAD * 8) + COMBINED_INPUT_BYTES - 1) / COMBINED_INPUT_BYTES>::
+            value>::value,
+  };
+
+  using type =
+    PtxPolicy<128, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_LDG, cub::BLOCK_SCAN_WARP_SCANS>;
+}; // Tuning sm35
+
+template <class Key, class Value>
+struct Tuning<sm52, Key, Value> : Tuning<sm30, Key, Value>
 {
   enum
   {
@@ -150,8 +196,8 @@ template <class KeysInputIt,
           class Size>
 struct ReduceByKeyAgent
 {
-  using key_type   = thrust::detail::it_value_t<KeysInputIt>;
-  using value_type = thrust::detail::it_value_t<ValuesInputIt>;
+  using key_type   = typename iterator_traits<KeysInputIt>::value_type;
+  using value_type = typename iterator_traits<ValuesInputIt>::value_type;
   using size_type  = Size;
 
   using size_value_pair_t = cub::KeyValuePair<size_type, value_type>;
@@ -165,16 +211,18 @@ struct ReduceByKeyAgent
   {
     using tuning = Tuning<Arch, key_type, value_type>;
 
-    using KeysLoadIt   = typename core::detail::LoadIterator<PtxPlan, KeysInputIt>::type;
-    using ValuesLoadIt = typename core::detail::LoadIterator<PtxPlan, ValuesInputIt>::type;
+    using KeysLoadIt   = typename core::LoadIterator<PtxPlan, KeysInputIt>::type;
+    using ValuesLoadIt = typename core::LoadIterator<PtxPlan, ValuesInputIt>::type;
 
-    using BlockLoadKeys   = typename core::detail::BlockLoad<PtxPlan, KeysLoadIt>::type;
-    using BlockLoadValues = typename core::detail::BlockLoad<PtxPlan, ValuesLoadIt>::type;
+    using BlockLoadKeys   = typename core::BlockLoad<PtxPlan, KeysLoadIt>::type;
+    using BlockLoadValues = typename core::BlockLoad<PtxPlan, ValuesLoadIt>::type;
 
-    using BlockDiscontinuityKeys = cub::BlockDiscontinuity<key_type, PtxPlan::BLOCK_THREADS, 1, 1>;
+    using BlockDiscontinuityKeys = cub::BlockDiscontinuity<key_type, PtxPlan::BLOCK_THREADS, 1, 1, Arch::ver>;
 
-    using TilePrefixCallback = cub::TilePrefixCallbackOp<size_value_pair_t, ReduceBySegmentOp, ScanTileState>;
-    using BlockScan          = cub::BlockScan<size_value_pair_t, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1>;
+    using TilePrefixCallback =
+      cub::TilePrefixCallbackOp<size_value_pair_t, ReduceBySegmentOp, ScanTileState, Arch::ver>;
+    using BlockScan =
+      cub::BlockScan<size_value_pair_t, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1, Arch::ver>;
 
     union TempStorage
     {
@@ -188,11 +236,11 @@ struct ReduceByKeyAgent
       typename BlockLoadKeys::TempStorage load_keys;
       typename BlockLoadValues::TempStorage load_values;
 
-      core::detail::uninitialized_array<key_value_pair_t, PtxPlan::ITEMS_PER_TILE + 1> raw_exchange;
+      core::uninitialized_array<key_value_pair_t, PtxPlan::ITEMS_PER_TILE + 1> raw_exchange;
     }; // union TempStorage
   }; // struct PtxPlan
 
-  using ptx_plan = typename core::detail::specialize_plan_msvc10_war<PtxPlan>::type::type;
+  using ptx_plan = typename core::specialize_plan_msvc10_war<PtxPlan>::type::type;
 
   using KeysLoadIt             = typename ptx_plan::KeysLoadIt;
   using ValuesLoadIt           = typename ptx_plan::ValuesLoadIt;
@@ -293,7 +341,7 @@ struct ReduceByKeyAgent
       size_value_pair_t (&scan_items)[ITEMS_PER_THREAD])
     {
       // Zip values and segment_flags
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         // Set segment_flags for first out-of-bounds item, zero for others
@@ -314,7 +362,7 @@ struct ReduceByKeyAgent
       key_value_pair_t (&scatter_items)[ITEMS_PER_THREAD])
     {
       // Zip values and segment_flags
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         scatter_items[ITEM].key   = keys[ITEM];
@@ -335,7 +383,7 @@ struct ReduceByKeyAgent
       size_type (&segment_indices)[ITEMS_PER_THREAD])
     {
       // Scatter flagged keys and values
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         if (segment_flags[ITEM])
@@ -360,10 +408,12 @@ struct ReduceByKeyAgent
       size_type num_tile_segments,
       size_type num_tile_segments_prefix)
     {
-      __syncthreads();
+      using core::sync_threadblock;
+
+      sync_threadblock();
 
       // Compact and scatter keys
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         if (segment_flags[ITEM])
@@ -373,7 +423,7 @@ struct ReduceByKeyAgent
         }
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       for (int item = threadIdx.x; item < num_tile_segments; item += BLOCK_THREADS)
       {
@@ -443,6 +493,8 @@ struct ReduceByKeyAgent
     template <bool IS_LAST_TILE>
     THRUST_DEVICE_FUNCTION void consume_first_tile(Size num_remaining, Size tile_offset, ScanTileState& tile_state)
     {
+      using core::sync_threadblock;
+
       key_type keys[ITEMS_PER_THREAD]; // Tile keys
       key_type pred_keys[ITEMS_PER_THREAD]; // Tile keys shifted up (predecessor)
       value_type values[ITEMS_PER_THREAD]; // Tile values
@@ -464,7 +516,7 @@ struct ReduceByKeyAgent
         BlockLoadKeys(storage.load_keys).Load(keys_load_it + tile_offset, keys);
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       // Load values (last tile repeats final element)
       if (IS_LAST_TILE)
@@ -477,7 +529,7 @@ struct ReduceByKeyAgent
         BlockLoadValues(storage.load_values).Load(values_load_it + tile_offset, values);
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       // Set head segment_flags.
       // First tile sets the first flag for the first item
@@ -536,6 +588,8 @@ struct ReduceByKeyAgent
     THRUST_DEVICE_FUNCTION void
     consume_subsequent_tile(Size num_remaining, int tile_idx, Size tile_offset, ScanTileState& tile_state)
     {
+      using core::sync_threadblock;
+
       key_type keys[ITEMS_PER_THREAD]; // Tile keys
       key_type pred_keys[ITEMS_PER_THREAD]; // Tile keys shifted up (predecessor)
       value_type values[ITEMS_PER_THREAD]; // Tile values
@@ -557,7 +611,7 @@ struct ReduceByKeyAgent
 
       key_type tile_pred_key = (threadIdx.x == 0) ? key_type(keys_load_it[tile_offset - 1]) : key_type();
 
-      __syncthreads();
+      sync_threadblock();
 
       // Load values (last tile repeats final element)
       if (IS_LAST_TILE)
@@ -570,7 +624,7 @@ struct ReduceByKeyAgent
         BlockLoadValues(storage.load_values).Load(values_load_it + tile_offset, values);
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       // Set head segment_flags
       BlockDiscontinuityKeys(storage.scan_storage.discontinuity)
@@ -629,8 +683,8 @@ struct ReduceByKeyAgent
       int /*num_tiles*/,
       ScanTileState& tile_state)
         : storage(storage_)
-        , keys_load_it(core::detail::make_load_iterator(ptx_plan(), keys_input_it_))
-        , values_load_it(core::detail::make_load_iterator(ptx_plan(), values_input_it_))
+        , keys_load_it(core::make_load_iterator(ptx_plan(), keys_input_it_))
+        , values_load_it(core::make_load_iterator(ptx_plan(), values_input_it_))
         , keys_output_it(keys_output_it_)
         , values_output_it(values_output_it_)
         , num_runs_output_it(num_runs_output_it_)
@@ -697,7 +751,7 @@ struct InitAgent
   template <class Arch>
   struct PtxPlan : PtxPolicy<128>
   {};
-  using ptx_plan = core::detail::specialize_plan<PtxPlan>;
+  using ptx_plan = core::specialize_plan<PtxPlan>;
 
   //---------------------------------------------------------------------
   // Agent entry point
@@ -734,8 +788,8 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
   Size num_items,
   cudaStream_t stream)
 {
-  using core::detail::AgentLauncher;
-  using core::detail::AgentPlan;
+  using core::AgentLauncher;
+  using core::AgentPlan;
 
   cudaError_t status = cudaSuccess;
   if (num_items == 0)
@@ -756,15 +810,15 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
   int tile_size  = reduce_by_key_plan.items_per_tile;
   Size num_tiles = ::cuda::ceil_div(num_items, tile_size);
 
-  size_t vshmem_size = core::detail::vshmem_size(reduce_by_key_plan.shared_memory_size, num_tiles);
+  size_t vshmem_size = core::vshmem_size(reduce_by_key_plan.shared_memory_size, num_tiles);
 
   size_t allocation_sizes[2] = {9, vshmem_size};
   status                     = ScanTileState::AllocationSize(static_cast<int>(num_tiles), allocation_sizes[0]);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   void* allocations[2] = {nullptr, nullptr};
   status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   if (d_temp_storage == nullptr)
   {
@@ -773,11 +827,11 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
 
   ScanTileState tile_state;
   status = tile_state.Init(static_cast<int>(num_tiles), allocations[0], allocation_sizes[0]);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   init_agent ia(init_plan, num_tiles, stream, "reduce_by_key::init_agent");
   ia.launch(tile_state, num_tiles, num_runs_output_it);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
   char* vshmem_ptr = vshmem_size > 0 ? (char*) allocations[1] : nullptr;
 
@@ -793,7 +847,7 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
     reduction_op,
     num_items,
     num_tiles);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   return status;
 }
 
@@ -842,14 +896,14 @@ THRUST_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key_dispatc
   void* allocations[2]       = {nullptr, nullptr};
 
   size_t storage_size = 0;
-  status              = core::detail::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
+  status              = core::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "reduce failed on 1st alias_storage");
 
   // Allocate temporary storage.
   thrust::detail::temporary_array<std::uint8_t, Derived> tmp(policy, storage_size);
   void* ptr = static_cast<void*>(tmp.data().get());
 
-  status = core::detail::alias_storage(ptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(ptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "reduce failed on 2nd alias_storage");
 
   Size* d_num_runs_out = thrust::detail::aligned_reinterpret_cast<Size*>(allocations[0]);
@@ -893,7 +947,7 @@ THRUST_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
   EqualityOp equality_op,
   ReductionOp reduction_op)
 {
-  using size_type = thrust::detail::it_difference_t<KeysInputIt>;
+  using size_type = typename iterator_traits<KeysInputIt>::difference_type;
 
   size_type num_items = thrust::distance(keys_first, keys_last);
 
@@ -963,9 +1017,9 @@ pair<KeyOutputIt, ValOutputIt> _CCCL_HOST_DEVICE reduce_by_key(
   ValOutputIt values_output,
   BinaryPred binary_pred)
 {
-  using value_type = ::cuda::std::_If<thrust::detail::is_output_iterator<ValOutputIt>,
-                                      thrust::detail::it_value_t<ValInputIt>,
-                                      thrust::detail::it_value_t<ValOutputIt>>;
+  using value_type = typename thrust::detail::eval_if<thrust::detail::is_output_iterator<ValOutputIt>::value,
+                                                      thrust::iterator_value<ValInputIt>,
+                                                      thrust::iterator_value<ValOutputIt>>::type;
   return cuda_cub::reduce_by_key(
     policy, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, plus<value_type>());
 }
@@ -979,7 +1033,7 @@ pair<KeyOutputIt, ValOutputIt> _CCCL_HOST_DEVICE reduce_by_key(
   KeyOutputIt keys_output,
   ValOutputIt values_output)
 {
-  using KeyT = thrust::detail::it_value_t<KeyInputIt>;
+  using KeyT = typename thrust::iterator_value<KeyInputIt>::type;
   return cuda_cub::reduce_by_key(
     policy, keys_first, keys_last, values_first, keys_output, values_output, equal_to<KeyT>());
 }
diff --git a/projects/rocthrust/thrust/system/cuda/detail/remove.h b/projects/rocthrust/thrust/system/cuda/detail/remove.h
index f53e2263265c..993408019419 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/remove.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/remove.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/detail/copy_if.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -50,7 +50,7 @@ template <class Derived, class InputIt, class StencilIt, class Predicate>
 InputIt _CCCL_HOST_DEVICE
 remove_if(execution_policy<Derived>& policy, InputIt first, InputIt last, StencilIt stencil, Predicate predicate)
 {
-  THRUST_CDP_DISPATCH((return cuda_cub::detail::copy_if<cub::SelectImpl::SelectPotentiallyInPlace>(
+  THRUST_CDP_DISPATCH((return cuda_cub::detail::copy_if<cuda_cub::detail::InputMayAliasOutput::yes>(
                                 policy, first, last, stencil, first, thrust::not_fn(predicate));),
                       (return thrust::remove_if(cvt_to_seq(derived_cast(policy)), first, last, stencil, predicate);));
 }
@@ -60,7 +60,7 @@ template <class Derived, class InputIt, class Predicate>
 InputIt _CCCL_HOST_DEVICE remove_if(execution_policy<Derived>& policy, InputIt first, InputIt last, Predicate predicate)
 {
   THRUST_CDP_DISPATCH(
-    (return cuda_cub::detail::copy_if<cub::SelectImpl::SelectPotentiallyInPlace>(
+    (return cuda_cub::detail::copy_if<cuda_cub::detail::InputMayAliasOutput::yes>(
               policy, first, last, static_cast<cub::NullType*>(nullptr), first, thrust::not_fn(predicate));),
     (return thrust::remove_if(cvt_to_seq(derived_cast(policy)), first, last, predicate);));
 }
diff --git a/projects/rocthrust/thrust/system/cuda/detail/replace.h b/projects/rocthrust/thrust/system/cuda/detail/replace.h
index ae538b53ce5d..45682ac52c21 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/replace.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/replace.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/detail/internal_functional.h>
 #  include <thrust/system/cuda/detail/transform.h>
 
@@ -127,7 +127,7 @@ OutputIt _CCCL_HOST_DEVICE replace_copy_if(
   Predicate predicate,
   T const& new_value)
 {
-  using output_type    = thrust::detail::it_value_t<OutputIt>;
+  using output_type    = typename iterator_traits<OutputIt>::value_type;
   using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
   return cuda_cub::transform(policy, first, last, result, new_value_if_t(predicate, new_value));
 }
@@ -142,7 +142,7 @@ OutputIt _CCCL_HOST_DEVICE replace_copy_if(
   Predicate predicate,
   T const& new_value)
 {
-  using output_type    = thrust::detail::it_value_t<OutputIt>;
+  using output_type    = typename iterator_traits<OutputIt>::value_type;
   using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
   return cuda_cub::transform(policy, first, last, stencil, result, new_value_if_t(predicate, new_value));
 }
diff --git a/projects/rocthrust/thrust/system/cuda/detail/reverse.h b/projects/rocthrust/thrust/system/cuda/detail/reverse.h
index 46fca87ad419..57cc16852fd4 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/reverse.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/reverse.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -58,8 +58,6 @@ THRUST_NAMESPACE_END
 #  include <thrust/system/cuda/detail/copy.h>
 #  include <thrust/system/cuda/detail/swap_ranges.h>
 
-#  include <cuda/std/iterator>
-
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
 {
@@ -73,7 +71,7 @@ ResultIt _CCCL_HOST_DEVICE reverse_copy(execution_policy<Derived>& policy, Items
 template <class Derived, class ItemsIt>
 void _CCCL_HOST_DEVICE reverse(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using difference_type = thrust::detail::it_difference_t<ItemsIt>;
+  using difference_type = typename thrust::iterator_difference<ItemsIt>::type;
 
   // find the midpoint of [first,last)
   difference_type N = thrust::distance(first, last);
diff --git a/projects/rocthrust/thrust/system/cuda/detail/scan.h b/projects/rocthrust/thrust/system/cuda/detail/scan.h
index 15c695366866..95ae0d797d0e 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/scan.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/scan.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -63,7 +63,7 @@ template <typename Derived, typename InputIt, typename Size, typename OutputIt,
 _CCCL_HOST_DEVICE OutputIt inclusive_scan_n_impl(
   thrust::cuda_cub::execution_policy<Derived>& policy, InputIt first, Size num_items, OutputIt result, ScanOp scan_op)
 {
-  using AccumT     = thrust::detail::it_value_t<InputIt>;
+  using AccumT     = typename thrust::iterator_traits<InputIt>::value_type;
   using Dispatch32 = cub::DispatchScan<InputIt, OutputIt, ScanOp, cub::NullType, std::uint32_t, AccumT>;
   using Dispatch64 = cub::DispatchScan<InputIt, OutputIt, ScanOp, cub::NullType, std::uint64_t, AccumT>;
 
@@ -119,14 +119,30 @@ _CCCL_HOST_DEVICE OutputIt inclusive_scan_n_impl(
   InitValueT init,
   ScanOp scan_op)
 {
-  using InputValueT = cub::detail::InputValue<InitValueT>;
-  using ValueT      = cub::detail::it_value_t<InputIt>;
-  using AccumT      = ::cuda::std::__accumulator_t<ScanOp, ValueT, InitValueT>;
+  using InputValueT             = cub::detail::InputValue<InitValueT>;
+  using ValueT                  = cub::detail::value_t<InputIt>;
+  using OutputValueT            = cub::detail::value_t<OutputIt>;
+  using AccumT                  = ::cuda::std::__accumulator_t<ScanOp, ValueT, InitValueT>;
+  constexpr bool ForceInclusive = true;
 
   using Dispatch32 =
-    cub::DispatchScan<InputIt, OutputIt, ScanOp, InputValueT, std::uint32_t, AccumT, cub::ForceInclusive::Yes>;
+    cub::DispatchScan<InputIt,
+                      OutputIt,
+                      ScanOp,
+                      InputValueT,
+                      std::int32_t,
+                      AccumT,
+                      cub::detail::scan::policy_hub<ValueT, OutputValueT, AccumT, std::int32_t, ScanOp>,
+                      ForceInclusive>;
   using Dispatch64 =
-    cub::DispatchScan<InputIt, OutputIt, ScanOp, InputValueT, std::uint64_t, AccumT, cub::ForceInclusive::Yes>;
+    cub::DispatchScan<InputIt,
+                      OutputIt,
+                      ScanOp,
+                      InputValueT,
+                      std::int64_t,
+                      AccumT,
+                      cub::detail::scan::policy_hub<ValueT, OutputValueT, AccumT, std::int64_t, ScanOp>,
+                      ForceInclusive>;
 
   cudaStream_t stream = thrust::cuda_cub::stream(policy);
   cudaError_t status;
@@ -140,7 +156,7 @@ _CCCL_HOST_DEVICE OutputIt inclusive_scan_n_impl(
   // Determine temporary storage requirements:
   size_t tmp_size = 0;
   {
-    THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(
+    THRUST_INDEX_TYPE_DISPATCH2(
       status,
       Dispatch32::Dispatch,
       Dispatch64::Dispatch,
@@ -156,7 +172,7 @@ _CCCL_HOST_DEVICE OutputIt inclusive_scan_n_impl(
   {
     // Allocate temporary storage:
     thrust::detail::temporary_array<std::uint8_t, Derived> tmp{policy, tmp_size};
-    THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(
+    THRUST_INDEX_TYPE_DISPATCH2(
       status,
       Dispatch32::Dispatch,
       Dispatch64::Dispatch,
@@ -262,7 +278,7 @@ template <typename Derived, typename InputIt, typename OutputIt, typename ScanOp
 _CCCL_HOST_DEVICE OutputIt inclusive_scan(
   thrust::cuda_cub::execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::cuda_cub::inclusive_scan_n(policy, first, num_items, result, scan_op);
 }
@@ -276,7 +292,7 @@ _CCCL_HOST_DEVICE OutputIt inclusive_scan(
   T init,
   ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::cuda_cub::inclusive_scan_n(policy, first, num_items, result, init, scan_op);
 }
@@ -314,7 +330,7 @@ _CCCL_HOST_DEVICE OutputIt exclusive_scan(
   T init,
   ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::cuda_cub::exclusive_scan_n(policy, first, num_items, result, init, scan_op);
 }
@@ -330,7 +346,7 @@ template <typename Derived, typename InputIt, typename OutputIt>
 _CCCL_HOST_DEVICE OutputIt
 exclusive_scan(thrust::cuda_cub::execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using init_type = thrust::detail::it_value_t<InputIt>;
+  using init_type = typename thrust::iterator_traits<InputIt>::value_type;
   return cuda_cub::exclusive_scan(policy, first, last, result, init_type{});
 };
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/scan_by_key.h b/projects/rocthrust/thrust/system/cuda/detail/scan_by_key.h
index 042a32ef4893..3ffc7898dcbb 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/scan_by_key.h
@@ -36,13 +36,14 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/dispatch/dispatch_scan_by_key.cuh>
 #  include <cub/util_type.cuh>
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/mpl/math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
@@ -53,7 +54,6 @@
 #  include <thrust/system/cuda/detail/par_to_seq.h>
 #  include <thrust/system/cuda/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
-#  include <thrust/type_traits/unwrap_contiguous_iterator.h>
 
 #  include <cstdint>
 
@@ -89,7 +89,7 @@ _CCCL_HOST_DEVICE ValuesOutIt inclusive_scan_by_key_n(
   using KeysInUnwrapIt    = thrust::try_unwrap_contiguous_iterator_t<KeysInIt>;
   using ValuesInUnwrapIt  = thrust::try_unwrap_contiguous_iterator_t<ValuesInIt>;
   using ValuesOutUnwrapIt = thrust::try_unwrap_contiguous_iterator_t<ValuesOutIt>;
-  using AccumT            = thrust::detail::it_value_t<ValuesInUnwrapIt>;
+  using AccumT            = typename thrust::iterator_traits<ValuesInUnwrapIt>::value_type;
 
   auto keys_unwrap   = thrust::try_unwrap_contiguous_iterator(keys);
   auto values_unwrap = thrust::try_unwrap_contiguous_iterator(values);
@@ -395,7 +395,7 @@ ValOutputIt _CCCL_HOST_DEVICE exclusive_scan_by_key(
   ValInputIt value_first,
   ValOutputIt value_result)
 {
-  using value_type = thrust::detail::it_value_t<ValInputIt>;
+  using value_type = typename thrust::iterator_traits<ValInputIt>::value_type;
   return cuda_cub::exclusive_scan_by_key(policy, key_first, key_last, value_first, value_result, value_type{});
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/scatter.h b/projects/rocthrust/thrust/system/cuda/detail/scatter.h
index 80f2ea80eaa0..17a61c70f77e 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/scatter.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/scatter.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/cuda/detail/transform.h>
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/sequence.h b/projects/rocthrust/thrust/system/cuda/detail/sequence.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/sequence.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/sequence.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/cuda/detail/set_operations.h b/projects/rocthrust/thrust/system/cuda/detail/set_operations.h
index deb58d488f30..5f0943774215 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/set_operations.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/set_operations.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/detail/alignment.h>
 #  include <thrust/detail/mpl/math.h>
@@ -52,9 +52,6 @@
 #  include <thrust/system/cuda/detail/par_to_seq.h>
 #  include <thrust/system/cuda/detail/util.h>
 
-#  include <cuda/std/__algorithm/max.h>
-#  include <cuda/std/__algorithm/min.h>
-
 #  include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
@@ -128,10 +125,10 @@ THRUST_DEVICE_FUNCTION Size biased_binary_search(It data, Size count, T key, Int
 template <bool UpperBound, class Size, class It1, class It2, class Comp>
 THRUST_DEVICE_FUNCTION Size merge_path(It1 a, Size aCount, It2 b, Size bCount, Size diag, Comp comp)
 {
-  using T = thrust::detail::it_value_t<It1>;
+  using T = typename thrust::iterator_traits<It1>::value_type;
 
-  Size begin = ::cuda::std::max<Size>(0, diag - bCount);
-  Size end   = ::cuda::std::min<Size>(diag, aCount);
+  Size begin = thrust::max<Size>(0, diag - bCount);
+  Size end   = thrust::min<Size>(diag, aCount);
 
   while (begin < end)
   {
@@ -155,7 +152,7 @@ template <class It1, class It2, class Size, class Size2, class CompareOp>
 THRUST_DEVICE_FUNCTION pair<Size, Size>
 balanced_path(It1 keys1, It2 keys2, Size num_keys1, Size num_keys2, Size diag, Size2 levels, CompareOp compare_op)
 {
-  using T = thrust::detail::it_value_t<It1>;
+  using T = typename iterator_traits<It1>::value_type;
 
   Size index1 = merge_path<false>(keys1, num_keys1, keys2, num_keys2, diag, compare_op);
   Size index2 = diag - index1;
@@ -222,7 +219,28 @@ struct Tuning;
 namespace mpl = thrust::detail::mpl::math;
 
 template <class T, class U>
-struct Tuning<core::detail::sm52, T, U>
+struct Tuning<sm30, T, U>
+{
+  enum
+  {
+    MAX_INPUT_BYTES             = mpl::max<size_t, sizeof(T), sizeof(U)>::value,
+    COMBINED_INPUT_BYTES        = sizeof(T), // + sizeof(Value),
+    NOMINAL_4B_ITEMS_PER_THREAD = 7,
+    ITEMS_PER_THREAD =
+      mpl::min<int,
+               NOMINAL_4B_ITEMS_PER_THREAD,
+               mpl::max<int,
+                        1,
+                        static_cast<int>(((NOMINAL_4B_ITEMS_PER_THREAD * 4) + COMBINED_INPUT_BYTES - 1)
+                                         / COMBINED_INPUT_BYTES)>::value>::value,
+  };
+
+  using type =
+    PtxPolicy<128, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_DEFAULT, cub::BLOCK_SCAN_WARP_SCANS>;
+}; // tuning sm30
+
+template <class T, class U>
+struct Tuning<sm52, T, U>
 {
   enum
   {
@@ -243,7 +261,7 @@ struct Tuning<core::detail::sm52, T, U>
 }; // tuning sm52
 
 template <class T, class U>
-struct Tuning<core::detail::sm60, T, U>
+struct Tuning<sm60, T, U>
 {
   enum
   {
@@ -275,10 +293,10 @@ template <class KeysIt1,
           class HAS_VALUES>
 struct SetOpAgent
 {
-  using key1_type   = thrust::detail::it_value_t<KeysIt1>;
-  using key2_type   = thrust::detail::it_value_t<KeysIt2>;
-  using value1_type = thrust::detail::it_value_t<ValuesIt1>;
-  using value2_type = thrust::detail::it_value_t<ValuesIt2>;
+  using key1_type   = typename iterator_traits<KeysIt1>::value_type;
+  using key2_type   = typename iterator_traits<KeysIt2>::value_type;
+  using value1_type = typename iterator_traits<ValuesIt1>::value_type;
+  using value2_type = typename iterator_traits<ValuesIt2>::value_type;
 
   using key_type   = key1_type;
   using value_type = value1_type;
@@ -290,19 +308,19 @@ struct SetOpAgent
   {
     using tuning = Tuning<Arch, key_type, value_type>;
 
-    using KeysLoadIt1   = typename core::detail::LoadIterator<PtxPlan, KeysIt1>::type;
-    using KeysLoadIt2   = typename core::detail::LoadIterator<PtxPlan, KeysIt2>::type;
-    using ValuesLoadIt1 = typename core::detail::LoadIterator<PtxPlan, ValuesIt1>::type;
-    using ValuesLoadIt2 = typename core::detail::LoadIterator<PtxPlan, ValuesIt2>::type;
+    using KeysLoadIt1   = typename core::LoadIterator<PtxPlan, KeysIt1>::type;
+    using KeysLoadIt2   = typename core::LoadIterator<PtxPlan, KeysIt2>::type;
+    using ValuesLoadIt1 = typename core::LoadIterator<PtxPlan, ValuesIt1>::type;
+    using ValuesLoadIt2 = typename core::LoadIterator<PtxPlan, ValuesIt2>::type;
 
-    using BlockLoadKeys1   = typename core::detail::BlockLoad<PtxPlan, KeysLoadIt1>::type;
-    using BlockLoadKeys2   = typename core::detail::BlockLoad<PtxPlan, KeysLoadIt2>::type;
-    using BlockLoadValues1 = typename core::detail::BlockLoad<PtxPlan, ValuesLoadIt1>::type;
-    using BlockLoadValues2 = typename core::detail::BlockLoad<PtxPlan, ValuesLoadIt2>::type;
+    using BlockLoadKeys1   = typename core::BlockLoad<PtxPlan, KeysLoadIt1>::type;
+    using BlockLoadKeys2   = typename core::BlockLoad<PtxPlan, KeysLoadIt2>::type;
+    using BlockLoadValues1 = typename core::BlockLoad<PtxPlan, ValuesLoadIt1>::type;
+    using BlockLoadValues2 = typename core::BlockLoad<PtxPlan, ValuesLoadIt2>::type;
 
-    using TilePrefixCallback = cub::TilePrefixCallbackOp<Size, ::cuda::std::plus<>, ScanTileState>;
+    using TilePrefixCallback = cub::TilePrefixCallbackOp<Size, ::cuda::std::plus<>, ScanTileState, Arch::ver>;
 
-    using BlockScan = cub::BlockScan<Size, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1>;
+    using BlockScan = cub::BlockScan<Size, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1, Arch::ver>;
 
     // gather required temporary storage in a union
     //
@@ -316,7 +334,7 @@ struct SetOpAgent
 
       struct LoadStorage
       {
-        core::detail::uninitialized_array<int, PtxPlan::BLOCK_THREADS> offset;
+        core::uninitialized_array<int, PtxPlan::BLOCK_THREADS> offset;
         union
         {
           // FIXME These don't appear to be used anywhere?
@@ -328,15 +346,15 @@ struct SetOpAgent
           // Allocate extra shmem than truly necessary
           // This will permit to avoid range checks in
           // serial set operations, e.g. serial_set_difference
-          core::detail::uninitialized_array<key_type, PtxPlan::ITEMS_PER_TILE + PtxPlan::BLOCK_THREADS> keys_shared;
+          core::uninitialized_array<key_type, PtxPlan::ITEMS_PER_TILE + PtxPlan::BLOCK_THREADS> keys_shared;
 
-          core::detail::uninitialized_array<value_type, PtxPlan::ITEMS_PER_TILE + PtxPlan::BLOCK_THREADS> values_shared;
+          core::uninitialized_array<value_type, PtxPlan::ITEMS_PER_TILE + PtxPlan::BLOCK_THREADS> values_shared;
         }; // anon union
       } load_storage; // struct LoadStorage
     }; // union TempStorage
   }; // struct PtxPlan
 
-  using ptx_plan = typename core::detail::specialize_plan_msvc10_war<PtxPlan>::type::type;
+  using ptx_plan = typename core::specialize_plan_msvc10_war<PtxPlan>::type::type;
 
   using KeysLoadIt1   = typename ptx_plan::KeysLoadIt1;
   using KeysLoadIt2   = typename ptx_plan::KeysLoadIt2;
@@ -390,7 +408,7 @@ struct SetOpAgent
     {
       if (IS_FULL_TILE)
       {
-        _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
         for (int ITEM = 0; ITEM < ITEMS_PER_THREAD - 1; ++ITEM)
         {
           int idx      = BLOCK_THREADS * ITEM + threadIdx.x;
@@ -408,7 +426,7 @@ struct SetOpAgent
       }
       else
       {
-        _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
         for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
         {
           int idx = BLOCK_THREADS * ITEM + threadIdx.x;
@@ -423,7 +441,7 @@ struct SetOpAgent
     template <class T, class It>
     THRUST_DEVICE_FUNCTION void reg_to_shared(It output, T (&input)[ITEMS_PER_THREAD])
     {
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         int idx     = BLOCK_THREADS * ITEM + threadIdx.x;
@@ -441,9 +459,10 @@ struct SetOpAgent
       Size tile_output_prefix,
       int tile_output_count)
     {
-      int local_scatter_idx = thread_output_prefix - tile_output_prefix;
+      using core::sync_threadblock;
 
-      _CCCL_PRAGMA_UNROLL_FULL()
+      int local_scatter_idx = thread_output_prefix - tile_output_prefix;
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         if (active_mask & (1 << ITEM))
@@ -451,7 +470,7 @@ struct SetOpAgent
           shared[local_scatter_idx++] = input[ITEM];
         }
       }
-      __syncthreads();
+      sync_threadblock();
 
       for (int item = threadIdx.x; item < tile_output_count; item += BLOCK_THREADS)
       {
@@ -482,7 +501,8 @@ struct SetOpAgent
     template <bool IS_LAST_TILE>
     void THRUST_DEVICE_FUNCTION consume_tile(Size tile_idx)
     {
-      using core::detail::uninitialized_array;
+      using core::sync_threadblock;
+      using core::uninitialized_array;
 
       pair<Size, Size> partition_beg = partitions[tile_idx + 0];
       pair<Size, Size> partition_end = partitions[tile_idx + 1];
@@ -504,7 +524,7 @@ struct SetOpAgent
 
       reg_to_shared(&storage.load_storage.keys_shared[0], keys_loc);
 
-      __syncthreads();
+      sync_threadblock();
 
       int diag_loc = min<int>(ITEMS_PER_THREAD * threadIdx.x, num_keys1 + num_keys2);
 
@@ -527,7 +547,7 @@ struct SetOpAgent
       int dst                          = threadIdx.x == 0 ? BLOCK_THREADS - 1 : threadIdx.x - 1;
       storage.load_storage.offset[dst] = value;
 
-      __syncthreads();
+      core::sync_threadblock();
 
       pair<int, int> partition1_loc = thrust::make_pair(
         storage.load_storage.offset[threadIdx.x] >> 16, storage.load_storage.offset[threadIdx.x] & 0xFFFF);
@@ -552,7 +572,7 @@ struct SetOpAgent
         indices,
         compare_op,
         set_op);
-      __syncthreads();
+      sync_threadblock();
 #  if 0
         if (ITEMS_PER_THREAD*threadIdx.x >= num_keys1 + num_keys2)
           active_mask = 0;
@@ -586,7 +606,7 @@ struct SetOpAgent
         tile_output_prefix = prefix_cb.GetExclusivePrefix();
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       // scatter results
       //
@@ -603,15 +623,15 @@ struct SetOpAgent
         value_type values_loc[ITEMS_PER_THREAD];
         gmem_to_reg<!IS_LAST_TILE>(values_loc, values1_in + keys1_beg, values2_in + keys2_beg, num_keys1, num_keys2);
 
-        __syncthreads();
+        sync_threadblock();
 
         reg_to_shared(&storage.load_storage.values_shared[0], values_loc);
 
-        __syncthreads();
+        sync_threadblock();
 
         // gather items from shared mem
         //
-        _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
         for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
         {
           if (active_mask & (1 << ITEM))
@@ -620,7 +640,7 @@ struct SetOpAgent
           }
         }
 
-        __syncthreads();
+        sync_threadblock();
 
         scatter(values_out,
                 values_loc,
@@ -658,10 +678,10 @@ struct SetOpAgent
          std::size_t* output_count_)
         : storage(storage_)
         , tile_state(tile_state_)
-        , keys1_in(core::detail::make_load_iterator(ptx_plan(), keys1_))
-        , keys2_in(core::detail::make_load_iterator(ptx_plan(), keys2_))
-        , values1_in(core::detail::make_load_iterator(ptx_plan(), values1_))
-        , values2_in(core::detail::make_load_iterator(ptx_plan(), values2_))
+        , keys1_in(core::make_load_iterator(ptx_plan(), keys1_))
+        , keys2_in(core::make_load_iterator(ptx_plan(), keys2_))
+        , values1_in(core::make_load_iterator(ptx_plan(), values1_))
+        , values2_in(core::make_load_iterator(ptx_plan(), values2_))
         , keys1_count(keys1_count_)
         , keys2_count(keys2_count_)
         , keys_out(keys_out_)
@@ -731,7 +751,7 @@ struct PartitionAgent
   struct PtxPlan : PtxPolicy<256>
   {};
 
-  using ptx_plan = core::detail::specialize_plan<PtxPlan>;
+  using ptx_plan = core::specialize_plan<PtxPlan>;
 
   //---------------------------------------------------------------------
   // Agent entry point
@@ -765,7 +785,7 @@ struct InitAgent
   struct PtxPlan : PtxPolicy<128>
   {};
 
-  using ptx_plan = core::detail::specialize_plan<PtxPlan>;
+  using ptx_plan = core::specialize_plan<PtxPlan>;
 
   //---------------------------------------------------------------------
   // Agent entry point
@@ -808,7 +828,7 @@ struct serial_set_intersection
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pA = compare_op(aKey, bKey);
@@ -864,7 +884,7 @@ struct serial_set_symmetric_difference
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -926,7 +946,7 @@ struct serial_set_difference
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -988,7 +1008,7 @@ struct serial_set_union
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -1056,8 +1076,8 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   cudaError_t status = cudaSuccess;
 
-  using core::detail::AgentLauncher;
-  using core::detail::AgentPlan;
+  using core::AgentLauncher;
+  using core::AgentPlan;
 
   using set_op_agent = AgentLauncher<
     SetOpAgent<KeysIt1, KeysIt2, ValuesIt1, ValuesIt2, KeysOutputIt, ValuesOutputIt, Size, CompareOp, SetOp, HAS_VALUES>>;
@@ -1076,16 +1096,16 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   size_t tile_agent_storage;
   status = ScanTileState::AllocationSize(static_cast<int>(num_tiles), tile_agent_storage);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
-  size_t vshmem_storage          = core::detail::vshmem_size(set_op_plan.shared_memory_size, num_tiles);
+  size_t vshmem_storage          = core::vshmem_size(set_op_plan.shared_memory_size, num_tiles);
   size_t partition_agent_storage = (num_tiles + 1) * sizeof(Size) * 2;
 
   void* allocations[3]       = {nullptr, nullptr, nullptr};
   size_t allocation_sizes[3] = {tile_agent_storage, partition_agent_storage, vshmem_storage};
 
-  status = core::detail::alias_storage(d_temp_storage, temp_storage_size, allocations, allocation_sizes);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  status = core::alias_storage(d_temp_storage, temp_storage_size, allocations, allocation_sizes);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   if (d_temp_storage == nullptr)
   {
@@ -1094,18 +1114,18 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   ScanTileState tile_state;
   status = tile_state.Init(static_cast<int>(num_tiles), allocations[0], allocation_sizes[0]);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   pair<Size, Size>* partitions = (pair<Size, Size>*) allocations[1];
   char* vshmem_ptr             = vshmem_storage > 0 ? (char*) allocations[2] : nullptr;
 
   init_agent ia(init_plan, num_tiles, stream, "set_op::init_agent");
   ia.launch(tile_state, num_tiles);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
   partition_agent pa(partition_plan, num_tiles + 1, stream, "set_op::partition agent");
   pa.launch(keys1, keys2, num_keys1, num_keys2, num_tiles + 1, partitions, compare_op, tile_size);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
   set_op_agent sa(set_op_plan, keys_total, stream, vshmem_ptr, "set_op::set_op_agent");
   sa.launch(
@@ -1122,7 +1142,7 @@ cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
     partitions,
     output_count,
     tile_state);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
   return status;
 }
@@ -1150,7 +1170,7 @@ THRUST_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
   CompareOp compare_op,
   SetOp set_op)
 {
-  using size_type = thrust::detail::it_difference_t<KeysIt1>;
+  using size_type = typename iterator_traits<KeysIt1>::difference_type;
 
   size_type num_keys1 = static_cast<size_type>(thrust::distance(keys1_first, keys1_last));
   size_type num_keys2 = static_cast<size_type>(thrust::distance(keys2_first, keys2_last));
@@ -1190,14 +1210,14 @@ THRUST_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
 
   size_t storage_size = 0;
 
-  status = core::detail::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "set_operations failed on 1st alias_storage");
 
   // Allocate temporary storage.
   thrust::detail::temporary_array<std::uint8_t, Derived> tmp(policy, storage_size);
   void* ptr = static_cast<void*>(tmp.data().get());
 
-  status = core::detail::alias_storage(ptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(ptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "set_operations failed on 2nd alias_storage");
 
   std::size_t* d_output_count = thrust::detail::aligned_reinterpret_cast<std::size_t*>(allocations[0]);
@@ -1248,7 +1268,7 @@ OutputIt _CCCL_HOST_DEVICE set_difference(
   CompareOp compare)
 {
   THRUST_CDP_DISPATCH(
-    (using items1_t = thrust::detail::it_value_t<ItemsIt1>; items1_t* null_ = nullptr;
+    (using items1_t = thrust::iterator_value_t<ItemsIt1>; items1_t* null_ = nullptr;
      auto tmp = __set_operations::set_operations<thrust::detail::false_type>(
        policy,
        items1_first,
@@ -1276,7 +1296,7 @@ OutputIt _CCCL_HOST_DEVICE set_difference(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return cuda_cub::set_difference(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1295,7 +1315,7 @@ OutputIt _CCCL_HOST_DEVICE set_intersection(
   CompareOp compare)
 {
   THRUST_CDP_DISPATCH(
-    (using items1_t = thrust::detail::it_value_t<ItemsIt1>; items1_t* null_ = nullptr;
+    (using items1_t = thrust::iterator_value_t<ItemsIt1>; items1_t* null_ = nullptr;
      auto tmp = __set_operations::set_operations<thrust::detail::false_type>(
        policy,
        items1_first,
@@ -1323,7 +1343,7 @@ OutputIt _CCCL_HOST_DEVICE set_intersection(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return cuda_cub::set_intersection(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1342,7 +1362,7 @@ OutputIt _CCCL_HOST_DEVICE set_symmetric_difference(
   CompareOp compare)
 {
   THRUST_CDP_DISPATCH(
-    (using items1_t = thrust::detail::it_value_t<ItemsIt1>; items1_t* null_ = nullptr;
+    (using items1_t = thrust::iterator_value_t<ItemsIt1>; items1_t* null_ = nullptr;
      auto tmp = __set_operations::set_operations<thrust::detail::false_type>(
        policy,
        items1_first,
@@ -1370,7 +1390,7 @@ OutputIt _CCCL_HOST_DEVICE set_symmetric_difference(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return cuda_cub::set_symmetric_difference(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1389,7 +1409,7 @@ OutputIt _CCCL_HOST_DEVICE set_union(
   CompareOp compare)
 {
   THRUST_CDP_DISPATCH(
-    (using items1_t = thrust::detail::it_value_t<ItemsIt1>; items1_t* null_ = nullptr;
+    (using items1_t = thrust::iterator_value_t<ItemsIt1>; items1_t* null_ = nullptr;
      auto tmp = __set_operations::set_operations<thrust::detail::false_type>(
        policy,
        items1_first,
@@ -1417,7 +1437,7 @@ OutputIt _CCCL_HOST_DEVICE set_union(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return cuda_cub::set_union(policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
 
@@ -1490,7 +1510,7 @@ pair<KeysOutputIt, ItemsOutputIt> _CCCL_HOST_DEVICE set_difference_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return cuda_cub::set_difference_by_key(
     policy,
     keys1_first,
@@ -1564,7 +1584,7 @@ pair<KeysOutputIt, ItemsOutputIt> _CCCL_HOST_DEVICE set_intersection_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return cuda_cub::set_intersection_by_key(
     policy,
     keys1_first,
@@ -1640,7 +1660,7 @@ pair<KeysOutputIt, ItemsOutputIt> _CCCL_HOST_DEVICE set_symmetric_difference_by_
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return cuda_cub::set_symmetric_difference_by_key(
     policy,
     keys1_first,
@@ -1717,7 +1737,7 @@ pair<KeysOutputIt, ItemsOutputIt> _CCCL_HOST_DEVICE set_union_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return cuda_cub::set_union_by_key(
     policy,
     keys1_first,
diff --git a/projects/rocthrust/thrust/system/cuda/detail/sort.h b/projects/rocthrust/thrust/system/cuda/detail/sort.h
index 15c673e850aa..895119a0389a 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/sort.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/sort.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/device_merge_sort.cuh>
@@ -58,20 +58,18 @@
 #  include <thrust/system/cuda/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
 
-#  include <cuda/cmath>
-
 #  include <cstdint>
 
-#  if _CCCL_HAS_NVFP16()
+#  if defined(_CCCL_HAS_NVFP16)
 #    include <cuda_fp16.h>
-#  endif // _CCCL_HAS_NVFP16()
+#  endif // _CCCL_HAS_NVFP16
 
-#  if _CCCL_HAS_NVBF16()
+#  if defined(_CCCL_HAS_NVBF16)
 _CCCL_DIAG_PUSH
 _CCCL_DIAG_SUPPRESS_CLANG("-Wunused-function")
 #    include <cuda_bf16.h>
 _CCCL_DIAG_POP
-#  endif // _CCCL_HAS_NVBF16()
+#  endif // _CCCL_HAS_NVBF16
 
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
@@ -94,19 +92,10 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
   using ItemsInputIt = cub::NullType*;
   ItemsInputIt items = nullptr;
 
-  cudaError_t status = cudaSuccess;
-
-  using dispatch32_t = cub::DispatchMergeSort<KeysIt, ItemsInputIt, KeysIt, ItemsInputIt, std::uint32_t, CompareOp>;
-  using dispatch64_t = cub::DispatchMergeSort<KeysIt, ItemsInputIt, KeysIt, ItemsInputIt, std::uint64_t, CompareOp>;
+  using DispatchMergeSortT = cub::DispatchMergeSort<KeysIt, ItemsInputIt, KeysIt, ItemsInputIt, Size, CompareOp>;
 
-  THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(
-    status,
-    dispatch32_t::Dispatch,
-    dispatch64_t::Dispatch,
-    keys_count,
-    (d_temp_storage, temp_storage_bytes, keys, items, keys, items, keys_count_fixed, compare_op, stream));
-
-  return status;
+  return DispatchMergeSortT::Dispatch(
+    d_temp_storage, temp_storage_bytes, keys, items, keys, items, keys_count, compare_op, stream);
 }
 
 template <class KeysIt, class ItemsIt, class Size, class CompareOp>
@@ -120,19 +109,10 @@ THRUST_RUNTIME_FUNCTION cudaError_t doit_step(
   cudaStream_t stream,
   thrust::detail::integral_constant<bool, true> /* sort_items */)
 {
-  cudaError_t status = cudaSuccess;
-
-  using dispatch32_t = cub::DispatchMergeSort<KeysIt, ItemsIt, KeysIt, ItemsIt, std::uint32_t, CompareOp>;
-  using dispatch64_t = cub::DispatchMergeSort<KeysIt, ItemsIt, KeysIt, ItemsIt, std::uint64_t, CompareOp>;
+  using DispatchMergeSortT = cub::DispatchMergeSort<KeysIt, ItemsIt, KeysIt, ItemsIt, Size, CompareOp>;
 
-  THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(
-    status,
-    dispatch32_t::Dispatch,
-    dispatch64_t::Dispatch,
-    keys_count,
-    (d_temp_storage, temp_storage_bytes, keys, items, keys, items, keys_count_fixed, compare_op, stream));
-
-  return status;
+  return DispatchMergeSortT::Dispatch(
+    d_temp_storage, temp_storage_bytes, keys, items, keys, items, keys_count, compare_op, stream);
 }
 
 template <class SORT_ITEMS, class /* STABLE */, class KeysIt, class ItemsIt, class Size, class CompareOp>
@@ -160,7 +140,7 @@ THRUST_RUNTIME_FUNCTION void merge_sort(
   execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 
 {
-  using size_type = thrust::detail::it_difference_t<KeysIt>;
+  using size_type = typename iterator_traits<KeysIt>::difference_type;
 
   size_type count = static_cast<size_type>(thrust::distance(keys_first, keys_last));
 
@@ -261,6 +241,14 @@ struct dispatch<thrust::detail::true_type, thrust::greater<KeyOrVoid>>
   }
 }; // struct dispatch -- sort pairs in descending order;
 
+template <class SORT_ITEMS, class KeyOrVoid>
+struct dispatch<SORT_ITEMS, ::cuda::std::less<KeyOrVoid>> : dispatch<SORT_ITEMS, thrust::less<KeyOrVoid>>
+{};
+
+template <class SORT_ITEMS, class KeyOrVoid>
+struct dispatch<SORT_ITEMS, ::cuda::std::greater<KeyOrVoid>> : dispatch<SORT_ITEMS, thrust::greater<KeyOrVoid>>
+{};
+
 template <typename SORT_ITEMS, typename Derived, typename Key, typename Item, typename Size, typename CompareOp>
 THRUST_RUNTIME_FUNCTION void radix_sort(execution_policy<Derived>& policy, Key* keys, Item* items, Size count, CompareOp)
 {
@@ -279,8 +267,8 @@ THRUST_RUNTIME_FUNCTION void radix_sort(execution_policy<Derived>& policy, Key*
     dispatch<SORT_ITEMS, CompareOp>::doit(nullptr, temp_storage_bytes, keys_buffer, items_buffer, keys_count, stream);
   cuda_cub::throw_on_error(status, "radix_sort: failed on 1st step");
 
-  size_t keys_temp_storage  = ::cuda::round_up(sizeof(Key) * keys_count, 128);
-  size_t items_temp_storage = ::cuda::round_up(sizeof(Item) * items_count, 128);
+  size_t keys_temp_storage  = core::align_to(sizeof(Key) * keys_count, 128);
+  size_t items_temp_storage = core::align_to(sizeof(Item) * items_count, 128);
 
   size_t storage_size = keys_temp_storage + items_temp_storage + temp_storage_bytes;
 
@@ -300,7 +288,7 @@ THRUST_RUNTIME_FUNCTION void radix_sort(execution_policy<Derived>& policy, Key*
     Key* temp_ptr = reinterpret_cast<Key*>(keys_buffer.d_buffers[1]);
     cuda_cub::copy_n(policy, temp_ptr, keys_count, keys);
   }
-  if constexpr (SORT_ITEMS::value)
+  _CCCL_IF_CONSTEXPR (SORT_ITEMS::value)
   {
     if (items_buffer.selector != 0)
     {
@@ -323,12 +311,13 @@ template <class Key, class CompareOp>
 using can_use_primitive_sort = ::cuda::std::integral_constant<
   bool,
   (::cuda::std::is_arithmetic<Key>::value
-#  if _CCCL_HAS_NVFP16() && !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
+#  if defined(_CCCL_HAS_NVFP16) && !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
    || ::cuda::std::is_same<Key, __half>::value
-#  endif // _CCCL_HAS_NVFP16() && !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
-#  if _CCCL_HAS_NVBF16() && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__) && !defined(__CUDA_NO_BFLOAT16_OPERATORS__)
+#  endif // defined(_CCCL_HAS_NVFP16) && !defined(__CUDA_NO_HALF_OPERATORS__) && !defined(__CUDA_NO_HALF_CONVERSIONS__)
+#  if defined(_CCCL_HAS_NVBF16) && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__) \
+    && !defined(__CUDA_NO_BFLOAT16_OPERATORS__)
    || ::cuda::std::is_same<Key, __nv_bfloat16>::value
-#  endif // _CCCL_HAS_NVBF16() && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__) &&
+#  endif // defined(_CCCL_HAS_NVBF16) && !defined(__CUDA_NO_BFLOAT16_CONVERSIONS__) &&
          // !defined(__CUDA_NO_BFLOAT16_OPERATORS__)
    )
     && (::cuda::std::is_same<CompareOp, thrust::less<Key>>::value
@@ -347,7 +336,7 @@ template <
   class KeysIt,
   class ItemsIt,
   class CompareOp,
-  ::cuda::std::enable_if_t<!can_use_primitive_sort<thrust::detail::it_value_t<KeysIt>, CompareOp>::value, int> = 0>
+  ::cuda::std::enable_if_t<!can_use_primitive_sort<typename iterator_value<KeysIt>::type, CompareOp>::value, int> = 0>
 THRUST_RUNTIME_FUNCTION void
 smart_sort(Policy& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 {
@@ -361,7 +350,7 @@ template <
   class KeysIt,
   class ItemsIt,
   class CompareOp,
-  ::cuda::std::enable_if_t<can_use_primitive_sort<thrust::detail::it_value_t<KeysIt>, CompareOp>::value, int> = 0>
+  ::cuda::std::enable_if_t<can_use_primitive_sort<typename iterator_value<KeysIt>::type, CompareOp>::value, int> = 0>
 THRUST_RUNTIME_FUNCTION void smart_sort(
   execution_policy<Policy>& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 {
@@ -413,7 +402,7 @@ _CCCL_EXEC_CHECK_DISABLE
 template <class Derived, class ItemsIt, class CompareOp>
 void _CCCL_HOST_DEVICE sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, CompareOp compare_op)
 {
-  THRUST_CDP_DISPATCH((using item_t = thrust::detail::it_value_t<ItemsIt>; item_t* null_ = nullptr;
+  THRUST_CDP_DISPATCH((using item_t = thrust::iterator_value_t<ItemsIt>; item_t* null_ = nullptr;
                        __smart_sort::smart_sort<thrust::detail::false_type, thrust::detail::false_type>(
                          policy, first, last, null_, compare_op);),
                       (thrust::sort(cvt_to_seq(derived_cast(policy)), first, last, compare_op);));
@@ -423,7 +412,7 @@ _CCCL_EXEC_CHECK_DISABLE
 template <class Derived, class ItemsIt, class CompareOp>
 void _CCCL_HOST_DEVICE stable_sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, CompareOp compare_op)
 {
-  THRUST_CDP_DISPATCH((using item_t = thrust::detail::it_value_t<ItemsIt>; item_t* null_ = nullptr;
+  THRUST_CDP_DISPATCH((using item_t = thrust::iterator_value_t<ItemsIt>; item_t* null_ = nullptr;
                        __smart_sort::smart_sort<thrust::detail::false_type, thrust::detail::true_type>(
                          policy, first, last, null_, compare_op);),
                       (thrust::stable_sort(cvt_to_seq(derived_cast(policy)), first, last, compare_op);));
@@ -456,14 +445,14 @@ void _CCCL_HOST_DEVICE stable_sort_by_key(
 template <class Derived, class ItemsIt>
 void _CCCL_HOST_DEVICE sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using item_type = thrust::detail::it_value_t<ItemsIt>;
+  using item_type = typename thrust::iterator_value<ItemsIt>::type;
   cuda_cub::sort(policy, first, last, less<item_type>());
 }
 
 template <class Derived, class ItemsIt>
 void _CCCL_HOST_DEVICE stable_sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using item_type = thrust::detail::it_value_t<ItemsIt>;
+  using item_type = typename thrust::iterator_value<ItemsIt>::type;
   cuda_cub::stable_sort(policy, first, last, less<item_type>());
 }
 
@@ -471,7 +460,7 @@ template <class Derived, class KeysIt, class ValuesIt>
 void _CCCL_HOST_DEVICE
 sort_by_key(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ValuesIt values)
 {
-  using key_type = thrust::detail::it_value_t<KeysIt>;
+  using key_type = typename thrust::iterator_value<KeysIt>::type;
   cuda_cub::sort_by_key(policy, keys_first, keys_last, values, less<key_type>());
 }
 
@@ -479,7 +468,7 @@ template <class Derived, class KeysIt, class ValuesIt>
 void _CCCL_HOST_DEVICE
 stable_sort_by_key(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ValuesIt values)
 {
-  using key_type = thrust::detail::it_value_t<KeysIt>;
+  using key_type = typename thrust::iterator_value<KeysIt>::type;
   cuda_cub::stable_sort_by_key(policy, keys_first, keys_last, values, less<key_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/swap_ranges.h b/projects/rocthrust/thrust/system/cuda/detail/swap_ranges.h
index fbd2547714ff..73a73d63775f 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/swap_ranges.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/distance.h>
 #  include <thrust/swap.h>
 #  include <thrust/system/cuda/detail/par_to_seq.h>
@@ -61,8 +61,8 @@ struct swap_f
   ItemsIt1 items1;
   ItemsIt2 items2;
 
-  using value1_type = thrust::detail::it_value_t<ItemsIt1>;
-  using value2_type = thrust::detail::it_value_t<ItemsIt2>;
+  using value1_type = typename iterator_traits<ItemsIt1>::value_type;
+  using value2_type = typename iterator_traits<ItemsIt2>::value_type;
 
   THRUST_FUNCTION
   swap_f(ItemsIt1 items1_, ItemsIt2 items2_)
@@ -88,7 +88,7 @@ template <class Derived, class ItemsIt1, class ItemsIt2>
 ItemsIt2 _CCCL_HOST_DEVICE
 swap_ranges(execution_policy<Derived>& policy, ItemsIt1 first1, ItemsIt1 last1, ItemsIt2 first2)
 {
-  using size_type = thrust::detail::it_difference_t<ItemsIt1>;
+  using size_type = typename iterator_traits<ItemsIt1>::difference_type;
 
   size_type num_items = static_cast<size_type>(thrust::distance(first1, last1));
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/tabulate.h b/projects/rocthrust/thrust/system/cuda/detail/tabulate.h
index 2e8583f8f7a8..6caec2101205 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/tabulate.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/tabulate.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <thrust/distance.h>
@@ -72,7 +72,7 @@ struct functor
 template <class Derived, class Iterator, class TabulateOp>
 void _CCCL_HOST_DEVICE tabulate(execution_policy<Derived>& policy, Iterator first, Iterator last, TabulateOp tabulate_op)
 {
-  using size_type = thrust::detail::it_difference_t<Iterator>;
+  using size_type = typename iterator_traits<Iterator>::difference_type;
 
   size_type count = thrust::distance(first, last);
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/temporary_buffer.h b/projects/rocthrust/thrust/system/cuda/detail/temporary_buffer.h
index a25d91dc4386..68d2b1c47ada 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/temporary_buffer.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2025 NVIDIA Corporation
+ *  Copyright 2008-2016 NVIDIA Corporation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,115 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/system/cuda/detail/par.h>
-#include <thrust/system/detail/bad_alloc.h>
-
-THRUST_NAMESPACE_BEGIN
-namespace cuda_cub
-{
-
-// If par_nosync does not have a user provided allocator attached, these
-// overloads should be selected.
-
-template <typename T>
-_CCCL_HOST pair<T*, ::cuda::std::ptrdiff_t> get_temporary_buffer(par_nosync_t&, ::cuda::std::ptrdiff_t n)
-{
-  void* ptr;
-  cudaError_t status = cudaMallocAsync(&ptr, sizeof(T) * n, nullptr);
-
-  if (status != cudaSuccess)
-  {
-    cudaGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with cudaMalloc.
-    status = cudaMalloc(&ptr, sizeof(T) * n);
-
-    if (status != cudaSuccess)
-    {
-      throw system::detail::bad_alloc(cuda_category().message(status).c_str());
-    }
-  }
-
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
-}
-
-template <typename Pointer>
-_CCCL_HOST void return_temporary_buffer(par_nosync_t&, Pointer ptr, ::cuda::std::ptrdiff_t)
-{
-  void* void_ptr = raw_pointer_cast(ptr);
-
-  cudaError_t status = cudaFreeAsync(void_ptr, nullptr);
-
-  if (status != cudaSuccess)
-  {
-    cudaGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with cudaFree.
-    status = cudaFree(void_ptr);
-
-    if (status != cudaSuccess)
-    {
-      throw system::detail::bad_alloc(cuda_category().message(status).c_str());
-    }
-  }
-}
-
-template <typename T>
-_CCCL_HOST pair<T*, ::cuda::std::ptrdiff_t>
-get_temporary_buffer(execute_on_stream_nosync& system, ::cuda::std::ptrdiff_t n)
-{
-  void* ptr;
-  cudaError_t status = cudaMallocAsync(&ptr, sizeof(T) * n, get_stream(system));
-
-  if (status != cudaSuccess)
-  {
-    cudaGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with cudaFree.
-    status = cudaMalloc(&ptr, sizeof(T) * n);
-
-    if (status != cudaSuccess)
-    {
-      throw system::detail::bad_alloc(cuda_category().message(status).c_str());
-    }
-  }
-
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
-}
-
-template <typename Pointer>
-_CCCL_HOST void return_temporary_buffer(execute_on_stream_nosync& system, Pointer ptr, ::cuda::std::ptrdiff_t)
-{
-  void* void_ptr = raw_pointer_cast(ptr);
-
-  cudaError_t status = cudaFreeAsync(void_ptr, get_stream(system));
-
-  if (status != cudaSuccess)
-  {
-    cudaGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with cudaMalloc.
-    status = cudaFree(void_ptr);
-
-    if (status != cudaSuccess)
-    {
-      throw system::detail::bad_alloc(cuda_category().message(status).c_str());
-    }
-  }
-}
-
-} // namespace cuda_cub
-THRUST_NAMESPACE_END
+// this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/cuda/detail/transform.h b/projects/rocthrust/thrust/system/cuda/detail/transform.h
index a04b468dab0c..64154a8f6da1 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/transform.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/transform.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/device_transform.cuh>
@@ -255,17 +255,16 @@ OutputIt THRUST_FUNCTION cub_transform_many(
     return result;
   }
 
-  constexpr auto stable_address =
-    (::cuda::proclaims_copyable_arguments<TransformOp>::value)
-      ? cub::detail::transform::requires_stable_address::no
-      : cub::detail::transform::requires_stable_address::yes;
+  constexpr auto requires_stable_address = !::cuda::proclaims_copyable_arguments<TransformOp>::value;
 
   cudaError_t status;
   THRUST_INDEX_TYPE_DISPATCH(
     status,
-    (cub::detail::transform::
-       dispatch_t<stable_address, decltype(num_items_fixed), ::cuda::std::tuple<InputIts...>, OutputIt, TransformOp>::
-         dispatch),
+    (cub::detail::transform::dispatch_t<requires_stable_address,
+                                        decltype(num_items_fixed),
+                                        ::cuda::std::tuple<InputIts...>,
+                                        OutputIt,
+                                        TransformOp>::dispatch),
     num_items,
     (firsts, result, num_items_fixed, transform_op, cuda_cub::stream(policy)));
   throw_on_error(status, "transform: failed inside CUB");
@@ -319,7 +318,7 @@ OutputIt THRUST_FUNCTION transform_if(
   TransformOp transform_op,
   Predicate predicate)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt>;
+  using size_type     = typename iterator_traits<InputIt>::difference_type;
   size_type num_items = static_cast<size_type>(thrust::distance(first, last));
   return __transform::unary(policy, first, result, num_items, stencil, transform_op, predicate);
 } // func transform_if
@@ -341,7 +340,7 @@ OutputIt THRUST_FUNCTION
 transform(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, TransformOp transform_op)
 {
   THRUST_CDP_DISPATCH(
-    (using size_type      = thrust::detail::it_difference_t<InputIt>;
+    (using size_type      = typename iterator_traits<InputIt>::difference_type;
      const auto num_items = static_cast<size_type>(thrust::distance(first, last));
      return __transform::cub_transform_many(policy, ::cuda::std::make_tuple(first), result, num_items, transform_op);),
     (while (first != last) {
@@ -372,7 +371,7 @@ OutputIt THRUST_FUNCTION transform_if(
   TransformOp transform_op,
   Predicate predicate)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt1>;
+  using size_type     = typename iterator_traits<InputIt1>::difference_type;
   size_type num_items = static_cast<size_type>(thrust::distance(first1, last1));
   return __transform::binary(policy, first1, first2, result, num_items, stencil, transform_op, predicate);
 } // func transform_if
@@ -387,7 +386,7 @@ OutputIt THRUST_FUNCTION transform(
   TransformOp transform_op)
 {
   THRUST_CDP_DISPATCH(
-    (using size_type      = thrust::detail::it_difference_t<InputIt1>;
+    (using size_type      = typename iterator_traits<InputIt1>::difference_type;
      const auto num_items = static_cast<size_type>(thrust::distance(first1, last1));
      return __transform::cub_transform_many(
        policy, ::cuda::std::make_tuple(first1, first2), result, num_items, transform_op);),
diff --git a/projects/rocthrust/thrust/system/cuda/detail/transform_reduce.h b/projects/rocthrust/thrust/system/cuda/detail/transform_reduce.h
index 16e8c935421f..7306a8ef34a4 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/transform_reduce.h
@@ -36,15 +36,17 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/system/cuda/config.h>
 
 #  include <cub/device/device_reduce.cuh>
 #  include <cub/util_math.cuh>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
+#  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/cuda/detail/cdp_dispatch.h>
@@ -129,7 +131,7 @@ template <class Derived, class InputIt, class TransformOp, class T, class Reduce
 T _CCCL_HOST_DEVICE transform_reduce(
   execution_policy<Derived>& policy, InputIt first, InputIt last, TransformOp transform_op, T init, ReduceOp reduce_op)
 {
-  using size_type           = thrust::detail::it_difference_t<InputIt>;
+  using size_type           = typename iterator_traits<InputIt>::difference_type;
   const size_type num_items = static_cast<size_type>(thrust::distance(first, last));
 
   THRUST_CDP_DISPATCH(
diff --git a/projects/rocthrust/thrust/system/cuda/detail/transform_scan.h b/projects/rocthrust/thrust/system/cuda/detail/transform_scan.h
index e3230d9c77d3..2227249ab168 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/transform_scan.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/transform_scan.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/transform_iterator.h>
@@ -61,11 +61,11 @@ OutputIt _CCCL_HOST_DEVICE transform_inclusive_scan(
   ScanOp scan_op)
 {
   // Use the transformed input iterator's value type per https://wg21.link/P0571
-  using input_type  = thrust::detail::it_value_t<InputIt>;
+  using input_type  = typename thrust::iterator_value<InputIt>::type;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
   using value_type  = ::cuda::std::remove_cvref_t<result_type>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, value_type, value_type>;
 
@@ -82,11 +82,11 @@ OutputIt _CCCL_HOST_DEVICE transform_inclusive_scan(
   InitialValueType init,
   ScanOp scan_op)
 {
-  using input_type  = thrust::detail::it_value_t<InputIt>;
+  using input_type  = typename thrust::iterator_value<InputIt>::type;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
   using value_type  = ::cuda::std::remove_cvref_t<result_type>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, value_type, value_type>;
 
@@ -107,7 +107,7 @@ OutputIt _CCCL_HOST_DEVICE transform_exclusive_scan(
   // Use the initial value type per https://wg21.link/P0571
   using result_type = ::cuda::std::remove_cvref_t<InitialValueType>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, result_type, result_type>;
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h b/projects/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
index 4b78d56832c4..d24cf87e6edf 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/uninitialized_copy.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/distance.h>
 #  include <thrust/system/cuda/detail/execution_policy.h>
 #  include <thrust/system/cuda/detail/parallel_for.h>
@@ -58,8 +58,8 @@ struct functor
   InputIt input;
   OutputIt output;
 
-  using InputType  = thrust::detail::it_value_t<InputIt>;
-  using OutputType = thrust::detail::it_value_t<OutputIt>;
+  using InputType  = typename iterator_traits<InputIt>::value_type;
+  using OutputType = typename iterator_traits<OutputIt>::value_type;
 
   THRUST_FUNCTION
   functor(InputIt input_, OutputIt output_)
diff --git a/projects/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h b/projects/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
index 23dc99628cb5..233f600e2bb6 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/uninitialized_fill.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 #  include <thrust/distance.h>
 #  include <thrust/system/cuda/detail/execution_policy.h>
 #  include <thrust/system/cuda/detail/parallel_for.h>
@@ -58,7 +58,7 @@ struct functor
   Iterator items;
   T value;
 
-  using value_type = thrust::detail::it_value_t<Iterator>;
+  using value_type = typename iterator_traits<Iterator>::value_type;
 
   THRUST_FUNCTION
   functor(Iterator items_, T const& value_)
diff --git a/projects/rocthrust/thrust/system/cuda/detail/unique.h b/projects/rocthrust/thrust/system/cuda/detail/unique.h
index 985143cf4be0..e8c413f10a12 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/unique.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/unique.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -45,6 +45,7 @@
 
 #  include <thrust/advance.h>
 #  include <thrust/count.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/cuda/detail/cdp_dispatch.h>
@@ -73,7 +74,7 @@ _CCCL_HOST_DEVICE OutputIterator unique_copy(
   BinaryPredicate binary_pred);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-_CCCL_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+_CCCL_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -123,7 +124,7 @@ struct items_per_thread
 };
 
 template <class T>
-struct Tuning<core::detail::sm52, T>
+struct Tuning<sm52, T>
 {
   const static int INPUT_SIZE = sizeof(T);
   enum
@@ -137,10 +138,40 @@ struct Tuning<core::detail::sm52, T>
     PtxPolicy<64, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_LDG, cub::BLOCK_SCAN_WARP_SCANS>;
 }; // Tuning for sm52
 
+template <class T>
+struct Tuning<sm35, T>
+{
+  const static int INPUT_SIZE = sizeof(T);
+  enum
+  {
+    NOMINAL_4B_ITEMS_PER_THREAD = 9,
+    //
+    ITEMS_PER_THREAD = items_per_thread<T, NOMINAL_4B_ITEMS_PER_THREAD>::value
+  };
+
+  using type =
+    PtxPolicy<128, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_LDG, cub::BLOCK_SCAN_WARP_SCANS>;
+}; // Tuning for sm35
+
+template <class T>
+struct Tuning<sm30, T>
+{
+  const static int INPUT_SIZE = sizeof(T);
+  enum
+  {
+    NOMINAL_4B_ITEMS_PER_THREAD = 7,
+    //
+    ITEMS_PER_THREAD = items_per_thread<T, NOMINAL_4B_ITEMS_PER_THREAD>::value
+  };
+
+  using type =
+    PtxPolicy<128, ITEMS_PER_THREAD, cub::BLOCK_LOAD_WARP_TRANSPOSE, cub::LOAD_DEFAULT, cub::BLOCK_SCAN_WARP_SCANS>;
+}; // Tuning for sm30
+
 template <class ItemsIt, class ItemsOutputIt, class BinaryPred, class Size, class NumSelectedOutIt>
 struct UniqueAgent
 {
-  using item_type = thrust::detail::it_value_t<ItemsIt>;
+  using item_type = typename iterator_traits<ItemsIt>::value_type;
 
   using ScanTileState = cub::ScanTileState<Size>;
 
@@ -149,16 +180,16 @@ struct UniqueAgent
   {
     using tuning = Tuning<Arch, item_type>;
 
-    using ItemsLoadIt = typename core::detail::LoadIterator<PtxPlan, ItemsIt>::type;
+    using ItemsLoadIt = typename core::LoadIterator<PtxPlan, ItemsIt>::type;
 
-    using BlockLoadItems = typename core::detail::BlockLoad<PtxPlan, ItemsLoadIt>::type;
+    using BlockLoadItems = typename core::BlockLoad<PtxPlan, ItemsLoadIt>::type;
 
-    using BlockDiscontinuityItems = cub::BlockDiscontinuity<item_type, PtxPlan::BLOCK_THREADS, 1, 1>;
+    using BlockDiscontinuityItems = cub::BlockDiscontinuity<item_type, PtxPlan::BLOCK_THREADS, 1, 1, Arch::ver>;
 
-    using TilePrefixCallback = cub::TilePrefixCallbackOp<Size, ::cuda::std::plus<>, ScanTileState>;
-    using BlockScan          = cub::BlockScan<Size, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1>;
+    using TilePrefixCallback = cub::TilePrefixCallbackOp<Size, ::cuda::std::plus<>, ScanTileState, Arch::ver>;
+    using BlockScan          = cub::BlockScan<Size, PtxPlan::BLOCK_THREADS, PtxPlan::SCAN_ALGORITHM, 1, 1, Arch::ver>;
 
-    using shared_items_t = core::detail::uninitialized_array<item_type, PtxPlan::ITEMS_PER_TILE>;
+    using shared_items_t = core::uninitialized_array<item_type, PtxPlan::ITEMS_PER_TILE>;
 
     union TempStorage
     {
@@ -175,7 +206,7 @@ struct UniqueAgent
     }; // union TempStorage
   }; // struct PtxPlan
 
-  using ptx_plan = typename core::detail::specialize_plan_msvc10_war<PtxPlan>::type::type;
+  using ptx_plan = typename core::specialize_plan_msvc10_war<PtxPlan>::type::type;
 
   using ItemsLoadIt             = typename ptx_plan::ItemsLoadIt;
   using BlockLoadItems          = typename ptx_plan::BlockLoadItems;
@@ -224,7 +255,9 @@ struct UniqueAgent
       Size num_selections_prefix,
       Size /*num_selections*/)
     {
-      _CCCL_PRAGMA_UNROLL_FULL()
+      using core::sync_threadblock;
+
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         int local_scatter_offset = selection_indices[ITEM] - num_selections_prefix;
@@ -234,14 +267,14 @@ struct UniqueAgent
         }
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       for (int item = threadIdx.x; item < num_tile_selections; item += BLOCK_THREADS)
       {
         items_out[num_selections_prefix + item] = get_shared()[item];
       }
 
-      __syncthreads();
+      sync_threadblock();
     }
 
     //---------------------------------------------------------------------
@@ -251,7 +284,8 @@ struct UniqueAgent
     template <bool IS_LAST_TILE, bool IS_FIRST_TILE>
     Size THRUST_DEVICE_FUNCTION consume_tile_impl(int num_tile_items, int tile_idx, Size tile_base)
     {
-      using core::detail::uninitialized_array;
+      using core::sync_threadblock;
+      using core::uninitialized_array;
 
       item_type items_loc[ITEMS_PER_THREAD];
       Size selection_flags[ITEMS_PER_THREAD];
@@ -267,7 +301,7 @@ struct UniqueAgent
         BlockLoadItems(temp_storage.load_items).Load(items_in + tile_base, items_loc);
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       if (IS_FIRST_TILE)
       {
@@ -281,7 +315,7 @@ struct UniqueAgent
           .FlagHeads(selection_flags, items_loc, predicate, tile_predecessor);
       }
 
-      _CCCL_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         // Set selection_flags for out-of-bounds items
@@ -291,7 +325,7 @@ struct UniqueAgent
         }
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       Size num_tile_selections   = 0;
       Size num_selections        = 0;
@@ -334,7 +368,7 @@ struct UniqueAgent
         }
       }
 
-      __syncthreads();
+      sync_threadblock();
 
       scatter(items_loc,
               selection_flags,
@@ -417,7 +451,7 @@ struct UniqueAgent
 
     impl(storage,
          tile_state,
-         core::detail::make_load_iterator(ptx_plan(), items_in),
+         core::make_load_iterator(ptx_plan(), items_in),
          items_out,
          binary_pred,
          num_items,
@@ -432,7 +466,7 @@ struct InitAgent
   template <class Arch>
   struct PtxPlan : PtxPolicy<128>
   {};
-  using ptx_plan = core::detail::specialize_plan<PtxPlan>;
+  using ptx_plan = core::specialize_plan<PtxPlan>;
 
   //---------------------------------------------------------------------
   // Agent entry point
@@ -460,9 +494,9 @@ static cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
   Size num_items,
   cudaStream_t stream)
 {
-  using core::detail::AgentLauncher;
-  using core::detail::AgentPlan;
-  using core::detail::get_agent_plan;
+  using core::AgentLauncher;
+  using core::AgentPlan;
+  using core::get_agent_plan;
 
   using unique_agent = AgentLauncher<UniqueAgent<ItemsInputIt, ItemsOutputIt, BinaryPred, Size, NumSelectedOutIt>>;
 
@@ -470,24 +504,24 @@ static cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   using init_agent = AgentLauncher<InitAgent<ScanTileState, NumSelectedOutIt, Size>>;
 
-  using core::detail::get_plan;
+  using core::get_plan;
   typename get_plan<init_agent>::type init_plan     = init_agent::get_plan();
   typename get_plan<unique_agent>::type unique_plan = unique_agent::get_plan(stream);
 
   int tile_size    = unique_plan.items_per_tile;
   size_t num_tiles = ::cuda::ceil_div(num_items, tile_size);
 
-  size_t vshmem_size = core::detail::vshmem_size(unique_plan.shared_memory_size, num_tiles);
+  size_t vshmem_size = core::vshmem_size(unique_plan.shared_memory_size, num_tiles);
 
   cudaError_t status         = cudaSuccess;
   size_t allocation_sizes[2] = {0, vshmem_size};
   status                     = ScanTileState::AllocationSize(static_cast<int>(num_tiles), allocation_sizes[0]);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   void* allocations[2] = {nullptr, nullptr};
   //
   status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
   if (d_temp_storage == nullptr)
   {
@@ -496,12 +530,12 @@ static cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   ScanTileState tile_status;
   status = tile_status.Init(static_cast<int>(num_tiles), allocations[0], allocation_sizes[0]);
-  _CUDA_CUB_RET_IF_FAIL(status);
+  CUDA_CUB_RET_IF_FAIL(status);
 
-  num_tiles = ::cuda::std::max<size_t>(1, num_tiles);
+  num_tiles = max<size_t>(1, num_tiles);
   init_agent ia(init_plan, num_tiles, stream, "unique_by_key::init_agent");
   ia.launch(tile_status, num_tiles, num_selected_out);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
 
   if (num_items == 0)
   {
@@ -512,7 +546,7 @@ static cudaError_t THRUST_RUNTIME_FUNCTION doit_step(
 
   unique_agent ua(unique_plan, num_items, stream, vshmem_ptr, "unique_by_key::unique_agent");
   ua.launch(items_in, items_out, binary_pred, num_selected_out, num_items, tile_status, num_tiles);
-  _CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
+  CUDA_CUB_RET_IF_FAIL(cudaPeekAtLastError());
   return status;
 }
 
@@ -524,7 +558,7 @@ THRUST_RUNTIME_FUNCTION ItemsOutputIt unique(
   ItemsOutputIt items_result,
   BinaryPred binary_pred)
 {
-  //  using size_type = thrust::detail::it_difference_t<ItemsInputIt>;
+  //  using size_type = typename iterator_traits<ItemsInputIt>::difference_type;
   using size_type = int;
 
   size_type num_items       = static_cast<size_type>(thrust::distance(items_first, items_last));
@@ -547,14 +581,14 @@ THRUST_RUNTIME_FUNCTION ItemsOutputIt unique(
   void* allocations[2]       = {nullptr, nullptr};
 
   size_t storage_size = 0;
-  status              = core::detail::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
+  status              = core::alias_storage(nullptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "unique: failed on 1st step");
 
   // Allocate temporary storage.
   thrust::detail::temporary_array<std::uint8_t, Derived> tmp(policy, storage_size);
   void* ptr = static_cast<void*>(tmp.data().get());
 
-  status = core::detail::alias_storage(ptr, storage_size, allocations, allocation_sizes);
+  status = core::alias_storage(ptr, storage_size, allocations, allocation_sizes);
   cuda_cub::throw_on_error(status, "unique: failed on 2nd step");
 
   size_type* d_num_selected_out = thrust::detail::aligned_reinterpret_cast<size_type*>(allocations[0]);
@@ -590,7 +624,7 @@ unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, Outp
 template <class Derived, class InputIt, class OutputIt>
 OutputIt _CCCL_HOST_DEVICE unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using input_type = thrust::detail::it_value_t<InputIt>;
+  using input_type = typename iterator_traits<InputIt>::value_type;
   return cuda_cub::unique_copy(policy, first, last, result, equal_to<input_type>());
 }
 
@@ -608,7 +642,7 @@ unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, Binar
 template <class Derived, class ForwardIt>
 ForwardIt _CCCL_HOST_DEVICE unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last)
 {
-  using input_type = thrust::detail::it_value_t<ForwardIt>;
+  using input_type = typename iterator_traits<ForwardIt>::value_type;
   return cuda_cub::unique(policy, first, last, equal_to<input_type>());
 }
 
@@ -626,7 +660,7 @@ struct zip_adj_not_predicate
 
 _CCCL_EXEC_CHECK_DISABLE
 template <class Derived, class ForwardIt, class BinaryPred>
-thrust::detail::it_difference_t<ForwardIt> _CCCL_HOST_DEVICE
+typename thrust::iterator_traits<ForwardIt>::difference_type _CCCL_HOST_DEVICE
 unique_count(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, BinaryPred binary_pred)
 {
   if (first == last)
diff --git a/projects/rocthrust/thrust/system/cuda/detail/unique_by_key.h b/projects/rocthrust/thrust/system/cuda/detail/unique_by_key.h
index c3bb8203e20b..0c5538a0fa10 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/unique_by_key.h
@@ -36,7 +36,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if _CCCL_HAS_CUDA_COMPILER()
+#if _CCCL_HAS_CUDA_COMPILER
 
 #  include <thrust/system/cuda/config.h>
 
@@ -44,6 +44,7 @@
 #  include <cub/util_math.cuh>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/mpl/math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
@@ -122,10 +123,10 @@ struct DispatchUniqueByKey
       num_items,
       binary_pred,
       stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     status = cub::detail::AliasTemporaries(d_temp_storage, temp_storage_bytes, allocations, allocation_sizes);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Return if we're only querying temporary storage requirements
     if (d_temp_storage == nullptr)
@@ -155,11 +156,11 @@ struct DispatchUniqueByKey
       num_items,
       binary_pred,
       stream);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
 
     // Get number of selected items
     status = cuda_cub::synchronize(policy);
-    _CUDA_CUB_RET_IF_FAIL(status);
+    CUDA_CUB_RET_IF_FAIL(status);
     OffsetT num_selected = get_value(policy, d_num_selected_out);
 
     result_end = thrust::make_pair(keys_out + num_selected, values_out + num_selected);
@@ -182,7 +183,7 @@ THRUST_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
   ValOutputIt values_result,
   BinaryPred binary_pred)
 {
-  using size_type = thrust::detail::it_difference_t<KeyInputIt>;
+  using size_type = typename iterator_traits<KeyInputIt>::difference_type;
 
   size_type num_items = static_cast<size_type>(thrust::distance(keys_first, keys_last));
   pair<KeyOutputIt, ValOutputIt> result_end{};
@@ -273,7 +274,7 @@ pair<KeyOutputIt, ValOutputIt> _CCCL_HOST_DEVICE unique_by_key_copy(
   KeyOutputIt keys_result,
   ValOutputIt values_result)
 {
-  using key_type = thrust::detail::it_value_t<KeyInputIt>;
+  using key_type = typename iterator_traits<KeyInputIt>::value_type;
   return cuda_cub::unique_by_key_copy(
     policy, keys_first, keys_last, values_first, keys_result, values_result, equal_to<key_type>());
 }
@@ -298,7 +299,7 @@ template <class Derived, class KeyInputIt, class ValInputIt>
 pair<KeyInputIt, ValInputIt> _CCCL_HOST_DEVICE
 unique_by_key(execution_policy<Derived>& policy, KeyInputIt keys_first, KeyInputIt keys_last, ValInputIt values_first)
 {
-  using key_type = thrust::detail::it_value_t<KeyInputIt>;
+  using key_type = typename iterator_traits<KeyInputIt>::value_type;
   return cuda_cub::unique_by_key(policy, keys_first, keys_last, values_first, equal_to<key_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/cuda/detail/util.h b/projects/rocthrust/thrust/system/cuda/detail/util.h
index 2857bc064c69..e7c3fa454ba4 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/util.h
+++ b/projects/rocthrust/thrust/system/cuda/detail/util.h
@@ -38,19 +38,18 @@
 
 #include <cub/config.cuh>
 
+#include <cub/detail/device_synchronize.cuh>
 #include <cub/util_device.cuh>
 
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/cuda/detail/execution_policy.h>
+#include <thrust/system/cuda/error.h>
+#include <thrust/system_error.h>
 
-#include <nv/target>
-
-#if !_CCCL_COMPILER(NVRTC)
-#  include <thrust/system/cuda/error.h>
-#  include <thrust/system_error.h>
+#include <cstdio>
+#include <exception>
 
-#  include <cstdio>
-#endif // !_CCCL_COMPILER(NVRTC)
+#include <nv/target>
 
 THRUST_NAMESPACE_BEGIN
 namespace cuda_cub
@@ -134,7 +133,6 @@ _CCCL_HOST_DEVICE cudaError_t synchronize_optional(Policy& policy)
   return synchronize_stream_optional(derived_cast(policy));
 }
 
-#if !_CCCL_COMPILER(NVRTC)
 template <class Type>
 THRUST_HOST_FUNCTION cudaError_t trivial_copy_from_device(Type* dst, Type const* src, size_t count, cudaStream_t stream)
 {
@@ -179,7 +177,11 @@ trivial_copy_device_to_device(Policy& policy, Type* dst, Type const* src, size_t
   cuda_cub::synchronize_optional(policy);
   return status;
 }
-#endif // !_CCCL_COMPILER(NVRTC)
+
+CCCL_DEPRECATED_BECAUSE("Use cuda::std::terminate() instead") inline void _CCCL_HOST_DEVICE terminate()
+{
+  NV_IF_TARGET(NV_IS_HOST, (std::terminate();), (asm("trap;");));
+}
 
 _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status)
 {
@@ -188,12 +190,12 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status)
 #ifdef THRUST_RDC_ENABLED
   cudaGetLastError();
 #else
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, (cudaGetLastError();));
+  NV_IF_TARGET(NV_IS_HOST, (cudaGetLastError();));
 #endif
 
   if (cudaSuccess != status)
   {
-    // Can't use #if inside _THRUST_IF_TARGET, use a temp macro to hoist the device
+    // Can't use #if inside NV_IF_TARGET, use a temp macro to hoist the device
     // instructions out of the target logic.
 #ifdef THRUST_RDC_ENABLED
 
@@ -206,9 +208,9 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status)
 
 #endif
 
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                      (throw thrust::system_error(status, thrust::cuda_category());),
-                      (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();));
+    NV_IF_TARGET(NV_IS_HOST,
+                 (throw thrust::system_error(status, thrust::cuda_category());),
+                 (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();));
 
 #undef THRUST_TEMP_DEVICE_CODE
   }
@@ -221,12 +223,12 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status, char const* msg
 #ifdef THRUST_RDC_ENABLED
   cudaGetLastError();
 #else
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, (cudaGetLastError();));
+  NV_IF_TARGET(NV_IS_HOST, (cudaGetLastError();));
 #endif
 
   if (cudaSuccess != status)
   {
-    // Can't use #if inside _THRUST_IF_TARGET, use a temp macro to hoist the device
+    // Can't use #if inside NV_IF_TARGET, use a temp macro to hoist the device
     // instructions out of the target logic.
 #ifdef THRUST_RDC_ENABLED
 
@@ -239,13 +241,356 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status, char const* msg
 
 #endif
 
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                      (throw thrust::system_error(status, thrust::cuda_category(), msg);),
-                      (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();));
+    NV_IF_TARGET(NV_IS_HOST,
+                 (throw thrust::system_error(status, thrust::cuda_category(), msg);),
+                 (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();));
 
 #undef THRUST_TEMP_DEVICE_CODE
   }
 }
+
+// deprecated [Since 2.8]
+template <class ValueType, class InputIt, class UnaryOp>
+struct CCCL_DEPRECATED_BECAUSE("Use thrust::transform_iterator") transform_input_iterator_t
+{
+  _CCCL_SUPPRESS_DEPRECATED_PUSH
+  using self_t = transform_input_iterator_t;
+  _CCCL_SUPPRESS_DEPRECATED_POP
+  using difference_type   = typename iterator_traits<InputIt>::difference_type;
+  using value_type        = ValueType;
+  using pointer           = void;
+  using reference         = value_type;
+  using iterator_category = ::cuda::std::random_access_iterator_tag;
+
+  InputIt input;
+  mutable UnaryOp op;
+
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE transform_input_iterator_t(InputIt input, UnaryOp op)
+      : input(input)
+      , op(op)
+  {}
+
+  transform_input_iterator_t(const self_t&) = default;
+
+  // UnaryOp might not be copy assignable, such as when it is a lambda.  Define
+  // an explicit copy assignment operator that doesn't try to assign it.
+  _CCCL_HOST_DEVICE self_t& operator=(const self_t& o)
+  {
+    input = o.input;
+    return *this;
+  }
+
+  /// Postfix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++input;
+    return retval;
+  }
+
+  /// Prefix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++()
+  {
+    ++input;
+    return *this;
+  }
+
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*() const
+  {
+    typename thrust::iterator_value<InputIt>::type x = *input;
+    return op(x);
+  }
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*()
+  {
+    typename thrust::iterator_value<InputIt>::type x = *input;
+    return op(x);
+  }
+
+  /// Addition
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(input + n, op);
+  }
+
+  /// Addition assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    input += n;
+    return *this;
+  }
+
+  /// Subtraction
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(input - n, op);
+  }
+
+  /// Subtraction assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    input -= n;
+    return *this;
+  }
+
+  /// Distance
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return input - other.input;
+  }
+
+  /// Array subscript
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return op(input[n]);
+  }
+
+  /// Equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (input == rhs.input);
+  }
+
+  /// Not equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (input != rhs.input);
+  }
+}; // struct transform_input_iterarot_t
+
+// deprecated [Since 2.8]
+template <class ValueType, class InputIt1, class InputIt2, class BinaryOp>
+struct CCCL_DEPRECATED_BECAUSE("Use thrust::transform_iterator of a thrust::zip_iterator")
+  transform_pair_of_input_iterators_t
+{
+  _CCCL_SUPPRESS_DEPRECATED_PUSH
+  using self_t = transform_pair_of_input_iterators_t;
+  _CCCL_SUPPRESS_DEPRECATED_POP
+  using difference_type   = typename iterator_traits<InputIt1>::difference_type;
+  using value_type        = ValueType;
+  using pointer           = void;
+  using reference         = value_type;
+  using iterator_category = ::cuda::std::random_access_iterator_tag;
+
+  InputIt1 input1;
+  InputIt2 input2;
+  mutable BinaryOp op;
+
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE
+  transform_pair_of_input_iterators_t(InputIt1 input1_, InputIt2 input2_, BinaryOp op_)
+      : input1(input1_)
+      , input2(input2_)
+      , op(op_)
+  {}
+
+  transform_pair_of_input_iterators_t(const self_t&) = default;
+
+  // BinaryOp might not be copy assignable, such as when it is a lambda.
+  // Define an explicit copy assignment operator that doesn't try to assign it.
+  _CCCL_HOST_DEVICE self_t& operator=(const self_t& o)
+  {
+    input1 = o.input1;
+    input2 = o.input2;
+    return *this;
+  }
+
+  /// Postfix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++input1;
+    ++input2;
+    return retval;
+  }
+
+  /// Prefix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++()
+  {
+    ++input1;
+    ++input2;
+    return *this;
+  }
+
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*() const
+  {
+    return op(*input1, *input2);
+  }
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*()
+  {
+    return op(*input1, *input2);
+  }
+
+  /// Addition
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(input1 + n, input2 + n, op);
+  }
+
+  /// Addition assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    input1 += n;
+    input2 += n;
+    return *this;
+  }
+
+  /// Subtraction
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(input1 - n, input2 - n, op);
+  }
+
+  /// Subtraction assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    input1 -= n;
+    input2 -= n;
+    return *this;
+  }
+
+  /// Distance
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return input1 - other.input1;
+  }
+
+  /// Array subscript
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return op(input1[n], input2[n]);
+  }
+
+  /// Equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (input1 == rhs.input1) && (input2 == rhs.input2);
+  }
+
+  /// Not equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (input1 != rhs.input1) || (input2 != rhs.input2);
+  }
+
+}; // struct transform_pair_of_input_iterators_t
+
+// deprecated [Since 2.8]
+struct CCCL_DEPRECATED_BECAUSE("Use cuda::std::identity") identity
+{
+  template <class T>
+  _CCCL_HOST_DEVICE T const& operator()(T const& t) const
+  {
+    return t;
+  }
+
+  template <class T>
+  _CCCL_HOST_DEVICE T& operator()(T& t) const
+  {
+    return t;
+  }
+};
+
+// deprecated [Since 2.8]
+template <class T>
+struct CCCL_DEPRECATED_BECAUSE("Use thrust::counting_iterator") counting_iterator_t
+{
+  _CCCL_SUPPRESS_DEPRECATED_PUSH
+  using self_t = counting_iterator_t;
+  _CCCL_SUPPRESS_DEPRECATED_POP
+  using difference_type   = T;
+  using value_type        = T;
+  using pointer           = void;
+  using reference         = T;
+  using iterator_category = ::cuda::std::random_access_iterator_tag;
+
+  T count;
+
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE counting_iterator_t(T count_)
+      : count(count_)
+  {}
+
+  /// Postfix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++count;
+    return retval;
+  }
+
+  /// Prefix increment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator++()
+  {
+    ++count;
+    return *this;
+  }
+
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*() const
+  {
+    return count;
+  }
+
+  /// Indirection
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator*()
+  {
+    return count;
+  }
+
+  /// Addition
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(count + n);
+  }
+
+  /// Addition assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    count += n;
+    return *this;
+  }
+
+  /// Subtraction
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(count - n);
+  }
+
+  /// Subtraction assignment
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    count -= n;
+    return *this;
+  }
+
+  /// Distance
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return count - other.count;
+  }
+
+  /// Array subscript
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return count + n;
+  }
+
+  /// Equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (count == rhs.count);
+  }
+
+  /// Not equal to
+  _CCCL_HOST_DEVICE _CCCL_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (count != rhs.count);
+  }
+
+}; // struct count_iterator_t
+
 } // namespace cuda_cub
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/cuda/error.h b/projects/rocthrust/thrust/system/cuda/error.h
index 1a2755587c22..cc13d9750e42 100644
--- a/projects/rocthrust/thrust/system/cuda/error.h
+++ b/projects/rocthrust/thrust/system/cuda/error.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/error_code.h>
 
@@ -135,7 +128,7 @@ enum errc_t
  *        shall return <tt>error_condition(ev,cuda_category())</tt>.
  *        Otherwise, the function shall return <tt>system_category.default_error_condition(ev)</tt>.
  */
-inline const error_category& cuda_category();
+inline const error_category& cuda_category(void);
 
 // XXX N3000 prefers is_error_code_enum<cuda::errc>
 
diff --git a/projects/rocthrust/thrust/system/cuda/execution_policy.h b/projects/rocthrust/thrust/system/cuda/execution_policy.h
index 82170d0a198a..fb84002398e3 100644
--- a/projects/rocthrust/thrust/system/cuda/execution_policy.h
+++ b/projects/rocthrust/thrust/system/cuda/execution_policy.h
@@ -28,12 +28,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/cuda/detail/execution_policy.h>
 #include <thrust/system/cuda/detail/par.h>
diff --git a/projects/rocthrust/thrust/system/cuda/future.h b/projects/rocthrust/thrust/system/cuda/future.h
new file mode 100644
index 000000000000..309d380a0028
--- /dev/null
+++ b/projects/rocthrust/thrust/system/cuda/future.h
@@ -0,0 +1,79 @@
+// Copyright (c) 2018 NVIDIA Corporation
+// Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
+//
+// Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if _CCCL_STD_VER >= 2017
+
+#  include <thrust/system/cuda/detail/execution_policy.h>
+#  include <thrust/system/cuda/pointer.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace cuda
+{
+
+struct ready_event;
+
+template <typename T>
+struct ready_future;
+
+struct unique_eager_event;
+
+template <typename T>
+struct unique_eager_future;
+
+template <typename... Events>
+_CCCL_HOST unique_eager_event when_all(Events&&... evs);
+
+} // namespace cuda
+} // namespace system
+
+namespace cuda
+{
+
+using thrust::system::cuda::ready_event;
+
+using thrust::system::cuda::ready_future;
+
+using thrust::system::cuda::unique_eager_event;
+using event = unique_eager_event;
+
+using thrust::system::cuda::unique_eager_future;
+template <typename T>
+using future = unique_eager_future<T>;
+
+using thrust::system::cuda::when_all;
+
+} // namespace cuda
+
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy>
+_CCCL_HOST thrust::cuda::unique_eager_event
+unique_eager_event_type(thrust::cuda::execution_policy<DerivedPolicy> const&) noexcept;
+
+template <typename T, typename DerivedPolicy>
+_CCCL_HOST thrust::cuda::unique_eager_future<T>
+unique_eager_future_type(thrust::cuda::execution_policy<DerivedPolicy> const&) noexcept;
+_CCCL_SUPPRESS_DEPRECATED_POP
+
+THRUST_NAMESPACE_END
+
+#  include <thrust/system/cuda/detail/future.inl>
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/cuda/memory_resource.h b/projects/rocthrust/thrust/system/cuda/memory_resource.h
index 23373e6b2f0b..34c57adaa7d9 100644
--- a/projects/rocthrust/thrust/system/cuda/memory_resource.h
+++ b/projects/rocthrust/thrust/system/cuda/memory_resource.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/mr/host_memory_resource.h>
 #include <thrust/mr/memory_resource.h>
 #include <thrust/system/cuda/detail/util.h>
@@ -95,7 +87,6 @@ using managed_memory_resource =
   detail::cuda_memory_resource<detail::cudaMallocManaged, cudaFree, thrust::cuda::universal_pointer<void>>;
 using pinned_memory_resource =
   detail::cuda_memory_resource<cudaMallocHost, cudaFreeHost, thrust::cuda::universal_pointer<void>>;
-
 } // namespace detail
 //! \endcond
 
diff --git a/projects/rocthrust/thrust/system/detail/adl/adjacent_difference.h b/projects/rocthrust/thrust/system/detail/adl/adjacent_difference.h
index ccbab2812226..a9cd95f8b30e 100644
--- a/projects/rocthrust/thrust/system/detail/adl/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/detail/adl/adjacent_difference.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the adjacent_difference.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch adjacent_difference
diff --git a/projects/rocthrust/thrust/system/detail/adl/assign_value.h b/projects/rocthrust/thrust/system/detail/adl/assign_value.h
index 8e2c062f6d4f..a3be872abcde 100644
--- a/projects/rocthrust/thrust/system/detail/adl/assign_value.h
+++ b/projects/rocthrust/thrust/system/detail/adl/assign_value.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the assign_value.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch assign_value
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/copy.h b/projects/rocthrust/thrust/system/detail/adl/async/copy.h
new file mode 100644
index 000000000000..88478b42d19a
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/copy.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/copy.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async copy.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/copy.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_COPY_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/copy.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_COPY_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_COPY_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_COPY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/copy.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_COPY_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_COPY_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/for_each.h b/projects/rocthrust/thrust/system/detail/adl/async/for_each.h
new file mode 100644
index 000000000000..53f7d1197b35
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/for_each.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/for_each.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async for_each.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/for_each.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_FOR_EACH_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/for_each.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_FOR_EACH_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_FOR_EACH_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_FOR_EACH_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/for_each.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_FOR_EACH_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_FOR_EACH_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/reduce.h b/projects/rocthrust/thrust/system/detail/adl/async/reduce.h
new file mode 100644
index 000000000000..d37df1abbe82
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/reduce.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/reduce.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async reduce.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/reduce.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_REDUCE_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/reduce.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_REDUCE_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_REDUCE_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_REDUCE_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/reduce.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_REDUCE_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_REDUCE_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/scan.h b/projects/rocthrust/thrust/system/detail/adl/async/scan.h
new file mode 100644
index 000000000000..8267b5174352
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/scan.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2020 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/scan.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async scans.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/scan.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_SCAN_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/scan.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_SCAN_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_SCAN_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_SCAN_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/scan.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_SCAN_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_SCAN_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/sort.h b/projects/rocthrust/thrust/system/detail/adl/async/sort.h
new file mode 100644
index 000000000000..60c36e202a4d
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/sort.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/sort.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async sort.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/sort.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_SORT_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/sort.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_SORT_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_SORT_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_SORT_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/sort.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_SORT_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_SORT_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/async/transform.h b/projects/rocthrust/thrust/system/detail/adl/async/transform.h
new file mode 100644
index 000000000000..663667574e6b
--- /dev/null
+++ b/projects/rocthrust/thrust/system/detail/adl/async/transform.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2008-2018 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a transform of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+// The purpose of this header is to #include the async/transform.h header of the
+// sequential, host, and device systems. It should be #included in any code
+// which uses ADL to dispatch async transform.
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// #include <thrust/system/detail/sequential/async/transform.h>
+
+// #define __THRUST_HOST_SYSTEM_ASYNC_TRANSFORM_HEADER <__THRUST_HOST_SYSTEM_ROOT/detail/async/transform.h>
+// #include __THRUST_HOST_SYSTEM_ASYNC_TRANSFORM_HEADER
+// #undef __THRUST_HOST_SYSTEM_ASYNC_TRANSFORM_HEADER
+
+#define __THRUST_DEVICE_SYSTEM_ASYNC_TRANSFORM_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/detail/async/transform.h>
+#include __THRUST_DEVICE_SYSTEM_ASYNC_TRANSFORM_HEADER
+#undef __THRUST_DEVICE_SYSTEM_ASYNC_TRANSFORM_HEADER
diff --git a/projects/rocthrust/thrust/system/detail/adl/binary_search.h b/projects/rocthrust/thrust/system/detail/adl/binary_search.h
index 8cfdaf35b670..e61cf1d3da82 100644
--- a/projects/rocthrust/thrust/system/detail/adl/binary_search.h
+++ b/projects/rocthrust/thrust/system/detail/adl/binary_search.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the binary_search.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch binary_search
diff --git a/projects/rocthrust/thrust/system/detail/adl/copy.h b/projects/rocthrust/thrust/system/detail/adl/copy.h
index ce6eb95608ab..887d63d6538f 100644
--- a/projects/rocthrust/thrust/system/detail/adl/copy.h
+++ b/projects/rocthrust/thrust/system/detail/adl/copy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the copy.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch copy
diff --git a/projects/rocthrust/thrust/system/detail/adl/copy_if.h b/projects/rocthrust/thrust/system/detail/adl/copy_if.h
index 7e7f62f23281..a3f3dd0012c4 100644
--- a/projects/rocthrust/thrust/system/detail/adl/copy_if.h
+++ b/projects/rocthrust/thrust/system/detail/adl/copy_if.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,19 +19,10 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the copy_if.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch copy_if
 
-#include <thrust/system/detail/generic/copy_if.h>
 #include <thrust/system/detail/sequential/copy_if.h>
 
 // SCons can't see through the #defines below to figure out what this header
diff --git a/projects/rocthrust/thrust/system/detail/adl/count.h b/projects/rocthrust/thrust/system/detail/adl/count.h
index fe3a9d5990a3..e0f2062b64f3 100644
--- a/projects/rocthrust/thrust/system/detail/adl/count.h
+++ b/projects/rocthrust/thrust/system/detail/adl/count.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the count.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch count
diff --git a/projects/rocthrust/thrust/system/detail/adl/equal.h b/projects/rocthrust/thrust/system/detail/adl/equal.h
index 44d6a6febe16..f761438de7ff 100644
--- a/projects/rocthrust/thrust/system/detail/adl/equal.h
+++ b/projects/rocthrust/thrust/system/detail/adl/equal.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the equal.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch equal
diff --git a/projects/rocthrust/thrust/system/detail/adl/extrema.h b/projects/rocthrust/thrust/system/detail/adl/extrema.h
index 0372cc9256e4..6c1e36d6a345 100644
--- a/projects/rocthrust/thrust/system/detail/adl/extrema.h
+++ b/projects/rocthrust/thrust/system/detail/adl/extrema.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the extrema.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch extrema
diff --git a/projects/rocthrust/thrust/system/detail/adl/fill.h b/projects/rocthrust/thrust/system/detail/adl/fill.h
index 7709110c959d..97a353fc2e42 100644
--- a/projects/rocthrust/thrust/system/detail/adl/fill.h
+++ b/projects/rocthrust/thrust/system/detail/adl/fill.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the fill.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch fill
diff --git a/projects/rocthrust/thrust/system/detail/adl/find.h b/projects/rocthrust/thrust/system/detail/adl/find.h
index 93af650ae6e0..2183299c44b7 100644
--- a/projects/rocthrust/thrust/system/detail/adl/find.h
+++ b/projects/rocthrust/thrust/system/detail/adl/find.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the find.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch find
diff --git a/projects/rocthrust/thrust/system/detail/adl/for_each.h b/projects/rocthrust/thrust/system/detail/adl/for_each.h
index 131fa5fdbb2b..82ad3c933e13 100644
--- a/projects/rocthrust/thrust/system/detail/adl/for_each.h
+++ b/projects/rocthrust/thrust/system/detail/adl/for_each.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the for_each.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch for_each
diff --git a/projects/rocthrust/thrust/system/detail/adl/gather.h b/projects/rocthrust/thrust/system/detail/adl/gather.h
index f161786f07f7..ef0449b8d6c6 100644
--- a/projects/rocthrust/thrust/system/detail/adl/gather.h
+++ b/projects/rocthrust/thrust/system/detail/adl/gather.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the gather.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch gather
diff --git a/projects/rocthrust/thrust/system/detail/adl/generate.h b/projects/rocthrust/thrust/system/detail/adl/generate.h
index a98d12303ef9..0f511899b8ce 100644
--- a/projects/rocthrust/thrust/system/detail/adl/generate.h
+++ b/projects/rocthrust/thrust/system/detail/adl/generate.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the generate.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch generate
diff --git a/projects/rocthrust/thrust/system/detail/adl/get_value.h b/projects/rocthrust/thrust/system/detail/adl/get_value.h
index 53bb6be26f95..4654133cbbea 100644
--- a/projects/rocthrust/thrust/system/detail/adl/get_value.h
+++ b/projects/rocthrust/thrust/system/detail/adl/get_value.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the get_value.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch get_value
diff --git a/projects/rocthrust/thrust/system/detail/adl/inner_product.h b/projects/rocthrust/thrust/system/detail/adl/inner_product.h
index 228916f2ee85..1766017799b1 100644
--- a/projects/rocthrust/thrust/system/detail/adl/inner_product.h
+++ b/projects/rocthrust/thrust/system/detail/adl/inner_product.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the inner_product.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch inner_product
diff --git a/projects/rocthrust/thrust/system/detail/adl/iter_swap.h b/projects/rocthrust/thrust/system/detail/adl/iter_swap.h
index eec7c453bf7f..8cb389255af3 100644
--- a/projects/rocthrust/thrust/system/detail/adl/iter_swap.h
+++ b/projects/rocthrust/thrust/system/detail/adl/iter_swap.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the iter_swap.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch iter_swap
diff --git a/projects/rocthrust/thrust/system/detail/adl/logical.h b/projects/rocthrust/thrust/system/detail/adl/logical.h
index 8edcec243155..e6678b2d786e 100644
--- a/projects/rocthrust/thrust/system/detail/adl/logical.h
+++ b/projects/rocthrust/thrust/system/detail/adl/logical.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the logical.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch logical
diff --git a/projects/rocthrust/thrust/system/detail/adl/malloc_and_free.h b/projects/rocthrust/thrust/system/detail/adl/malloc_and_free.h
index f6f0074ce527..18fe65e880bd 100644
--- a/projects/rocthrust/thrust/system/detail/adl/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/detail/adl/malloc_and_free.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the malloc_and_free.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch malloc_and_free
diff --git a/projects/rocthrust/thrust/system/detail/adl/merge.h b/projects/rocthrust/thrust/system/detail/adl/merge.h
index 557632b016ba..39f81625cf3b 100644
--- a/projects/rocthrust/thrust/system/detail/adl/merge.h
+++ b/projects/rocthrust/thrust/system/detail/adl/merge.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the merge.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch merge
diff --git a/projects/rocthrust/thrust/system/detail/adl/mismatch.h b/projects/rocthrust/thrust/system/detail/adl/mismatch.h
index 70f880f6c82c..23c867a730c2 100644
--- a/projects/rocthrust/thrust/system/detail/adl/mismatch.h
+++ b/projects/rocthrust/thrust/system/detail/adl/mismatch.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the mismatch.h header
 // of the host and device systems. It should be #included in any
 // code which uses adl to dispatch mismatch
diff --git a/projects/rocthrust/thrust/system/detail/adl/partition.h b/projects/rocthrust/thrust/system/detail/adl/partition.h
index e34ecff2b817..acc61345f3c9 100644
--- a/projects/rocthrust/thrust/system/detail/adl/partition.h
+++ b/projects/rocthrust/thrust/system/detail/adl/partition.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the partition.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch partition
diff --git a/projects/rocthrust/thrust/system/detail/adl/per_device_resource.h b/projects/rocthrust/thrust/system/detail/adl/per_device_resource.h
index 1bd0880663ff..6ba012f0dbbe 100644
--- a/projects/rocthrust/thrust/system/detail/adl/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/detail/adl/per_device_resource.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the per_device_resource.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch per_device_resource
@@ -35,7 +27,6 @@
 #if 0
 #  include <thrust/system/cpp/detail/per_device_resource.h>
 #  include <thrust/system/cuda/detail/per_device_resource.h>
-#  include <thrust/system/hip/detail/per_device_resource.h>
 #  include <thrust/system/omp/detail/per_device_resource.h>
 #  include <thrust/system/tbb/detail/per_device_resource.h>
 #endif
diff --git a/projects/rocthrust/thrust/system/detail/adl/reduce.h b/projects/rocthrust/thrust/system/detail/adl/reduce.h
index 34b1cfc281cf..b7005fb7c1c7 100644
--- a/projects/rocthrust/thrust/system/detail/adl/reduce.h
+++ b/projects/rocthrust/thrust/system/detail/adl/reduce.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the reduce.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch reduce
diff --git a/projects/rocthrust/thrust/system/detail/adl/reduce_by_key.h b/projects/rocthrust/thrust/system/detail/adl/reduce_by_key.h
index 9d5eeaf426e1..3bbc059337d2 100644
--- a/projects/rocthrust/thrust/system/detail/adl/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/adl/reduce_by_key.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the reduce_by_key.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch reduce_by_key
diff --git a/projects/rocthrust/thrust/system/detail/adl/remove.h b/projects/rocthrust/thrust/system/detail/adl/remove.h
index e52186059f5c..9c20cfc53773 100644
--- a/projects/rocthrust/thrust/system/detail/adl/remove.h
+++ b/projects/rocthrust/thrust/system/detail/adl/remove.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the remove.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch remove
diff --git a/projects/rocthrust/thrust/system/detail/adl/replace.h b/projects/rocthrust/thrust/system/detail/adl/replace.h
index 4b3dcd6c812d..67aa4f64c7a2 100644
--- a/projects/rocthrust/thrust/system/detail/adl/replace.h
+++ b/projects/rocthrust/thrust/system/detail/adl/replace.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the replace.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch replace
diff --git a/projects/rocthrust/thrust/system/detail/adl/reverse.h b/projects/rocthrust/thrust/system/detail/adl/reverse.h
index d2b696d52787..73df3e12a43b 100644
--- a/projects/rocthrust/thrust/system/detail/adl/reverse.h
+++ b/projects/rocthrust/thrust/system/detail/adl/reverse.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the reverse.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch reverse
diff --git a/projects/rocthrust/thrust/system/detail/adl/scan.h b/projects/rocthrust/thrust/system/detail/adl/scan.h
index 71d043274182..ac5f97c3eaf0 100644
--- a/projects/rocthrust/thrust/system/detail/adl/scan.h
+++ b/projects/rocthrust/thrust/system/detail/adl/scan.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the scan.h header
 // of the host and device systems. It should be #included in any
 // code which uses adl to dispatch scan
diff --git a/projects/rocthrust/thrust/system/detail/adl/scan_by_key.h b/projects/rocthrust/thrust/system/detail/adl/scan_by_key.h
index 575fa0578973..f12533fe910f 100644
--- a/projects/rocthrust/thrust/system/detail/adl/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/adl/scan_by_key.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the scan_by_key.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch scan_by_key
diff --git a/projects/rocthrust/thrust/system/detail/adl/scatter.h b/projects/rocthrust/thrust/system/detail/adl/scatter.h
index f9a62539d784..d38d91cb08ca 100644
--- a/projects/rocthrust/thrust/system/detail/adl/scatter.h
+++ b/projects/rocthrust/thrust/system/detail/adl/scatter.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the scatter.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch scatter
diff --git a/projects/rocthrust/thrust/system/detail/adl/sequence.h b/projects/rocthrust/thrust/system/detail/adl/sequence.h
index 336fcafd4dc0..92e829548c26 100644
--- a/projects/rocthrust/thrust/system/detail/adl/sequence.h
+++ b/projects/rocthrust/thrust/system/detail/adl/sequence.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the sequence.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch sequence
diff --git a/projects/rocthrust/thrust/system/detail/adl/set_operations.h b/projects/rocthrust/thrust/system/detail/adl/set_operations.h
index 0068488aa7e8..2486ac90d076 100644
--- a/projects/rocthrust/thrust/system/detail/adl/set_operations.h
+++ b/projects/rocthrust/thrust/system/detail/adl/set_operations.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the set_operations.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch set_operations
diff --git a/projects/rocthrust/thrust/system/detail/adl/sort.h b/projects/rocthrust/thrust/system/detail/adl/sort.h
index 57f4f6519e75..37af9437ddab 100644
--- a/projects/rocthrust/thrust/system/detail/adl/sort.h
+++ b/projects/rocthrust/thrust/system/detail/adl/sort.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the sort.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch sort
diff --git a/projects/rocthrust/thrust/system/detail/adl/swap_ranges.h b/projects/rocthrust/thrust/system/detail/adl/swap_ranges.h
index bf6b03c80d50..6f3d42f1e0cd 100644
--- a/projects/rocthrust/thrust/system/detail/adl/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/detail/adl/swap_ranges.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the swap_ranges.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch swap_ranges
diff --git a/projects/rocthrust/thrust/system/detail/adl/tabulate.h b/projects/rocthrust/thrust/system/detail/adl/tabulate.h
index e355dbbbf0f2..3f3e767abd75 100644
--- a/projects/rocthrust/thrust/system/detail/adl/tabulate.h
+++ b/projects/rocthrust/thrust/system/detail/adl/tabulate.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the tabulate.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch tabulate
diff --git a/projects/rocthrust/thrust/system/detail/adl/temporary_buffer.h b/projects/rocthrust/thrust/system/detail/adl/temporary_buffer.h
index 30109b015aec..20be9d3e6578 100644
--- a/projects/rocthrust/thrust/system/detail/adl/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/detail/adl/temporary_buffer.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the temporary_buffer.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch get_temporary_buffer or return_temporary_buffer
diff --git a/projects/rocthrust/thrust/system/detail/adl/transform.h b/projects/rocthrust/thrust/system/detail/adl/transform.h
index af9f044b04bf..d30ef4438f85 100644
--- a/projects/rocthrust/thrust/system/detail/adl/transform.h
+++ b/projects/rocthrust/thrust/system/detail/adl/transform.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the transform.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch transform
diff --git a/projects/rocthrust/thrust/system/detail/adl/transform_reduce.h b/projects/rocthrust/thrust/system/detail/adl/transform_reduce.h
index d8bc2d62c35f..91fb784198a3 100644
--- a/projects/rocthrust/thrust/system/detail/adl/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/detail/adl/transform_reduce.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the transform_reduce.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch transform_reduce
diff --git a/projects/rocthrust/thrust/system/detail/adl/transform_scan.h b/projects/rocthrust/thrust/system/detail/adl/transform_scan.h
index 5f4b79aae5cf..6e149bbe47f5 100644
--- a/projects/rocthrust/thrust/system/detail/adl/transform_scan.h
+++ b/projects/rocthrust/thrust/system/detail/adl/transform_scan.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the transform_scan.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch transform_scan
diff --git a/projects/rocthrust/thrust/system/detail/adl/uninitialized_copy.h b/projects/rocthrust/thrust/system/detail/adl/uninitialized_copy.h
index b20325846fec..81b74046c953 100644
--- a/projects/rocthrust/thrust/system/detail/adl/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/detail/adl/uninitialized_copy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the uninitialized_copy.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch uninitialized_copy
diff --git a/projects/rocthrust/thrust/system/detail/adl/uninitialized_fill.h b/projects/rocthrust/thrust/system/detail/adl/uninitialized_fill.h
index 1ace3056b100..496d40d325a1 100644
--- a/projects/rocthrust/thrust/system/detail/adl/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/detail/adl/uninitialized_fill.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the uninitialized_fill.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch uninitialized_fill
diff --git a/projects/rocthrust/thrust/system/detail/adl/unique.h b/projects/rocthrust/thrust/system/detail/adl/unique.h
index 0d0d4ac0ee61..c247b86df13f 100644
--- a/projects/rocthrust/thrust/system/detail/adl/unique.h
+++ b/projects/rocthrust/thrust/system/detail/adl/unique.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the unique.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch unique
diff --git a/projects/rocthrust/thrust/system/detail/adl/unique_by_key.h b/projects/rocthrust/thrust/system/detail/adl/unique_by_key.h
index 2c83f7477af8..78cc0f0d1cd4 100644
--- a/projects/rocthrust/thrust/system/detail/adl/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/adl/unique_by_key.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // the purpose of this header is to #include the unique_by_key.h header
 // of the sequential, host, and device systems. It should be #included in any
 // code which uses adl to dispatch unique_by_key
diff --git a/projects/rocthrust/thrust/system/detail/bad_alloc.h b/projects/rocthrust/thrust/system/detail/bad_alloc.h
index 583d445ebf22..d3ff4a91f744 100644
--- a/projects/rocthrust/thrust/system/detail/bad_alloc.h
+++ b/projects/rocthrust/thrust/system/detail/bad_alloc.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <new>
 #include <string>
 
@@ -48,9 +40,9 @@ class bad_alloc : public std::bad_alloc
     m_what += w;
   } // end bad_alloc()
 
-  inline virtual ~bad_alloc() noexcept {};
+  inline virtual ~bad_alloc(void) noexcept {};
 
-  inline virtual const char* what() const noexcept
+  inline virtual const char* what(void) const noexcept
   {
     return m_what.c_str();
   } // end what()
diff --git a/projects/rocthrust/thrust/system/detail/errno.h b/projects/rocthrust/thrust/system/detail/errno.h
index ae80793b1c70..62c9a3112c82 100644
--- a/projects/rocthrust/thrust/system/detail/errno.h
+++ b/projects/rocthrust/thrust/system/detail/errno.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // The rationale for the existence of these apparently redundant definitions is
 // to provide them portably and to avoid bringing in system headers which might
 // pollute the global namespace. These identifiers are in lowercase to avoid
diff --git a/projects/rocthrust/thrust/system/detail/error_code.inl b/projects/rocthrust/thrust/system/detail/error_code.inl
index 6be3e2a71d48..ea3daa32a3ac 100644
--- a/projects/rocthrust/thrust/system/detail/error_code.inl
+++ b/projects/rocthrust/thrust/system/detail/error_code.inl
@@ -54,10 +54,10 @@ error_code ::error_code(int val, const error_category& cat)
 template <typename ErrorCodeEnum>
 error_code ::error_code(ErrorCodeEnum e
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
                         ,
                         _THRUST_STD::enable_if_t<is_error_code_enum<ErrorCodeEnum>::value>*
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 )
 {
   *this = make_error_code(e);
@@ -71,11 +71,11 @@ void error_code ::assign(int val, const error_category& cat)
 
 template <typename ErrorCodeEnum>
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 _THRUST_STD::enable_if_t<is_error_code_enum<ErrorCodeEnum>::value, error_code>&
 #else
 error_code&
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 error_code ::operator=(ErrorCodeEnum e)
 {
   *this = make_error_code(e);
diff --git a/projects/rocthrust/thrust/system/detail/error_condition.inl b/projects/rocthrust/thrust/system/detail/error_condition.inl
index 0b57c2ac289f..e8a6492a290c 100644
--- a/projects/rocthrust/thrust/system/detail/error_condition.inl
+++ b/projects/rocthrust/thrust/system/detail/error_condition.inl
@@ -55,10 +55,10 @@ error_condition ::error_condition(int val, const error_category& cat)
 template <typename ErrorConditionEnum>
 error_condition ::error_condition(ErrorConditionEnum e
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
                                   ,
                                   _THRUST_STD::enable_if_t<is_error_condition_enum<ErrorConditionEnum>::value>*
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 )
 {
   *this = make_error_condition(e);
@@ -72,11 +72,11 @@ void error_condition ::assign(int val, const error_category& cat)
 
 template <typename ErrorConditionEnum>
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 _THRUST_STD::enable_if_t<is_error_condition_enum<ErrorConditionEnum>::value, error_condition>&
 #else
 error_condition&
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
 error_condition ::operator=(ErrorConditionEnum e)
 {
   *this = make_error_condition(e);
diff --git a/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.h b/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.h
index 86bfcf6d328f..6a53f0a9b864 100644
--- a/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.inl b/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.inl
index b8a59df68fa9..683ad64999e5 100644
--- a/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/adjacent_difference.inl
@@ -17,19 +17,11 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/generic/adjacent_difference.h>
 #include <thrust/adjacent_difference.h>
-#include <thrust/detail/temporary_array.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/generic/adjacent_difference.h>
+#include <thrust/detail/temporary_array.h>
 #include <thrust/transform.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -40,27 +32,30 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator adjacent_difference(
-  thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result)
+
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator adjacent_difference(thrust::execution_policy<DerivedPolicy> &exec,
+                                   InputIterator first, InputIterator last,
+                                   OutputIterator result)
 {
-  using InputType = thrust::detail::it_value_t<InputIterator>;
+  using InputType = typename thrust::iterator_traits<InputIterator>::value_type;
   thrust::minus<InputType> binary_op;
 
   return thrust::adjacent_difference(exec, first, last, result, binary_op);
 } // end adjacent_difference()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator adjacent_difference(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  BinaryFunction binary_op)
+
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryFunction>
+THRUST_HOST_DEVICE
+OutputIterator adjacent_difference(thrust::execution_policy<DerivedPolicy> &exec,
+                                   InputIterator first, InputIterator last,
+                                   OutputIterator result,
+                                   BinaryFunction binary_op)
 {
-  using InputType = thrust::detail::it_value_t<InputIterator>;
+  using InputType = typename thrust::iterator_traits<InputIterator>::value_type;
 
-  if (first == last)
+  if(first == last)
   {
     // empty range, nothing to do
     return result;
@@ -79,6 +74,7 @@ THRUST_HOST_DEVICE OutputIterator adjacent_difference(
   return result + (last - first);
 }
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/advance.h b/projects/rocthrust/thrust/system/detail/generic/advance.h
index b14615861d4c..ba2f4edcff7e 100644
--- a/projects/rocthrust/thrust/system/detail/generic/advance.h
+++ b/projects/rocthrust/thrust/system/detail/generic/advance.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
diff --git a/projects/rocthrust/thrust/system/detail/generic/advance.inl b/projects/rocthrust/thrust/system/detail/generic/advance.inl
index 301a4fe63a05..417ea43627a0 100644
--- a/projects/rocthrust/thrust/system/detail/generic/advance.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/advance.inl
@@ -17,40 +17,51 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/advance.h>
-
-#include _THRUST_STD_INCLUDE(type_traits)
+#include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
-namespace system::detail::generic
+namespace system
 {
+namespace detail
+{
+namespace generic
+{
+namespace detail
+{
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator, typename Distance>
-THRUST_HOST_DEVICE void advance(InputIterator& i, Distance n)
+template<typename InputIterator, typename Distance>
+THRUST_HOST_DEVICE
+void advance(InputIterator& i, Distance n, thrust::incrementable_traversal_tag)
 {
-  using traversal = typename iterator_traversal<InputIterator>::type;
-  if constexpr (_THRUST_STD::is_convertible_v<traversal, random_access_traversal_tag>)
+  while(n)
   {
-    i += n;
-  }
-  else
-  {
-    while (n)
-    {
-      ++i;
-      --n;
-    }
-  }
-}
-} // namespace system::detail::generic
+    ++i;
+    --n;
+  } // end while
+} // end advance()
+
+THRUST_EXEC_CHECK_DISABLE
+template<typename InputIterator, typename Distance>
+THRUST_HOST_DEVICE
+void advance(InputIterator& i, Distance n, thrust::random_access_traversal_tag)
+{
+  i += n;
+} // end advance()
+
+} // end detail
+
+template<typename InputIterator, typename Distance>
+THRUST_HOST_DEVICE
+void advance(InputIterator& i, Distance n)
+{
+  // dispatch on iterator traversal
+  thrust::system::detail::generic::detail::advance(i, n,
+    typename thrust::iterator_traversal<InputIterator>::type());
+} // end advance()
+
+} // end namespace detail
+} // end namespace generic
+} // end namespace system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/binary_search.h b/projects/rocthrust/thrust/system/detail/generic/binary_search.h
index 034db45f893c..2ee6f09002cf 100644
--- a/projects/rocthrust/thrust/system/detail/generic/binary_search.h
+++ b/projects/rocthrust/thrust/system/detail/generic/binary_search.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/binary_search.inl b/projects/rocthrust/thrust/system/detail/generic/binary_search.inl
index bc6269ce6750..7971f35d9816 100644
--- a/projects/rocthrust/thrust/system/detail/generic/binary_search.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/binary_search.inl
@@ -17,34 +17,30 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/binary_search.h>
-#include <thrust/detail/function.h>
-#include <thrust/detail/temporary_array.h>
-#include <thrust/detail/type_traits.h>
 #include <thrust/distance.h>
-#include <thrust/for_each.h>
-#include <thrust/iterator/iterator_traits.h>
+#include <thrust/binary_search.h>
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/binary_search.h>
+
+#include <thrust/for_each.h>
+#include <thrust/detail/function.h>
 #include <thrust/system/detail/generic/scalar/binary_search.h>
 #include <thrust/system/detail/generic/select_system.h>
 
+#include <thrust/detail/temporary_array.h>
+#include <thrust/detail/type_traits.h>
+
 THRUST_NAMESPACE_BEGIN
 namespace detail
 {
 
+
 // XXX WAR circular #inclusion with this forward declaration
-template <typename, typename>
-class temporary_array;
+template<typename,typename> class temporary_array;
+
 
-} // namespace detail
+} // end detail
 namespace system
 {
 namespace detail
@@ -54,42 +50,48 @@ namespace generic
 namespace detail
 {
 
+
 // short names to avoid nvcc bug
 struct lbf
 {
-  template <typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
-  THRUST_HOST_DEVICE thrust::detail::it_difference_t<RandomAccessIterator>
-  operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
+  template<typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
+  THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<RandomAccessIterator>::difference_type
+    operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
   {
     return thrust::system::detail::generic::scalar::lower_bound(begin, end, value, comp) - begin;
   }
 };
 
+
 struct ubf
 {
-  template <typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
-  THRUST_HOST_DEVICE thrust::detail::it_difference_t<RandomAccessIterator>
-  operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
+  template<typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
+  THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<RandomAccessIterator>::difference_type
+    operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
   {
     return thrust::system::detail::generic::scalar::upper_bound(begin, end, value, comp) - begin;
   }
 };
 
+
 struct bsf
 {
-  template <typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
-  THRUST_HOST_DEVICE bool
-  operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
+  template<typename RandomAccessIterator, typename T, typename StrictWeakOrdering>
+  THRUST_HOST_DEVICE
+  bool operator()(RandomAccessIterator begin, RandomAccessIterator end, const T& value, StrictWeakOrdering comp)
   {
     RandomAccessIterator iter = thrust::system::detail::generic::scalar::lower_bound(begin, end, value, comp);
 
-    thrust::detail::wrapped_function<StrictWeakOrdering, bool> wrapped_comp{comp};
+    thrust::detail::wrapped_function<StrictWeakOrdering,bool> wrapped_comp{comp};
 
     return iter != end && !wrapped_comp(value, *iter);
   }
 };
 
-template <typename ForwardIterator, typename StrictWeakOrdering, typename BinarySearchFunction>
+
+template<typename ForwardIterator, typename StrictWeakOrdering, typename BinarySearchFunction>
 struct binary_search_functor
 {
   ForwardIterator begin;
@@ -99,65 +101,54 @@ struct binary_search_functor
 
   THRUST_HOST_DEVICE
   binary_search_functor(ForwardIterator begin, ForwardIterator end, StrictWeakOrdering comp, BinarySearchFunction func)
-      : begin(begin)
-      , end(end)
-      , comp(comp)
-      , func(func)
-  {}
-
-  template <typename Tuple>
-  THRUST_HOST_DEVICE void operator()(Tuple t)
+    : begin(begin), end(end), comp(comp), func(func) {}
+
+  template<typename Tuple>
+  THRUST_HOST_DEVICE
+  void operator()(Tuple t)
   {
     thrust::get<1>(t) = func(begin, end, thrust::get<0>(t), comp);
   }
 }; // binary_search_functor
 
+
 // Vector Implementation
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering,
-          typename BinarySearchFunction>
-THRUST_HOST_DEVICE OutputIterator binary_search(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output,
-  StrictWeakOrdering comp,
-  BinarySearchFunction func)
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering, typename BinarySearchFunction>
+THRUST_HOST_DEVICE
+OutputIterator binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                             ForwardIterator begin,
+                             ForwardIterator end,
+                             InputIterator values_begin,
+                             InputIterator values_end,
+                             OutputIterator output,
+                             StrictWeakOrdering comp,
+                             BinarySearchFunction func)
 {
-  thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(values_begin, output)),
-    thrust::make_zip_iterator(thrust::make_tuple(values_end, output + thrust::distance(values_begin, values_end))),
-    detail::binary_search_functor<ForwardIterator, StrictWeakOrdering, BinarySearchFunction>(begin, end, comp, func));
+  thrust::for_each(exec,
+                   thrust::make_zip_iterator(thrust::make_tuple(values_begin, output)),
+                   thrust::make_zip_iterator(thrust::make_tuple(values_end, output + thrust::distance(values_begin, values_end))),
+                   detail::binary_search_functor<ForwardIterator, StrictWeakOrdering, BinarySearchFunction>(begin, end, comp, func));
 
   return output + thrust::distance(values_begin, values_end);
 }
 
+
+
 // Scalar Implementation
-template <typename OutputType,
-          typename DerivedPolicy,
-          typename ForwardIterator,
-          typename T,
-          typename StrictWeakOrdering,
-          typename BinarySearchFunction>
-THRUST_HOST_DEVICE OutputType binary_search(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  const T& value,
-  StrictWeakOrdering comp,
-  BinarySearchFunction func)
+template<typename OutputType, typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering, typename BinarySearchFunction>
+THRUST_HOST_DEVICE
+OutputType binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator begin,
+                         ForwardIterator end,
+                         const T& value,
+                         StrictWeakOrdering comp,
+                         BinarySearchFunction func)
 {
   // use the vectorized path to implement the scalar version
 
   // allocate device buffers for value and output
-  thrust::detail::temporary_array<T, DerivedPolicy> d_value(exec, 1);
-  thrust::detail::temporary_array<OutputType, DerivedPolicy> d_output(exec, 1);
+  thrust::detail::temporary_array<T,DerivedPolicy>          d_value(exec,1);
+  thrust::detail::temporary_array<OutputType,DerivedPolicy> d_output(exec,1);
 
   { // copy value to device
     using value_in_system_t = typename thrust::iterator_system<const T*>::type;
@@ -165,14 +156,11 @@ THRUST_HOST_DEVICE OutputType binary_search(
     using thrust::system::detail::generic::select_system;
     thrust::copy_n(select_system(thrust::detail::derived_cast(thrust::detail::strip_const(value_in_system)),
                                  thrust::detail::derived_cast(thrust::detail::strip_const(exec))),
-                   &value,
-                   1,
-                   d_value.begin());
+                   &value, 1, d_value.begin());
   }
 
   // perform the query
-  thrust::system::detail::generic::detail::binary_search(
-    exec, begin, end, d_value.begin(), d_value.end(), d_output.begin(), comp, func);
+  thrust::system::detail::generic::detail::binary_search(exec, begin, end, d_value.begin(), d_value.end(), d_output.begin(), comp, func);
 
   OutputType output;
   { // copy result to host and return
@@ -181,210 +169,226 @@ THRUST_HOST_DEVICE OutputType binary_search(
     using thrust::system::detail::generic::select_system;
     thrust::copy_n(select_system(thrust::detail::derived_cast(thrust::detail::strip_const(exec)),
                                  thrust::detail::derived_cast(thrust::detail::strip_const(result_out_system))),
-                   d_output.begin(),
-                   1,
-                   &output);
+                   d_output.begin(), 1, &output);
   }
 
   return output;
 }
 
+
 // this functor differs from thrust::less<T>
 // because it allows the types of lhs & rhs to differ
 // which is required by the binary search functions
 // XXX use C++14 thrust::less<> when it's ready
 struct binary_search_less
 {
-  template <typename T1, typename T2>
-  THRUST_HOST_DEVICE bool operator()(const T1& lhs, const T2& rhs) const
+  template<typename T1, typename T2>
+  THRUST_HOST_DEVICE
+  bool operator()(const T1& lhs, const T2& rhs) const
   {
     return lhs < rhs;
   }
 };
 
+
 } // end namespace detail
 
+
 //////////////////////
 // Scalar Functions //
 //////////////////////
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE ForwardIterator
-lower_bound(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator begin, ForwardIterator end, const T& value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+ForwardIterator lower_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator begin,
+                            ForwardIterator end,
+                            const T& value)
 {
   namespace p = thrust::placeholders;
   return thrust::lower_bound(exec, begin, end, value, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE ForwardIterator lower_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  const T& value,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+ForwardIterator lower_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator begin,
+                            ForwardIterator end,
+                            const T& value,
+                            StrictWeakOrdering comp)
 {
-  using difference_type = thrust::detail::it_difference_t<ForwardIterator>;
+  using difference_type = typename thrust::iterator_traits<ForwardIterator>::difference_type;
 
   return begin + detail::binary_search<difference_type>(exec, begin, end, value, comp, detail::lbf());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE ForwardIterator
-upper_bound(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator begin, ForwardIterator end, const T& value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+ForwardIterator upper_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator begin,
+                            ForwardIterator end,
+                            const T& value)
 {
   namespace p = thrust::placeholders;
   return thrust::upper_bound(exec, begin, end, value, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE ForwardIterator upper_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  const T& value,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+ForwardIterator upper_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator begin,
+                            ForwardIterator end,
+                            const T& value,
+                            StrictWeakOrdering comp)
 {
-  using difference_type = thrust::detail::it_difference_t<ForwardIterator>;
+  using difference_type = typename thrust::iterator_traits<ForwardIterator>::difference_type;
 
   return begin + detail::binary_search<difference_type>(exec, begin, end, value, comp, detail::ubf());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE bool
-binary_search(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator begin, ForwardIterator end, const T& value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+bool binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                   ForwardIterator begin,
+                   ForwardIterator end,
+                   const T& value)
 {
   return thrust::binary_search(exec, begin, end, value, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE bool binary_search(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  const T& value,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+bool binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                   ForwardIterator begin,
+                   ForwardIterator end,
+                   const T& value,
+                   StrictWeakOrdering comp)
 {
   return detail::binary_search<bool>(exec, begin, end, value, comp, detail::bsf());
 }
 
+
 //////////////////////
 // Vector Functions //
 //////////////////////
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator lower_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator lower_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                           ForwardIterator begin,
+                           ForwardIterator end,
+                           InputIterator values_begin,
+                           InputIterator values_end,
+                           OutputIterator output)
 {
   namespace p = thrust::placeholders;
   return thrust::lower_bound(exec, begin, end, values_begin, values_end, output, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator lower_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator lower_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                           ForwardIterator begin,
+                           ForwardIterator end,
+                           InputIterator values_begin,
+                           InputIterator values_end,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
   return detail::binary_search(exec, begin, end, values_begin, values_end, output, comp, detail::lbf());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator upper_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator upper_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                           ForwardIterator begin,
+                           ForwardIterator end,
+                           InputIterator values_begin,
+                           InputIterator values_end,
+                           OutputIterator output)
 {
   namespace p = thrust::placeholders;
   return thrust::upper_bound(exec, begin, end, values_begin, values_end, output, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator upper_bound(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator upper_bound(thrust::execution_policy<DerivedPolicy> &exec,
+                           ForwardIterator begin,
+                           ForwardIterator end,
+                           InputIterator values_begin,
+                           InputIterator values_end,
+                           OutputIterator output,
+                           StrictWeakOrdering comp)
 {
   return detail::binary_search(exec, begin, end, values_begin, values_end, output, comp, detail::ubf());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator binary_search(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                             ForwardIterator begin,
+                             ForwardIterator end,
+                             InputIterator values_begin,
+                             InputIterator values_end,
+                             OutputIterator output)
 {
   namespace p = thrust::placeholders;
   return thrust::binary_search(exec, begin, end, values_begin, values_end, output, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy,
-          typename ForwardIterator,
-          typename InputIterator,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator binary_search(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator begin,
-  ForwardIterator end,
-  InputIterator values_begin,
-  InputIterator values_end,
-  OutputIterator output,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename OutputIterator, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator binary_search(thrust::execution_policy<DerivedPolicy> &exec,
+                             ForwardIterator begin,
+                             ForwardIterator end,
+                             InputIterator values_begin,
+                             InputIterator values_end,
+                             OutputIterator output,
+                             StrictWeakOrdering comp)
 {
   return detail::binary_search(exec, begin, end, values_begin, values_end, output, comp, detail::bsf());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const LessThanComparable& value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename LessThanComparable>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator,ForwardIterator>
+equal_range(thrust::execution_policy<DerivedPolicy> &exec,
+            ForwardIterator first,
+            ForwardIterator last,
+            const LessThanComparable &value)
 {
   return thrust::equal_range(exec, first, last, value, detail::binary_search_less());
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> equal_range(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  const T& value,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T, typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator,ForwardIterator>
+equal_range(thrust::execution_policy<DerivedPolicy> &exec,
+            ForwardIterator first,
+            ForwardIterator last,
+            const T &value,
+            StrictWeakOrdering comp)
 {
   ForwardIterator lb = thrust::lower_bound(exec, first, last, value, comp);
   ForwardIterator ub = thrust::upper_bound(exec, first, last, value, comp);
   return thrust::make_pair(lb, ub);
 }
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/copy.h b/projects/rocthrust/thrust/system/detail/generic/copy.h
index 243c89714ac1..0b670c505d4d 100644
--- a/projects/rocthrust/thrust/system/detail/generic/copy.h
+++ b/projects/rocthrust/thrust/system/detail/generic/copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/copy.inl b/projects/rocthrust/thrust/system/detail/generic/copy.inl
index be38b9a41aac..56925ec3df83 100644
--- a/projects/rocthrust/thrust/system/detail/generic/copy.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/copy.inl
@@ -26,7 +26,6 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/internal_functional.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/for_each.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/detail/minimum_system.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/copy_if.h b/projects/rocthrust/thrust/system/detail/generic/copy_if.h
index 47435c731127..5c8853eb1512 100644
--- a/projects/rocthrust/thrust/system/detail/generic/copy_if.h
+++ b/projects/rocthrust/thrust/system/detail/generic/copy_if.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/copy_if.inl b/projects/rocthrust/thrust/system/detail/generic/copy_if.inl
index 69bd2528467e..96726a3e526f 100644
--- a/projects/rocthrust/thrust/system/detail/generic/copy_if.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/copy_if.inl
@@ -26,6 +26,7 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/copy_if.h>
+#include <thrust/detail/integer_traits.h>
 #include <thrust/detail/internal_functional.h>
 #include <thrust/detail/temporary_array.h>
 #include <thrust/detail/type_traits.h>
@@ -38,11 +39,7 @@
 #include <thrust/system/detail/generic/copy_if.h>
 #include <thrust/transform.h>
 
-#include _THRUST_STD_INCLUDE(limits)
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <limits>
-#endif
+#include <limits>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -124,7 +121,7 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
   OutputIterator result,
   Predicate pred)
 {
-  using difference_type = thrust::detail::it_difference_t<InputIterator1>;
+  using difference_type = typename thrust::iterator_traits<InputIterator1>::difference_type;
 
   // empty sequence
   if (first == last)
@@ -139,7 +136,8 @@ THRUST_HOST_DEVICE OutputIterator copy_if(
   ::internal::make_unsigned_t<difference_type> unsigned_n(n);
 
   // use 32-bit indices when possible (almost always)
-  if (sizeof(difference_type) > sizeof(unsigned int) && unsigned_n > _THRUST_STD::numeric_limits<unsigned int>::max())
+  if (sizeof(difference_type) > sizeof(unsigned int)
+      && unsigned_n > thrust::detail::integer_traits<unsigned int>::const_max)
   {
     result = detail::copy_if<difference_type>(exec, first, last, stencil, result, pred);
   } // end if
diff --git a/projects/rocthrust/thrust/system/detail/generic/count.h b/projects/rocthrust/thrust/system/detail/generic/count.h
index d00a66de0087..efc31690d3b1 100644
--- a/projects/rocthrust/thrust/system/detail/generic/count.h
+++ b/projects/rocthrust/thrust/system/detail/generic/count.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -36,14 +29,14 @@ namespace generic
 {
 
 template <typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count(thrust::execution_policy<DerivedPolicy>& exec,
       InputIterator first,
       InputIterator last,
       const EqualityComparable& value);
 
 template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 count_if(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, Predicate pred);
 
 } // end namespace generic
diff --git a/projects/rocthrust/thrust/system/detail/generic/count.inl b/projects/rocthrust/thrust/system/detail/generic/count.inl
index 1b7de0777cc5..350a866a0dae 100644
--- a/projects/rocthrust/thrust/system/detail/generic/count.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/count.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
 #include <thrust/system/detail/generic/count.h>
 #include <thrust/transform_reduce.h>
+#include <thrust/detail/internal_functional.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,54 +29,53 @@ namespace detail
 namespace generic
 {
 
+
 template <typename InputType, typename Predicate, typename CountType>
 struct count_if_transform
 {
-  THRUST_HOST_DEVICE count_if_transform(Predicate _pred)
-      : pred(_pred)
-  {}
+  THRUST_HOST_DEVICE
+  count_if_transform(Predicate _pred) : pred(_pred){}
 
   THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE CountType operator()(const InputType& val)
+  THRUST_HOST_DEVICE
+  CountType operator()(const InputType& val)
   {
-    if (pred(val))
-    {
+    if(pred(val))
       return 1;
-    }
     else
-    {
       return 0;
-    }
   } // end operator()
 
   Predicate pred;
 }; // end count_if_transform
 
+
 template <typename DerivedPolicy, typename InputIterator, typename EqualityComparable>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-count(thrust::execution_policy<DerivedPolicy>& exec,
-      InputIterator first,
-      InputIterator last,
-      const EqualityComparable& value)
+THRUST_HOST_DEVICE
+typename thrust::iterator_traits<InputIterator>::difference_type
+count(thrust::execution_policy<DerivedPolicy> &exec, InputIterator first, InputIterator last, const EqualityComparable& value)
 {
   using thrust::placeholders::_1;
 
   return thrust::count_if(exec, first, last, _1 == value);
 } // end count()
 
+
 template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-count_if(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, Predicate pred)
+THRUST_HOST_DEVICE
+typename thrust::iterator_traits<InputIterator>::difference_type
+count_if(thrust::execution_policy<DerivedPolicy> &exec, InputIterator first, InputIterator last, Predicate pred)
 {
-  using InputType = thrust::detail::it_value_t<InputIterator>;
-  using CountType = thrust::detail::it_difference_t<InputIterator>;
+  using InputType = typename thrust::iterator_traits<InputIterator>::value_type;
+  using CountType = typename thrust::iterator_traits<InputIterator>::difference_type;
 
   thrust::system::detail::generic::count_if_transform<InputType, Predicate, CountType> unary_op(pred);
   thrust::plus<CountType> binary_op;
   return thrust::transform_reduce(exec, first, last, unary_op, CountType(0), binary_op);
 } // end count_if()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/distance.h b/projects/rocthrust/thrust/system/detail/generic/distance.h
index ca7587a0f9c7..ebab71ebba4d 100644
--- a/projects/rocthrust/thrust/system/detail/generic/distance.h
+++ b/projects/rocthrust/thrust/system/detail/generic/distance.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -36,7 +29,7 @@ namespace generic
 {
 
 template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
+inline THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::difference_type
 distance(InputIterator first, InputIterator last);
 
 } // end namespace generic
diff --git a/projects/rocthrust/thrust/system/detail/generic/distance.inl b/projects/rocthrust/thrust/system/detail/generic/distance.inl
index e704463e2a93..a917e7ec43a9 100644
--- a/projects/rocthrust/thrust/system/detail/generic/distance.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/distance.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/distance.h>
+#include <thrust/iterator/iterator_traits.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -38,14 +30,16 @@ namespace generic
 namespace detail
 {
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-distance(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag)
+template<typename InputIterator>
+inline THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    distance(InputIterator first, InputIterator last, thrust::incrementable_traversal_tag)
 {
-  thrust::detail::it_difference_t<InputIterator> result(0);
+  typename thrust::iterator_traits<InputIterator>::difference_type result(0);
 
-  while (first != last)
+  while(first != last)
   {
     ++first;
     ++result;
@@ -54,25 +48,31 @@ distance(InputIterator first, InputIterator last, thrust::incrementable_traversa
   return result;
 } // end advance()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator>
-distance(InputIterator first, InputIterator last, thrust::random_access_traversal_tag)
+template<typename InputIterator>
+inline THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    distance(InputIterator first, InputIterator last, thrust::random_access_traversal_tag)
 {
   return last - first;
 } // end distance()
 
-} // namespace detail
+
+} // end detail
 
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator>
-inline THRUST_HOST_DEVICE thrust::detail::it_difference_t<InputIterator> distance(InputIterator first, InputIterator last)
+template<typename InputIterator>
+inline THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::difference_type
+    distance(InputIterator first, InputIterator last)
 {
   // dispatch on iterator traversal
-  return thrust::system::detail::generic::detail::distance(
-    first, last, typename thrust::iterator_traversal<InputIterator>::type());
+  return thrust::system::detail::generic::detail::distance(first, last,
+    typename thrust::iterator_traversal<InputIterator>::type());
 } // end advance()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/equal.h b/projects/rocthrust/thrust/system/detail/generic/equal.h
index b5d27e155882..73513fcd5d86 100644
--- a/projects/rocthrust/thrust/system/detail/generic/equal.h
+++ b/projects/rocthrust/thrust/system/detail/generic/equal.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/extrema.h b/projects/rocthrust/thrust/system/detail/generic/extrema.h
index 5cf1b45d38fa..65a894aeaa62 100644
--- a/projects/rocthrust/thrust/system/detail/generic/extrema.h
+++ b/projects/rocthrust/thrust/system/detail/generic/extrema.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/extrema.inl b/projects/rocthrust/thrust/system/detail/generic/extrema.inl
index dad616708792..91e2f2be892b 100644
--- a/projects/rocthrust/thrust/system/detail/generic/extrema.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/extrema.inl
@@ -159,7 +159,7 @@ template <typename DerivedPolicy, typename ForwardIterator>
 THRUST_HOST_DEVICE ForwardIterator
 min_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
 {
-  using value_type = thrust::detail::it_value_t<ForwardIterator>;
+  using value_type = typename thrust::iterator_value<ForwardIterator>::type;
 
   return thrust::min_element(exec, first, last, thrust::less<value_type>());
 } // end min_element()
@@ -173,8 +173,8 @@ THRUST_HOST_DEVICE ForwardIterator min_element(
     return last;
   }
 
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
-  using IndexType = thrust::detail::it_difference_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
+  using IndexType = typename thrust::iterator_traits<ForwardIterator>::difference_type;
 
   thrust::tuple<InputType, IndexType> result = thrust::reduce(
     exec,
@@ -190,7 +190,7 @@ template <typename DerivedPolicy, typename ForwardIterator>
 THRUST_HOST_DEVICE ForwardIterator
 max_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
 {
-  using value_type = thrust::detail::it_value_t<ForwardIterator>;
+  using value_type = typename thrust::iterator_value<ForwardIterator>::type;
 
   return thrust::max_element(exec, first, last, thrust::less<value_type>());
 } // end max_element()
@@ -204,8 +204,8 @@ THRUST_HOST_DEVICE ForwardIterator max_element(
     return last;
   }
 
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
-  using IndexType = thrust::detail::it_difference_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
+  using IndexType = typename thrust::iterator_traits<ForwardIterator>::difference_type;
 
   thrust::tuple<InputType, IndexType> result = thrust::reduce(
     exec,
@@ -221,7 +221,7 @@ template <typename DerivedPolicy, typename ForwardIterator>
 THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator>
 minmax_element(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
 {
-  using value_type = thrust::detail::it_value_t<ForwardIterator>;
+  using value_type = typename thrust::iterator_value<ForwardIterator>::type;
 
   return thrust::minmax_element(exec, first, last, thrust::less<value_type>());
 } // end minmax_element()
@@ -235,8 +235,8 @@ THRUST_HOST_DEVICE thrust::pair<ForwardIterator, ForwardIterator> minmax_element
     return thrust::make_pair(last, last);
   }
 
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
-  using IndexType = thrust::detail::it_difference_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
+  using IndexType = typename thrust::iterator_traits<ForwardIterator>::difference_type;
 
   thrust::tuple<thrust::tuple<InputType, IndexType>, thrust::tuple<InputType, IndexType>> result =
     thrust::transform_reduce(
diff --git a/projects/rocthrust/thrust/system/detail/generic/fill.h b/projects/rocthrust/thrust/system/detail/generic/fill.h
index 92a515036902..a508bfbf8a21 100644
--- a/projects/rocthrust/thrust/system/detail/generic/fill.h
+++ b/projects/rocthrust/thrust/system/detail/generic/fill.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/internal_functional.h>
 #include <thrust/generate.h>
 #include <thrust/system/detail/generic/tag.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/find.h b/projects/rocthrust/thrust/system/detail/generic/find.h
index a0f3560d5332..e7fb8cf7a7e5 100644
--- a/projects/rocthrust/thrust/system/detail/generic/find.h
+++ b/projects/rocthrust/thrust/system/detail/generic/find.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/find.inl b/projects/rocthrust/thrust/system/detail/generic/find.inl
index 72c7e736774e..d8dfa81a4188 100644
--- a/projects/rocthrust/thrust/system/detail/generic/find.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/find.inl
@@ -17,28 +17,16 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
 #include <thrust/find.h>
+#include <thrust/reduce.h>
+
+#include <thrust/tuple.h>
+#include <thrust/detail/minmax.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/reduce.h>
-#include <thrust/tuple.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
+#include <thrust/detail/internal_functional.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#endif
 
 // Contributed by Erich Elsen
 
@@ -50,26 +38,32 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator, typename T>
-THRUST_HOST_DEVICE InputIterator
-find(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, const T& value)
+
+template<typename DerivedPolicy, typename InputIterator, typename T>
+THRUST_HOST_DEVICE
+InputIterator find(thrust::execution_policy<DerivedPolicy> &exec,
+                   InputIterator first,
+                   InputIterator last,
+                   const T& value)
 {
   using thrust::placeholders::_1;
 
   return thrust::find_if(exec, first, last, _1 == value);
 } // end find()
 
-template <typename TupleType>
+
+template<typename TupleType>
 struct find_if_functor
 {
-  THRUST_HOST_DEVICE TupleType operator()(const TupleType& lhs, const TupleType& rhs) const
+  THRUST_HOST_DEVICE
+  TupleType operator()(const TupleType& lhs, const TupleType& rhs) const
   {
     // select the smallest index among true results
-    if (thrust::get<0>(lhs) && thrust::get<0>(rhs))
+    if(thrust::get<0>(lhs) && thrust::get<0>(rhs))
     {
-      return TupleType(true, (_THRUST_STD::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
+      return TupleType(true, (thrust::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
     }
-    else if (thrust::get<0>(lhs))
+    else if(thrust::get<0>(lhs))
     {
       return lhs;
     }
@@ -80,18 +74,19 @@ struct find_if_functor
   }
 };
 
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE InputIterator
-find_if(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, Predicate pred)
+
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+InputIterator find_if(thrust::execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
-  using difference_type = thrust::detail::it_difference_t<InputIterator>;
+  using difference_type = typename thrust::iterator_traits<InputIterator>::difference_type;
   using result_type     = typename thrust::tuple<bool, difference_type>;
 
   // empty sequence
-  if (first == last)
-  {
-    return last;
-  }
+  if(first == last) return last;
 
   const difference_type n = thrust::distance(first, last);
 
@@ -100,48 +95,55 @@ find_if(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, Inpu
 
   // TODO incorporate sizeof(InputType) into interval_threshold and round to multiple of 32
   const difference_type interval_threshold = 1 << 20;
-  const difference_type interval_size      = (_THRUST_STD::min)(interval_threshold, n);
+  const difference_type interval_size = (thrust::min)(interval_threshold, n);
 
   // force transform_iterator output to bool
   using XfrmIterator  = thrust::transform_iterator<Predicate, InputIterator, bool>;
   using IteratorTuple = thrust::tuple<XfrmIterator, thrust::counting_iterator<difference_type>>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  IteratorTuple iter_tuple =
-    thrust::make_tuple(XfrmIterator(first, pred), thrust::counting_iterator<difference_type>(0));
+  IteratorTuple iter_tuple = thrust::make_tuple(XfrmIterator(first, pred),
+                                                thrust::counting_iterator<difference_type>(0));
 
   ZipIterator begin = thrust::make_zip_iterator(iter_tuple);
   ZipIterator end   = begin + n;
 
-  for (ZipIterator interval_begin = begin; interval_begin < end; interval_begin += interval_size)
+  for(ZipIterator interval_begin = begin; interval_begin < end; interval_begin += interval_size)
   {
     ZipIterator interval_end = interval_begin + interval_size;
-    if (end < interval_end)
+    if(end < interval_end)
     {
       interval_end = end;
     } // end if
 
-    result_type result = thrust::reduce(
-      exec, interval_begin, interval_end, result_type(false, interval_end - begin), find_if_functor<result_type>());
+    result_type result = thrust::reduce(exec,
+                                        interval_begin, interval_end,
+                                        result_type(false,interval_end - begin),
+                                        find_if_functor<result_type>());
 
     // see if we found something
-    if (thrust::get<0>(result))
+    if(thrust::get<0>(result))
     {
       return first + thrust::get<1>(result);
     }
   }
 
-  // nothing was found if we reach here...
+  //nothing was found if we reach here...
   return first + n;
 }
 
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE InputIterator
-find_if_not(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, Predicate pred)
+
+template<typename DerivedPolicy, typename InputIterator, typename Predicate>
+THRUST_HOST_DEVICE
+InputIterator find_if_not(thrust::execution_policy<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          Predicate pred)
 {
   return thrust::find_if(exec, first, last, thrust::not_fn(pred));
 } // end find()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/for_each.h b/projects/rocthrust/thrust/system/detail/generic/for_each.h
index c7b90f205400..9c69477b58db 100644
--- a/projects/rocthrust/thrust/system/detail/generic/for_each.h
+++ b/projects/rocthrust/thrust/system/detail/generic/for_each.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,13 +24,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/static_assert.h>
 #include <thrust/system/detail/generic/tag.h>
@@ -47,7 +40,8 @@ template <typename DerivedPolicy, typename InputIterator, typename UnaryFunction
 THRUST_HOST_DEVICE InputIterator
 for_each(thrust::execution_policy<DerivedPolicy>&, InputIterator first, InputIterator, UnaryFunction)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<InputIterator, false>::value),
+                           "unimplemented for this system");
   return first;
 } // end for_each()
 
@@ -55,7 +49,8 @@ template <typename DerivedPolicy, typename InputIterator, typename Size, typenam
 THRUST_HOST_DEVICE InputIterator
 for_each_n(thrust::execution_policy<DerivedPolicy>&, InputIterator first, Size, UnaryFunction)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<InputIterator, false>::value),
+                           "unimplemented for this system");
   return first;
 } // end for_each_n()
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/gather.h b/projects/rocthrust/thrust/system/detail/generic/gather.h
index d8466b7d60da..e878c35864e8 100644
--- a/projects/rocthrust/thrust/system/detail/generic/gather.h
+++ b/projects/rocthrust/thrust/system/detail/generic/gather.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/gather.inl b/projects/rocthrust/thrust/system/detail/generic/gather.inl
index ac6d27d9ba04..40a3e357e4de 100644
--- a/projects/rocthrust/thrust/system/detail/generic/gather.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/gather.inl
@@ -25,7 +25,6 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/permutation_iterator.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/generate.h b/projects/rocthrust/thrust/system/detail/generic/generate.h
index 5028f3897eef..3d9f533f9372 100644
--- a/projects/rocthrust/thrust/system/detail/generic/generate.h
+++ b/projects/rocthrust/thrust/system/detail/generic/generate.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/generate.inl b/projects/rocthrust/thrust/system/detail/generic/generate.inl
index bcf9cb9eadbd..1864581dd537 100644
--- a/projects/rocthrust/thrust/system/detail/generic/generate.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/generate.inl
@@ -25,39 +25,70 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-
+#include <thrust/detail/internal_functional.h>
+#include <thrust/detail/static_assert.h>
 #include <thrust/for_each.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/system/detail/generic/generate.h>
 
-#include _THRUST_STD_INCLUDE(utility)
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <type_traits>
+#endif
 
 THRUST_NAMESPACE_BEGIN
-namespace system::detail::generic
+namespace system
 {
-template <typename Generator>
-struct generate_functor
+namespace detail
+{
+namespace generic
 {
-  THRUST_EXEC_CHECK_DISABLE
-  template <typename T>
-  THRUST_HOST_DEVICE void operator()(T&& x)
-  {
-    _THRUST_STD::forward<T>(x) = gen();
-  }
-
-  Generator gen;
-};
 
 template <typename ExecutionPolicy, typename ForwardIterator, typename Generator>
 THRUST_HOST_DEVICE void
-generate(execution_policy<ExecutionPolicy>& exec, ForwardIterator first, ForwardIterator last, Generator gen)
+generate(thrust::execution_policy<ExecutionPolicy>& exec, ForwardIterator first, ForwardIterator last, Generator gen)
 {
-  thrust::for_each(exec, first, last, generate_functor<Generator>{_THRUST_STD::move(gen)});
-}
+  // this static assert is necessary due to a workaround in generate_functor
+  // it takes a const reference to accept temporaries from proxy iterators
+  // and then const_casts the constness away
+  //
+  // this had the weird side effect of allowing generate (and fill, and whatever
+  // else is implemented in terms of generate) to fill through const iterators.
+  // this might become unnecessary once Thrust is C++11-and-above only, since the
+  // other solution is to take an rvalue reference in a second overload of
+  // operator() of the function object, but until we support pre-11, this is a
+  // nice solution that validates the const_cast and doesn't take away any
+  // functionality.
+  THRUST_STATIC_ASSERT_MSG(
+    !_THRUST_STD::is_const<
+      _THRUST_STD::remove_reference_t<typename thrust::iterator_traits<ForwardIterator>::reference>>::value,
+    "generating to `const` iterators is not allowed");
+  thrust::for_each(exec, first, last, typename thrust::detail::generate_functor<ExecutionPolicy, Generator>::type(gen));
+} // end generate()
 
 template <typename ExecutionPolicy, typename OutputIterator, typename Size, typename Generator>
 THRUST_HOST_DEVICE OutputIterator
-generate_n(execution_policy<ExecutionPolicy>& exec, OutputIterator first, Size n, Generator gen)
+generate_n(thrust::execution_policy<ExecutionPolicy>& exec, OutputIterator first, Size n, Generator gen)
 {
-  return thrust::for_each_n(exec, first, n, generate_functor<Generator>{_THRUST_STD::move(gen)});
-}
-} // namespace system::detail::generic
+  // this static assert is necessary due to a workaround in generate_functor
+  // it takes a const reference to accept temporaries from proxy iterators
+  // and then const_casts the constness away
+  //
+  // this had the weird side effect of allowing generate (and fill, and whatever
+  // else is implemented in terms of generate) to fill through const iterators.
+  // this might become unnecessary once Thrust is C++11-and-above only, since the
+  // other solution is to take an rvalue reference in a second overload of
+  // operator() of the function object, but until we support pre-11, this is a
+  // nice solution that validates the const_cast and doesn't take away any
+  // functionality.
+  THRUST_STATIC_ASSERT_MSG(
+    !_THRUST_STD::is_const<
+      _THRUST_STD::remove_reference_t<typename thrust::iterator_traits<OutputIterator>::reference>>::value,
+    "generating to `const` iterators is not allowed");
+  return thrust::for_each_n(
+    exec, first, n, typename thrust::detail::generate_functor<ExecutionPolicy, Generator>::type(gen));
+} // end generate()
+
+} // end namespace generic
+} // end namespace detail
+} // end namespace system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/inner_product.h b/projects/rocthrust/thrust/system/detail/generic/inner_product.h
index 89a359c0efed..281d2f82b8e9 100644
--- a/projects/rocthrust/thrust/system/detail/generic/inner_product.h
+++ b/projects/rocthrust/thrust/system/detail/generic/inner_product.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/inner_product.inl b/projects/rocthrust/thrust/system/detail/generic/inner_product.inl
index 849d477d12bc..653aa7a26e04 100644
--- a/projects/rocthrust/thrust/system/detail/generic/inner_product.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/inner_product.inl
@@ -18,15 +18,9 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/internal_functional.h>
 #include <thrust/functional.h>
+#include <thrust/iterator/zip_iterator.h>
 #include <thrust/system/detail/generic/inner_product.h>
 #include <thrust/transform_reduce.h>
 #include <thrust/zip_function.h>
@@ -39,40 +33,37 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputType>
-THRUST_HOST_DEVICE OutputType inner_product(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputType init)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputType>
+THRUST_HOST_DEVICE
+OutputType inner_product(thrust::execution_policy<DerivedPolicy> &exec,
+                         InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         OutputType init)
 {
-  thrust::plus<OutputType> binary_op1;
+  thrust::plus<OutputType>       binary_op1;
   thrust::multiplies<OutputType> binary_op2;
   return thrust::inner_product(exec, first1, last1, first2, init, binary_op1, binary_op2);
 } // end inner_product()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputType,
-          typename BinaryFunction1,
-          typename BinaryFunction2>
-THRUST_HOST_DEVICE OutputType inner_product(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputType init,
-  BinaryFunction1 binary_op1,
-  BinaryFunction2 binary_op2)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputType, typename BinaryFunction1, typename BinaryFunction2>
+THRUST_HOST_DEVICE
+OutputType inner_product(thrust::execution_policy<DerivedPolicy> &exec,
+                         InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         OutputType init,
+                         BinaryFunction1 binary_op1,
+                         BinaryFunction2 binary_op2)
 {
   const auto first = thrust::make_zip_iterator(first1, first2);
   const auto last  = thrust::make_zip_iterator(last1, first2); // only first iterator matters
   return thrust::transform_reduce(exec, first, last, thrust::make_zip_function(binary_op2), init, binary_op1);
 } // end inner_product()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/logical.h b/projects/rocthrust/thrust/system/detail/generic/logical.h
index 529b46994688..b2342953551e 100644
--- a/projects/rocthrust/thrust/system/detail/generic/logical.h
+++ b/projects/rocthrust/thrust/system/detail/generic/logical.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/internal_functional.h>
 #include <thrust/find.h>
 #include <thrust/logical.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/memory.h b/projects/rocthrust/thrust/system/detail/generic/memory.h
index eb3b02f1226d..928f0b872063 100644
--- a/projects/rocthrust/thrust/system/detail/generic/memory.h
+++ b/projects/rocthrust/thrust/system/detail/generic/memory.h
@@ -23,13 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/pointer.h>
 #include <thrust/detail/type_traits.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/memory.inl b/projects/rocthrust/thrust/system/detail/generic/memory.inl
index aaf385104397..eedfd664ee8a 100644
--- a/projects/rocthrust/thrust/system/detail/generic/memory.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/memory.inl
@@ -17,19 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/malloc_and_free_fwd.h>
-#include <thrust/detail/static_assert.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/system/detail/adl/malloc_and_free.h>
+#include <thrust/detail/static_assert.h>
+#include <thrust/detail/malloc_and_free.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -39,45 +30,74 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename Size>
-THRUST_HOST_DEVICE void malloc(thrust::execution_policy<DerivedPolicy>&, Size)
+
+template<typename DerivedPolicy, typename Size>
+THRUST_HOST_DEVICE
+  void malloc(thrust::execution_policy<DerivedPolicy> &, Size)
 {
-  static_assert(thrust::detail::depend_on_instantiation<Size, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<Size, false>::value)
+  , "unimplemented for this system"
+  );
 }
 
-template <typename T, typename DerivedPolicy>
-THRUST_HOST_DEVICE thrust::pointer<T, DerivedPolicy> malloc(thrust::execution_policy<DerivedPolicy>& exec, std::size_t n)
+
+template<typename T, typename DerivedPolicy>
+THRUST_HOST_DEVICE
+  thrust::pointer<T,DerivedPolicy>
+    malloc(thrust::execution_policy<DerivedPolicy> &exec, std::size_t n)
 {
-  thrust::pointer<void, DerivedPolicy> void_ptr = thrust::malloc(exec, sizeof(T) * n);
+  thrust::pointer<void,DerivedPolicy> void_ptr = thrust::malloc(exec, sizeof(T) * n);
 
-  return pointer<T, DerivedPolicy>(static_cast<T*>(void_ptr.get()));
+  return pointer<T,DerivedPolicy>(static_cast<T*>(void_ptr.get()));
 } // end malloc()
 
-template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE void free(thrust::execution_policy<DerivedPolicy>&, Pointer)
+
+template<typename DerivedPolicy, typename Pointer>
+THRUST_HOST_DEVICE
+  void free(thrust::execution_policy<DerivedPolicy> &, Pointer)
 {
-  static_assert(thrust::detail::depend_on_instantiation<Pointer, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<Pointer, false>::value)
+  , "unimplemented for this system"
+  );
 }
 
-template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
-THRUST_HOST_DEVICE void assign_value(thrust::execution_policy<DerivedPolicy>&, Pointer1, Pointer2)
+
+template<typename DerivedPolicy, typename Pointer1, typename Pointer2>
+THRUST_HOST_DEVICE
+void assign_value(thrust::execution_policy<DerivedPolicy> &, Pointer1, Pointer2)
 {
-  static_assert(thrust::detail::depend_on_instantiation<Pointer1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<Pointer1, false>::value)
+  , "unimplemented for this system"
+  );
 }
 
-template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE void get_value(thrust::execution_policy<DerivedPolicy>&, Pointer)
+
+template<typename DerivedPolicy, typename Pointer>
+THRUST_HOST_DEVICE
+void get_value(thrust::execution_policy<DerivedPolicy> &, Pointer)
 {
-  static_assert(thrust::detail::depend_on_instantiation<Pointer, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<Pointer, false>::value)
+  , "unimplemented for this system"
+  );
 }
 
-template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
-THRUST_HOST_DEVICE void iter_swap(thrust::execution_policy<DerivedPolicy>&, Pointer1, Pointer2)
+
+template<typename DerivedPolicy, typename Pointer1, typename Pointer2>
+THRUST_HOST_DEVICE
+void iter_swap(thrust::execution_policy<DerivedPolicy> &, Pointer1, Pointer2)
 {
-  static_assert(thrust::detail::depend_on_instantiation<Pointer1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<Pointer1, false>::value)
+  , "unimplemented for this system"
+  );
 }
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/merge.h b/projects/rocthrust/thrust/system/detail/generic/merge.h
index 2b3a68b68af9..1dbadea72598 100644
--- a/projects/rocthrust/thrust/system/detail/generic/merge.h
+++ b/projects/rocthrust/thrust/system/detail/generic/merge.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/merge.inl b/projects/rocthrust/thrust/system/detail/generic/merge.inl
index 87127c87374d..df573309c3ff 100644
--- a/projects/rocthrust/thrust/system/detail/generic/merge.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/merge.inl
@@ -14,23 +14,16 @@
  *  limitations under the License.
  */
 
+
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
 #include <thrust/detail/static_assert.h>
+#include <thrust/system/detail/generic/merge.h>
+#include <thrust/merge.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/merge.h>
-#include <thrust/system/detail/generic/merge.h>
+#include <thrust/detail/internal_functional.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,56 +33,56 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator merge(
-  thrust::execution_policy<DerivedPolicy>&,
-  InputIterator1,
-  InputIterator1,
-  InputIterator2,
-  InputIterator2,
-  OutputIterator result,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  OutputIterator merge(thrust::execution_policy<DerivedPolicy> &,
+                       InputIterator1,
+                       InputIterator1,
+                       InputIterator2,
+                       InputIterator2,
+                       OutputIterator result,
+                       StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator1, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end merge()
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator merge(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator merge(thrust::execution_policy<DerivedPolicy> &exec,
+                       InputIterator1 first1,
+                       InputIterator1 last1,
+                       InputIterator2 first2,
+                       InputIterator2 last2,
+                       OutputIterator result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::merge(exec, first1, last1, first2, last2, result, thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::merge(exec,first1,last1,first2,last2,result,thrust::less<value_type>());
 } // end merge()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Compare>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  Compare comp)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename InputIterator3, typename InputIterator4, typename OutputIterator1, typename OutputIterator2, typename Compare>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                 InputIterator1 keys_first1, InputIterator1 keys_last1,
+                 InputIterator2 keys_first2, InputIterator2 keys_last2,
+                 InputIterator3 values_first1, InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result,
+                 Compare comp)
 {
   using iterator_tuple1 = thrust::tuple<InputIterator1, InputIterator3>;
   using iterator_tuple2 = thrust::tuple<InputIterator2, InputIterator4>;
@@ -109,45 +102,27 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
 
   thrust::detail::compare_first<Compare> comp_first(comp);
 
-  iterator_tuple3 result =
-    thrust::merge(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
-      .get_iterator_tuple();
+  iterator_tuple3 result = thrust::merge(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first).get_iterator_tuple();
 
   return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end merge_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename InputIterator3, typename InputIterator4, typename OutputIterator1, typename OutputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    merge_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                 InputIterator1 keys_first1, InputIterator1 keys_last1,
+                 InputIterator2 keys_first2, InputIterator2 keys_last2,
+                 InputIterator3 values_first1, InputIterator4 values_first2,
+                 OutputIterator1 keys_result,
+                 OutputIterator2 values_result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::merge_by_key(
-    exec,
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::merge_by_key(exec, keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, thrust::less<value_type>());
 } // end merge_by_key()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/mismatch.h b/projects/rocthrust/thrust/system/detail/generic/mismatch.h
index 40494be183bd..7b13e6ecbf38 100644
--- a/projects/rocthrust/thrust/system/detail/generic/mismatch.h
+++ b/projects/rocthrust/thrust/system/detail/generic/mismatch.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/mismatch.inl b/projects/rocthrust/thrust/system/detail/generic/mismatch.inl
index 1629c4fbbb87..4b14423cdeb4 100644
--- a/projects/rocthrust/thrust/system/detail/generic/mismatch.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/mismatch.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/generic/mismatch.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/detail/internal_functional.h>
 #include <thrust/find.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/generic/mismatch.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -38,37 +30,45 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
-  thrust::execution_policy<DerivedPolicy>& exec, InputIterator1 first1, InputIterator1 last1, InputIterator2 first2)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<InputIterator1, InputIterator2>
+    mismatch(thrust::execution_policy<DerivedPolicy> &exec,
+             InputIterator1 first1,
+             InputIterator1 last1,
+             InputIterator2 first2)
 {
   using namespace thrust::placeholders;
 
   return thrust::mismatch(exec, first1, last1, first2, _1 == _2);
 } // end mismatch()
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<InputIterator1, InputIterator2> mismatch(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  BinaryPredicate pred)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  thrust::pair<InputIterator1, InputIterator2>
+    mismatch(thrust::execution_policy<DerivedPolicy> &exec,
+             InputIterator1 first1,
+             InputIterator1 last1,
+             InputIterator2 first2,
+             BinaryPredicate pred)
 {
   // Contributed by Erich Elsen
   using IteratorTuple = thrust::tuple<InputIterator1, InputIterator2>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_first = thrust::make_zip_iterator(thrust::make_tuple(first1, first2));
+  ZipIterator zipped_first = thrust::make_zip_iterator(thrust::make_tuple(first1,first2));
   ZipIterator zipped_last  = thrust::make_zip_iterator(thrust::make_tuple(last1, first2));
 
-  ZipIterator result =
-    thrust::find_if_not(exec, zipped_first, zipped_last, thrust::detail::tuple_binary_predicate<BinaryPredicate>(pred));
+  ZipIterator result = thrust::find_if_not(exec, zipped_first, zipped_last, thrust::detail::tuple_binary_predicate<BinaryPredicate>(pred));
 
-  return thrust::make_pair(thrust::get<0>(result.get_iterator_tuple()), thrust::get<1>(result.get_iterator_tuple()));
+  return thrust::make_pair(thrust::get<0>(result.get_iterator_tuple()),
+                           thrust::get<1>(result.get_iterator_tuple()));
 } // end mismatch()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/partition.h b/projects/rocthrust/thrust/system/detail/generic/partition.h
index beb27fe32541..bee7bfba1883 100644
--- a/projects/rocthrust/thrust/system/detail/generic/partition.h
+++ b/projects/rocthrust/thrust/system/detail/generic/partition.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/partition.inl b/projects/rocthrust/thrust/system/detail/generic/partition.inl
index 2b3ca1654d6a..1a8b2d3eedbd 100644
--- a/projects/rocthrust/thrust/system/detail/generic/partition.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/partition.inl
@@ -17,25 +17,19 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/advance.h>
-#include <thrust/count.h>
-#include <thrust/detail/internal_functional.h>
-#include <thrust/detail/temporary_array.h>
+#include <thrust/system/detail/generic/partition.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/transform_iterator.h>
 #include <thrust/pair.h>
-#include <thrust/partition.h>
+
 #include <thrust/remove.h>
+#include <thrust/count.h>
+#include <thrust/advance.h>
+#include <thrust/partition.h>
 #include <thrust/sort.h>
-#include <thrust/system/detail/generic/partition.h>
+#include <thrust/iterator/transform_iterator.h>
+
+#include <thrust/detail/internal_functional.h>
+#include <thrust/detail/temporary_array.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -45,17 +39,23 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator stable_partition(
-  thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator stable_partition(thrust::execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   Predicate pred)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   // copy input to temp buffer
-  thrust::detail::temporary_array<InputType, DerivedPolicy> temp(exec, first, last);
+  thrust::detail::temporary_array<InputType,DerivedPolicy> temp(exec, first, last);
 
   // count the size of the true partition
-  thrust::detail::it_difference_t<ForwardIterator> num_true = thrust::count_if(exec, first, last, pred);
+  typename thrust::iterator_difference<ForwardIterator>::type num_true = thrust::count_if(exec, first,last,pred);
 
   // point to the beginning of the false partition
   ForwardIterator out_false = first;
@@ -64,23 +64,27 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
   return thrust::stable_partition_copy(exec, temp.begin(), temp.end(), first, out_false, pred).first;
 } // end stable_partition()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator stable_partition(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator stable_partition(thrust::execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   InputIterator stencil,
+                                   Predicate pred)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   // copy input to temp buffer
-  thrust::detail::temporary_array<InputType, DerivedPolicy> temp(exec, first, last);
+  thrust::detail::temporary_array<InputType,DerivedPolicy> temp(exec, first, last);
 
   // count the size of the true partition
   InputIterator stencil_last = stencil;
   thrust::advance(stencil_last, temp.size());
-  thrust::detail::it_difference_t<InputIterator> num_true = thrust::count_if(exec, stencil, stencil_last, pred);
+  typename thrust::iterator_difference<InputIterator>::type num_true = thrust::count_if(exec, stencil, stencil_last, pred);
 
   // point to the beginning of the false partition
   ForwardIterator out_false = first;
@@ -89,18 +93,20 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
   return thrust::stable_partition_copy(exec, temp.begin(), temp.end(), stencil, first, out_false, pred).first;
 } // end stable_partition()
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   auto not_pred = thrust::not_fn(pred);
 
@@ -113,20 +119,22 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
   return thrust::make_pair(end_of_true_partition, end_of_false_partition);
 } // end stable_partition_copy()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                          InputIterator1 first,
+                          InputIterator1 last,
+                          InputIterator2 stencil,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   auto not_pred = thrust::not_fn(pred);
 
@@ -139,74 +147,101 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> stable_partiti
   return thrust::make_pair(end_of_true_partition, end_of_false_partition);
 } // end stable_partition_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator
-partition(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   return thrust::stable_partition(exec, first, last, pred);
 } // end partition()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator partition(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   return thrust::stable_partition(exec, first, last, stencil, pred);
 } // end partition()
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                   InputIterator first,
+                   InputIterator last,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
-  return thrust::stable_partition_copy(exec, first, last, out_true, out_false, pred);
+  return thrust::stable_partition_copy(exec,first,last,out_true,out_false,pred);
 } // end partition_copy()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> partition_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    partition_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                   InputIterator1 first,
+                   InputIterator1 last,
+                   InputIterator2 stencil,
+                   OutputIterator1 out_true,
+                   OutputIterator2 out_false,
+                   Predicate pred)
 {
-  return thrust::stable_partition_copy(exec, first, last, stencil, out_true, out_false, pred);
+  return thrust::stable_partition_copy(exec,first,last,stencil,out_true,out_false,pred);
 } // end partition_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator partition_point(
-  thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator partition_point(thrust::execution_policy<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last,
+                                  Predicate pred)
 {
   return thrust::find_if_not(exec, first, last, pred);
 } // end partition_point()
 
-template <typename DerivedPolicy, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE bool
-is_partitioned(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  bool is_partitioned(thrust::execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      Predicate pred)
 {
   return thrust::is_sorted(exec,
                            thrust::make_transform_iterator(first, thrust::not_fn(pred)),
-                           thrust::make_transform_iterator(last, thrust::not_fn(pred)));
+                           thrust::make_transform_iterator(last,  thrust::not_fn(pred)));
 } // end is_partitioned()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/per_device_resource.h b/projects/rocthrust/thrust/system/detail/generic/per_device_resource.h
index d3cabcf20994..088f9c5b5504 100644
--- a/projects/rocthrust/thrust/system/detail/generic/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/detail/generic/per_device_resource.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/mr/memory_resource.h>
 #include <thrust/system/detail/generic/tag.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/reduce.h b/projects/rocthrust/thrust/system/detail/generic/reduce.h
index b68ebc44dc6d..84b6cc335fad 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reduce.h
+++ b/projects/rocthrust/thrust/system/detail/generic/reduce.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/tag.h>
 
@@ -37,7 +30,7 @@ namespace generic
 {
 
 template <typename DerivedPolicy, typename InputIterator>
-THRUST_HOST_DEVICE thrust::detail::it_value_t<InputIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<InputIterator>::value_type
 reduce(thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last);
 
 template <typename DerivedPolicy, typename InputIterator, typename T>
diff --git a/projects/rocthrust/thrust/system/detail/generic/reduce.inl b/projects/rocthrust/thrust/system/detail/generic/reduce.inl
index 069729dfe169..dafdba0508fb 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reduce.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/reduce.inl
@@ -18,19 +18,11 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/static_assert.h>
-#include <thrust/functional.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/reduce.h>
 #include <thrust/system/detail/generic/reduce.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/functional.h>
+#include <thrust/detail/static_assert.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,33 +32,47 @@ namespace detail
 namespace generic
 {
 
-template <typename ExecutionPolicy, typename InputIterator>
-THRUST_HOST_DEVICE thrust::detail::it_value_t<InputIterator>
-reduce(thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, InputIterator last)
+
+template<typename ExecutionPolicy, typename InputIterator>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<InputIterator>::value_type
+    reduce(thrust::execution_policy<ExecutionPolicy> &exec, InputIterator first, InputIterator last)
 {
-  using InputType = thrust::detail::it_value_t<InputIterator>;
+  using InputType = typename thrust::iterator_value<InputIterator>::type;
 
   // use InputType(0) as init by default
   return thrust::reduce(exec, first, last, InputType(0));
 } // end reduce()
 
-template <typename ExecutionPolicy, typename InputIterator, typename T>
-THRUST_HOST_DEVICE T
-reduce(thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, InputIterator last, T init)
+
+template<typename ExecutionPolicy, typename InputIterator, typename T>
+THRUST_HOST_DEVICE
+  T reduce(thrust::execution_policy<ExecutionPolicy> &exec, InputIterator first, InputIterator last, T init)
 {
   // use plus<T> by default
   return thrust::reduce(exec, first, last, init, thrust::plus<T>());
 } // end reduce()
 
-template <typename ExecutionPolicy, typename RandomAccessIterator, typename OutputType, typename BinaryFunction>
-THRUST_HOST_DEVICE OutputType reduce(
-  thrust::execution_policy<ExecutionPolicy>&, RandomAccessIterator, RandomAccessIterator, OutputType, BinaryFunction)
+
+template<typename ExecutionPolicy,
+         typename RandomAccessIterator,
+         typename OutputType,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputType reduce(thrust::execution_policy<ExecutionPolicy> &,
+                    RandomAccessIterator,
+                    RandomAccessIterator,
+                    OutputType,
+                    BinaryFunction)
 {
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator, false>::value,
-                "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<RandomAccessIterator, false>::value)
+  , "unimplemented for this system"
+  );
   return OutputType();
 } // end reduce()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.h b/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.h
index 9a2f3efe49b0..9c7d0b5c9193 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/tag.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.inl b/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
index af5ceaf54ed4..53ca72aefe0d 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/reduce_by_key.inl
@@ -18,32 +18,19 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/internal_functional.h>
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
-#include <thrust/detail/temporary_array.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/detail/minimum_system.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/iterator/is_output_iterator.h>
-#include <thrust/iterator/detail/minimum_system.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/scan.h>
-#include <thrust/scatter.h>
 #include <thrust/transform.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(iterator)
-#endif
-
+#include <thrust/scatter.h>
+#include <thrust/iterator/zip_iterator.h>
 #include <limits>
 
+#include <thrust/detail/internal_functional.h>
+#include <thrust/scan.h>
+#include <thrust/detail/temporary_array.h>
+
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
@@ -54,6 +41,7 @@ namespace generic
 namespace detail
 {
 
+
 template <typename ValueType, typename TailFlagType, typename AssociativeOperator>
 struct reduce_by_key_functor
 {
@@ -61,52 +49,53 @@ struct reduce_by_key_functor
 
   using result_type = typename thrust::tuple<ValueType, TailFlagType>;
 
-  THRUST_HOST_DEVICE reduce_by_key_functor(AssociativeOperator _binary_op)
-      : binary_op(_binary_op)
-  {}
+  THRUST_HOST_DEVICE
+  reduce_by_key_functor(AssociativeOperator _binary_op) : binary_op(_binary_op) {}
 
-  THRUST_HOST_DEVICE result_type operator()(result_type a, result_type b)
+  THRUST_HOST_DEVICE
+  result_type operator()(result_type a, result_type b)
   {
     return result_type(thrust::get<1>(b) ? thrust::get<0>(b) : binary_op(thrust::get<0>(a), thrust::get<0>(b)),
                        thrust::get<1>(a) | thrust::get<1>(b));
   }
 };
 
+
 } // end namespace detail
 
-template <typename ExecutionPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred,
-  BinaryFunction binary_op)
+
+template<typename ExecutionPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    reduce_by_key(thrust::execution_policy<ExecutionPolicy> &exec,
+                  InputIterator1 keys_first,
+                  InputIterator1 keys_last,
+                  InputIterator2 values_first,
+                  OutputIterator1 keys_output,
+                  OutputIterator2 values_output,
+                  BinaryPredicate binary_pred,
+                  BinaryFunction binary_op)
 {
-  using difference_type = thrust::detail::it_difference_t<InputIterator1>;
+  using difference_type = typename thrust::iterator_traits<InputIterator1>::difference_type;
 
   using FlagType = unsigned int; // TODO use difference_type
 
-  // Use the input iterator's value type per https://wg21.link/P0571
-  using ValueType = thrust::detail::it_value_t<InputIterator2>;
+    // Use the input iterator's value type per https://wg21.link/P0571
+    using ValueType = typename thrust::iterator_value<InputIterator2>::type;
 
-  if (keys_first == keys_last)
-  {
-    return thrust::make_pair(keys_output, values_output);
-  }
+    if (keys_first == keys_last)
+        return thrust::make_pair(keys_output, values_output);
 
-  // input size
-  difference_type n = keys_last - keys_first;
+    // input size
+    difference_type n = keys_last - keys_first;
 
-  InputIterator2 values_last = values_first + n;
+    InputIterator2 values_last = values_first + n;
 
   // compute head flags
   thrust::detail::temporary_array<FlagType, ExecutionPolicy> head_flags(exec, n);
@@ -119,77 +108,82 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   thrust::transform(exec, keys_first, keys_last - 1, keys_first + 1, tail_flags.begin(), thrust::not_fn(binary_pred));
   tail_flags[n - 1] = 1;
 
-  // scan the values by flag
-  thrust::detail::temporary_array<ValueType, ExecutionPolicy> scanned_values(exec, n);
-  thrust::detail::temporary_array<FlagType, ExecutionPolicy> scanned_tail_flags(exec, n);
+    // scan the values by flag
+    thrust::detail::temporary_array<ValueType,ExecutionPolicy> scanned_values(exec, n);
+    thrust::detail::temporary_array<FlagType,ExecutionPolicy>  scanned_tail_flags(exec, n);
 
-  thrust::inclusive_scan(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(values_first, head_flags.begin())),
-    thrust::make_zip_iterator(thrust::make_tuple(values_last, head_flags.end())),
-    thrust::make_zip_iterator(thrust::make_tuple(scanned_values.begin(), scanned_tail_flags.begin())),
-    detail::reduce_by_key_functor<ValueType, FlagType, BinaryFunction>(binary_op));
+    thrust::inclusive_scan
+        (exec,
+         thrust::make_zip_iterator(thrust::make_tuple(values_first,           head_flags.begin())),
+         thrust::make_zip_iterator(thrust::make_tuple(values_last,            head_flags.end())),
+         thrust::make_zip_iterator(thrust::make_tuple(scanned_values.begin(), scanned_tail_flags.begin())),
+         detail::reduce_by_key_functor<ValueType, FlagType, BinaryFunction>(binary_op));
 
-  thrust::exclusive_scan(
-    exec, tail_flags.begin(), tail_flags.end(), scanned_tail_flags.begin(), FlagType(0), thrust::plus<FlagType>());
+    thrust::exclusive_scan(exec, tail_flags.begin(), tail_flags.end(), scanned_tail_flags.begin(), FlagType(0), thrust::plus<FlagType>());
 
-  // number of unique keys
-  FlagType N = scanned_tail_flags[n - 1] + 1;
+    // number of unique keys
+    FlagType N = scanned_tail_flags[n - 1] + 1;
 
-  // scatter the keys and accumulated values
-  thrust::scatter_if(exec, keys_first, keys_last, scanned_tail_flags.begin(), head_flags.begin(), keys_output);
-  thrust::scatter_if(
-    exec, scanned_values.begin(), scanned_values.end(), scanned_tail_flags.begin(), tail_flags.begin(), values_output);
+    // scatter the keys and accumulated values
+    thrust::scatter_if(exec, keys_first,            keys_last,             scanned_tail_flags.begin(), head_flags.begin(), keys_output);
+    thrust::scatter_if(exec, scanned_values.begin(), scanned_values.end(), scanned_tail_flags.begin(), tail_flags.begin(), values_output);
 
-  return thrust::make_pair(keys_output + N, values_output + N);
+    return thrust::make_pair(keys_output + N, values_output + N);
 } // end reduce_by_key()
 
-template <typename ExecutionPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+
+template<typename ExecutionPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    reduce_by_key(thrust::execution_policy<ExecutionPolicy> &exec,
+                  InputIterator1 keys_first,
+                  InputIterator1 keys_last,
+                  InputIterator2 values_first,
+                  OutputIterator1 keys_output,
+                  OutputIterator2 values_output)
 {
-  using KeyType = thrust::detail::it_value_t<InputIterator1>;
+  using KeyType = typename thrust::iterator_value<InputIterator1>::type;
 
   // use equal_to<KeyType> as default BinaryPredicate
-  return thrust::reduce_by_key(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, thrust::equal_to<KeyType>());
+  return thrust::reduce_by_key(exec, keys_first, keys_last, values_first, keys_output, values_output, thrust::equal_to<KeyType>());
 } // end reduce_by_key()
 
-template <typename ExecutionPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
-{
-  using T = ::internal::
 
-    If<thrust::detail::is_output_iterator<OutputIterator2>,
-       thrust::detail::it_value_t<InputIterator2>,
-       thrust::detail::it_value_t<OutputIterator2>>;
+template<typename ExecutionPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  thrust::pair<OutputIterator1,OutputIterator2>
+    reduce_by_key(thrust::execution_policy<ExecutionPolicy> &exec,
+                  InputIterator1 keys_first,
+                  InputIterator1 keys_last,
+                  InputIterator2 values_first,
+                  OutputIterator1 keys_output,
+                  OutputIterator2 values_output,
+                  BinaryPredicate binary_pred)
+{
+  using T = typename thrust::detail::eval_if<thrust::detail::is_output_iterator<OutputIterator2>::value,
+                                             thrust::iterator_value<InputIterator2>,
+                                             thrust::iterator_value<OutputIterator2>>::type;
 
   // use plus<T> as default BinaryFunction
-  return thrust::reduce_by_key(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, thrust::plus<T>());
+  return thrust::reduce_by_key(exec,
+                               keys_first, keys_last,
+                               values_first,
+                               keys_output,
+                               values_output,
+                               binary_pred,
+                               thrust::plus<T>());
 } // end reduce_by_key()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/remove.h b/projects/rocthrust/thrust/system/detail/generic/remove.h
index ec58a72ed9fd..95481499e08e 100644
--- a/projects/rocthrust/thrust/system/detail/generic/remove.h
+++ b/projects/rocthrust/thrust/system/detail/generic/remove.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/remove.inl b/projects/rocthrust/thrust/system/detail/generic/remove.inl
index 15ad7543deb8..41744caefcd9 100644
--- a/projects/rocthrust/thrust/system/detail/generic/remove.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/remove.inl
@@ -17,20 +17,12 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/generic/remove.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/detail/copy_if.h>
 #include <thrust/detail/internal_functional.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/remove.h>
-#include <thrust/system/detail/generic/remove.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,9 +32,15 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE ForwardIterator
-remove(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, const T& value)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  ForwardIterator remove(thrust::execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last,
+                         const T &value)
 {
   thrust::detail::equal_to_value<T> pred(value);
 
@@ -50,13 +48,17 @@ remove(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, For
   return thrust::remove_if(exec, first, last, pred);
 } // end remove()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator remove_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  const T& value)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator result,
+                             const T &value)
 {
   thrust::detail::equal_to_value<T> pred(value);
 
@@ -64,63 +66,79 @@ THRUST_HOST_DEVICE OutputIterator remove_copy(
   return thrust::remove_copy_if(exec, first, last, result, pred);
 } // end remove_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator
-remove_if(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator remove_if(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   // create temporary storage for an intermediate result
-  thrust::detail::temporary_array<InputType, DerivedPolicy> temp(exec, first, last);
+  thrust::detail::temporary_array<InputType,DerivedPolicy> temp(exec, first, last);
 
   // remove into temp
   return thrust::remove_copy_if(exec, temp.begin(), temp.end(), temp.begin(), first, pred);
 } // end remove_if()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator remove_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator remove_if(thrust::execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   // create temporary storage for an intermediate result
-  thrust::detail::temporary_array<InputType, DerivedPolicy> temp(exec, first, last);
+  thrust::detail::temporary_array<InputType,DerivedPolicy> temp(exec, first, last);
 
   // remove into temp
   return thrust::remove_copy_if(exec, temp.begin(), temp.end(), stencil, first, pred);
 } // end remove_if()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate>
-THRUST_HOST_DEVICE OutputIterator remove_copy_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy_if(thrust::execution_policy<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                Predicate pred)
 {
   return thrust::remove_copy_if(exec, first, last, first, result, pred);
 } // end remove_copy_if()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-THRUST_HOST_DEVICE OutputIterator remove_copy_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  OutputIterator remove_copy_if(thrust::execution_policy<DerivedPolicy> &exec,
+                                InputIterator1 first,
+                                InputIterator1 last,
+                                InputIterator2 stencil,
+                                OutputIterator result,
+                                Predicate pred)
 {
   return thrust::copy_if(exec, first, last, stencil, result, thrust::not_fn(pred));
 } // end remove_copy_if()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/replace.h b/projects/rocthrust/thrust/system/detail/generic/replace.h
index 1ba06f033e5e..af6abe4b5875 100644
--- a/projects/rocthrust/thrust/system/detail/generic/replace.h
+++ b/projects/rocthrust/thrust/system/detail/generic/replace.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/replace.inl b/projects/rocthrust/thrust/system/detail/generic/replace.inl
index 6ad06e9f4c39..cf9bbec948b9 100644
--- a/projects/rocthrust/thrust/system/detail/generic/replace.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/replace.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/functional.h>
-#include <thrust/replace.h>
 #include <thrust/system/detail/generic/replace.h>
 #include <thrust/transform.h>
+#include <thrust/replace.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,26 +32,27 @@ namespace generic
 namespace detail
 {
 
+
 // this functor receives x, and returns a new_value if predicate(x) is true; otherwise,
 // it returns x
-template <typename Predicate, typename NewType, typename OutputType>
-struct new_value_if
+template<typename Predicate, typename NewType, typename OutputType>
+  struct new_value_if
 {
-  THRUST_HOST_DEVICE new_value_if(Predicate p, NewType nv)
-      : pred(p)
-      , new_value(nv)
-  {}
+  THRUST_HOST_DEVICE
+  new_value_if(Predicate p, NewType nv):pred(p),new_value(nv){}
 
-  template <typename InputType>
-  THRUST_HOST_DEVICE OutputType operator()(const InputType& x) const
+  template<typename InputType>
+  THRUST_HOST_DEVICE
+  OutputType operator()(const InputType &x) const
   {
     return pred(x) ? new_value : x;
   } // end operator()()
 
   // this version of operator()() works like the previous but
   // feeds its second argument to pred
-  template <typename InputType, typename PredicateArgumentType>
-  THRUST_HOST_DEVICE OutputType operator()(const InputType& x, const PredicateArgumentType& y)
+  template<typename InputType, typename PredicateArgumentType>
+  THRUST_HOST_DEVICE
+  OutputType operator()(const InputType &x, const PredicateArgumentType &y)
   {
     return pred(y) ? new_value : x;
   } // end operator()()
@@ -68,16 +61,17 @@ struct new_value_if
   NewType new_value;
 }; // end new_value_if
 
+
 // this unary functor ignores its argument and returns a constant
-template <typename T>
-struct constant_unary
+template<typename T>
+  struct constant_unary
 {
-  THRUST_HOST_DEVICE constant_unary(T _c)
-      : c(_c)
-  {}
+  THRUST_HOST_DEVICE
+  constant_unary(T _c):c(_c){}
 
-  template <typename U>
-  THRUST_HOST_DEVICE T operator()(U&)
+  template<typename U>
+  THRUST_HOST_DEVICE
+  T operator()(U &)
   {
     return c;
   } // end operator()()
@@ -85,96 +79,99 @@ struct constant_unary
   T c;
 }; // end constant_unary
 
-} // namespace detail
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  Predicate pred,
-  const T& new_value)
+} // end detail
+
+
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy_if(thrust::execution_policy<DerivedPolicy> &exec,
+                                 InputIterator first,
+                                 InputIterator last,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
-  using OutputType = thrust::detail::it_value_t<OutputIterator>;
+  using OutputType = typename thrust::iterator_traits<OutputIterator>::value_type;
 
-  detail::new_value_if<Predicate, T, OutputType> op(pred, new_value);
+  detail::new_value_if<Predicate,T,OutputType> op(pred,new_value);
   return thrust::transform(exec, first, last, result, op);
 } // end replace_copy_if()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate,
-          typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred,
-  const T& new_value)
+
+template<typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy_if(thrust::execution_policy<DerivedPolicy> &exec,
+                                 InputIterator1 first,
+                                 InputIterator1 last,
+                                 InputIterator2 stencil,
+                                 OutputIterator result,
+                                 Predicate pred,
+                                 const T &new_value)
 {
-  using OutputType = thrust::detail::it_value_t<OutputIterator>;
+  using OutputType = typename thrust::iterator_traits<OutputIterator>::value_type;
 
-  detail::new_value_if<Predicate, T, OutputType> op(pred, new_value);
+  detail::new_value_if<Predicate,T,OutputType> op(pred,new_value);
   return thrust::transform(exec, first, last, stencil, result, op);
 } // end replace_copy_if()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator replace_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  const T& old_value,
-  const T& new_value)
+
+template<typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename T>
+THRUST_HOST_DEVICE
+  OutputIterator replace_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                              InputIterator first,
+                              InputIterator last,
+                              OutputIterator result,
+                              const T &old_value,
+                              const T &new_value)
 {
   using thrust::placeholders::_1;
 
   return thrust::replace_copy_if(exec, first, last, result, _1 == old_value, new_value);
 } // end replace_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE void replace_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  Predicate pred,
-  const T& new_value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  void replace_if(thrust::execution_policy<DerivedPolicy> &exec,
+                  ForwardIterator first,
+                  ForwardIterator last,
+                  Predicate pred,
+                  const T &new_value)
 {
   detail::constant_unary<T> f(new_value);
   thrust::transform_if(exec, first, last, first, first, f, pred);
 } // end replace_if()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
-THRUST_HOST_DEVICE void replace_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred,
-  const T& new_value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate, typename T>
+THRUST_HOST_DEVICE
+  void replace_if(thrust::execution_policy<DerivedPolicy> &exec,
+                  ForwardIterator first,
+                  ForwardIterator last,
+                  InputIterator stencil,
+                  Predicate pred,
+                  const T &new_value)
 {
   detail::constant_unary<T> f(new_value);
   thrust::transform_if(exec, first, last, stencil, first, f, pred);
 } // end replace_if()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void
-replace(thrust::execution_policy<DerivedPolicy>& exec,
-        ForwardIterator first,
-        ForwardIterator last,
-        const T& old_value,
-        const T& new_value)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void replace(thrust::execution_policy<DerivedPolicy> &exec,
+               ForwardIterator first,
+               ForwardIterator last,
+               const T &old_value,
+               const T &new_value)
 {
   using thrust::placeholders::_1;
 
   return thrust::replace_if(exec, first, last, _1 == old_value, new_value);
 } // end replace()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/reverse.h b/projects/rocthrust/thrust/system/detail/generic/reverse.h
index fca69688c2ba..cc1d495eaf08 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reverse.h
+++ b/projects/rocthrust/thrust/system/detail/generic/reverse.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/reverse.inl b/projects/rocthrust/thrust/system/detail/generic/reverse.inl
index b02a6d76ce83..0f01ab0a37eb 100644
--- a/projects/rocthrust/thrust/system/detail/generic/reverse.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/reverse.inl
@@ -17,21 +17,13 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/generic/reverse.h>
 #include <thrust/advance.h>
-#include <thrust/detail/copy.h>
 #include <thrust/distance.h>
+#include <thrust/detail/copy.h>
+#include <thrust/swap.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/reverse_iterator.h>
-#include <thrust/swap.h>
-#include <thrust/system/detail/generic/reverse.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -41,11 +33,14 @@ namespace detail
 namespace generic
 {
 
-template <typename ExecutionPolicy, typename BidirectionalIterator>
-THRUST_HOST_DEVICE void
-reverse(thrust::execution_policy<ExecutionPolicy>& exec, BidirectionalIterator first, BidirectionalIterator last)
+
+template<typename ExecutionPolicy, typename BidirectionalIterator>
+THRUST_HOST_DEVICE
+  void reverse(thrust::execution_policy<ExecutionPolicy> &exec,
+               BidirectionalIterator first,
+               BidirectionalIterator last)
 {
-  using difference_type = thrust::detail::it_difference_t<BidirectionalIterator>;
+  using difference_type = typename thrust::iterator_difference<BidirectionalIterator>::type;
 
   // find the midpoint of [first,last)
   difference_type N = thrust::distance(first, last);
@@ -56,16 +51,23 @@ reverse(thrust::execution_policy<ExecutionPolicy>& exec, BidirectionalIterator f
   thrust::swap_ranges(exec, first, mid, thrust::make_reverse_iterator(last));
 } // end reverse()
 
-template <typename ExecutionPolicy, typename BidirectionalIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator reverse_copy(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  BidirectionalIterator first,
-  BidirectionalIterator last,
-  OutputIterator result)
+
+template<typename ExecutionPolicy,
+         typename BidirectionalIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator reverse_copy(thrust::execution_policy<ExecutionPolicy> &exec,
+                              BidirectionalIterator first,
+                              BidirectionalIterator last,
+                              OutputIterator result)
 {
-  return thrust::copy(exec, thrust::make_reverse_iterator(last), thrust::make_reverse_iterator(first), result);
+  return thrust::copy(exec,
+                      thrust::make_reverse_iterator(last),
+                      thrust::make_reverse_iterator(first),
+                      result);
 } // end reverse_copy()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.h b/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
index e37330fa95df..aacf64707bbd 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
+++ b/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl b/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
index c0dae758c97c..57c4cd777ed8 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/scalar/binary_search.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/pair.h>
 #include <thrust/detail/function.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -43,18 +35,24 @@ namespace generic
 namespace scalar
 {
 
-template <typename RandomAccessIterator, typename Size, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE RandomAccessIterator
-lower_bound_n(RandomAccessIterator first, Size n, const T& val, BinaryPredicate comp)
+template<typename RandomAccessIterator, typename Size, typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+RandomAccessIterator lower_bound_n(RandomAccessIterator first,
+                                   Size n,
+                                   const T &val,
+                                   BinaryPredicate comp)
 {
   // wrap comp
-  thrust::detail::wrapped_function<BinaryPredicate, bool> wrapped_comp{comp};
+  thrust::detail::wrapped_function<
+    BinaryPredicate,
+    bool
+  > wrapped_comp{comp};
 
   Size start = 0, i;
-  while (start < n)
+  while(start < n)
   {
-    i = start + (n - start) / 2; // Overflow-safe variant of (a+b)/2
-    if (wrapped_comp(first[i], val))
+    i = start + (n - start) / 2;  // Overflow-safe variant of (a+b)/2
+    if(wrapped_comp(first[i], val))
     {
       start = i + 1;
     }
@@ -69,26 +67,34 @@ lower_bound_n(RandomAccessIterator first, Size n, const T& val, BinaryPredicate
 
 // XXX generalize these upon implementation of scalar::distance & scalar::advance
 
-template <typename RandomAccessIterator, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE RandomAccessIterator
-lower_bound(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp)
+template<typename RandomAccessIterator, typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+RandomAccessIterator lower_bound(RandomAccessIterator first, RandomAccessIterator last,
+                                 const T &val,
+                                 BinaryPredicate comp)
 {
-  thrust::detail::it_difference_t<RandomAccessIterator> n = last - first;
+  typename thrust::iterator_difference<RandomAccessIterator>::type n = last - first;
   return lower_bound_n(first, n, val, comp);
 }
 
-template <typename RandomAccessIterator, typename Size, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE RandomAccessIterator
-upper_bound_n(RandomAccessIterator first, Size n, const T& val, BinaryPredicate comp)
+template<typename RandomAccessIterator, typename Size, typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+RandomAccessIterator upper_bound_n(RandomAccessIterator first,
+                                   Size n,
+                                   const T &val,
+                                   BinaryPredicate comp)
 {
   // wrap comp
-  thrust::detail::wrapped_function<BinaryPredicate, bool> wrapped_comp{comp};
+  thrust::detail::wrapped_function<
+    BinaryPredicate,
+    bool
+  > wrapped_comp{comp};
 
   Size start = 0, i;
-  while (start < n)
+  while(start < n)
   {
-    i = start + (n - start) / 2; // Overflow-safe variant of (a+b)/2
-    if (wrapped_comp(val, first[i]))
+    i = start + (n - start) / 2;  // Overflow-safe variant of (a+b)/2
+    if(wrapped_comp(val, first[i]))
     {
       n = i;
     }
@@ -101,40 +107,50 @@ upper_bound_n(RandomAccessIterator first, Size n, const T& val, BinaryPredicate
   return first + start;
 }
 
-template <typename RandomAccessIterator, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE RandomAccessIterator
-upper_bound(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp)
+template<typename RandomAccessIterator, typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+RandomAccessIterator upper_bound(RandomAccessIterator first, RandomAccessIterator last,
+                                 const T &val,
+                                 BinaryPredicate comp)
 {
-  thrust::detail::it_difference_t<RandomAccessIterator> n = last - first;
+  typename thrust::iterator_difference<RandomAccessIterator>::type n = last - first;
   return upper_bound_n(first, n, val, comp);
 }
 
-template <typename RandomAccessIterator, typename T, typename BinaryPredicate>
-THRUST_HOST_DEVICE pair<RandomAccessIterator, RandomAccessIterator>
-equal_range(RandomAccessIterator first, RandomAccessIterator last, const T& val, BinaryPredicate comp)
+template<typename RandomAccessIterator, typename T, typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  pair<RandomAccessIterator,RandomAccessIterator>
+    equal_range(RandomAccessIterator first, RandomAccessIterator last,
+                const T &val,
+                BinaryPredicate comp)
 {
   RandomAccessIterator lb = thrust::system::detail::generic::scalar::lower_bound(first, last, val, comp);
   return thrust::make_pair(lb, thrust::system::detail::generic::scalar::upper_bound(lb, last, val, comp));
 }
 
-template <typename RandomAccessIterator, typename T, typename Compare>
-THRUST_HOST_DEVICE bool binary_search(RandomAccessIterator first, RandomAccessIterator last, const T& value, Compare comp)
+
+template<typename RandomAccessIterator, typename T, typename Compare>
+THRUST_HOST_DEVICE
+bool binary_search(RandomAccessIterator first, RandomAccessIterator last, const T &value, Compare comp)
 {
   RandomAccessIterator iter = thrust::system::detail::generic::scalar::lower_bound(first, last, value, comp);
 
   // wrap comp
-  thrust::detail::wrapped_function<Compare, bool> wrapped_comp{comp};
+  thrust::detail::wrapped_function<
+    Compare,
+    bool
+  > wrapped_comp{comp};
 
-  return iter != last && !wrapped_comp(value, *iter);
+  return iter != last && !wrapped_comp(value,*iter);
 }
 
-} // namespace scalar
+} // end scalar
 
-} // namespace generic
+} // end generic
 
-} // namespace detail
+} // end detail
 
-} // namespace system
+} // end system
 
 THRUST_NAMESPACE_END
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/scan.h b/projects/rocthrust/thrust/system/detail/generic/scan.h
index 52b2ae872b3e..e0718806810a 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scan.h
+++ b/projects/rocthrust/thrust/system/detail/generic/scan.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/scan.inl b/projects/rocthrust/thrust/system/detail/generic/scan.inl
index 3c8f61b7ba55..d1984c4b9bd6 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scan.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/scan.inl
@@ -14,23 +14,17 @@
  *  limitations under the License.
  */
 
+
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/static_assert.h>
-#include <thrust/detail/type_traits.h>
-#include <thrust/functional.h>
+#include <thrust/system/detail/generic/scan.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/scan.h>
-#include <thrust/system/detail/generic/scan.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/iterator/is_output_iterator.h>
+#include <thrust/functional.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,51 +34,92 @@ namespace detail
 namespace generic
 {
 
-template <typename ExecutionPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan(
-  thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result)
+
+template<typename ExecutionPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan(thrust::execution_policy<ExecutionPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   // assume plus as the associative operator
   return thrust::inclusive_scan(exec, first, last, result, thrust::plus<>());
 } // end inclusive_scan()
 
-template <typename ExecutionPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result)
+
+template<typename ExecutionPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(thrust::execution_policy<ExecutionPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result)
 {
   // Use the input iterator's value type per https://wg21.link/P0571
-  using ValueType = thrust::detail::it_value_t<InputIterator>;
+  using ValueType = typename thrust::iterator_value<InputIterator>::type;
   return thrust::exclusive_scan(exec, first, last, result, ValueType{});
 } // end exclusive_scan()
 
-template <typename ExecutionPolicy, typename InputIterator, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  T init)
+
+template<typename ExecutionPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(thrust::execution_policy<ExecutionPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                T init)
 {
   // assume plus as the associative operator
   return thrust::exclusive_scan(exec, first, last, result, init, thrust::plus<>());
 } // end exclusive_scan()
 
-template <typename ExecutionPolicy, typename InputIterator, typename OutputIterator, typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan(
-  thrust::execution_policy<ExecutionPolicy>&, InputIterator, InputIterator, OutputIterator result, BinaryFunction)
+
+template<typename ExecutionPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan(thrust::execution_policy<ExecutionPolicy> &,
+                                InputIterator,
+                                InputIterator,
+                                OutputIterator result,
+                                BinaryFunction)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end inclusive_scan
 
-template <typename ExecutionPolicy, typename InputIterator, typename OutputIterator, typename T, typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan(
-  thrust::execution_policy<ExecutionPolicy>&, InputIterator, InputIterator, OutputIterator result, T, BinaryFunction)
+
+template<typename ExecutionPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename T,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan(thrust::execution_policy<ExecutionPolicy> &,
+                                InputIterator,
+                                InputIterator,
+                                OutputIterator result,
+                                T,
+                                BinaryFunction)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end exclusive_scan()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/scan_by_key.h b/projects/rocthrust/thrust/system/detail/generic/scan_by_key.h
index 884b8e1faac5..281ab0d15f92 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/generic/scan_by_key.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/scan_by_key.inl b/projects/rocthrust/thrust/system/detail/generic/scan_by_key.inl
index 16f0585fa349..1beb621146ba 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scan_by_key.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/scan_by_key.inl
@@ -17,23 +17,15 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
-#include <thrust/detail/temporary_array.h>
+#include <thrust/system/detail/generic/scan_by_key.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/zip_iterator.h>
+#include <thrust/transform.h>
 #include <thrust/replace.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/detail/temporary_array.h>
+#include <thrust/detail/internal_functional.h>
 #include <thrust/scan.h>
-#include <thrust/system/detail/generic/scan_by_key.h>
-#include <thrust/transform.h>
 
 #include <cstdint>
 
@@ -47,6 +39,7 @@ namespace generic
 namespace detail
 {
 
+
 template <typename OutputType, typename HeadFlagType, typename AssociativeOperator>
 struct segmented_scan_functor
 {
@@ -54,67 +47,74 @@ struct segmented_scan_functor
 
   using result_type = typename thrust::tuple<OutputType, HeadFlagType>;
 
-  THRUST_HOST_DEVICE segmented_scan_functor(AssociativeOperator _binary_op)
-      : binary_op(_binary_op)
-  {}
+  THRUST_HOST_DEVICE
+  segmented_scan_functor(AssociativeOperator _binary_op) : binary_op(_binary_op) {}
 
-  THRUST_HOST_DEVICE result_type operator()(result_type a, result_type b)
+  THRUST_HOST_DEVICE
+  result_type operator()(result_type a, result_type b)
   {
     return result_type(thrust::get<1>(b) ? thrust::get<0>(b) : binary_op(thrust::get<0>(a), thrust::get<0>(b)),
                        thrust::get<1>(a) | thrust::get<1>(b));
   }
 };
 
+
 } // end namespace detail
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
   return thrust::inclusive_scan_by_key(exec, first1, last1, first2, result, thrust::equal_to<>());
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred)
 {
   return thrust::inclusive_scan_by_key(exec, first1, last1, first2, result, binary_pred, thrust::plus<>());
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator inclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
-  using OutputType   = thrust::detail::it_value_t<InputIterator2>;
+  using OutputType = typename thrust::iterator_traits<InputIterator2>::value_type;
   using HeadFlagType = std::uint8_t;
 
   const size_t n = last1 - first1;
 
-  if (n != 0)
+  if(n != 0)
   {
     // compute head flags
     thrust::detail::temporary_array<HeadFlagType, DerivedPolicy> flags(exec, n);
@@ -126,82 +126,92 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
     //    S. Sengupta, M. Harris, and M. Garland. "Efficient parallel scan algorithms for GPUs"
     //    NVIDIA Technical Report NVR-2008-003, December 2008
     //    http://mgarland.org/files/papers/nvr-2008-003.pdf
-    thrust::inclusive_scan(
-      exec,
-      thrust::make_zip_iterator(thrust::make_tuple(first2, flags.begin())),
-      thrust::make_zip_iterator(thrust::make_tuple(first2, flags.begin())) + n,
-      thrust::make_zip_iterator(thrust::make_tuple(result, flags.begin())),
-      detail::segmented_scan_functor<OutputType, HeadFlagType, AssociativeOperator>(binary_op));
+    thrust::inclusive_scan(exec,
+                           thrust::make_zip_iterator(thrust::make_tuple(first2, flags.begin())),
+                           thrust::make_zip_iterator(thrust::make_tuple(first2, flags.begin())) + n,
+                           thrust::make_zip_iterator(thrust::make_tuple(result, flags.begin())),
+                           detail::segmented_scan_functor<OutputType, HeadFlagType, AssociativeOperator>(binary_op));
   }
 
   return result + n;
 }
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result)
 {
-  using InitType = thrust::detail::it_value_t<InputIterator2>;
+  using InitType = typename thrust::iterator_traits<InputIterator2>::value_type;
   return thrust::exclusive_scan_by_key(exec, first1, last1, first2, result, InitType{});
 }
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator, typename T>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init)
 {
   return thrust::exclusive_scan_by_key(exec, first1, last1, first2, result, init, thrust::equal_to<>());
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename T,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred)
 {
   return thrust::exclusive_scan_by_key(exec, first1, last1, first2, result, init, binary_pred, thrust::plus<>());
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename T,
-          typename BinaryPredicate,
-          typename AssociativeOperator>
-THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  T init,
-  BinaryPredicate binary_pred,
-  AssociativeOperator binary_op)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename T,
+         typename BinaryPredicate,
+         typename AssociativeOperator>
+THRUST_HOST_DEVICE
+  OutputIterator exclusive_scan_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                       InputIterator1 first1,
+                                       InputIterator1 last1,
+                                       InputIterator2 first2,
+                                       OutputIterator result,
+                                       T init,
+                                       BinaryPredicate binary_pred,
+                                       AssociativeOperator binary_op)
 {
-  using OutputType   = T;
+  using OutputType = T;
   using HeadFlagType = std::uint8_t;
 
   const size_t n = last1 - first1;
 
-  if (n != 0)
+  if(n != 0)
   {
     InputIterator2 last2 = first2 + n;
 
@@ -211,9 +221,8 @@ THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
     thrust::transform(exec, first1, last1 - 1, first1 + 1, flags.begin() + 1, thrust::not_fn(binary_pred));
 
     // shift input one to the right and initialize segments with init
-    thrust::detail::temporary_array<OutputType, DerivedPolicy> temp(exec, n);
-    thrust::replace_copy_if(
-      exec, first2, last2 - 1, flags.begin() + 1, temp.begin() + 1, thrust::negate<HeadFlagType>(), init);
+    thrust::detail::temporary_array<OutputType,DerivedPolicy> temp(exec, n);
+    thrust::replace_copy_if(exec, first2, last2 - 1, flags.begin() + 1, temp.begin() + 1, thrust::negate<HeadFlagType>(), init);
     temp[0] = init;
 
     // scan key-flag tuples,
@@ -221,17 +230,17 @@ THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
     //    S. Sengupta, M. Harris, and M. Garland. "Efficient parallel scan algorithms for GPUs"
     //    NVIDIA Technical Report NVR-2008-003, December 2008
     //    http://mgarland.org/files/papers/nvr-2008-003.pdf
-    thrust::inclusive_scan(
-      exec,
-      thrust::make_zip_iterator(thrust::make_tuple(temp.begin(), flags.begin())),
-      thrust::make_zip_iterator(thrust::make_tuple(temp.begin(), flags.begin())) + n,
-      thrust::make_zip_iterator(thrust::make_tuple(result, flags.begin())),
-      detail::segmented_scan_functor<OutputType, HeadFlagType, AssociativeOperator>(binary_op));
+    thrust::inclusive_scan(exec,
+                           thrust::make_zip_iterator(thrust::make_tuple(temp.begin(), flags.begin())),
+                           thrust::make_zip_iterator(thrust::make_tuple(temp.begin(), flags.begin())) + n,
+                           thrust::make_zip_iterator(thrust::make_tuple(result,       flags.begin())),
+                           detail::segmented_scan_functor<OutputType, HeadFlagType, AssociativeOperator>(binary_op));
   }
 
   return result + n;
 }
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/scatter.h b/projects/rocthrust/thrust/system/detail/generic/scatter.h
index 75bea804b0b6..0c44fa49f444 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scatter.h
+++ b/projects/rocthrust/thrust/system/detail/generic/scatter.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/scatter.inl b/projects/rocthrust/thrust/system/detail/generic/scatter.inl
index 8f5ba26f739e..7b7e620e4bcb 100644
--- a/projects/rocthrust/thrust/system/detail/generic/scatter.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/scatter.inl
@@ -26,7 +26,6 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/copy.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/permutation_iterator.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/select_system.h b/projects/rocthrust/thrust/system/detail/generic/select_system.h
index 584b32d6001a..2f6db9c35743 100644
--- a/projects/rocthrust/thrust/system/detail/generic/select_system.h
+++ b/projects/rocthrust/thrust/system/detail/generic/select_system.h
@@ -19,13 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/any_system_tag.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/select_system_exists.h b/projects/rocthrust/thrust/system/detail/generic/select_system_exists.h
index cfb6e23df996..7d3fdc7220be 100644
--- a/projects/rocthrust/thrust/system/detail/generic/select_system_exists.h
+++ b/projects/rocthrust/thrust/system/detail/generic/select_system_exists.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
 // forward declaration of any_system_tag for any_conversion below
diff --git a/projects/rocthrust/thrust/system/detail/generic/sequence.h b/projects/rocthrust/thrust/system/detail/generic/sequence.h
index febcd7df0e98..90497e859235 100644
--- a/projects/rocthrust/thrust/system/detail/generic/sequence.h
+++ b/projects/rocthrust/thrust/system/detail/generic/sequence.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/sequence.inl b/projects/rocthrust/thrust/system/detail/generic/sequence.inl
index 0cbe55c0bbcd..17859265399e 100644
--- a/projects/rocthrust/thrust/system/detail/generic/sequence.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/sequence.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/sequence.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/tabulate.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -37,18 +29,25 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE void
-sequence(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  void sequence(thrust::execution_policy<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last)
 {
-  using T = thrust::detail::it_value_t<ForwardIterator>;
+  using T = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   thrust::sequence(exec, first, last, T(0));
 } // end sequence()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void
-sequence(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, T init)
+
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void sequence(thrust::execution_policy<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                T init)
 {
   thrust::sequence(exec, first, last, init, T(1));
 } // end sequence()
@@ -62,7 +61,8 @@ struct compute_sequence_value
   T step;
 
   THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE T operator()(std::size_t i) const
+  THRUST_HOST_DEVICE
+  T operator()(std::size_t i) const
   {
     return init + step * i;
   }
@@ -74,20 +74,31 @@ struct compute_sequence_value<T, typename std::enable_if<std::is_arithmetic<T>::
   T step;
 
   THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE T operator()(std::size_t i) const
+  THRUST_HOST_DEVICE
+  T operator()(std::size_t i) const
   {
     return init + step * static_cast<T>(i);
   }
 };
-} // namespace detail
+}
 
-template <typename DerivedPolicy, typename ForwardIterator, typename T>
-THRUST_HOST_DEVICE void
-sequence(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, T init, T step)
+template<typename DerivedPolicy, typename ForwardIterator, typename T>
+THRUST_HOST_DEVICE
+  void sequence(thrust::execution_policy<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                T init,
+                T step)
 {
-  thrust::tabulate(exec, first, last, detail::compute_sequence_value<T>{std::move(init), std::move(step)});
+
+  thrust::tabulate(exec,
+                   first,
+                   last,
+                   detail::compute_sequence_value<T>{std::move(init),
+                                                     std::move(step)});
 } // end sequence()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/set_operations.h b/projects/rocthrust/thrust/system/detail/generic/set_operations.h
index 5915b5fce9ee..af9fc6fe5c5a 100644
--- a/projects/rocthrust/thrust/system/detail/generic/set_operations.h
+++ b/projects/rocthrust/thrust/system/detail/generic/set_operations.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/set_operations.inl b/projects/rocthrust/thrust/system/detail/generic/set_operations.inl
index 27009b084637..86e38af93eb6 100644
--- a/projects/rocthrust/thrust/system/detail/generic/set_operations.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/set_operations.inl
@@ -17,21 +17,13 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
 #include <thrust/detail/static_assert.h>
+#include <thrust/system/detail/generic/set_operations.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/constant_iterator.h>
+#include <thrust/detail/internal_functional.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/system/detail/generic/set_operations.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -41,70 +33,68 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_difference(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_difference(thrust::execution_policy<DerivedPolicy> &exec,
+                              InputIterator1                           first1,
+                              InputIterator1                           last1,
+                              InputIterator2                           first2,
+                              InputIterator2                           last2,
+                              OutputIterator                           result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
   return thrust::set_difference(exec, first1, last1, first2, last2, result, thrust::less<value_type>());
 } // end set_difference()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_difference_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                        InputIterator1                           keys_first1,
+                        InputIterator1                           keys_last1,
+                        InputIterator2                           keys_first2,
+                        InputIterator2                           keys_last2,
+                        InputIterator3                           values_first1,
+                        InputIterator4                           values_first2,
+                        OutputIterator1                          keys_result,
+                        OutputIterator2                          values_result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::set_difference_by_key(
-    exec,
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::set_difference_by_key(exec, keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, thrust::less<value_type>());
 } // end set_difference_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_difference_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                        InputIterator1                           keys_first1,
+                        InputIterator1                           keys_last1,
+                        InputIterator2                           keys_first2,
+                        InputIterator2                           keys_last2,
+                        InputIterator3                           values_first1,
+                        InputIterator4                           values_first2,
+                        OutputIterator1                          keys_result,
+                        OutputIterator2                          values_result,
+                        StrictWeakOrdering                       comp)
 {
   using iterator_tuple1 = thrust::tuple<InputIterator1, InputIterator3>;
   using iterator_tuple2 = thrust::tuple<InputIterator2, InputIterator4>;
@@ -124,74 +114,71 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_difference
 
   thrust::detail::compare_first<StrictWeakOrdering> comp_first(comp);
 
-  iterator_tuple3 result =
-    thrust::set_difference(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
-      .get_iterator_tuple();
+  iterator_tuple3 result = thrust::set_difference(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first).get_iterator_tuple();
 
   return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_difference_by_key()
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_intersection(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_intersection(thrust::execution_policy<DerivedPolicy> &exec,
+                                InputIterator1                           first1,
+                                InputIterator1                           last1,
+                                InputIterator2                           first2,
+                                InputIterator2                           last2,
+                                OutputIterator                           result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
   return thrust::set_intersection(exec, first1, last1, first2, last2, result, thrust::less<value_type>());
 } // end set_intersection()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_intersection_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                          InputIterator1                           keys_first1,
+                          InputIterator1                           keys_last1,
+                          InputIterator2                           keys_first2,
+                          InputIterator2                           keys_last2,
+                          InputIterator3                           values_first1,
+                          OutputIterator1                          keys_result,
+                          OutputIterator2                          values_result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::set_intersection_by_key(
-    exec,
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    keys_result,
-    values_result,
-    thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::set_intersection_by_key(exec, keys_first1, keys_last1, keys_first2, keys_last2, values_first1, keys_result, values_result, thrust::less<value_type>());
 } // end set_intersection_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersection_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_intersection_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                          InputIterator1                           keys_first1,
+                          InputIterator1                           keys_last1,
+                          InputIterator2                           keys_first2,
+                          InputIterator2                           keys_last2,
+                          InputIterator3                           values_first1,
+                          OutputIterator1                          keys_result,
+                          OutputIterator2                          values_result,
+                          StrictWeakOrdering                       comp)
 {
-  using value_type1       = thrust::detail::it_value_t<InputIterator3>;
+  using value_type1       = typename thrust::iterator_value<InputIterator3>::type;
   using constant_iterator = thrust::constant_iterator<value_type1>;
 
   using iterator_tuple1 = thrust::tuple<InputIterator1, InputIterator3>;
@@ -216,77 +203,73 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_intersecti
 
   thrust::detail::compare_first<StrictWeakOrdering> comp_first(comp);
 
-  iterator_tuple3 result =
-    thrust::set_intersection(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
-      .get_iterator_tuple();
+  iterator_tuple3 result = thrust::set_intersection(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first).get_iterator_tuple();
 
   return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_intersection_by_key()
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_symmetric_difference(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_symmetric_difference(thrust::execution_policy<DerivedPolicy> &exec,
+                                        InputIterator1                           first1,
+                                        InputIterator1                           last1,
+                                        InputIterator2                           first2,
+                                        InputIterator2                           last2,
+                                        OutputIterator                           result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
   return thrust::set_symmetric_difference(exec, first1, last1, first2, last2, result, thrust::less<value_type>());
 } // end set_symmetric_difference()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_symmetric_difference_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                  InputIterator1                           keys_first1,
+                                  InputIterator1                           keys_last1,
+                                  InputIterator2                           keys_first2,
+                                  InputIterator2                           keys_last2,
+                                  InputIterator3                           values_first1,
+                                  InputIterator4                           values_first2,
+                                  OutputIterator1                          keys_result,
+                                  OutputIterator2                          values_result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::set_symmetric_difference_by_key(
-    exec,
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::set_symmetric_difference_by_key(exec, keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, thrust::less<value_type>());
 } // end set_symmetric_difference_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_difference_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_symmetric_difference_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                                  InputIterator1                           keys_first1,
+                                  InputIterator1                           keys_last1,
+                                  InputIterator2                           keys_first2,
+                                  InputIterator2                           keys_last2,
+                                  InputIterator3                           values_first1,
+                                  InputIterator4                           values_first2,
+                                  OutputIterator1                          keys_result,
+                                  OutputIterator2                          values_result,
+                                  StrictWeakOrdering                       comp)
 {
   using iterator_tuple1 = thrust::tuple<InputIterator1, InputIterator3>;
   using iterator_tuple2 = thrust::tuple<InputIterator2, InputIterator4>;
@@ -306,78 +289,73 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_symmetric_
 
   thrust::detail::compare_first<StrictWeakOrdering> comp_first(comp);
 
-  iterator_tuple3 result =
-    thrust::set_symmetric_difference(
-      exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
-      .get_iterator_tuple();
+  iterator_tuple3 result = thrust::set_symmetric_difference(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first).get_iterator_tuple();
 
   return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_symmetric_difference_by_key()
 
-template <typename DerivedPolicy, typename InputIterator1, typename InputIterator2, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator set_union(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+OutputIterator set_union(thrust::execution_policy<DerivedPolicy> &exec,
+                         InputIterator1                           first1,
+                         InputIterator1                           last1,
+                         InputIterator2                           first2,
+                         InputIterator2                           last2,
+                         OutputIterator                           result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
   return thrust::set_union(exec, first1, last1, first2, last2, result, thrust::less<value_type>());
 } // end set_union()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_union_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                   InputIterator1                           keys_first1,
+                   InputIterator1                           keys_last1,
+                   InputIterator2                           keys_first2,
+                   InputIterator2                           keys_last2,
+                   InputIterator3                           values_first1,
+                   InputIterator4                           values_first2,
+                   OutputIterator1                          keys_result,
+                   OutputIterator2                          values_result)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::set_union_by_key(
-    exec,
-    keys_first1,
-    keys_last1,
-    keys_first2,
-    keys_last2,
-    values_first1,
-    values_first2,
-    keys_result,
-    values_result,
-    thrust::less<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator1>::type;
+  return thrust::set_union_by_key(exec, keys_first1, keys_last1, keys_first2, keys_last2, values_first1, values_first2, keys_result, values_result, thrust::less<value_type>());
 } // end set_union_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  set_union_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                   InputIterator1                           keys_first1,
+                   InputIterator1                           keys_last1,
+                   InputIterator2                           keys_first2,
+                   InputIterator2                           keys_last2,
+                   InputIterator3                           values_first1,
+                   InputIterator4                           values_first2,
+                   OutputIterator1                          keys_result,
+                   OutputIterator2                          values_result,
+                   StrictWeakOrdering                       comp)
 {
   using iterator_tuple1 = thrust::tuple<InputIterator1, InputIterator3>;
   using iterator_tuple2 = thrust::tuple<InputIterator2, InputIterator4>;
@@ -397,85 +375,100 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> set_union_by_k
 
   thrust::detail::compare_first<StrictWeakOrdering> comp_first(comp);
 
-  iterator_tuple3 result =
-    thrust::set_union(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first)
-      .get_iterator_tuple();
+  iterator_tuple3 result = thrust::set_union(exec, zipped_first1, zipped_last1, zipped_first2, zipped_last2, zipped_result, comp_first).get_iterator_tuple();
 
   return thrust::make_pair(thrust::get<0>(result), thrust::get<1>(result));
 } // end set_union_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator set_difference(
-  thrust::execution_policy<DerivedPolicy>&,
-  InputIterator1,
-  InputIterator1,
-  InputIterator2,
-  InputIterator2,
-  OutputIterator result,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator set_difference(thrust::execution_policy<DerivedPolicy> &,
+                              InputIterator1,
+                              InputIterator1,
+                              InputIterator2,
+                              InputIterator2,
+                              OutputIterator  result,
+                              StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator1, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end set_difference()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator set_intersection(
-  thrust::execution_policy<DerivedPolicy>&,
-  InputIterator1,
-  InputIterator1,
-  InputIterator2,
-  InputIterator2,
-  OutputIterator result,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator set_intersection(thrust::execution_policy<DerivedPolicy> &,
+                                InputIterator1,
+                                InputIterator1,
+                                InputIterator2,
+                                InputIterator2,
+                                OutputIterator result,
+                                StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator1, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end set_intersection()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator set_symmetric_difference(
-  thrust::execution_policy<DerivedPolicy>&,
-  InputIterator1,
-  InputIterator1,
-  InputIterator2,
-  InputIterator2,
-  OutputIterator result,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator set_symmetric_difference(thrust::execution_policy<DerivedPolicy> &,
+                                        InputIterator1,
+                                        InputIterator1,
+                                        InputIterator2,
+                                        InputIterator2,
+                                        OutputIterator result,
+                                        StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator1, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end set_symmetric_difference()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator set_union(
-  thrust::execution_policy<DerivedPolicy>&,
-  InputIterator1,
-  InputIterator1,
-  InputIterator2,
-  InputIterator2,
-  OutputIterator result,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator set_union(thrust::execution_policy<DerivedPolicy> &,
+                         InputIterator1,
+                         InputIterator1,
+                         InputIterator2,
+                         InputIterator2,
+                         OutputIterator result,
+                         StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<InputIterator1, false>::value, "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<InputIterator1, false>::value)
+  , "unimplemented for this system"
+  );
   return result;
 } // end set_union()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/shuffle.h b/projects/rocthrust/thrust/system/detail/generic/shuffle.h
index 5e6603cc1023..5efa9cb8b291 100644
--- a/projects/rocthrust/thrust/system/detail/generic/shuffle.h
+++ b/projects/rocthrust/thrust/system/detail/generic/shuffle.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/shuffle.inl b/projects/rocthrust/thrust/system/detail/generic/shuffle.inl
index 7d258da752cc..4eb491214c27 100644
--- a/projects/rocthrust/thrust/system/detail/generic/shuffle.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/shuffle.inl
@@ -15,7 +15,6 @@
  */
 
 #include <thrust/detail/config.h>
-
 #include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
@@ -27,26 +26,20 @@
 #include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
-namespace system
-{
-namespace detail
-{
-namespace generic
-{
+namespace system {
+namespace detail {
+namespace generic {
 
 // An implementation of a Feistel cipher for operating on 64 bit keys
-class feistel_bijection
-{
-  struct round_state
-  {
+class feistel_bijection {
+  struct round_state {
     std::uint32_t left;
     std::uint32_t right;
   };
 
-public:
+ public:
   template <class URBG>
-  THRUST_HOST_DEVICE feistel_bijection(std::uint64_t m, URBG&& g)
-  {
+  THRUST_HOST_DEVICE feistel_bijection(std::uint64_t m, URBG&& g) {
     std::uint64_t total_bits = get_cipher_bits(m);
     // Half bits rounded down
     left_side_bits = total_bits / 2;
@@ -55,54 +48,45 @@ public:
     right_side_bits = total_bits - left_side_bits;
     right_side_mask = (1ull << right_side_bits) - 1;
 
-    for (std::uint32_t i = 0; i < num_rounds; i++)
-    {
+    for (std::uint32_t i = 0; i < num_rounds; i++) {
       key[i] = g();
     }
   }
 
-  THRUST_HOST_DEVICE std::uint64_t nearest_power_of_two() const
-  {
+  THRUST_HOST_DEVICE std::uint64_t nearest_power_of_two() const {
     return 1ull << (left_side_bits + right_side_bits);
   }
 
-  THRUST_HOST_DEVICE std::uint64_t operator()(const std::uint64_t val) const
-  {
-    std::uint32_t state[2] = {static_cast<std::uint32_t>(val >> right_side_bits),
-                              static_cast<std::uint32_t>(val & right_side_mask)};
-    for (std::uint32_t i = 0; i < num_rounds; i++)
+  THRUST_HOST_DEVICE std::uint64_t operator()(const std::uint64_t val) const {
+    std::uint32_t state[2] = { static_cast<std::uint32_t>( val >> right_side_bits ), static_cast<std::uint32_t>( val & right_side_mask ) };
+    for( std::uint32_t i = 0; i < num_rounds; i++ )
     {
-      std::uint32_t hi, lo;
-      constexpr std::uint64_t M0 = UINT64_C(0xD2B74407B1CE6E93);
-      mulhilo(M0, state[0], hi, lo);
-      lo       = (lo << (right_side_bits - left_side_bits)) | state[1] >> left_side_bits;
-      state[0] = ((hi ^ key[i]) ^ state[1]) & left_side_mask;
-      state[1] = lo & right_side_mask;
+        std::uint32_t hi, lo;
+        constexpr std::uint64_t M0 = UINT64_C( 0xD2B74407B1CE6E93 );
+        mulhilo( M0, state[0], hi, lo );
+        lo = ( lo << ( right_side_bits - left_side_bits ) ) | state[1] >> left_side_bits;
+        state[0] = ( ( hi ^ key[i] ) ^ state[1] ) & left_side_mask;
+        state[1] = lo & right_side_mask;
     }
     // Combine the left and right sides together to get result
     return (static_cast<std::uint64_t>(state[0]) << right_side_bits) | static_cast<std::uint64_t>(state[1]);
   }
 
-private:
-  // Perform 64 bit multiplication and save result in two 32 bit int
-  static THRUST_HOST_DEVICE void mulhilo(std::uint64_t a, std::uint64_t b, std::uint32_t& hi, std::uint32_t& lo)
-  {
-    std::uint64_t product = a * b;
-    hi                    = static_cast<std::uint32_t>(product >> 32);
-    lo                    = static_cast<std::uint32_t>(product);
-  }
+ private:
+   // Perform 64 bit multiplication and save result in two 32 bit int
+   static THRUST_HOST_DEVICE void mulhilo( std::uint64_t a, std::uint64_t b, std::uint32_t& hi, std::uint32_t& lo )
+   {
+       std::uint64_t product = a * b;
+       hi = static_cast<std::uint32_t>( product >> 32 );
+       lo = static_cast<std::uint32_t>( product );
+   }
 
   // Find the nearest power of two
-  static THRUST_HOST_DEVICE std::uint64_t get_cipher_bits(std::uint64_t m)
-  {
-    if (m <= 16)
-    {
-      return 4;
-    }
+  static THRUST_HOST_DEVICE std::uint64_t get_cipher_bits(std::uint64_t m) {
+    if (m <= 16) return 4;
     std::uint64_t i = 0;
     m--;
-    while (m != 0)
-    {
+    while (m != 0) {
       i++;
       m >>= 1;
     }
@@ -117,75 +101,65 @@ private:
   std::uint32_t key[num_rounds];
 };
 
-struct key_flag_tuple
-{
+struct key_flag_tuple {
   std::uint64_t key;
   std::uint64_t flag;
 };
 
 // scan only flags
-struct key_flag_scan_op
-{
-  THRUST_HOST_DEVICE key_flag_tuple operator()(const key_flag_tuple& a, const key_flag_tuple& b)
-  {
+struct key_flag_scan_op {
+  THRUST_HOST_DEVICE key_flag_tuple operator()(const key_flag_tuple& a,
+                                                const key_flag_tuple& b) {
     return {b.key, a.flag + b.flag};
   }
 };
 
-struct construct_key_flag_op
-{
+struct construct_key_flag_op {
   std::uint64_t m;
   feistel_bijection bijection;
-  THRUST_HOST_DEVICE construct_key_flag_op(std::uint64_t m, feistel_bijection bijection)
-      : m(m)
-      , bijection(bijection)
-  {}
-  THRUST_HOST_DEVICE key_flag_tuple operator()(std::uint64_t idx)
-  {
+  THRUST_HOST_DEVICE construct_key_flag_op(std::uint64_t m,
+                                            feistel_bijection bijection)
+      : m(m), bijection(bijection) {}
+  THRUST_HOST_DEVICE key_flag_tuple operator()(std::uint64_t idx) {
     auto gather_key = bijection(idx);
     return key_flag_tuple{gather_key, (gather_key < m) ? 1ull : 0ull};
   }
 };
 
 template <typename InputIterT, typename OutputIterT>
-struct write_output_op
-{
+struct write_output_op {
   std::uint64_t m;
   InputIterT in;
   OutputIterT out;
   // flag contains inclusive scan of valid keys
   // perform gather using valid keys
   THRUST_EXEC_CHECK_DISABLE
-  THRUST_HOST_DEVICE std::size_t operator()(key_flag_tuple x)
-  {
-    if (x.key < m)
-    {
+  THRUST_HOST_DEVICE std::size_t operator()(key_flag_tuple x) {
+    if (x.key < m) {
       // -1 because inclusive scan
       out[x.flag - 1] = in[x.key];
     }
-    return 0; // Discarded
+    return 0;  // Discarded
   }
 };
 
 template <typename ExecutionPolicy, typename RandomIterator, typename URBG>
-THRUST_HOST_DEVICE void
-shuffle(thrust::execution_policy<ExecutionPolicy>& exec, RandomIterator first, RandomIterator last, URBG&& g)
-{
-  using InputType = typename thrust::detail::it_value_t<RandomIterator>;
+THRUST_HOST_DEVICE void shuffle(
+    thrust::execution_policy<ExecutionPolicy>& exec, RandomIterator first,
+    RandomIterator last, URBG&& g) {
+  using InputType = typename thrust::iterator_value_t<RandomIterator>;
 
   // copy input to temp buffer
-  thrust::detail::temporary_array<InputType, ExecutionPolicy> temp(exec, first, last);
+  thrust::detail::temporary_array<InputType, ExecutionPolicy> temp(exec, first,
+                                                                   last);
   thrust::shuffle_copy(exec, temp.begin(), temp.end(), first, g);
 }
 
-template <typename ExecutionPolicy, typename RandomIterator, typename OutputIterator, typename URBG>
+template <typename ExecutionPolicy, typename RandomIterator,
+          typename OutputIterator, typename URBG>
 THRUST_HOST_DEVICE void shuffle_copy(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  RandomIterator first,
-  RandomIterator last,
-  OutputIterator result,
-  URBG&& g)
-{
+    thrust::execution_policy<ExecutionPolicy>& exec, RandomIterator first,
+    RandomIterator last, OutputIterator result, URBG&& g) {
   // m is the length of the input
   // we have an available bijection of length n via a feistel cipher
   std::size_t m = last - first;
@@ -195,19 +169,22 @@ THRUST_HOST_DEVICE void shuffle_copy(
   // perform stream compaction over length n bijection to get length m
   // pseudorandom bijection over the original input
   thrust::counting_iterator<std::uint64_t> indices(0);
-  thrust::transform_iterator<construct_key_flag_op, decltype(indices), key_flag_tuple> key_flag_it(
-    indices, construct_key_flag_op(m, bijection));
-  write_output_op<RandomIterator, decltype(result)> write_functor{m, first, result};
-  auto gather_output_it =
-    thrust::make_transform_output_iterator(thrust::discard_iterator<std::size_t>(), write_functor);
+  thrust::transform_iterator<construct_key_flag_op, decltype(indices),
+                             key_flag_tuple>
+      key_flag_it(indices, construct_key_flag_op(m, bijection));
+  write_output_op<RandomIterator, decltype(result)> write_functor{m, first,
+                                                                  result};
+  auto gather_output_it = thrust::make_transform_output_iterator(
+      thrust::discard_iterator<std::size_t>(), write_functor);
   // the feistel_bijection outputs a stream of permuted indices in range [0,n)
   // flag each value < m and compact it, so we have a set of permuted indices in
   // range [0,m) each thread gathers an input element according to its
   // pseudorandom permuted index
-  thrust::inclusive_scan(exec, key_flag_it, key_flag_it + n, gather_output_it, key_flag_scan_op());
+  thrust::inclusive_scan(exec, key_flag_it, key_flag_it + n, gather_output_it,
+                         key_flag_scan_op());
 }
 
-} // end namespace generic
-} // end namespace detail
-} // end namespace system
+}  // end namespace generic
+}  // end namespace detail
+}  // end namespace system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/sort.h b/projects/rocthrust/thrust/system/detail/generic/sort.h
index a92a6759723a..22e12773cb82 100644
--- a/projects/rocthrust/thrust/system/detail/generic/sort.h
+++ b/projects/rocthrust/thrust/system/detail/generic/sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/sort.inl b/projects/rocthrust/thrust/system/detail/generic/sort.inl
index 278c1d321e13..6e8ca2cbf905 100644
--- a/projects/rocthrust/thrust/system/detail/generic/sort.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/sort.inl
@@ -14,25 +14,19 @@
  *  limitations under the License.
  */
 
+
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
-#include <thrust/distance.h>
-#include <thrust/find.h>
+#include <thrust/system/detail/generic/sort.h>
 #include <thrust/functional.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/distance.h>
+#include <thrust/functional.h>
+#include <thrust/find.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/system/detail/generic/sort.h>
 #include <thrust/tuple.h>
+#include <thrust/detail/internal_functional.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -42,101 +36,134 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename RandomAccessIterator>
-THRUST_HOST_DEVICE void
-sort(thrust::execution_policy<DerivedPolicy>& exec, RandomAccessIterator first, RandomAccessIterator last)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void sort(thrust::execution_policy<DerivedPolicy> &exec,
+            RandomAccessIterator first,
+            RandomAccessIterator last)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator>::type;
   thrust::sort(exec, first, last, thrust::less<value_type>());
 } // end sort()
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void
-sort(thrust::execution_policy<DerivedPolicy>& exec,
-     RandomAccessIterator first,
-     RandomAccessIterator last,
-     StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void sort(thrust::execution_policy<DerivedPolicy> &exec,
+            RandomAccessIterator first,
+            RandomAccessIterator last,
+            StrictWeakOrdering comp)
 {
   // implement with stable_sort
   thrust::stable_sort(exec, first, last, comp);
 } // end sort()
 
-template <typename DerivedPolicy, typename RandomAccessIterator1, typename RandomAccessIterator2>
-THRUST_HOST_DEVICE void sort_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+THRUST_HOST_DEVICE
+  void sort_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                   RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator1>::type;
   thrust::sort_by_key(exec, keys_first, keys_last, values_first, thrust::less<value_type>());
 } // end sort_by_key()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void sort_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void sort_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                   RandomAccessIterator1 keys_first,
+                   RandomAccessIterator1 keys_last,
+                   RandomAccessIterator2 values_first,
+                   StrictWeakOrdering comp)
 {
   // implement with stable_sort_by_key
   thrust::stable_sort_by_key(exec, keys_first, keys_last, values_first, comp);
 } // end sort_by_key()
 
-template <typename DerivedPolicy, typename RandomAccessIterator>
-THRUST_HOST_DEVICE void
-stable_sort(thrust::execution_policy<DerivedPolicy>& exec, RandomAccessIterator first, RandomAccessIterator last)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator>
+THRUST_HOST_DEVICE
+  void stable_sort(thrust::execution_policy<DerivedPolicy> &exec,
+                   RandomAccessIterator first,
+                   RandomAccessIterator last)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator>::type;
   thrust::stable_sort(exec, first, last, thrust::less<value_type>());
 } // end stable_sort()
 
-template <typename DerivedPolicy, typename RandomAccessIterator1, typename RandomAccessIterator2>
-THRUST_HOST_DEVICE void stable_sort_by_key(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2>
+THRUST_HOST_DEVICE
+  void stable_sort_by_key(thrust::execution_policy<DerivedPolicy> &exec,
+                          RandomAccessIterator1 keys_first,
+                          RandomAccessIterator1 keys_last,
+                          RandomAccessIterator2 values_first)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using value_type = typename iterator_value<RandomAccessIterator1>::type;
   thrust::stable_sort_by_key(exec, keys_first, keys_last, values_first, thrust::less<value_type>());
 } // end stable_sort_by_key()
 
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE bool
-is_sorted(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  bool is_sorted(thrust::execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last)
 {
   return thrust::is_sorted_until(exec, first, last) == last;
 } // end is_sorted()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Compare>
-THRUST_HOST_DEVICE bool
-is_sorted(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Compare comp)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Compare>
+THRUST_HOST_DEVICE
+  bool is_sorted(thrust::execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 Compare comp)
 {
   return thrust::is_sorted_until(exec, first, last, comp) == last;
 } // end is_sorted()
 
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator
-is_sorted_until(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+
+template<typename DerivedPolicy, typename ForwardIterator>
+THRUST_HOST_DEVICE
+  ForwardIterator is_sorted_until(thrust::execution_policy<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_value<ForwardIterator>::type;
 
   return thrust::is_sorted_until(exec, first, last, thrust::less<InputType>());
 } // end is_sorted_until()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Compare>
-THRUST_HOST_DEVICE ForwardIterator is_sorted_until(
-  thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Compare comp)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Compare>
+THRUST_HOST_DEVICE
+  ForwardIterator is_sorted_until(thrust::execution_policy<DerivedPolicy> &exec,
+                                  ForwardIterator first,
+                                  ForwardIterator last,
+                                  Compare comp)
 {
-  if (thrust::distance(first, last) < 2)
-  {
-    return last;
-  }
+  if(thrust::distance(first,last) < 2) return last;
 
   using IteratorTuple = thrust::tuple<ForwardIterator, ForwardIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
@@ -147,35 +174,45 @@ THRUST_HOST_DEVICE ForwardIterator is_sorted_until(
   ZipIterator zipped_first = thrust::make_zip_iterator(thrust::make_tuple(first_plus_one, first));
   ZipIterator zipped_last  = thrust::make_zip_iterator(thrust::make_tuple(last, first));
 
-  return thrust::get<0>(
-    thrust::find_if(exec, zipped_first, zipped_last, thrust::detail::tuple_binary_predicate<Compare>(comp))
-      .get_iterator_tuple());
+  return thrust::get<0>(thrust::find_if(exec, zipped_first, zipped_last, thrust::detail::tuple_binary_predicate<Compare>(comp)).get_iterator_tuple());
 } // end is_sorted_until()
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void
-stable_sort(thrust::execution_policy<DerivedPolicy>&, RandomAccessIterator, RandomAccessIterator, StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void stable_sort(thrust::execution_policy<DerivedPolicy> &,
+                   RandomAccessIterator,
+                   RandomAccessIterator,
+                   StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator, false>::value,
-                "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<RandomAccessIterator, false>::value)
+  , "unimplemented for this system"
+  );
 } // end stable_sort()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void stable_sort_by_key(
-  thrust::execution_policy<DerivedPolicy>&,
-  RandomAccessIterator1,
-  RandomAccessIterator1,
-  RandomAccessIterator2,
-  StrictWeakOrdering)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+  void stable_sort_by_key(thrust::execution_policy<DerivedPolicy> &,
+                          RandomAccessIterator1,
+                          RandomAccessIterator1,
+                          RandomAccessIterator2,
+                          StrictWeakOrdering)
 {
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator1, false>::value,
-                "unimplemented for this system");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<RandomAccessIterator1, false>::value)
+  , "unimplemented for this system"
+  );
 } // end stable_sort_by_key()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/swap_ranges.h b/projects/rocthrust/thrust/system/detail/generic/swap_ranges.h
index 425c7eaff07e..0860a49a3aa5 100644
--- a/projects/rocthrust/thrust/system/detail/generic/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/detail/generic/swap_ranges.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/tabulate.h b/projects/rocthrust/thrust/system/detail/generic/tabulate.h
index e9cf8448a4a9..9bb142c4e7c7 100644
--- a/projects/rocthrust/thrust/system/detail/generic/tabulate.h
+++ b/projects/rocthrust/thrust/system/detail/generic/tabulate.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/tabulate.inl b/projects/rocthrust/thrust/system/detail/generic/tabulate.inl
index 4b849c79c017..f4692aea3def 100644
--- a/projects/rocthrust/thrust/system/detail/generic/tabulate.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/tabulate.inl
@@ -17,19 +17,11 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/distance.h>
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/generic/tabulate.h>
+#include <thrust/iterator/iterator_traits.h>
 #include <thrust/transform.h>
+#include <thrust/distance.h>
+#include <thrust/iterator/counting_iterator.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -39,11 +31,17 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename UnaryOperation>
-THRUST_HOST_DEVICE void tabulate(
-  thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, UnaryOperation unary_op)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename UnaryOperation>
+THRUST_HOST_DEVICE
+  void tabulate(thrust::execution_policy<DerivedPolicy> &exec,
+                ForwardIterator first,
+                ForwardIterator last,
+                UnaryOperation unary_op)
 {
-  using difference_type = thrust::detail::it_difference_t<ForwardIterator>;
+  using difference_type = typename iterator_difference<ForwardIterator>::type;
 
   // by default, counting_iterator uses a 64b difference_type on 32b platforms to avoid overflowing its counter.
   // this causes problems when a zip_iterator is created in transform's implementation -- ForwardIterator is
@@ -54,6 +52,7 @@ THRUST_HOST_DEVICE void tabulate(
   thrust::transform(exec, iter, iter + thrust::distance(first, last), first, unary_op);
 } // end tabulate()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/tag.h b/projects/rocthrust/thrust/system/detail/generic/tag.h
index e6dabec8f905..bcdd66b4bbe2 100644
--- a/projects/rocthrust/thrust/system/detail/generic/tag.h
+++ b/projects/rocthrust/thrust/system/detail/generic/tag.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
diff --git a/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.h b/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.h
index 7a205048bdb0..5ce3ebf62f6c 100644
--- a/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/pointer.h>
 #include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
diff --git a/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.inl b/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
index 61e7c4405f2f..63bf71819df2 100644
--- a/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/temporary_buffer.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/malloc_and_free.h>
+#include <thrust/system/detail/generic/temporary_buffer.h>
 #include <thrust/detail/pointer.h>
+#include <thrust/detail/malloc_and_free.h>
 #include <thrust/pair.h>
-#include <thrust/system/detail/generic/temporary_buffer.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -38,16 +30,16 @@ namespace detail
 namespace generic
 {
 
-template <typename T, typename DerivedPolicy>
+
+template<typename T, typename DerivedPolicy>
 THRUST_HOST_DEVICE
-thrust::pair<thrust::pointer<T, DerivedPolicy>, typename thrust::pointer<T, DerivedPolicy>::difference_type>
-get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
-                     typename thrust::pointer<T, DerivedPolicy>::difference_type n)
+  thrust::pair<thrust::pointer<T,DerivedPolicy>, typename thrust::pointer<T,DerivedPolicy>::difference_type>
+    get_temporary_buffer(thrust::execution_policy<DerivedPolicy> &exec, typename thrust::pointer<T,DerivedPolicy>::difference_type n)
 {
-  thrust::pointer<T, DerivedPolicy> ptr = thrust::malloc<T>(exec, n);
+  thrust::pointer<T,DerivedPolicy> ptr = thrust::malloc<T>(exec, n);
 
   // check for a failed malloc
-  if (!ptr.get())
+  if(!ptr.get())
   {
     n = 0;
   } // end if
@@ -55,9 +47,11 @@ get_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec,
   return thrust::make_pair(ptr, n);
 } // end get_temporary_buffer()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE void return_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec, Pointer p, std::ptrdiff_t)
+template<typename DerivedPolicy, typename Pointer>
+THRUST_HOST_DEVICE
+  void return_temporary_buffer(thrust::execution_policy<DerivedPolicy> &exec, Pointer p, std::ptrdiff_t)
 {
   // If we are here, no user customization of the three-argument signature with
   // a size parameter of `return_temporary_buffer` was found. There may be an
@@ -72,9 +66,11 @@ THRUST_HOST_DEVICE void return_temporary_buffer(thrust::execution_policy<Derived
   return_temporary_buffer(thrust::detail::derived_cast(thrust::detail::strip_const(exec)), p);
 } // end return_temporary_buffer()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE void return_temporary_buffer(thrust::execution_policy<DerivedPolicy>& exec, Pointer p)
+template<typename DerivedPolicy, typename Pointer>
+THRUST_HOST_DEVICE
+  void return_temporary_buffer(thrust::execution_policy<DerivedPolicy> &exec, Pointer p)
 {
   // If we are here, no user customization of either the old two-argument
   // signature or the new three-argument signature with a size parameter of
@@ -82,7 +78,8 @@ THRUST_HOST_DEVICE void return_temporary_buffer(thrust::execution_policy<Derived
   thrust::free(exec, p);
 } // end return_temporary_buffer()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/transform.h b/projects/rocthrust/thrust/system/detail/generic/transform.h
index a41d97859adf..4f1b0fd88832 100644
--- a/projects/rocthrust/thrust/system/detail/generic/transform.h
+++ b/projects/rocthrust/thrust/system/detail/generic/transform.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/transform.inl b/projects/rocthrust/thrust/system/detail/generic/transform.inl
index 1d3f5b28a04c..91415abcb894 100644
--- a/projects/rocthrust/thrust/system/detail/generic/transform.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/transform.inl
@@ -17,21 +17,13 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/internal_functional.h>
+#include <thrust/system/detail/generic/transform.h>
 #include <thrust/for_each.h>
-#include <thrust/iterator/detail/minimum_system.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/system/detail/generic/transform.h>
+#include <thrust/iterator/detail/minimum_system.h>
 #include <thrust/tuple.h>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/detail/internal_functional.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -41,13 +33,17 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename UnaryFunction>
-THRUST_HOST_DEVICE OutputIterator transform(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator result,
-  UnaryFunction op)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename UnaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator transform(thrust::execution_policy<DerivedPolicy> &exec,
+                           InputIterator first,
+                           InputIterator last,
+                           OutputIterator result,
+                           UnaryFunction op)
 {
   using UnaryTransformFunctor = thrust::detail::unary_transform_functor<UnaryFunction>;
 
@@ -55,27 +51,28 @@ THRUST_HOST_DEVICE OutputIterator transform(
   using IteratorTuple = thrust::tuple<InputIterator, OutputIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_result = thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(first, result)),
-    thrust::make_zip_iterator(thrust::make_tuple(last, result)),
-    UnaryTransformFunctor(op));
+  ZipIterator zipped_result =
+    thrust::for_each(exec,
+                     thrust::make_zip_iterator(thrust::make_tuple(first,result)),
+                     thrust::make_zip_iterator(thrust::make_tuple(last,result)),
+                     UnaryTransformFunctor(op));
 
   return thrust::get<1>(zipped_result.get_iterator_tuple());
 } // end transform()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE OutputIterator transform(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  OutputIterator result,
-  BinaryFunction op)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputIterator transform(thrust::execution_policy<DerivedPolicy> &exec,
+                           InputIterator1 first1,
+                           InputIterator1 last1,
+                           InputIterator2 first2,
+                           OutputIterator result,
+                           BinaryFunction op)
 {
   // given the minimal system, determine the binary transform functor we need
   using BinaryTransformFunctor = thrust::detail::binary_transform_functor<BinaryFunction>;
@@ -84,27 +81,28 @@ THRUST_HOST_DEVICE OutputIterator transform(
   using IteratorTuple = thrust::tuple<InputIterator1, InputIterator2, OutputIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_result = thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(first1, first2, result)),
-    thrust::make_zip_iterator(thrust::make_tuple(last1, first2, result)),
-    BinaryTransformFunctor(op));
+  ZipIterator zipped_result =
+    thrust::for_each(exec,
+                     thrust::make_zip_iterator(thrust::make_tuple(first1,first2,result)),
+                     thrust::make_zip_iterator(thrust::make_tuple(last1,first2,result)),
+                     BinaryTransformFunctor(op));
 
   return thrust::get<2>(zipped_result.get_iterator_tuple());
 } // end transform()
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename ForwardIterator,
-          typename UnaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  ForwardIterator result,
-  UnaryFunction unary_op,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(thrust::execution_policy<DerivedPolicy> &exec,
+                               InputIterator first,
+                               InputIterator last,
+                               ForwardIterator result,
+                               UnaryFunction unary_op,
+                               Predicate pred)
 {
   using UnaryTransformIfFunctor = thrust::detail::unary_transform_if_functor<UnaryFunction, Predicate>;
 
@@ -112,29 +110,30 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
   using IteratorTuple = thrust::tuple<InputIterator, ForwardIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_result = thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(first, result)),
-    thrust::make_zip_iterator(thrust::make_tuple(last, result)),
-    UnaryTransformIfFunctor(unary_op, pred));
+  ZipIterator zipped_result =
+    thrust::for_each(exec,
+                     thrust::make_zip_iterator(thrust::make_tuple(first,result)),
+                     thrust::make_zip_iterator(thrust::make_tuple(last,result)),
+                     UnaryTransformIfFunctor(unary_op,pred));
 
   return thrust::get<1>(zipped_result.get_iterator_tuple());
 } // end transform_if()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename ForwardIterator,
-          typename UnaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  ForwardIterator result,
-  UnaryFunction unary_op,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename ForwardIterator,
+         typename UnaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(thrust::execution_policy<DerivedPolicy> &exec,
+                               InputIterator1 first,
+                               InputIterator1 last,
+                               InputIterator2 stencil,
+                               ForwardIterator result,
+                               UnaryFunction unary_op,
+                               Predicate pred)
 {
   using UnaryTransformIfFunctor = thrust::detail::unary_transform_if_with_stencil_functor<UnaryFunction, Predicate>;
 
@@ -142,31 +141,32 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
   using IteratorTuple = thrust::tuple<InputIterator1, InputIterator2, ForwardIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_result = thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(first, stencil, result)),
-    thrust::make_zip_iterator(thrust::make_tuple(last, stencil, result)),
-    UnaryTransformIfFunctor(unary_op, pred));
+  ZipIterator zipped_result =
+    thrust::for_each(exec,
+                     thrust::make_zip_iterator(thrust::make_tuple(first,stencil,result)),
+                     thrust::make_zip_iterator(thrust::make_tuple(last,stencil,result)),
+                     UnaryTransformIfFunctor(unary_op,pred));
 
   return thrust::get<2>(zipped_result.get_iterator_tuple());
 } // end transform_if()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename ForwardIterator,
-          typename BinaryFunction,
-          typename Predicate>
-THRUST_HOST_DEVICE ForwardIterator transform_if(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator3 stencil,
-  ForwardIterator result,
-  BinaryFunction binary_op,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename ForwardIterator,
+         typename BinaryFunction,
+         typename Predicate>
+THRUST_HOST_DEVICE
+  ForwardIterator transform_if(thrust::execution_policy<DerivedPolicy> &exec,
+                               InputIterator1 first1,
+                               InputIterator1 last1,
+                               InputIterator2 first2,
+                               InputIterator3 stencil,
+                               ForwardIterator result,
+                               BinaryFunction binary_op,
+                               Predicate pred)
 {
   using BinaryTransformIfFunctor = thrust::detail::binary_transform_if_functor<BinaryFunction, Predicate>;
 
@@ -174,16 +174,17 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
   using IteratorTuple = thrust::tuple<InputIterator1, InputIterator2, InputIterator3, ForwardIterator>;
   using ZipIterator   = thrust::zip_iterator<IteratorTuple>;
 
-  ZipIterator zipped_result = thrust::for_each(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(first1, first2, stencil, result)),
-    thrust::make_zip_iterator(thrust::make_tuple(last1, first2, stencil, result)),
-    BinaryTransformIfFunctor(binary_op, pred));
+  ZipIterator zipped_result =
+    thrust::for_each(exec,
+                     thrust::make_zip_iterator(thrust::make_tuple(first1,first2,stencil,result)),
+                     thrust::make_zip_iterator(thrust::make_tuple(last1,first2,stencil,result)),
+                     BinaryTransformIfFunctor(binary_op,pred));
 
   return thrust::get<3>(zipped_result.get_iterator_tuple());
 } // end transform_if()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/transform_reduce.h b/projects/rocthrust/thrust/system/detail/generic/transform_reduce.h
index 7dae7d7d0d19..49f4dd3e18de 100644
--- a/projects/rocthrust/thrust/system/detail/generic/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/detail/generic/transform_reduce.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/transform_reduce.inl b/projects/rocthrust/thrust/system/detail/generic/transform_reduce.inl
index 7aa923ab38e3..8f2858022a54 100644
--- a/projects/rocthrust/thrust/system/detail/generic/transform_reduce.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/transform_reduce.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/iterator/transform_iterator.h>
-#include <thrust/reduce.h>
 #include <thrust/system/detail/generic/transform_reduce.h>
+#include <thrust/reduce.h>
+#include <thrust/iterator/transform_iterator.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,18 +29,19 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename UnaryFunction,
-          typename OutputType,
-          typename BinaryFunction>
-THRUST_HOST_DEVICE OutputType transform_reduce(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  UnaryFunction unary_op,
-  OutputType init,
-  BinaryFunction binary_op)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename UnaryFunction,
+         typename OutputType,
+         typename BinaryFunction>
+THRUST_HOST_DEVICE
+  OutputType transform_reduce(thrust::execution_policy<DerivedPolicy> &exec,
+                              InputIterator first,
+                              InputIterator last,
+                              UnaryFunction unary_op,
+                              OutputType init,
+                              BinaryFunction binary_op)
 {
   thrust::transform_iterator<UnaryFunction, InputIterator, OutputType> xfrm_first(first, unary_op);
   thrust::transform_iterator<UnaryFunction, InputIterator, OutputType> xfrm_last(last, unary_op);
@@ -56,7 +49,8 @@ THRUST_HOST_DEVICE OutputType transform_reduce(
   return thrust::reduce(exec, xfrm_first, xfrm_last, init, binary_op);
 } // end transform_reduce()
 
-} // namespace generic
-} // namespace detail
-} // namespace system
+
+} // end generic
+} // end detail
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/detail/generic/transform_scan.inl b/projects/rocthrust/thrust/system/detail/generic/transform_scan.inl
index fc19dbcb4371..446323144735 100644
--- a/projects/rocthrust/thrust/system/detail/generic/transform_scan.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/transform_scan.inl
@@ -26,14 +26,11 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/scan.h>
 #include <thrust/system/detail/generic/transform_scan.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
-
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
@@ -56,7 +53,7 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
   BinaryFunction binary_op)
 {
   // Use the input iterator's value type per https://wg21.link/P0571
-  using InputType  = thrust::detail::it_value_t<InputIterator>;
+  using InputType  = typename thrust::iterator_value<InputIterator>::type;
   using ResultType = thrust::detail::invoke_result_t<UnaryFunction, InputType>;
   using ValueType  = ::internal::remove_cvref_t<ResultType>;
 
@@ -81,7 +78,7 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
   InitialValueType init,
   BinaryFunction binary_op)
 {
-  using InputType  = thrust::detail::it_value_t<InputIterator>;
+  using InputType  = typename thrust::iterator_value<InputIterator>::type;
   using ResultType = thrust::detail::invoke_result_t<UnaryFunction, InputType>;
   using ValueType  = ::internal::remove_cvref_t<ResultType>;
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.h b/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.h
index bf13b6e84fbf..5dbeee7818b7 100644
--- a/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl b/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
index c8ca3c2ada29..5a629de55355 100644
--- a/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/uninitialized_copy.inl
@@ -76,12 +76,12 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_copy(
   ZipIterator end   = begin;
 
   // get a zip_iterator pointing to the end
-  const thrust::detail::it_difference_t<InputIterator> n = thrust::distance(first, last);
+  const typename thrust::iterator_difference<InputIterator>::type n = thrust::distance(first, last);
   thrust::advance(end, n);
 
   // create a functor
-  using InputType  = thrust::detail::it_value_t<InputIterator>;
-  using OutputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType  = typename iterator_traits<InputIterator>::value_type;
+  using OutputType = typename iterator_traits<ForwardIterator>::value_type;
 
   detail::uninitialized_copy_functor<InputType, OutputType> f;
 
@@ -120,8 +120,8 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_copy_n(
   ZipIterator zipped_first = thrust::make_zip_iterator(thrust::make_tuple(first, result));
 
   // create a functor
-  using InputType  = thrust::detail::it_value_t<InputIterator>;
-  using OutputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType  = typename iterator_traits<InputIterator>::value_type;
+  using OutputType = typename iterator_traits<ForwardIterator>::value_type;
 
   detail::uninitialized_copy_functor<InputType, OutputType> f;
 
@@ -150,7 +150,7 @@ template <typename ExecutionPolicy, typename InputIterator, typename ForwardIter
 THRUST_HOST_DEVICE ForwardIterator uninitialized_copy(
   thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, InputIterator last, ForwardIterator result)
 {
-  using ResultType = thrust::detail::it_value_t<ForwardIterator>;
+  using ResultType = typename iterator_traits<ForwardIterator>::value_type;
 
   using ResultTypeHasTrivialCopyConstructor = typename _THRUST_STD::is_trivially_copy_constructible<ResultType>::type;
 
@@ -162,7 +162,7 @@ template <typename ExecutionPolicy, typename InputIterator, typename Size, typen
 THRUST_HOST_DEVICE ForwardIterator uninitialized_copy_n(
   thrust::execution_policy<ExecutionPolicy>& exec, InputIterator first, Size n, ForwardIterator result)
 {
-  using ResultType = thrust::detail::it_value_t<ForwardIterator>;
+  using ResultType = typename iterator_traits<ForwardIterator>::value_type;
 
   using ResultTypeHasTrivialCopyConstructor = typename _THRUST_STD::is_trivially_copy_constructible<ResultType>::type;
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.h b/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.h
index 7897ed44947a..8499a619e1c6 100644
--- a/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.inl b/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.inl
index 832d9a7db866..b6c5f12f5062 100644
--- a/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/uninitialized_fill.inl
@@ -64,7 +64,7 @@ THRUST_HOST_DEVICE void uninitialized_fill(
   const T& x,
   thrust::detail::false_type) // _THRUST_STD::is_trivially_copy_constructible
 {
-  using ValueType = thrust::detail::it_value_t<ForwardIterator>;
+  using ValueType = typename iterator_traits<ForwardIterator>::value_type;
 
   thrust::for_each(exec, first, last, thrust::detail::uninitialized_fill_functor<ValueType>(x));
 } // end uninitialized_fill()
@@ -88,7 +88,7 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_fill_n(
   const T& x,
   thrust::detail::false_type) // _THRUST_STD::is_trivially_copy_constructible
 {
-  using ValueType = thrust::detail::it_value_t<ForwardIterator>;
+  using ValueType = typename iterator_traits<ForwardIterator>::value_type;
 
   return thrust::for_each_n(exec, first, n, thrust::detail::uninitialized_fill_functor<ValueType>(x));
 } // end uninitialized_fill()
@@ -99,7 +99,7 @@ template <typename DerivedPolicy, typename ForwardIterator, typename T>
 THRUST_HOST_DEVICE void uninitialized_fill(
   thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, const T& x)
 {
-  using ValueType = thrust::detail::it_value_t<ForwardIterator>;
+  using ValueType = typename iterator_traits<ForwardIterator>::value_type;
 
   using ValueTypeHasTrivialCopyConstructor = _THRUST_STD::is_trivially_copy_constructible<ValueType>;
 
@@ -111,7 +111,7 @@ template <typename DerivedPolicy, typename ForwardIterator, typename Size, typen
 THRUST_HOST_DEVICE ForwardIterator
 uninitialized_fill_n(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, Size n, const T& x)
 {
-  using ValueType = thrust::detail::it_value_t<ForwardIterator>;
+  using ValueType = typename iterator_traits<ForwardIterator>::value_type;
 
   using ValueTypeHasTrivialCopyConstructor = _THRUST_STD::is_trivially_copy_constructible<ValueType>;
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/unique.h b/projects/rocthrust/thrust/system/detail/generic/unique.h
index fe102dc6650a..9539139d1014 100644
--- a/projects/rocthrust/thrust/system/detail/generic/unique.h
+++ b/projects/rocthrust/thrust/system/detail/generic/unique.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/tag.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -59,11 +52,11 @@ THRUST_HOST_DEVICE OutputIterator unique_copy(
   BinaryPredicate binary_pred);
 
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type
 unique_count(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   thrust::execution_policy<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
diff --git a/projects/rocthrust/thrust/system/detail/generic/unique.inl b/projects/rocthrust/thrust/system/detail/generic/unique.inl
index cdb52fd40981..86dbd828ecce 100644
--- a/projects/rocthrust/thrust/system/detail/generic/unique.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/unique.inl
@@ -17,25 +17,17 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/generic/unique.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/transform.h>
+#include <thrust/unique.h>
+#include <thrust/detail/temporary_array.h>
+#include <thrust/detail/internal_functional.h>
 #include <thrust/detail/copy_if.h>
 #include <thrust/detail/count.h>
-#include <thrust/detail/internal_functional.h>
-#include <thrust/detail/range/head_flags.h>
-#include <thrust/detail/temporary_array.h>
 #include <thrust/distance.h>
 #include <thrust/functional.h>
-#include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/generic/unique.h>
-#include <thrust/transform.h>
-#include <thrust/unique.h>
+#include <thrust/detail/range/head_flags.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -45,44 +37,61 @@ namespace detail
 namespace generic
 {
 
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE ForwardIterator
-unique(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator>
+THRUST_HOST_DEVICE
+  ForwardIterator unique(thrust::execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
   return thrust::unique(exec, first, last, thrust::equal_to<InputType>());
 } // end unique()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE ForwardIterator unique(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  ForwardIterator unique(thrust::execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last,
+                         BinaryPredicate binary_pred)
 {
-  using InputType = thrust::detail::it_value_t<ForwardIterator>;
+  using InputType = typename thrust::iterator_traits<ForwardIterator>::value_type;
 
-  thrust::detail::temporary_array<InputType, DerivedPolicy> input(exec, first, last);
+  thrust::detail::temporary_array<InputType,DerivedPolicy> input(exec, first, last);
 
   return thrust::unique_copy(exec, input.begin(), input.end(), first, binary_pred);
 } // end unique()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator unique_copy(
-  thrust::execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator output)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator unique_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator output)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator>;
-  return thrust::unique_copy(exec, first, last, output, thrust::equal_to<value_type>());
+  using value_type = typename thrust::iterator_value<InputIterator>::type;
+  return thrust::unique_copy(exec, first,last,output,thrust::equal_to<value_type>());
 } // end unique_copy()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE OutputIterator unique_copy(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator output,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  OutputIterator unique_copy(thrust::execution_policy<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator output,
+                             BinaryPredicate binary_pred)
 {
   thrust::detail::head_flags<InputIterator, BinaryPredicate> stencil(first, last, binary_pred);
 
@@ -91,12 +100,16 @@ THRUST_HOST_DEVICE OutputIterator unique_copy(
   return thrust::copy_if(exec, first, last, stencil.begin(), output, _1);
 } // end unique_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
-  thrust::execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(thrust::execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 BinaryPredicate binary_pred)
 {
   thrust::detail::head_flags<ForwardIterator, BinaryPredicate> stencil(first, last, binary_pred);
 
@@ -105,14 +118,20 @@ THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count
   return thrust::count_if(exec, stencil.begin(), stencil.end(), _1);
 } // end unique_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
-unique_count(thrust::execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator>
+THRUST_HOST_DEVICE
+  typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(thrust::execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last)
 {
-  using value_type = thrust::detail::it_value_t<ForwardIterator>;
+  using value_type = typename thrust::iterator_value<ForwardIterator>::type;
   return thrust::unique_count(exec, first, last, thrust::equal_to<value_type>());
 } // end unique_copy()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/generic/unique_by_key.h b/projects/rocthrust/thrust/system/detail/generic/unique_by_key.h
index f5839e3692f8..c88c3f38e391 100644
--- a/projects/rocthrust/thrust/system/detail/generic/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/generic/unique_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/detail/generic/tag.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/generic/unique_by_key.inl b/projects/rocthrust/thrust/system/detail/generic/unique_by_key.inl
index c77e2f877ab6..a54212288930 100644
--- a/projects/rocthrust/thrust/system/detail/generic/unique_by_key.inl
+++ b/projects/rocthrust/thrust/system/detail/generic/unique_by_key.inl
@@ -17,24 +17,16 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/copy_if.h>
-#include <thrust/detail/internal_functional.h>
-#include <thrust/detail/range/head_flags.h>
-#include <thrust/detail/temporary_array.h>
-#include <thrust/iterator/detail/minimum_system.h>
+#include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/iterator/detail/minimum_system.h>
 #include <thrust/iterator/zip_iterator.h>
-#include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/transform.h>
+#include <thrust/detail/temporary_array.h>
+#include <thrust/detail/internal_functional.h>
+#include <thrust/detail/copy_if.h>
 #include <thrust/unique.h>
+#include <thrust/detail/range/head_flags.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -44,89 +36,102 @@ namespace detail
 namespace generic
 {
 
-template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first)
+
+template<typename ExecutionPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator1,ForwardIterator2>
+unique_by_key(thrust::execution_policy<ExecutionPolicy> &exec,
+              ForwardIterator1 keys_first,
+              ForwardIterator1 keys_last,
+              ForwardIterator2 values_first)
 {
-  using KeyType = thrust::detail::it_value_t<ForwardIterator1>;
+  using KeyType = typename thrust::iterator_traits<ForwardIterator1>::value_type;
   return thrust::unique_by_key(exec, keys_first, keys_last, values_first, thrust::equal_to<KeyType>());
 } // end unique_by_key()
 
-template <typename ExecutionPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first,
-  BinaryPredicate binary_pred)
+
+template<typename ExecutionPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+thrust::pair<ForwardIterator1,ForwardIterator2>
+unique_by_key(thrust::execution_policy<ExecutionPolicy> &exec,
+              ForwardIterator1 keys_first,
+              ForwardIterator1 keys_last,
+              ForwardIterator2 values_first,
+              BinaryPredicate binary_pred)
 {
-  using InputType1 = thrust::detail::it_value_t<ForwardIterator1>;
-  using InputType2 = thrust::detail::it_value_t<ForwardIterator2>;
+  using InputType1 = typename thrust::iterator_traits<ForwardIterator1>::value_type;
+  using InputType2 = typename thrust::iterator_traits<ForwardIterator2>::value_type;
 
   ForwardIterator2 values_last = values_first + (keys_last - keys_first);
 
-  thrust::detail::temporary_array<InputType1, ExecutionPolicy> keys(exec, keys_first, keys_last);
-  thrust::detail::temporary_array<InputType2, ExecutionPolicy> vals(exec, values_first, values_last);
+  thrust::detail::temporary_array<InputType1,ExecutionPolicy> keys(exec, keys_first, keys_last);
+  thrust::detail::temporary_array<InputType2,ExecutionPolicy> vals(exec, values_first, values_last);
 
   return thrust::unique_by_key_copy(exec, keys.begin(), keys.end(), vals.begin(), keys_first, values_first, binary_pred);
 } // end unique_by_key()
 
-template <typename ExecutionPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output)
+
+template<typename ExecutionPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+unique_by_key_copy(thrust::execution_policy<ExecutionPolicy> &exec,
+                   InputIterator1 keys_first,
+                   InputIterator1 keys_last,
+                   InputIterator2 values_first,
+                   OutputIterator1 keys_output,
+                   OutputIterator2 values_output)
 {
-  using KeyType = thrust::detail::it_value_t<InputIterator1>;
-  return thrust::unique_by_key_copy(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, thrust::equal_to<KeyType>());
+  using KeyType = typename thrust::iterator_traits<InputIterator1>::value_type;
+  return thrust::unique_by_key_copy(exec, keys_first, keys_last, values_first, keys_output, values_output, thrust::equal_to<KeyType>());
 } // end unique_by_key_copy()
 
-template <typename ExecutionPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  thrust::execution_policy<ExecutionPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+
+template<typename ExecutionPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+unique_by_key_copy(thrust::execution_policy<ExecutionPolicy> &exec,
+                   InputIterator1 keys_first,
+                   InputIterator1 keys_last,
+                   InputIterator2 values_first,
+                   OutputIterator1 keys_output,
+                   OutputIterator2 values_output,
+                   BinaryPredicate binary_pred)
 {
-  using difference_type = thrust::detail::it_difference_t<InputIterator1>;
+  using difference_type = typename thrust::iterator_traits<InputIterator1>::difference_type;
 
   difference_type n = thrust::distance(keys_first, keys_last);
 
   thrust::detail::head_flags<InputIterator1, BinaryPredicate> stencil(keys_first, keys_last, binary_pred);
 
   using namespace thrust::placeholders;
-  thrust::zip_iterator<thrust::tuple<OutputIterator1, OutputIterator2>> result = thrust::copy_if(
-    exec,
-    thrust::make_zip_iterator(thrust::make_tuple(keys_first, values_first)),
-    thrust::make_zip_iterator(thrust::make_tuple(keys_first, values_first)) + n,
-    stencil.begin(),
-    thrust::make_zip_iterator(thrust::make_tuple(keys_output, values_output)),
-    _1);
+  thrust::zip_iterator< thrust::tuple<OutputIterator1, OutputIterator2> > result =
+    thrust::copy_if(exec,
+                    thrust::make_zip_iterator(thrust::make_tuple(keys_first, values_first)),
+                    thrust::make_zip_iterator(thrust::make_tuple(keys_first, values_first)) + n,
+                    stencil.begin(),
+                    thrust::make_zip_iterator(thrust::make_tuple(keys_output, values_output)),
+                    _1);
 
   difference_type output_size = result - thrust::make_zip_iterator(thrust::make_tuple(keys_output, values_output));
 
   return thrust::make_pair(keys_output + output_size, values_output + output_size);
 } // end unique_by_key_copy()
 
+
 } // end namespace generic
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/internal/decompose.h b/projects/rocthrust/thrust/system/detail/internal/decompose.h
index 1c0209f4e9ea..7d023a92534e 100644
--- a/projects/rocthrust/thrust/system/detail/internal/decompose.h
+++ b/projects/rocthrust/thrust/system/detail/internal/decompose.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
@@ -45,17 +37,17 @@ class index_range
       , m_end(end)
   {}
 
-  THRUST_HOST_DEVICE index_type begin() const
+  THRUST_HOST_DEVICE index_type begin(void) const
   {
     return m_begin;
   }
 
-  THRUST_HOST_DEVICE index_type end() const
+  THRUST_HOST_DEVICE index_type end(void) const
   {
     return m_end;
   }
 
-  THRUST_HOST_DEVICE index_type size() const
+  THRUST_HOST_DEVICE index_type size(void) const
   {
     return m_end - m_begin;
   }
@@ -104,7 +96,7 @@ class uniform_decomposition
     }
   }
 
-  THRUST_HOST_DEVICE index_type size() const
+  THRUST_HOST_DEVICE index_type size(void) const
   {
     return m_intervals;
   }
diff --git a/projects/rocthrust/thrust/system/detail/sequential/adjacent_difference.h b/projects/rocthrust/thrust/system/detail/sequential/adjacent_difference.h
index bfe3236f566f..339a46d42ee7 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/adjacent_difference.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
@@ -49,7 +42,7 @@ THRUST_HOST_DEVICE OutputIterator adjacent_difference(
   OutputIterator result,
   BinaryFunction binary_op)
 {
-  using InputType = thrust::detail::it_value_t<InputIterator>;
+  using InputType = typename thrust::iterator_traits<InputIterator>::value_type;
 
   if (first == last)
   {
diff --git a/projects/rocthrust/thrust/system/detail/sequential/assign_value.h b/projects/rocthrust/thrust/system/detail/sequential/assign_value.h
index e220ab345a66..01f2aec602ef 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/assign_value.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/assign_value.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/binary_search.h b/projects/rocthrust/thrust/system/detail/sequential/binary_search.h
index 578d43392903..4ae6a7503acd 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/binary_search.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/binary_search.h
@@ -22,14 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/advance.h>
 #include <thrust/detail/function.h>
 #include <thrust/distance.h>
@@ -55,7 +47,7 @@ THRUST_HOST_DEVICE ForwardIterator lower_bound(
   // wrap comp
   thrust::detail::wrapped_function<StrictWeakOrdering, bool> wrapped_comp{comp};
 
-  using difference_type = thrust::detail::it_difference_t<ForwardIterator>;
+  using difference_type = typename thrust::iterator_difference<ForwardIterator>::type;
 
   difference_type len = thrust::distance(first, last);
 
@@ -93,7 +85,7 @@ THRUST_HOST_DEVICE ForwardIterator upper_bound(
   // wrap comp
   thrust::detail::wrapped_function<StrictWeakOrdering, bool> wrapped_comp{comp};
 
-  using difference_type = thrust::detail::it_difference_t<ForwardIterator>;
+  using difference_type = typename thrust::iterator_difference<ForwardIterator>::type;
 
   difference_type len = thrust::distance(first, last);
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/copy.h b/projects/rocthrust/thrust/system/detail/sequential/copy.h
index c81882901250..513c25bd6b79 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/copy.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/copy.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/copy.inl b/projects/rocthrust/thrust/system/detail/sequential/copy.inl
index 34277599b7bb..cd3527694555 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/copy.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/copy.inl
@@ -17,20 +17,12 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/type_traits.h>
-#include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/sequential/copy.h>
+#include <thrust/detail/type_traits.h>
 #include <thrust/system/detail/sequential/general_copy.h>
 #include <thrust/system/detail/sequential/trivial_copy.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/type_traits/is_trivially_relocatable.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -43,82 +35,110 @@ namespace sequential
 namespace copy_detail
 {
 
+
 // returns the raw pointer associated with a Pointer-like thing
-template <typename Pointer>
-THRUST_HOST_DEVICE typename thrust::detail::pointer_traits<Pointer>::raw_pointer get(Pointer ptr)
+template<typename Pointer>
+THRUST_HOST_DEVICE
+  typename thrust::detail::pointer_traits<Pointer>::raw_pointer
+    get(Pointer ptr)
 {
   return thrust::detail::pointer_traits<Pointer>::get(ptr);
 }
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator
-copy(InputIterator first,
-     InputIterator last,
-     OutputIterator result,
-     thrust::detail::true_type) // is_indirectly_trivially_relocatable_to
+template<typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy(InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::detail::true_type)  // is_indirectly_trivially_relocatable_to
 {
-  using Size = thrust::detail::it_difference_t<InputIterator>;
+  using Size = typename thrust::iterator_difference<InputIterator>::type;
 
   const Size n = last - first;
   thrust::system::detail::sequential::trivial_copy_n(get(&*first), n, get(&*result));
   return result + n;
 } // end copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator
-copy(InputIterator first,
-     InputIterator last,
-     OutputIterator result,
-     thrust::detail::false_type) // is_indirectly_trivially_relocatable_to
+template<typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy(InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::detail::false_type)  // is_indirectly_trivially_relocatable_to
 {
-  return thrust::system::detail::sequential::general_copy(first, last, result);
+  return thrust::system::detail::sequential::general_copy(first,last,result);
 } // end copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator, typename Size, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator copy_n(
-  InputIterator first,
-  Size n,
-  OutputIterator result,
-  thrust::detail::true_type) // is_indirectly_trivially_relocatable_to
+template<typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy_n(InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::detail::true_type)  // is_indirectly_trivially_relocatable_to
 {
   thrust::system::detail::sequential::trivial_copy_n(get(&*first), n, get(&*result));
   return result + n;
 } // end copy_n()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename InputIterator, typename Size, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator copy_n(
-  InputIterator first,
-  Size n,
-  OutputIterator result,
-  thrust::detail::false_type) // is_indirectly_trivially_relocatable_to
+template<typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy_n(InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::detail::false_type)  // is_indirectly_trivially_relocatable_to
 {
-  return thrust::system::detail::sequential::general_copy_n(first, n, result);
+  return thrust::system::detail::sequential::general_copy_n(first,n,result);
 } // end copy_n()
 
+
 } // end namespace copy_detail
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator
-copy(sequential::execution_policy<DerivedPolicy>&, InputIterator first, InputIterator last, OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy(sequential::execution_policy<DerivedPolicy> &,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result)
 {
-  return thrust::system::detail::sequential::copy_detail::copy(
-    first, last, result, typename thrust::is_indirectly_trivially_relocatable_to<InputIterator, OutputIterator>::type());
+  return thrust::system::detail::sequential::copy_detail::copy(first, last, result,
+    typename thrust::is_indirectly_trivially_relocatable_to<InputIterator,OutputIterator>::type());
 } // end copy()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename OutputIterator>
-THRUST_HOST_DEVICE OutputIterator
-copy_n(sequential::execution_policy<DerivedPolicy>&, InputIterator first, Size n, OutputIterator result)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+THRUST_HOST_DEVICE
+  OutputIterator copy_n(sequential::execution_policy<DerivedPolicy> &,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result)
 {
-  return thrust::system::detail::sequential::copy_detail::copy_n(
-    first, n, result, typename thrust::is_indirectly_trivially_relocatable_to<InputIterator, OutputIterator>::type());
+  return thrust::system::detail::sequential::copy_detail::copy_n(first, n, result,
+    typename thrust::is_indirectly_trivially_relocatable_to<InputIterator,OutputIterator>::type());
 } // end copy_n()
 
+
 } // end namespace sequential
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/sequential/copy_backward.h b/projects/rocthrust/thrust/system/detail/sequential/copy_backward.h
index 84d4b9770a22..6f8646d6e770 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/copy_backward.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/copy_backward.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
diff --git a/projects/rocthrust/thrust/system/detail/sequential/copy_if.h b/projects/rocthrust/thrust/system/detail/sequential/copy_if.h
index 716d0ffa1bd6..bc22f0d35181 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/copy_if.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/copy_if.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/count.h b/projects/rocthrust/thrust/system/detail/sequential/count.h
index 46b5e3997de4..8916bc0a4cd5 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/count.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/count.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special count functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/equal.h b/projects/rocthrust/thrust/system/detail/sequential/equal.h
index c16d767294fd..e4a2f5a3825b 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/equal.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/equal.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special equal functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/execution_policy.h b/projects/rocthrust/thrust/system/detail/sequential/execution_policy.h
index 9e2b90d50ba2..016add297082 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/execution_policy.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/execution_policy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ struct execution_policy : thrust::execution_policy<Derived>
   }
 };
 
-THRUST_GLOBAL_CONSTANT tag seq;
+THRUST_INLINE_CONSTANT tag seq;
 
 } // namespace sequential
 } // namespace detail
diff --git a/projects/rocthrust/thrust/system/detail/sequential/extrema.h b/projects/rocthrust/thrust/system/detail/sequential/extrema.h
index 5260babd25cd..cc3a11878e6b 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/extrema.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/extrema.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
diff --git a/projects/rocthrust/thrust/system/detail/sequential/fill.h b/projects/rocthrust/thrust/system/detail/sequential/fill.h
index 4f678637a7dd..b1b5b6ce4f22 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/fill.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/fill.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special fill functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/find.h b/projects/rocthrust/thrust/system/detail/sequential/find.h
index 44e8ae2a1846..ddc5b0c796a3 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/find.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/find.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/for_each.h b/projects/rocthrust/thrust/system/detail/sequential/for_each.h
index 072fff7acf33..6550697f02f3 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/for_each.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/for_each.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/gather.h b/projects/rocthrust/thrust/system/detail/sequential/gather.h
index ba0481099622..349ad4797897 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/gather.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/gather.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special gather functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/general_copy.h b/projects/rocthrust/thrust/system/detail/sequential/general_copy.h
index bd3c90dd7807..67b037bf5808 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/general_copy.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/general_copy.h
@@ -46,27 +46,19 @@ namespace sequential
 namespace general_copy_detail
 {
 
+template <typename T1, typename T2>
+struct lazy_is_assignable : _THRUST_STD::is_assignable<typename T1::type, typename T2::type>
+{};
+
 // sometimes OutputIterator's reference type is reported as void
 // in that case, just assume that we're able to assign to it OK
 template <typename InputIterator, typename OutputIterator>
 struct reference_is_assignable
-{
-  template <typename OI>
-  static constexpr bool h()
-  {
-    if constexpr (_THRUST_STD::is_same_v<thrust::detail::it_reference_t<OI>, void>)
-    {
-      return true;
-    }
-    else
-    {
-      return _THRUST_STD::is_assignable_v<thrust::detail::it_reference_t<OI>,
-                                          thrust::detail::it_reference_t<InputIterator>>;
-    }
-  }
-
-  static constexpr bool value = h<OutputIterator>();
-};
+    : thrust::detail::eval_if<
+        _THRUST_STD::is_same<typename thrust::iterator_reference<OutputIterator>::type, void>::value,
+        thrust::detail::true_type,
+        lazy_is_assignable<thrust::iterator_reference<OutputIterator>, thrust::iterator_reference<InputIterator>>>::type
+{};
 
 // introduce an iterator assign helper to deal with assignments from
 // a wrapped reference
@@ -85,7 +77,7 @@ inline THRUST_HOST_DEVICE
   typename thrust::detail::disable_if<reference_is_assignable<InputIterator, OutputIterator>::value>::type
   iter_assign(OutputIterator dst, InputIterator src)
 {
-  using value_type = thrust::detail::it_value_t<InputIterator>;
+  using value_type = typename thrust::iterator_value<InputIterator>::type;
 
   // insert a temporary and hope for the best
   *dst = static_cast<value_type>(*src);
@@ -100,7 +92,7 @@ THRUST_HOST_DEVICE OutputIterator general_copy(InputIterator first, InputIterato
   for (; first != last; ++first, (void) ++result)
   {
     // gcc 4.2 crashes while instantiating iter_assign
-#if THRUST_COMPILER(GCC, <, 4, 3)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && (THRUST_GCC_VERSION < 40300)
     *result = *first;
 #else
     general_copy_detail::iter_assign(result, first);
@@ -117,7 +109,7 @@ THRUST_HOST_DEVICE OutputIterator general_copy_n(InputIterator first, Size n, Ou
   for (; n > Size(0); ++first, (void) ++result, (void) --n)
   {
     // gcc 4.2 crashes while instantiating iter_assign
-#if THRUST_COMPILER(GCC, <, 4, 3)
+#if (THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_GCC) && (THRUST_GCC_VERSION < 40300)
     *result = *first;
 #else
     general_copy_detail::iter_assign(result, first);
diff --git a/projects/rocthrust/thrust/system/detail/sequential/generate.h b/projects/rocthrust/thrust/system/detail/sequential/generate.h
index bb451c07a831..2bbbdbbe131e 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/generate.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/generate.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special generate functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/get_value.h b/projects/rocthrust/thrust/system/detail/sequential/get_value.h
index 0bbd3778514f..e272c94b6f07 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/get_value.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/get_value.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
@@ -37,7 +30,7 @@ namespace sequential
 {
 
 template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE thrust::detail::it_value_t<Pointer>
+THRUST_HOST_DEVICE typename thrust::iterator_value<Pointer>::type
 get_value(sequential::execution_policy<DerivedPolicy>&, Pointer ptr)
 {
   return *thrust::raw_pointer_cast(ptr);
diff --git a/projects/rocthrust/thrust/system/detail/sequential/inner_product.h b/projects/rocthrust/thrust/system/detail/sequential/inner_product.h
index 65e86607ccc0..04f77c4e4ddd 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/inner_product.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/inner_product.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special inner_product functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/insertion_sort.h b/projects/rocthrust/thrust/system/detail/sequential/insertion_sort.h
index 86bd6f1bb575..8bdc23319604 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/insertion_sort.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/insertion_sort.h
@@ -18,14 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/function.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/sequential/copy_backward.h>
@@ -42,7 +34,7 @@ THRUST_EXEC_CHECK_DISABLE
 template <typename RandomAccessIterator, typename StrictWeakOrdering>
 THRUST_HOST_DEVICE void insertion_sort(RandomAccessIterator first, RandomAccessIterator last, StrictWeakOrdering comp)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator>::type;
 
   if (first == last)
   {
@@ -86,8 +78,8 @@ template <typename RandomAccessIterator1, typename RandomAccessIterator2, typena
 THRUST_HOST_DEVICE void insertion_sort_by_key(
   RandomAccessIterator1 first1, RandomAccessIterator1 last1, RandomAccessIterator2 first2, StrictWeakOrdering comp)
 {
-  using value_type1 = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using value_type2 = thrust::detail::it_value_t<RandomAccessIterator2>;
+  using value_type1 = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using value_type2 = typename thrust::iterator_value<RandomAccessIterator2>::type;
 
   if (first1 == last1)
   {
diff --git a/projects/rocthrust/thrust/system/detail/sequential/iter_swap.h b/projects/rocthrust/thrust/system/detail/sequential/iter_swap.h
index 5497c70914f5..c7eb2753aa3f 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/iter_swap.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/iter_swap.h
@@ -43,7 +43,7 @@ namespace sequential
 template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
 THRUST_HOST_DEVICE void iter_swap(sequential::execution_policy<DerivedPolicy>&, Pointer1 a, Pointer2 b)
 {
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || !_THRUST_USE_ROCPRIM
+#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CPP
   using _THRUST_STD::swap;
 #else
   using thrust::swap;
diff --git a/projects/rocthrust/thrust/system/detail/sequential/logical.h b/projects/rocthrust/thrust/system/detail/sequential/logical.h
index 9769f1969773..1c73e1289f38 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/logical.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/logical.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special logical functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/malloc_and_free.h b/projects/rocthrust/thrust/system/detail/sequential/malloc_and_free.h
index d0d89126c063..87114f5156b0 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/malloc_and_free.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/merge.h b/projects/rocthrust/thrust/system/detail/sequential/merge.h
index cbe8ef2e67cb..0d3e8e6ddd10 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/merge.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/merge.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/merge.inl b/projects/rocthrust/thrust/system/detail/sequential/merge.inl
index dbf00bbf7556..496a144ea3f2 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/merge.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/merge.inl
@@ -17,18 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/system/detail/sequential/merge.h>
 #include <thrust/detail/copy.h>
-#include <thrust/detail/function.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/detail/sequential/merge.h>
+#include <thrust/detail/function.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -38,27 +30,31 @@ namespace detail
 namespace sequential
 {
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE OutputIterator merge(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first1,
-  InputIterator1 last1,
-  InputIterator2 first2,
-  InputIterator2 last2,
-  OutputIterator result,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+OutputIterator merge(sequential::execution_policy<DerivedPolicy> &exec,
+                     InputIterator1 first1,
+                     InputIterator1 last1,
+                     InputIterator2 first2,
+                     InputIterator2 last2,
+                     OutputIterator result,
+                     StrictWeakOrdering comp)
 {
   // wrap comp
-  thrust::detail::wrapped_function<StrictWeakOrdering, bool> wrapped_comp{comp};
+  thrust::detail::wrapped_function<
+    StrictWeakOrdering,
+    bool
+  > wrapped_comp{comp};
 
-  while (first1 != last1 && first2 != last2)
+  while(first1 != last1 && first2 != last2)
   {
-    if (wrapped_comp(*first2, *first1))
+    if(wrapped_comp(*first2, *first1))
     {
       *result = *first2;
       ++first2;
@@ -75,33 +71,38 @@ THRUST_HOST_DEVICE OutputIterator merge(
   return thrust::copy(exec, first2, last2, thrust::copy(exec, first1, last1, result));
 } // end merge()
 
+
 THRUST_EXEC_CHECK_DISABLE
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  sequential::execution_policy<DerivedPolicy>&,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first1,
-  InputIterator4 values_first2,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+thrust::pair<OutputIterator1,OutputIterator2>
+  merge_by_key(sequential::execution_policy<DerivedPolicy> &,
+               InputIterator1 keys_first1,
+               InputIterator1 keys_last1,
+               InputIterator2 keys_first2,
+               InputIterator2 keys_last2,
+               InputIterator3 values_first1,
+               InputIterator4 values_first2,
+               OutputIterator1 keys_result,
+               OutputIterator2 values_result,
+               StrictWeakOrdering comp)
 {
   // wrap comp
-  thrust::detail::wrapped_function<StrictWeakOrdering, bool> wrapped_comp{comp};
+  thrust::detail::wrapped_function<
+    StrictWeakOrdering,
+    bool
+  > wrapped_comp{comp};
 
-  while (keys_first1 != keys_last1 && keys_first2 != keys_last2)
+  while(keys_first1 != keys_last1 && keys_first2 != keys_last2)
   {
-    if (!wrapped_comp(*keys_first2, *keys_first1))
+    if(!wrapped_comp(*keys_first2, *keys_first1))
     {
       // *keys_first1 <= *keys_first2
       *keys_result   = *keys_first1;
@@ -122,7 +123,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
     ++values_result;
   }
 
-  while (keys_first1 != keys_last1)
+  while(keys_first1 != keys_last1)
   {
     *keys_result   = *keys_first1;
     *values_result = *values_first1;
@@ -132,7 +133,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
     ++values_result;
   }
 
-  while (keys_first2 != keys_last2)
+  while(keys_first2 != keys_last2)
   {
     *keys_result   = *keys_first2;
     *values_result = *values_first2;
@@ -145,6 +146,7 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
   return thrust::make_pair(keys_result, values_result);
 }
 
+
 } // end namespace sequential
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/sequential/mismatch.h b/projects/rocthrust/thrust/system/detail/sequential/mismatch.h
index 40d80c212ebd..5cec44d12b4f 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/mismatch.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/mismatch.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special mismatch functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/partition.h b/projects/rocthrust/thrust/system/detail/sequential/partition.h
index ccf4cd3d6d6a..3c0f4953b61a 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/partition.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/partition.h
@@ -62,7 +62,7 @@ THRUST_HOST_DEVICE void iter_swap(ForwardIterator1 iter1, ForwardIterator2 iter2
 {
   // note: we cannot use swap(*iter1, *iter2) here, because the reference_type's could be proxy references, for which
   // swap() is not guaranteed to work
-  using T = thrust::detail::it_value_t<ForwardIterator1>;
+  using T = typename thrust::iterator_value<ForwardIterator1>::type;
   T temp  = _THRUST_STD::move(*iter1);
   *iter1  = _THRUST_STD::move(*iter2);
   *iter2  = _THRUST_STD::move(temp);
@@ -163,7 +163,7 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
   // wrap pred
   thrust::detail::wrapped_function<Predicate, bool> wrapped_pred{pred};
 
-  using T = thrust::detail::it_value_t<ForwardIterator>;
+  using T = typename thrust::iterator_value<ForwardIterator>::type;
 
   using TempRange    = thrust::detail::temporary_array<T, DerivedPolicy>;
   using TempIterator = typename TempRange::iterator;
@@ -205,7 +205,7 @@ THRUST_HOST_DEVICE ForwardIterator stable_partition(
   // wrap pred
   thrust::detail::wrapped_function<Predicate, bool> wrapped_pred{pred};
 
-  using T = thrust::detail::it_value_t<ForwardIterator>;
+  using T = typename thrust::iterator_value<ForwardIterator>::type;
 
   using TempRange    = thrust::detail::temporary_array<T, DerivedPolicy>;
   using TempIterator = typename TempRange::iterator;
diff --git a/projects/rocthrust/thrust/system/detail/sequential/per_device_resource.h b/projects/rocthrust/thrust/system/detail/sequential/per_device_resource.h
index f02fcfcdc3ff..8c4a903cd16b 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/per_device_resource.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special per device resource functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/reduce.h b/projects/rocthrust/thrust/system/detail/sequential/reduce.h
index 1e8e8f221b2f..1129b4d84061 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/reduce.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/reduce.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/reduce_by_key.h b/projects/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
index 18133617ef45..bba9cfc9c871 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/reduce_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
@@ -55,11 +48,11 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
   BinaryPredicate binary_pred,
   BinaryFunction binary_op)
 {
-  using InputKeyType   = thrust::detail::it_value_t<InputIterator1>;
-  using InputValueType = thrust::detail::it_value_t<InputIterator2>;
+  using InputKeyType   = typename thrust::iterator_traits<InputIterator1>::value_type;
+  using InputValueType = typename thrust::iterator_traits<InputIterator2>::value_type;
 
   // Use the input iterator's value type per https://wg21.link/P0571
-  using TemporaryType = thrust::detail::it_value_t<InputIterator2>;
+  using TemporaryType = typename thrust::iterator_value<InputIterator2>::type;
 
   if (keys_first != keys_last)
   {
diff --git a/projects/rocthrust/thrust/system/detail/sequential/remove.h b/projects/rocthrust/thrust/system/detail/sequential/remove.h
index 329a770765cd..b1c04cc9e520 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/remove.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/remove.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/replace.h b/projects/rocthrust/thrust/system/detail/sequential/replace.h
index bea87a2b8a02..c09e35c6782b 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/replace.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/replace.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special replace functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/reverse.h b/projects/rocthrust/thrust/system/detail/sequential/reverse.h
index 462388e34aab..1c0f914559f5 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/reverse.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/reverse.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special reverse functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/scan.h b/projects/rocthrust/thrust/system/detail/sequential/scan.h
index 8a4955c3cf01..3a3ec9c7bf06 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/scan.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/scan.h
@@ -30,11 +30,15 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/function.h>
-#include <thrust/detail/libcxx_wrapper/std/__functional/invoke.h>
 #include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <iterator>
+#endif
+
 THRUST_NAMESPACE_BEGIN
 namespace system
 {
@@ -55,7 +59,7 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan(
   using namespace thrust::detail;
 
   // Use the input iterator's value type per https://wg21.link/P0571
-  using ValueType = thrust::detail::it_value_t<InputIterator>;
+  using ValueType = typename thrust::iterator_value<InputIterator>::type;
 
   // wrap binary_op
   thrust::detail::wrapped_function<BinaryFunction, ValueType> wrapped_binary_op{binary_op};
@@ -91,8 +95,8 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan(
 {
   using namespace thrust::detail;
 
-  using ValueType =
-    typename ::internal::accumulator_t<BinaryFunction, thrust::detail::it_value_t<InputIterator>, InitialValueType>;
+  using ValueType = typename ::internal::
+    accumulator_t<BinaryFunction, typename _THRUST_STD::iterator_traits<InputIterator>::value_type, InitialValueType>;
 
   // wrap binary_op
   thrust::detail::wrapped_function<BinaryFunction, ValueType> wrapped_binary_op{binary_op};
diff --git a/projects/rocthrust/thrust/system/detail/sequential/scan_by_key.h b/projects/rocthrust/thrust/system/detail/sequential/scan_by_key.h
index 6d6896929962..89847ee084db 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/scan_by_key.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
@@ -57,8 +50,8 @@ THRUST_HOST_DEVICE OutputIterator inclusive_scan_by_key(
   BinaryPredicate binary_pred,
   BinaryFunction binary_op)
 {
-  using KeyType   = thrust::detail::it_value_t<InputIterator1>;
-  using ValueType = thrust::detail::it_value_t<InputIterator2>;
+  using KeyType   = typename thrust::iterator_traits<InputIterator1>::value_type;
+  using ValueType = typename thrust::iterator_traits<InputIterator2>::value_type;
 
   // wrap binary_op
   thrust::detail::wrapped_function<BinaryFunction, ValueType> wrapped_binary_op{binary_op};
@@ -108,7 +101,7 @@ THRUST_HOST_DEVICE OutputIterator exclusive_scan_by_key(
   BinaryPredicate binary_pred,
   BinaryFunction binary_op)
 {
-  using KeyType   = thrust::detail::it_value_t<InputIterator1>;
+  using KeyType   = typename thrust::iterator_traits<InputIterator1>::value_type;
   using ValueType = T;
 
   if (first1 != last1)
diff --git a/projects/rocthrust/thrust/system/detail/sequential/scatter.h b/projects/rocthrust/thrust/system/detail/sequential/scatter.h
index d6ec9fadbf55..82b79ba9ccf3 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/scatter.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/scatter.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special scatter functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/sequence.h b/projects/rocthrust/thrust/system/detail/sequential/sequence.h
index 45869142718c..22880d122be7 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/sequence.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/sequence.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special sequence functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/set_operations.h b/projects/rocthrust/thrust/system/detail/sequential/set_operations.h
index 74b7fb4b0e33..909402b70d4b 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/set_operations.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/set_operations.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/copy.h>
 #include <thrust/detail/function.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
diff --git a/projects/rocthrust/thrust/system/detail/sequential/sort.h b/projects/rocthrust/thrust/system/detail/sequential/sort.h
index 45685ab47d95..44859876da92 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/sort.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/sort.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/sort.inl b/projects/rocthrust/thrust/system/detail/sequential/sort.inl
index ee84b885bbda..70bc8ce3d1e8 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/sort.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/sort.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,13 +27,14 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__type_traits/conjunction.h>
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/reverse.h>
 #include <thrust/system/detail/sequential/stable_merge_sort.h>
 #include <thrust/system/detail/sequential/stable_primitive_sort.h>
 
+#include <thrust/detail/nv_target.h>
+
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
 #endif
@@ -67,7 +68,7 @@ THRUST_HOST_DEVICE void stable_sort(
   thrust::system::detail::sequential::stable_primitive_sort(exec, first, last);
 
   // if comp is greater<T> then reverse the keys
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator>;
+  using KeyType = typename thrust::iterator_traits<RandomAccessIterator>::value_type;
 
   if (needs_reverse<KeyType, StrictWeakOrdering>::value)
   {
@@ -88,7 +89,7 @@ THRUST_HOST_DEVICE void stable_sort_by_key(
   thrust::detail::true_type)
 {
   // if comp is greater<T> then reverse the keys and values
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_traits<RandomAccessIterator1>::value_type;
 
   // note, we also have to reverse the (unordered) input to preserve stability
   if (needs_reverse<KeyType, StrictWeakOrdering>::value)
@@ -140,7 +141,7 @@ template <typename KeyType, typename Compare>
 struct use_primitive_sort
     : ::internal::_And<::internal::is_arithmetic<KeyType>,
                        _THRUST_STD::disjunction<_THRUST_STD::is_same<Compare, thrust::less<KeyType>>,
-                                                _THRUST_STD::is_same<Compare, thrust::greater<KeyType>>>>
+                                               _THRUST_STD::is_same<Compare, thrust::greater<KeyType>>>>
 {};
 
 } // end namespace sort_detail
@@ -153,12 +154,12 @@ THRUST_HOST_DEVICE void stable_sort(
   StrictWeakOrdering comp)
 {
   // the compilation time of stable_primitive_sort is too expensive to use within a single CUDA thread
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (using KeyType = thrust::detail::it_value_t<RandomAccessIterator>;
+  NV_IF_TARGET(
+    NV_IS_HOST,
+    (using KeyType = thrust::iterator_value_t<RandomAccessIterator>;
      sort_detail::use_primitive_sort<KeyType, StrictWeakOrdering> use_primitive_sort;
      sort_detail::stable_sort(exec, first, last, comp, use_primitive_sort);),
-    ( // _THRUST_IS_DEVICE:
+    ( // NV_IS_DEVICE:
       thrust::detail::false_type use_primitive_sort;
       sort_detail::stable_sort(exec, first, last, comp, use_primitive_sort);));
 }
@@ -175,12 +176,12 @@ THRUST_HOST_DEVICE void stable_sort_by_key(
   StrictWeakOrdering comp)
 {
   // the compilation time of stable_primitive_sort_by_key is too expensive to use within a single CUDA thread
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  NV_IF_TARGET(
+    NV_IS_HOST,
+    (using KeyType = thrust::iterator_value_t<RandomAccessIterator1>;
      sort_detail::use_primitive_sort<KeyType, StrictWeakOrdering> use_primitive_sort;
      sort_detail::stable_sort_by_key(exec, first1, last1, first2, comp, use_primitive_sort);),
-    ( // _THRUST_IS_DEVICE:
+    ( // NV_IS_DEVICE:
       thrust::detail::false_type use_primitive_sort;
       sort_detail::stable_sort_by_key(exec, first1, last1, first2, comp, use_primitive_sort);));
 }
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h b/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
index a518120ac251..2464aa7d011e 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.inl b/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.inl
index 2afc354fa2ad..d61fa62795dd 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_merge_sort.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,26 +19,13 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/detail/temporary_array.h>
 #include <thrust/merge.h>
 #include <thrust/system/detail/sequential/insertion_sort.h>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <thrust/detail/algorithm_wrapper.h>
-#endif
+#include <thrust/detail/minmax.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  include _THRUST_STD_INCLUDE(iterator)
-#endif
+#include <thrust/detail/nv_target.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -50,15 +37,18 @@ namespace sequential
 namespace stable_merge_sort_detail
 {
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void inplace_merge(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator first,
-  RandomAccessIterator middle,
-  RandomAccessIterator last,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void inplace_merge(sequential::execution_policy<DerivedPolicy> &exec,
+                   RandomAccessIterator first,
+                   RandomAccessIterator middle,
+                   RandomAccessIterator last,
+                   StrictWeakOrdering comp)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator>::type;
 
   thrust::detail::temporary_array<value_type, DerivedPolicy> a(exec, first, middle);
   thrust::detail::temporary_array<value_type, DerivedPolicy> b(exec, middle, last);
@@ -66,227 +56,274 @@ THRUST_HOST_DEVICE void inplace_merge(
   thrust::merge(exec, a.begin(), a.end(), b.begin(), b.end(), first, comp);
 }
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void inplace_merge_by_key(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first1,
-  RandomAccessIterator1 middle1,
-  RandomAccessIterator1 last1,
-  RandomAccessIterator2 first2,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void inplace_merge_by_key(sequential::execution_policy<DerivedPolicy> &exec,
+                          RandomAccessIterator1 first1,
+                          RandomAccessIterator1 middle1,
+                          RandomAccessIterator1 last1,
+                          RandomAccessIterator2 first2,
+                          StrictWeakOrdering comp)
 {
-  using value_type1 = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using value_type2 = thrust::detail::it_value_t<RandomAccessIterator2>;
+  using value_type1 = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using value_type2 = typename thrust::iterator_value<RandomAccessIterator2>::type;
 
   RandomAccessIterator2 middle2 = first2 + (middle1 - first1);
-  RandomAccessIterator2 last2   = first2 + (last1 - first1);
+  RandomAccessIterator2 last2   = first2 + (last1   - first1);
 
   thrust::detail::temporary_array<value_type1, DerivedPolicy> lhs1(exec, first1, middle1);
   thrust::detail::temporary_array<value_type1, DerivedPolicy> rhs1(exec, middle1, last1);
   thrust::detail::temporary_array<value_type2, DerivedPolicy> lhs2(exec, first2, middle2);
   thrust::detail::temporary_array<value_type2, DerivedPolicy> rhs2(exec, middle2, last2);
 
-  thrust::merge_by_key(
-    exec, lhs1.begin(), lhs1.end(), rhs1.begin(), rhs1.end(), lhs2.begin(), rhs2.begin(), first1, first2, comp);
+  thrust::merge_by_key(exec,
+                       lhs1.begin(), lhs1.end(),
+                       rhs1.begin(), rhs1.end(),
+                       lhs2.begin(), rhs2.begin(),
+                       first1, first2,
+                       comp);
 }
 
-template <typename RandomAccessIterator, typename Size, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void
-insertion_sort_each(RandomAccessIterator first, RandomAccessIterator last, Size partition_size, StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator,
+         typename Size,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void insertion_sort_each(RandomAccessIterator first,
+                         RandomAccessIterator last,
+                         Size partition_size,
+                         StrictWeakOrdering comp)
 {
-  if (partition_size > 1)
+  if(partition_size > 1)
   {
-    for (; first < last; first += partition_size)
+    for(; first < last; first += partition_size)
     {
-      RandomAccessIterator partition_last = (_THRUST_STD::min)(last, first + partition_size);
+      RandomAccessIterator partition_last = (thrust::min)(last, first + partition_size);
 
       thrust::system::detail::sequential::insertion_sort(first, partition_last, comp);
     } // end for
   } // end if
 } // end insertion_sort_each()
 
-template <typename RandomAccessIterator1, typename RandomAccessIterator2, typename Size, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void insertion_sort_each_by_key(
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  Size partition_size,
-  StrictWeakOrdering comp)
+
+template<typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename Size,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void insertion_sort_each_by_key(RandomAccessIterator1 keys_first,
+                                RandomAccessIterator1 keys_last,
+                                RandomAccessIterator2 values_first,
+                                Size partition_size,
+                                StrictWeakOrdering comp)
 {
-  if (partition_size > 1)
+  if(partition_size > 1)
   {
-    for (; keys_first < keys_last; keys_first += partition_size, values_first += partition_size)
+    for(; keys_first < keys_last; keys_first += partition_size, values_first += partition_size)
     {
-      RandomAccessIterator1 keys_partition_last = (_THRUST_STD::min)(keys_last, keys_first + partition_size);
+      RandomAccessIterator1 keys_partition_last = (thrust::min)(keys_last, keys_first + partition_size);
 
       thrust::system::detail::sequential::insertion_sort_by_key(keys_first, keys_partition_last, values_first, comp);
     } // end for
   } // end if
 } // end insertion_sort_each()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename Size,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void merge_adjacent_partitions(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first,
-  RandomAccessIterator1 last,
-  Size partition_size,
-  RandomAccessIterator2 result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename Size,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void merge_adjacent_partitions(sequential::execution_policy<DerivedPolicy> &exec,
+                               RandomAccessIterator1 first,
+                               RandomAccessIterator1 last,
+                               Size partition_size,
+                               RandomAccessIterator2 result,
+                               StrictWeakOrdering comp)
 {
-  for (; first < last; first += 2 * partition_size, result += 2 * partition_size)
+  for(; first < last; first += 2 * partition_size, result += 2 * partition_size)
   {
-    RandomAccessIterator1 interval_middle = (_THRUST_STD::min)(last, first + partition_size);
-    RandomAccessIterator1 interval_last   = (_THRUST_STD::min)(last, interval_middle + partition_size);
-
-    thrust::merge(exec, first, interval_middle, interval_middle, interval_last, result, comp);
+    RandomAccessIterator1 interval_middle = (thrust::min)(last, first + partition_size);
+    RandomAccessIterator1 interval_last   = (thrust::min)(last, interval_middle + partition_size);
+
+    thrust::merge(exec,
+                  first, interval_middle,
+                  interval_middle, interval_last,
+                  result,
+                  comp);
   } // end for
 } // end merge_adjacent_partitions()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename Size,
-          typename RandomAccessIterator3,
-          typename RandomAccessIterator4,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void merge_adjacent_partitions_by_key(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  Size partition_size,
-  RandomAccessIterator3 keys_result,
-  RandomAccessIterator4 values_result,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename Size,
+         typename RandomAccessIterator3,
+         typename RandomAccessIterator4,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void merge_adjacent_partitions_by_key(sequential::execution_policy<DerivedPolicy> &exec,
+                                      RandomAccessIterator1 keys_first,
+                                      RandomAccessIterator1 keys_last,
+                                      RandomAccessIterator2 values_first,
+                                      Size partition_size,
+                                      RandomAccessIterator3 keys_result,
+                                      RandomAccessIterator4 values_result,
+                                      StrictWeakOrdering comp)
 {
   Size stride = 2 * partition_size;
 
-  for (; keys_first < keys_last;
-       keys_first += stride, values_first += stride, keys_result += stride, values_result += stride)
+  for(;
+      keys_first < keys_last;
+      keys_first += stride, values_first += stride, keys_result += stride, values_result += stride)
   {
-    RandomAccessIterator1 keys_interval_middle = (_THRUST_STD::min)(keys_last, keys_first + partition_size);
-    RandomAccessIterator1 keys_interval_last   = (_THRUST_STD::min)(keys_last, keys_interval_middle + partition_size);
+    RandomAccessIterator1 keys_interval_middle = (thrust::min)(keys_last, keys_first + partition_size);
+    RandomAccessIterator1 keys_interval_last   = (thrust::min)(keys_last, keys_interval_middle + partition_size);
 
     RandomAccessIterator2 values_first2 = values_first + (keys_interval_middle - keys_first);
 
-    thrust::merge_by_key(
-      exec,
-      keys_first,
-      keys_interval_middle,
-      keys_interval_middle,
-      keys_interval_last,
-      values_first,
-      values_first2,
-      keys_result,
-      values_result,
-      comp);
+    thrust::merge_by_key(exec,
+                         keys_first, keys_interval_middle,
+                         keys_interval_middle, keys_interval_last,
+                         values_first,
+                         values_first2,
+                         keys_result,
+                         values_result,
+                         comp);
   } // end for
 } // end merge_adjacent_partitions()
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void iterative_stable_merge_sort(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator first,
-  RandomAccessIterator last,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void iterative_stable_merge_sort(sequential::execution_policy<DerivedPolicy> &exec,
+                                 RandomAccessIterator first,
+                                 RandomAccessIterator last,
+                                 StrictWeakOrdering comp)
 {
-  using value_type      = thrust::detail::it_value_t<RandomAccessIterator>;
-  using difference_type = thrust::detail::it_difference_t<RandomAccessIterator>;
+  using value_type      = typename thrust::iterator_value<RandomAccessIterator>::type;
+  using difference_type = typename thrust::iterator_difference<RandomAccessIterator>::type;
 
   difference_type n = last - first;
+  difference_type partition_size = 32;
 
-  thrust::detail::temporary_array<value_type, DerivedPolicy> temp(exec, n);
+  // WORKAROUND: Memory access fault occurs on HIP when the size of the temp array is less than 16.
+  // This workaround is based on the check that's used in the recursive version.
+  if(n <= partition_size)
+  {
+    insertion_sort_each(first, last, partition_size, comp);
+  }
+  else
+  {
+    thrust::detail::temporary_array<value_type, DerivedPolicy> temp(exec, n);
 
-  // insertion sort each 32 element partition
-  difference_type partition_size = 32;
-  insertion_sort_each(first, last, partition_size, comp);
+    // insertion sort each 32 element partition
+    insertion_sort_each(first, last, partition_size, comp);
 
-  // ping indicates whether or not the latest data is in the source range [first, last)
-  bool ping = true;
+    // ping indicates whether or not the latest data is in the source range [first, last)
+    bool ping = true;
 
-  // merge adjacent partitions until the partition size covers the entire range
-  for (; partition_size < n; partition_size *= 2, ping = !ping)
-  {
-    if (ping)
+    // merge adjacent partitions until the partition size covers the entire range
+    for(;
+      partition_size < n;
+      partition_size *= 2, ping = !ping)
     {
-      merge_adjacent_partitions(exec, first, last, partition_size, temp.begin(), comp);
-    } // end if
-    else
+      if(ping)
+      {
+        merge_adjacent_partitions(exec, first, last, partition_size, temp.begin(), comp);
+      } // end if
+      else
+      {
+        merge_adjacent_partitions(exec, temp.begin(), temp.end(), partition_size, first, comp);
+      } // end else
+    } // end for m
+
+    if(!ping)
     {
-      merge_adjacent_partitions(exec, temp.begin(), temp.end(), partition_size, first, comp);
-    } // end else
-  } // end for m
-
-  if (!ping)
-  {
-    thrust::copy(exec, temp.begin(), temp.end(), first);
-  } // end if
+      thrust::copy(exec, temp.begin(), temp.end(), first);
+    } // end if
+  }
 } // end iterative_stable_merge_sort()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void iterative_stable_merge_sort_by_key(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void iterative_stable_merge_sort_by_key(sequential::execution_policy<DerivedPolicy> &exec,
+                                        RandomAccessIterator1 keys_first,
+                                        RandomAccessIterator1 keys_last,
+                                        RandomAccessIterator2 values_first,
+                                        StrictWeakOrdering comp)
 {
-  using value_type1     = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using value_type2     = thrust::detail::it_value_t<RandomAccessIterator2>;
-  using difference_type = thrust::detail::it_difference_t<RandomAccessIterator1>;
+  using value_type1     = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using value_type2     = typename thrust::iterator_value<RandomAccessIterator2>::type;
+  using difference_type = typename thrust::iterator_difference<RandomAccessIterator1>::type;
 
   difference_type n = keys_last - keys_first;
+  difference_type partition_size = 32;
 
-  thrust::detail::temporary_array<value_type1, DerivedPolicy> keys_temp(exec, n);
-  thrust::detail::temporary_array<value_type2, DerivedPolicy> values_temp(exec, n);
+  // WORKAROUND: Memory access fault occurs on HIP when the size of the temp array is less than 16.
+  // This workaround is based on the check that's used in the recursive version.
+  if(n <= partition_size)
+  {
+    // insertion sort each 32 element partition
+    insertion_sort_each_by_key(keys_first, keys_last, values_first, partition_size, comp);
+  }
+  else
+  {
+    thrust::detail::temporary_array<value_type1, DerivedPolicy> keys_temp(exec, n);
+    thrust::detail::temporary_array<value_type2, DerivedPolicy> values_temp(exec, n);
 
-  // insertion sort each 32 element partition
-  difference_type partition_size = 32;
-  insertion_sort_each_by_key(keys_first, keys_last, values_first, partition_size, comp);
+    // insertion sort each 32 element partition
+    insertion_sort_each_by_key(keys_first, keys_last, values_first, partition_size, comp);
 
-  // ping indicates whether or not the latest data is in the source range [first, last)
-  bool ping = true;
+    // ping indicates whether or not the latest data is in the source range [first, last)
+    bool ping = true;
 
-  // merge adjacent partitions until the partition size covers the entire range
-  for (; partition_size < n; partition_size *= 2, ping = !ping)
-  {
-    if (ping)
+    // merge adjacent partitions until the partition size covers the entire range
+    for(;
+        partition_size < n;
+        partition_size *= 2, ping = !ping)
     {
-      merge_adjacent_partitions_by_key(
-        exec, keys_first, keys_last, values_first, partition_size, keys_temp.begin(), values_temp.begin(), comp);
-    } // end if
-    else
+      if(ping)
+      {
+        merge_adjacent_partitions_by_key(exec, keys_first, keys_last, values_first, partition_size, keys_temp.begin(), values_temp.begin(), comp);
+      } // end if
+      else
+      {
+        merge_adjacent_partitions_by_key(exec, keys_temp.begin(), keys_temp.end(), values_temp.begin(), partition_size, keys_first, values_first, comp);
+      } // end else
+    } // end for m
+
+    if(!ping)
     {
-      merge_adjacent_partitions_by_key(
-        exec, keys_temp.begin(), keys_temp.end(), values_temp.begin(), partition_size, keys_first, values_first, comp);
-    } // end else
-  } // end for m
-
-  if (!ping)
-  {
-    thrust::copy(exec, keys_temp.begin(), keys_temp.end(), keys_first);
-    thrust::copy(exec, values_temp.begin(), values_temp.end(), values_first);
-  } // end if
+      thrust::copy(exec, keys_temp.begin(), keys_temp.end(), keys_first);
+      thrust::copy(exec, values_temp.begin(), values_temp.end(), values_first);
+    } // end if
+  }
 } // end iterative_stable_merge_sort()
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void recursive_stable_merge_sort(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator first,
-  RandomAccessIterator last,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void recursive_stable_merge_sort(sequential::execution_policy<DerivedPolicy> &exec,
+                                 RandomAccessIterator first,
+                                 RandomAccessIterator last,
+                                 StrictWeakOrdering comp)
 {
-  if (last - first <= 32)
+  if(last - first <= 32)
   {
     thrust::system::detail::sequential::insertion_sort(first, last, comp);
   } // end if
@@ -295,23 +332,24 @@ THRUST_HOST_DEVICE void recursive_stable_merge_sort(
     RandomAccessIterator middle = first + (last - first) / 2;
 
     stable_merge_sort_detail::recursive_stable_merge_sort(exec, first, middle, comp);
-    stable_merge_sort_detail::recursive_stable_merge_sort(exec, middle, last, comp);
+    stable_merge_sort_detail::recursive_stable_merge_sort(exec, middle,  last, comp);
     stable_merge_sort_detail::inplace_merge(exec, first, middle, last, comp);
   } // end else
 } // end recursive_stable_merge_sort()
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void recursive_stable_merge_sort_by_key(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first1,
-  RandomAccessIterator1 last1,
-  RandomAccessIterator2 first2,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void recursive_stable_merge_sort_by_key(sequential::execution_policy<DerivedPolicy> &exec,
+                                        RandomAccessIterator1 first1,
+                                        RandomAccessIterator1 last1,
+                                        RandomAccessIterator2 first2,
+                                        StrictWeakOrdering comp)
 {
-  if (last1 - first1 <= 32)
+  if(last1 - first1 <= 32)
   {
     thrust::system::detail::sequential::insertion_sort_by_key(first1, last1, first2, comp);
   } // end if
@@ -320,46 +358,54 @@ THRUST_HOST_DEVICE void recursive_stable_merge_sort_by_key(
     RandomAccessIterator1 middle1 = first1 + (last1 - first1) / 2;
     RandomAccessIterator2 middle2 = first2 + (last1 - first1) / 2;
 
-    stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, first1, middle1, first2, comp);
-    stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, middle1, last1, middle2, comp);
+    stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, first1, middle1, first2,  comp);
+    stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, middle1,  last1, middle2, comp);
     stable_merge_sort_detail::inplace_merge_by_key(exec, first1, middle1, last1, first2, comp);
   } // end else
 } // end recursive_stable_merge_sort_by_key()
 
+
 } // end namespace stable_merge_sort_detail
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void stable_merge_sort(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator first,
-  RandomAccessIterator last,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void stable_merge_sort(sequential::execution_policy<DerivedPolicy> &exec,
+                       RandomAccessIterator first,
+                       RandomAccessIterator last,
+                       StrictWeakOrdering comp)
 {
-  _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-               (
-                 // avoid recursion in CUDA or HIP threads
-                 stable_merge_sort_detail::iterative_stable_merge_sort(exec, first, last, comp);),
-               (stable_merge_sort_detail::recursive_stable_merge_sort(exec, first, last, comp);));
+  NV_IF_TARGET(NV_IS_DEVICE, (
+    // avoid recursion in CUDA or HIP threads
+    stable_merge_sort_detail::iterative_stable_merge_sort(exec, first, last, comp);
+  ), (
+    stable_merge_sort_detail::recursive_stable_merge_sort(exec, first, last, comp);
+  ));
 }
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-THRUST_HOST_DEVICE void stable_merge_sort_by_key(
-  sequential::execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first1,
-  RandomAccessIterator1 last1,
-  RandomAccessIterator2 first2,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+THRUST_HOST_DEVICE
+void stable_merge_sort_by_key(sequential::execution_policy<DerivedPolicy> &exec,
+                              RandomAccessIterator1 first1,
+                              RandomAccessIterator1 last1,
+                              RandomAccessIterator2 first2,
+                              StrictWeakOrdering comp)
 {
-  _THRUST_IF_TARGET(_THRUST_IS_DEVICE,
-               (
-                 // avoid recursion in CUDA or HIP threads
-                 stable_merge_sort_detail::iterative_stable_merge_sort_by_key(exec, first1, last1, first2, comp);),
-               (stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, first1, last1, first2, comp);));
+  NV_IF_TARGET(NV_IS_DEVICE, (
+    // avoid recursion in CUDA or HIP threads
+    stable_merge_sort_detail::iterative_stable_merge_sort_by_key(exec, first1, last1, first2, comp);
+  ), (
+    stable_merge_sort_detail::recursive_stable_merge_sort_by_key(exec, first1, last1, first2, comp);
+  ));
 }
 
+
 } // end namespace sequential
 } // end namespace detail
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h b/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
index 669ff0d58d28..09938753ee1f 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.inl b/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.inl
index b48eec55c740..b1fa1ecd5a9e 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_primitive_sort.inl
@@ -48,12 +48,12 @@ namespace stable_primitive_sort_detail
 
 template <typename Iterator>
 struct enable_if_bool_sort
-    : _THRUST_STD::enable_if<_THRUST_STD::is_same<bool, thrust::detail::it_value_t<Iterator>>::value>
+    : _THRUST_STD::enable_if<_THRUST_STD::is_same<bool, typename thrust::iterator_value<Iterator>::type>::value>
 {};
 
 template <typename Iterator>
 struct disable_if_bool_sort
-    : thrust::detail::disable_if<_THRUST_STD::is_same<bool, thrust::detail::it_value_t<Iterator>>::value>
+    : thrust::detail::disable_if<_THRUST_STD::is_same<bool, typename thrust::iterator_value<Iterator>::type>::value>
 {};
 
 template <typename DerivedPolicy, typename RandomAccessIterator>
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h b/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
index 1ff256221e9f..cd6e82b36936 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.inl b/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.inl
index 486bfe22486e..cabbef014499 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.inl
+++ b/projects/rocthrust/thrust/system/detail/sequential/stable_radix_sort.inl
@@ -193,7 +193,7 @@ inline THRUST_HOST_DEVICE void radix_shuffle_n(
   Integer bit_shift,
   size_t* histogram)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator1>::type;
 
   // note that we are going to mutate the histogram during this sequential scatter
   thrust::scatter(
@@ -221,7 +221,7 @@ THRUST_HOST_DEVICE void radix_shuffle_n(
   Integer bit_shift,
   size_t* histogram)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator1>::type;
 
   // note that we are going to mutate the histogram during this sequential scatter
   thrust::scatter(
@@ -247,7 +247,7 @@ THRUST_HOST_DEVICE void radix_sort(
   RandomAccessIterator4 vals2,
   const size_t N)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator1>::type;
 
   using Encoder     = RadixEncoder<KeyType>;
   using EncodedType = decltype(_THRUST_STD::declval<Encoder>()(_THRUST_STD::declval<KeyType>()));
@@ -533,7 +533,7 @@ THRUST_HOST_DEVICE void radix_sort(
   RandomAccessIterator2 keys2,
   const size_t N)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator1>::type;
   radix_sort_dispatcher<sizeof(KeyType)>()(exec, keys1, keys2, N);
 }
 
@@ -550,7 +550,7 @@ THRUST_HOST_DEVICE void radix_sort(
   RandomAccessIterator4 vals2,
   const size_t N)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator1>::type;
   radix_sort_dispatcher<sizeof(KeyType)>()(exec, keys1, keys2, vals1, vals2, N);
 }
 
@@ -560,7 +560,7 @@ template <typename DerivedPolicy, typename RandomAccessIterator>
 THRUST_HOST_DEVICE void stable_radix_sort(
   sequential::execution_policy<DerivedPolicy>& exec, RandomAccessIterator first, RandomAccessIterator last)
 {
-  using KeyType = thrust::detail::it_value_t<RandomAccessIterator>;
+  using KeyType = typename thrust::iterator_value<RandomAccessIterator>::type;
 
   size_t N = last - first;
 
@@ -576,8 +576,8 @@ THRUST_HOST_DEVICE void stable_radix_sort_by_key(
   RandomAccessIterator1 last1,
   RandomAccessIterator2 first2)
 {
-  using KeyType   = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using ValueType = thrust::detail::it_value_t<RandomAccessIterator2>;
+  using KeyType   = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using ValueType = typename thrust::iterator_value<RandomAccessIterator2>::type;
 
   size_t N = last1 - first1;
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/swap_ranges.h b/projects/rocthrust/thrust/system/detail/sequential/swap_ranges.h
index 696c916cb870..979c99a096db 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/swap_ranges.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special swap_ranges functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/tabulate.h b/projects/rocthrust/thrust/system/detail/sequential/tabulate.h
index 8bd301289a56..47b14d154daa 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/tabulate.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/tabulate.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special tabulate functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/temporary_buffer.h b/projects/rocthrust/thrust/system/detail/sequential/temporary_buffer.h
index 8da64673cb33..a32c5aed28de 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/temporary_buffer.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/transform.h b/projects/rocthrust/thrust/system/detail/sequential/transform.h
index e077bcb8c991..f6fb79efb2b6 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/transform.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/transform.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special transform functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/transform_reduce.h b/projects/rocthrust/thrust/system/detail/sequential/transform_reduce.h
index 7984a1763db6..3b0eff8770f5 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/transform_reduce.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special transform_reduce functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/transform_scan.h b/projects/rocthrust/thrust/system/detail/sequential/transform_scan.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/transform_scan.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/transform_scan.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/detail/sequential/trivial_copy.h b/projects/rocthrust/thrust/system/detail/sequential/trivial_copy.h
index 9804132a6fc1..ed064f3fb175 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/trivial_copy.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/trivial_copy.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,13 +23,7 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/nv_target.h>
 #include <thrust/system/detail/sequential/general_copy.h>
 
 #include <cstring>
@@ -54,11 +48,10 @@ THRUST_HOST_DEVICE T* trivial_copy_n(const T* first, std::ptrdiff_t n, T* result
 
   T* return_value = nullptr;
 
-  _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                    (std::memmove(result, first, n * sizeof(T)); return_value = result + n;),
-                    ( // _THRUST_IS_DEVICE:
-                      return_value = thrust::system::detail::sequential::general_copy_n(first, n, result);));
-
+  NV_IF_TARGET(NV_IS_HOST,
+               (std::memmove(result, first, n * sizeof(T)); return_value = result + n;),
+               ( // NV_IS_DEVICE:
+                 return_value = thrust::system::detail::sequential::general_copy_n(first, n, result);));
   return return_value;
 } // end trivial_copy_n()
 
diff --git a/projects/rocthrust/thrust/system/detail/sequential/uninitialized_copy.h b/projects/rocthrust/thrust/system/detail/sequential/uninitialized_copy.h
index 0968d886dc52..9cab27692e14 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/uninitialized_copy.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/detail/sequential/uninitialized_fill.h b/projects/rocthrust/thrust/system/detail/sequential/uninitialized_fill.h
index ca6300b46b71..74c7beaa2e90 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/uninitialized_fill.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special unintialized_fill functions
diff --git a/projects/rocthrust/thrust/system/detail/sequential/unique.h b/projects/rocthrust/thrust/system/detail/sequential/unique.h
index ac1666f812c8..1a22a6d77b4f 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/unique.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/unique.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
@@ -50,7 +43,7 @@ THRUST_HOST_DEVICE OutputIterator unique_copy(
   OutputIterator output,
   BinaryPredicate binary_pred)
 {
-  using T = thrust::detail::it_value_t<InputIterator>;
+  using T = typename thrust::iterator_traits<InputIterator>::value_type;
 
   if (first != last)
   {
@@ -89,11 +82,11 @@ THRUST_HOST_DEVICE ForwardIterator unique(
 } // end unique()
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   sequential::execution_policy<DerivedPolicy>&, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
 {
-  using T = thrust::detail::it_value_t<ForwardIterator>;
-  thrust::detail::it_difference_t<ForwardIterator> count{};
+  using T = typename thrust::iterator_traits<ForwardIterator>::value_type;
+  typename thrust::iterator_traits<ForwardIterator>::difference_type count{};
 
   if (first != last)
   {
diff --git a/projects/rocthrust/thrust/system/detail/sequential/unique_by_key.h b/projects/rocthrust/thrust/system/detail/sequential/unique_by_key.h
index c83f448650d6..5a99ef69c6b4 100644
--- a/projects/rocthrust/thrust/system/detail/sequential/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/detail/sequential/unique_by_key.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/pair.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
@@ -57,8 +50,8 @@ THRUST_HOST_DEVICE thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_
   OutputIterator2 values_output,
   BinaryPredicate binary_pred)
 {
-  using InputKeyType    = thrust::detail::it_value_t<InputIterator1>;
-  using OutputValueType = thrust::detail::it_value_t<OutputIterator2>;
+  using InputKeyType    = typename thrust::iterator_traits<InputIterator1>::value_type;
+  using OutputValueType = typename thrust::iterator_traits<OutputIterator2>::value_type;
 
   if (keys_first != keys_last)
   {
diff --git a/projects/rocthrust/thrust/system/detail/system_error.inl b/projects/rocthrust/thrust/system/detail/system_error.inl
index 7436ac0bdf5e..8660f4f2e6f9 100644
--- a/projects/rocthrust/thrust/system/detail/system_error.inl
+++ b/projects/rocthrust/thrust/system/detail/system_error.inl
@@ -14,18 +14,11 @@
  *  limitations under the License.
  */
 
+
 #pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/system/system_error.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -33,68 +26,77 @@ THRUST_NAMESPACE_BEGIN
 namespace system
 {
 
-system_error ::system_error(error_code ec, const std::string& what_arg)
-    : std::runtime_error(what_arg)
-    , m_error_code(ec)
-{} // end system_error::system_error()
 
-system_error ::system_error(error_code ec, const char* what_arg)
-    : std::runtime_error(what_arg)
-    , m_error_code(ec)
+system_error
+  ::system_error(error_code ec, const std::string &what_arg)
+    : std::runtime_error(what_arg), m_error_code(ec)
+{
+
+} // end system_error::system_error()
+
+
+system_error
+  ::system_error(error_code ec, const char *what_arg)
+    : std::runtime_error(what_arg), m_error_code(ec)
 {
   ;
 } // end system_error::system_error()
 
-system_error ::system_error(error_code ec)
-    : std::runtime_error("")
-    , m_error_code(ec)
+
+system_error
+  ::system_error(error_code ec)
+    : std::runtime_error(""), m_error_code(ec)
 {
   ;
 } // end system_error::system_error()
 
-system_error ::system_error(int ev, const error_category& ecat, const std::string& what_arg)
-    : std::runtime_error(what_arg)
-    , m_error_code(ev, ecat)
+
+system_error
+  ::system_error(int ev, const error_category &ecat, const std::string &what_arg)
+    : std::runtime_error(what_arg), m_error_code(ev,ecat)
 {
   ;
 } // end system_error::system_error()
 
-system_error ::system_error(int ev, const error_category& ecat, const char* what_arg)
-    : std::runtime_error(what_arg)
-    , m_error_code(ev, ecat)
+
+system_error
+  ::system_error(int ev, const error_category &ecat, const char *what_arg)
+    : std::runtime_error(what_arg), m_error_code(ev,ecat)
 {
   ;
 } // end system_error::system_error()
 
-system_error ::system_error(int ev, const error_category& ecat)
-    : std::runtime_error("")
-    , m_error_code(ev, ecat)
+
+system_error
+  ::system_error(int ev, const error_category &ecat)
+    : std::runtime_error(""), m_error_code(ev,ecat)
 {
   ;
 } // end system_error::system_error()
 
-const error_code& system_error ::code() const noexcept
+
+const error_code &system_error
+  ::code(void) const noexcept
 {
   return m_error_code;
 } // end system_error::code()
 
-const char* system_error ::what() const noexcept
+
+const char *system_error
+  ::what(void) const noexcept
 {
-  if (m_what.empty())
+  if(m_what.empty())
   {
     try
     {
       m_what = this->std::runtime_error::what();
-      if (m_error_code)
+      if(m_error_code)
       {
-        if (!m_what.empty())
-        {
-          m_what += ": ";
-        }
+        if(!m_what.empty()) m_what += ": ";
         m_what += m_error_code.message();
       }
     }
-    catch (...)
+    catch(...)
     {
       return std::runtime_error::what();
     }
@@ -103,6 +105,7 @@ const char* system_error ::what() const noexcept
   return m_what.c_str();
 } // end system_error::what()
 
-} // namespace system
+
+} // end system
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/error_code.h b/projects/rocthrust/thrust/system/error_code.h
index 18b5e482fd32..df3e830e3a88 100644
--- a/projects/rocthrust/thrust/system/error_code.h
+++ b/projects/rocthrust/thrust/system/error_code.h
@@ -33,9 +33,7 @@
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/detail/errno.h>
 
-#if !THRUST_COMPILER(NVRTC)
-#  include <iostream>
-#endif // !THRUST_COMPILER(NVRTC)
+#include <iostream>
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
 #endif
@@ -261,10 +259,10 @@ class error_code
   template <typename ErrorCodeEnum>
   error_code(ErrorCodeEnum e
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
              ,
              _THRUST_STD::enable_if_t<is_error_code_enum<ErrorCodeEnum>::value>* = 0
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   );
 
   // [19.5.2.3] modifiers:
@@ -277,11 +275,11 @@ class error_code
    */
   template <typename ErrorCodeEnum>
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   _THRUST_STD::enable_if_t<is_error_code_enum<ErrorCodeEnum>::value, error_code>&
 #else
   error_code&
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   operator=(ErrorCodeEnum e);
 
   /*! \post <tt>value() == 0</tt> and <tt>category() == system_category()</tt>.
@@ -334,12 +332,10 @@ inline error_code make_error_code(errc::errc_t e);
  */
 inline bool operator<(const error_code& lhs, const error_code& rhs);
 
-#if !THRUST_COMPILER(NVRTC)
 /*! Effects: <tt>os << ec.category().name() << ':' << ec.value()</tt>.
  */
 template <typename charT, typename traits>
 std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>& os, const error_code& ec);
-#endif // !THRUST_COMPILER(NVRTC)
 
 // [19.5.3] class error_condition
 
@@ -374,10 +370,10 @@ class error_condition
   template <typename ErrorConditionEnum>
   error_condition(ErrorConditionEnum e
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
                   ,
                   _THRUST_STD::enable_if_t<is_error_condition_enum<ErrorConditionEnum>::value>* = 0
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   );
 
   // [19.5.3.3] modifiers
@@ -398,11 +394,11 @@ class error_condition
    */
   template <typename ErrorConditionEnum>
 // XXX WAR msvc's problem with enable_if
-#if !THRUST_COMPILER(MSVC)
+#if THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   _THRUST_STD::enable_if_t<is_error_condition_enum<ErrorConditionEnum>::value, error_condition>&
 #else
   error_condition&
-#endif // !THRUST_COMPILER(MSVC)
+#endif // THRUST_HOST_COMPILER != THRUST_HOST_COMPILER_MSVC
   operator=(ErrorConditionEnum e);
 
   /*! Clears this \p error_code object.
diff --git a/projects/rocthrust/thrust/system/hip/config.h b/projects/rocthrust/thrust/system/hip/config.h
index dfd2b0e6b9df..d0f505bd564b 100644
--- a/projects/rocthrust/thrust/system/hip/config.h
+++ b/projects/rocthrust/thrust/system/hip/config.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,32 +27,24 @@
  ******************************************************************************/
 #pragma once
 
-#include <thrust/detail/config.h> // IWYU pragma: export
+#include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#ifndef __HIP_DEVICE_COMPILE__
-#  define THRUST_HIP_RUNTIME_FUNCTION THRUST_HOST_DEVICE
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#  ifndef __HIP_DEVICE_COMPILE__
+#    define __THRUST_HAS_HIPRT__        1
+#    define THRUST_HIP_RUNTIME_FUNCTION THRUST_HOST_DEVICE THRUST_FORCEINLINE
+#    define THRUST_RUNTIME_FUNCTION     THRUST_HIP_RUNTIME_FUNCTION
+#  else
+#    define __THRUST_HAS_HIPRT__        0
+#    define THRUST_HIP_RUNTIME_FUNCTION THRUST_HOST THRUST_FORCEINLINE
+#    define THRUST_RUNTIME_FUNCTION     THRUST_HIP_RUNTIME_FUNCTION
+#  endif
 #else
-#  define THRUST_HIP_RUNTIME_FUNCTION THRUST_HOST
+#  define __THRUST_HAS_HIPRT__        0
+#  define THRUST_HIP_RUNTIME_FUNCTION THRUST_HOST THRUST_FORCEINLINE
+#  define THRUST_RUNTIME_FUNCTION     THRUST_HIP_RUNTIME_FUNCTION
 #endif
 
-#ifdef THRUST_PROVIDE_LEGACY_ARCH_MACROS
-#  ifdef __HIP_DEVICE_COMPILE__
-#    define THRUST_HIP_DEVICE_CODE
-#  endif // __HIP_DEVICE_COMPILE__
-#endif // THRUST_PROVIDE_LEGACY_ARCH_MACROS
-
-#define THRUST_HIP_DEVICE_FUNCTION THRUST_DEVICE THRUST_FORCEINLINE
-#define THRUST_HIP_HOST_FUNCTION   THRUST_HOST THRUST_FORCEINLINE
-#define THRUST_HIP_FUNCTION        THRUST_HOST_DEVICE THRUST_FORCEINLINE
-
 // TODO: These paremeters should be tuned for NAVI.
 #ifndef THRUST_HIP_DEFAULT_MAX_BLOCK_SIZE
 #  define THRUST_HIP_DEFAULT_MAX_BLOCK_SIZE 256
@@ -63,6 +55,14 @@
 #define THRUST_HIP_LAUNCH_BOUNDS(BlockSize) __launch_bounds__(BlockSize, THRUST_HIP_DEFAULT_MIN_WARPS_PER_EU)
 #define THRUST_HIP_LAUNCH_BOUNDS_DEFAULT    THRUST_HIP_LAUNCH_BOUNDS(THRUST_HIP_DEFAULT_MAX_BLOCK_SIZE)
 
+#ifdef __HIP_DEVICE_COMPILE__
+#  define THRUST_HIP_DEVICE_CODE
+#endif
+
+#define THRUST_HIP_DEVICE_FUNCTION THRUST_DEVICE THRUST_FORCEINLINE
+#define THRUST_HIP_HOST_FUNCTION   THRUST_HOST THRUST_FORCEINLINE
+#define THRUST_HIP_FUNCTION        THRUST_HOST_DEVICE THRUST_FORCEINLINE
+
 #ifdef THRUST_HIP_DEBUG_SYNC
 #  define THRUST_HIP_DEBUG_SYNC_FLAG true
 #  define DEBUG
@@ -76,7 +76,7 @@
 
 // Workaround, so kernel(s) called by function is/are not lost,
 // Implicit instantiation of function template
-// that will be used in #if !defined(__HIP_DEVICE_COMPILE__) block.
+// that will be used in #if __THRUST_HAS_HIPRT__ block.
 #define THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(function) \
   do                                                     \
   {                                                      \
diff --git a/projects/rocthrust/thrust/system/hip/detail/adjacent_difference.h b/projects/rocthrust/thrust/system/hip/detail/adjacent_difference.h
index a52ecaae016b..3a60b663d2fd 100644
--- a/projects/rocthrust/thrust/system/hip/detail/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/hip/detail/adjacent_difference.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,10 +37,11 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/functional.h>
@@ -48,15 +49,14 @@
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 #  include <thrust/type_traits/is_contiguous_iterator.h>
-#  include <thrust/type_traits/unwrap_contiguous_iterator.h>
-
-#  include _THRUST_STD_INCLUDE(type_traits)
 
 // rocprim include
 #  include <rocprim/rocprim.hpp>
 
 #  include <cstdint>
 
+#  include _THRUST_STD_INCLUDE(type_traits)
+
 THRUST_NAMESPACE_BEGIN
 
 template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryFunction>
@@ -130,11 +130,11 @@ adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt la
   using UnwrapInputIt  = thrust::try_unwrap_contiguous_iterator_t<InputIt>;
   using UnwrapOutputIt = thrust::try_unwrap_contiguous_iterator_t<OutputIt>;
 
-  using InputValueT  = thrust::detail::it_value_t<UnwrapInputIt>;
-  using OutputValueT = thrust::detail::it_value_t<UnwrapOutputIt>;
+  using InputValueT  = thrust::iterator_value_t<UnwrapInputIt>;
+  using OutputValueT = thrust::iterator_value_t<UnwrapOutputIt>;
 
   constexpr bool can_compare_iterators =
-    ::std::is_pointer<UnwrapInputIt>::value && ::std::is_pointer<UnwrapOutputIt>::value
+    _THRUST_STD::is_pointer<UnwrapInputIt>::value && _THRUST_STD::is_pointer<UnwrapOutputIt>::value
     && std::is_same<InputValueT, OutputValueT>::value;
 
   auto first_unwrap  = thrust::try_unwrap_contiguous_iterator(first);
@@ -197,7 +197,7 @@ adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt la
     {
       result = __adjacent_difference::adjacent_difference(policy, first, last, result, binary_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static void
     seq(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt& result, BinaryOp binary_op)
     {
@@ -205,7 +205,7 @@ adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt la
     }
 # endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   workaround::par(policy, first, last, result, binary_op);
 #  else
   workaround::seq(policy, first, last, result, binary_op);
@@ -218,7 +218,7 @@ template <class Derived, class InputIt, class OutputIt>
 OutputIt THRUST_HOST_DEVICE
 adjacent_difference(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using input_type = thrust::detail::it_value_t<InputIt>;
+  using input_type = typename iterator_traits<InputIt>::value_type;
   return hip_rocprim::adjacent_difference(policy, first, last, result, minus<input_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/assign_value.h b/projects/rocthrust/thrust/system/hip/detail/assign_value.h
index 864959196b56..a46449a8211d 100644
--- a/projects/rocthrust/thrust/system/hip/detail/assign_value.h
+++ b/projects/rocthrust/thrust/system/hip/detail/assign_value.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,58 +27,71 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
 #  include <thrust/system/hip/detail/copy.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/system/hip/detail/nv/target.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
+
 template <typename DerivedPolicy, typename Pointer1, typename Pointer2>
-THRUST_HOST_DEVICE void assign_value([[maybe_unused]] execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
+inline THRUST_HOST_DEVICE void
+assign_value(thrust::hip::execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    THRUST_HOST auto operator()(execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
+    THRUST_HOST inline static void
+    host_path(thrust::hip::execution_policy<DerivedPolicy>& exec, Pointer1 dst, Pointer2 src)
     {
       hip_rocprim::copy(exec, src, src + 1, dst);
     }
+
+    THRUST_DEVICE inline static void
+    device_path(thrust::hip::execution_policy<DerivedPolicy>&, Pointer1 dst, Pointer2 src)
+    {
+      *thrust::raw_pointer_cast(dst) = *thrust::raw_pointer_cast(src);
+    }
   };
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST, (HostPath{}(exec, dst, src);), *thrust::raw_pointer_cast(dst) = *thrust::raw_pointer_cast(src););
-}
+
+  NV_IF_TARGET(
+    NV_IS_HOST, (war_nvbugs_881631::host_path(exec, dst, src);), (war_nvbugs_881631::device_path(exec, dst, src);));
+
+} // end assign_value()
 
 template <typename System1, typename System2, typename Pointer1, typename Pointer2>
-THRUST_HOST_DEVICE void
-assign_value([[maybe_unused]] cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
+inline THRUST_HOST_DEVICE void assign_value(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    THRUST_HOST auto operator()(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
+    THRUST_HOST inline static void host_path(cross_system<System1, System2>& systems, Pointer1 dst, Pointer2 src)
     {
-      // rotate the systems so that they are ordered the same as (src, dst) for the call to thrust::copy
+      // rotate the systems so that they are ordered the same as (src, dst)
+      // for the call to thrust::copy
       cross_system<System2, System1> rotated_systems = systems.rotate();
       hip_rocprim::copy(rotated_systems, src, src + 1, dst);
     }
+
+    THRUST_DEVICE inline static void device_path(cross_system<System1, System2>&, Pointer1 dst, Pointer2 src)
+    {
+      // XXX forward the true hip::execution_policy inside systems here
+      //     instead of materializing a tag
+      thrust::hip::tag hip_tag;
+      thrust::hip_rocprim::assign_value(hip_tag, dst, src);
+    }
   };
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (HostPath{}(systems, dst, src);),
-    (
-      // XXX forward the true hip::execution_policy inside systems here instead of materializing a tag
-      hip::tag hip_tag; hip_rocprim::assign_value(hip_tag, dst, src);));
-}
+
+  NV_IF_TARGET(NV_IS_HOST,
+               (war_nvbugs_881631::host_path(systems, dst, src);),
+               (war_nvbugs_881631::device_path(systems, dst, src);));
+} // end assign_value()
+
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
 #endif
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/copy.h b/projects/rocthrust/thrust/system/hip/detail/async/copy.h
new file mode 100644
index 000000000000..886afa2a2ea4
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/copy.h
@@ -0,0 +1,357 @@
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#  include <thrust/system/hip/config.h>
+
+#  include <thrust/advance.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/distance.h>
+#  include <thrust/functional.h>
+#  include <thrust/iterator/iterator_traits.h>
+#  include <thrust/system/hip/detail/async/customization.h>
+#  include <thrust/system/hip/detail/async/transform.h>
+#  include <thrust/system/hip/detail/cross_system.h>
+#  include <thrust/system/hip/future.h>
+#  include <thrust/type_traits/is_contiguous_iterator.h>
+#  include <thrust/type_traits/is_trivially_relocatable.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+#  include <thrust/uninitialized_copy.h>
+
+#  include <type_traits>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+// ContiguousIterator input and output iterators
+// TriviallyCopyable elements
+// Host to device, device to host, device to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<is_indirectly_trivially_relocatable_to<ForwardIt, OutputIt>::value, unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(select_device_system(from_exec, to_exec));
+
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(select_device_system(from_exec, to_exec));
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+      extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+      extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+  }
+
+  // Run copy.
+
+  thrust::hip_rocprim::throw_on_error(
+    hipMemcpyAsync(thrust::raw_pointer_cast(&*output),
+                   thrust::raw_pointer_cast(&*first),
+                   sizeof(T) * n,
+                   direction_of_copy(from_exec, to_exec),
+                   e.stream().native_handle()),
+    "after copy launch");
+
+  return e;
+}
+
+// Non-ContiguousIterator input or output, or non-TriviallyRelocatable value type
+// Device to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(thrust::hip::execution_policy<FromPolicy>& from_exec,
+                  thrust::hip::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Size n,
+                  OutputIt output) ->
+  typename std::enable_if<conjunction<negation<is_indirectly_trivially_relocatable_to<ForwardIt, OutputIt>>,
+                                      decltype(is_device_to_device_copy(from_exec, to_exec))>::value,
+                          unique_eager_event>::type
+{
+  return async_transform_n(select_device_system(from_exec, to_exec), first, n, output, ::internal::identity{});
+}
+
+template <typename OutputIt>
+void async_copy_n_compile_failure_no_hip_to_non_contiguous_output()
+{
+  THRUST_STATIC_ASSERT_MSG(
+    (negation<is_contiguous_iterator<OutputIt>>::value),
+    "copying to non-ContiguousIterators in another system from the HIP system "
+    "is not supported; use `THRUST_PROCLAIM_CONTIGUOUS_ITERATOR(Iterator)` to "
+    "indicate that an iterator points to elements that are contiguous in memory.");
+}
+
+// Non-ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Device to host, host to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt /*first*/, Size /*n*/, OutputIt /*output*/) ->
+  typename std::enable_if<conjunction<negation<is_contiguous_iterator<OutputIt>>,
+                                      is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                  typename iterator_traits<OutputIt>::value_type>,
+                                      disjunction<decltype(is_host_to_device_copy(from_exec, to_exec)),
+                                                  decltype(is_device_to_host_copy(from_exec, to_exec))>>::value,
+                          unique_eager_event>::type
+{
+  async_copy_n_compile_failure_no_hip_to_non_contiguous_output<OutputIt>();
+
+  return {};
+}
+
+// Workaround for MSVC's lack of expression SFINAE and also for an NVCC bug.
+// In NVCC, when two SFINAE-enabled overloads are only distinguishable by a
+// part of a SFINAE condition that is in a `decltype`, NVCC thinks they are the
+// same overload and emits an error.
+template <typename FromPolicy,
+          typename ToPolicy,
+          typename ForwardIt,
+          typename OutputIt
+          // MSVC2015 WAR: doesn't like decltype(...)::value in superclass definition
+          ,
+          typename IsH2DCopy =
+            decltype(is_host_to_device_copy(std::declval<FromPolicy const&>(), std::declval<ToPolicy const&>()))>
+struct is_buffered_trivially_relocatable_host_to_device_copy
+    : thrust::integral_constant<bool,
+                                !is_contiguous_iterator<ForwardIt>::value && is_contiguous_iterator<OutputIt>::value
+                                  && is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                 typename iterator_traits<OutputIt>::value_type>::value
+                                  && IsH2DCopy::value>
+{};
+
+// Non-ContiguousIterator input iterator, ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Host to device
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(
+  FromPolicy& from_exec, thrust::hip::execution_policy<ToPolicy>& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<is_buffered_trivially_relocatable_host_to_device_copy<FromPolicy,
+                                                                                thrust::hip::execution_policy<ToPolicy>,
+                                                                                ForwardIt,
+                                                                                OutputIt>::value,
+                          unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const host_alloc = get_async_host_allocator(from_exec);
+
+  // Create host-side buffer.
+
+  auto buffer = uninitialized_allocate_unique_n<T>(host_alloc, n);
+
+  auto const buffer_ptr = buffer.get();
+
+  // Copy into host-side buffer.
+
+  // TODO: Switch to an async call once we have async interfaces for host
+  // systems and support for cross system dependencies.
+  uninitialized_copy_n(from_exec, first, n, buffer_ptr);
+
+  // Run device-side copy.
+
+  auto new_to_exec = thrust::detail::derived_cast(to_exec).rebind_after(std::tuple_cat(
+    std::make_tuple(std::move(buffer)),
+    extract_dependencies(std::move(thrust::detail::derived_cast(from_exec))),
+    extract_dependencies(std::move(thrust::detail::derived_cast(to_exec)))));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(to_exec))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_to_exec))>::value));
+
+  return async_copy_n(
+    from_exec
+    // TODO: We have to cast back to the right execution_policy class. Ideally,
+    // we should be moving here.
+    ,
+    new_to_exec,
+    buffer_ptr,
+    n,
+    output);
+}
+
+// Workaround for MSVC's lack of expression SFINAE and also for an NVCC bug.
+// In NVCC, when two SFINAE-enabled overloads are only distinguishable by a
+// part of a SFINAE condition that is in a `decltype`, NVCC thinks they are the
+// same overload and emits an error.
+template <typename FromPolicy,
+          typename ToPolicy,
+          typename ForwardIt,
+          typename OutputIt
+          // MSVC2015 WAR: doesn't like decltype(...)::value in superclass definition
+          ,
+          typename IsD2HCopy =
+            decltype(is_device_to_host_copy(std::declval<FromPolicy const&>(), std::declval<ToPolicy const&>()))>
+struct is_buffered_trivially_relocatable_device_to_host_copy
+    : thrust::integral_constant<bool,
+                                !is_contiguous_iterator<ForwardIt>::value && is_contiguous_iterator<OutputIt>::value
+                                  && is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                                 typename iterator_traits<OutputIt>::value_type>::value
+                                  && IsD2HCopy::value>
+{};
+
+// Non-ContiguousIterator input iterator, ContiguousIterator output iterator
+// TriviallyRelocatable value type
+// Device to host
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(
+  thrust::hip::execution_policy<FromPolicy>& from_exec, ToPolicy& to_exec, ForwardIt first, Size n, OutputIt output) ->
+  typename std::enable_if<
+    is_buffered_trivially_relocatable_device_to_host_copy<thrust::hip::execution_policy<FromPolicy>,
+                                                          ToPolicy,
+                                                          ForwardIt,
+                                                          OutputIt>::value,
+    unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(from_exec);
+
+  // Create device-side buffer.
+
+  auto buffer = uninitialized_allocate_unique_n<T>(device_alloc, n);
+
+  auto const buffer_ptr = buffer.get();
+
+  // Run device-side copy.
+
+  auto f0 = async_copy_n(from_exec, from_exec, first, n, buffer_ptr);
+
+  // Run copy back to host.
+
+  auto new_from_exec = thrust::detail::derived_cast(from_exec).rebind_after(std::move(buffer), std::move(f0));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(from_exec))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_from_exec))>::value));
+
+  return async_copy_n(new_from_exec, to_exec, buffer_ptr, n, output);
+}
+
+template <typename InputType, typename OutputType>
+void async_copy_n_compile_failure_non_trivially_relocatable_elements()
+{
+  THRUST_STATIC_ASSERT_MSG(
+    (is_trivially_relocatable_to<OutputType, InputType>::value),
+    "only sequences of TriviallyRelocatable elements can be copied to and from "
+    "the HIP system; use `THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(T)` to "
+    "indicate that a type can be copied by bitwise (e.g. by `memcpy`)");
+}
+
+// Non-TriviallyRelocatable value type
+// Host to device, device to host
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename OutputIt, typename Size>
+auto async_copy_n(FromPolicy& from_exec, ToPolicy& to_exec, ForwardIt /*first*/, Size /*n*/, OutputIt /*output*/) ->
+  typename std::enable_if<
+    conjunction<negation<is_trivially_relocatable_to<typename iterator_traits<ForwardIt>::value_type,
+                                                     typename iterator_traits<OutputIt>::value_type>>,
+                disjunction<decltype(is_host_to_device_copy(from_exec, to_exec)),
+                            decltype(is_device_to_host_copy(from_exec, to_exec))>>::value,
+    unique_eager_event>::type
+{
+  // TODO: We could do more here with hipHostRegister.
+
+  async_copy_n_compile_failure_non_trivially_relocatable_elements<
+    typename thrust::iterator_traits<ForwardIt>::value_type,
+    typename std::add_lvalue_reference<typename thrust::iterator_traits<OutputIt>::value_type>::type>();
+
+  return {};
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+auto async_copy(thrust::hip::execution_policy<FromPolicy>& from_exec,
+                thrust::cpp::execution_policy<ToPolicy>& to_exec,
+                ForwardIt first,
+                Sentinel last,
+                OutputIt output)
+  THRUST_RETURNS(
+    thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+  // ADL entry point.
+  template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+  auto async_copy(thrust::cpp::execution_policy<FromPolicy>& from_exec,
+                  thrust::hip::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Sentinel last,
+                  OutputIt output)
+    THRUST_RETURNS(
+      thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+  // ADL entry point.
+  template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
+  auto async_copy(thrust::hip::execution_policy<FromPolicy>& from_exec,
+                  thrust::hip::execution_policy<ToPolicy>& to_exec,
+                  ForwardIt first,
+                  Sentinel last,
+                  OutputIt output)
+    THRUST_RETURNS(
+      thrust::system::hip::detail::async_copy_n(from_exec, to_exec, first, thrust::distance(first, last), output))
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/customization.h b/projects/rocthrust/thrust/system/hip/detail/async/customization.h
new file mode 100644
index 000000000000..838807068ee8
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/customization.h
@@ -0,0 +1,112 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#    include <thrust/system/hip/config.h>
+
+#    include <thrust/detail/execute_with_allocator.h>
+#    include <thrust/detail/type_deduction.h>
+#    include <thrust/mr/allocator.h>
+#    include <thrust/mr/disjoint_sync_pool.h>
+#    include <thrust/mr/host_memory_resource.h>
+#    include <thrust/mr/sync_pool.h>
+#    include <thrust/per_device_resource.h>
+#    include <thrust/system/hip/memory_resource.h>
+
+#    include <cstdint>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+using default_async_host_resource = thrust::mr::synchronized_pool_resource<thrust::host_memory_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_host_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::mr::stateless_resource_allocator<std::uint8_t, default_async_host_resource>{})
+
+  ///////////////////////////////////////////////////////////////////////////////
+
+  using default_async_device_resource =
+    thrust::mr::disjoint_synchronized_pool_resource<thrust::system::hip::memory_resource,
+                                                    thrust::mr::new_delete_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_device_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::per_device_allocator<std::uint8_t, default_async_device_resource, par_t>{})
+
+    template <typename Allocator, template <typename> class BaseSystem>
+    auto get_async_device_allocator(thrust::detail::execute_with_allocator<Allocator, BaseSystem>& exec)
+      THRUST_RETURNS(exec.get_allocator())
+
+        THRUST_SUPPRESS_DEPRECATED_PUSH
+  template <typename Allocator, template <typename> class BaseSystem>
+  THRUST_DEPRECATED auto get_async_device_allocator(
+    thrust::detail::execute_with_allocator_and_dependencies<Allocator, BaseSystem>& exec)
+    THRUST_RETURNS(exec.get_allocator()) THRUST_SUPPRESS_DEPRECATED_POP
+
+  ///////////////////////////////////////////////////////////////////////////////
+
+  using default_async_universal_host_pinned_resource =
+    thrust::mr::synchronized_pool_resource<thrust::system::hip::universal_host_pinned_memory_resource>;
+
+template <typename DerivedPolicy>
+auto get_async_universal_host_pinned_allocator(thrust::detail::execution_policy_base<DerivedPolicy>&)
+  THRUST_RETURNS(thrust::mr::stateless_resource_allocator<std::uint8_t, default_async_universal_host_pinned_resource>{})
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+THRUST_NAMESPACE_END
+
+#  endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#endif
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/exclusive_scan.h b/projects/rocthrust/thrust/system/hip/detail/async/exclusive_scan.h
new file mode 100644
index 000000000000..8964bf6ce706
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/exclusive_scan.h
@@ -0,0 +1,150 @@
+/******************************************************************************
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#    include <thrust/system/hip/config.h>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/hip/detail/async/customization.h>
+#    include <thrust/system/hip/detail/util.h>
+#    include <thrust/system/hip/future.h>
+
+#    include <type_traits>
+
+// TODO specialize for thrust::plus to use e.g. ExclusiveSum instead of ExcScan
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Size,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+unique_eager_event async_exclusive_scan_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, InitialValueType init, BinaryOp op)
+{
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  size_t tmp_size = 0;
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_exclusive_scan(
+        policy, nullptr, tmp_size, first, out, init, n, op, nullptr, THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after determining tmp storage "
+      "requirements for exclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_exclusive_scan(
+        policy, tmp_ptr, tmp_size, first, out, init, n, op, user_raw_stream, THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after dispatching exclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Sentinel,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+auto async_exclusive_scan(
+  execution_policy<DerivedPolicy>& policy,
+  ForwardIt first,
+  Sentinel&& last,
+  OutputIt&& out,
+  InitialValueType&& init,
+  BinaryOp&& op)
+  THRUST_RETURNS(thrust::system::hip::detail::async_exclusive_scan_n(
+    policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/for_each.h b/projects/rocthrust/thrust/system/hip/detail/async/for_each.h
new file mode 100644
index 000000000000..24c3d9f6e1b0
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/for_each.h
@@ -0,0 +1,132 @@
+
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#  include <thrust/system/hip/config.h>
+
+#  include <thrust/distance.h>
+#  include <thrust/iterator/iterator_traits.h>
+#  include <thrust/system/hip/detail/async/customization.h>
+#  include <thrust/system/hip/detail/parallel_for.h>
+#  include <thrust/system/hip/future.h>
+
+#  include <type_traits> // IWYU pragma: export
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename ForwardIt, typename UnaryFunction>
+struct async_for_each_fn
+{
+  ForwardIt first;
+  UnaryFunction f;
+
+  THRUST_HOST_DEVICE async_for_each_fn(ForwardIt&& first_, UnaryFunction&& f_)
+      : first(std::move(first_))
+      , f(std::move(f_))
+  {}
+
+  template <typename Index>
+  THRUST_HOST_DEVICE void operator()(Index idx)
+  {
+    f(thrust::raw_reference_cast(first[idx]));
+  }
+};
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename UnaryFunction>
+unique_eager_event async_for_each_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, UnaryFunction func)
+{
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(extract_dependencies(std::move(thrust::detail::derived_cast(policy))));
+  }
+
+  // Run for_each.
+
+  async_for_each_fn<ForwardIt, UnaryFunction> wrapped(std::move(first), std::move(func));
+
+  thrust::hip_rocprim::throw_on_error(
+    thrust::hip_rocprim::__parallel_for::parallel_for(n, std::move(wrapped), e.stream().native_handle()),
+    "after for_each launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
+auto async_for_each(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, UnaryFunction&& func)
+  THRUST_RETURNS(
+    thrust::system::hip::detail::async_for_each_n(policy, first, thrust::distance(first, last), THRUST_FWD(func)));
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/inclusive_scan.h b/projects/rocthrust/thrust/system/hip/detail/async/inclusive_scan.h
new file mode 100644
index 000000000000..506d925ae130
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/inclusive_scan.h
@@ -0,0 +1,221 @@
+/******************************************************************************
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2021-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#    include <thrust/system/hip/config.h>
+
+#    include <thrust/distance.h>
+#    include <thrust/iterator/iterator_traits.h>
+#    include <thrust/system/hip/detail/async/customization.h>
+#    include <thrust/system/hip/detail/util.h>
+#    include <thrust/system/hip/future.h>
+
+#    include <type_traits>
+
+// TODO specialize for thrust::plus to use e.g. InclusiveSum instead of IncScan
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename BinaryOp>
+unique_eager_event
+async_inclusive_scan_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, BinaryOp op)
+{
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  size_t tmp_size = 0;
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_inclusive_scan(
+        policy,
+        nullptr,
+        tmp_size,
+        first,
+        out,
+        n,
+        op,
+        0, // Null stream, just for sizing.
+        THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after determining tmp storage "
+      "requirements for inclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_inclusive_scan(
+        policy, tmp_ptr, tmp_size, first, out, n, op, user_raw_stream, THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after dispatching inclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+template <typename DerivedPolicy,
+          typename ForwardIt,
+          typename Size,
+          typename OutputIt,
+          typename InitialValueType,
+          typename BinaryOp>
+unique_eager_event async_inclusive_scan_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt out, InitialValueType init, BinaryOp op)
+{
+  auto const device_alloc = get_async_device_allocator(policy);
+  unique_eager_event ev;
+
+  // Determine temporary device storage requirements.
+  size_t tmp_size = 0;
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_inclusive_scan(
+        policy,
+        nullptr,
+        tmp_size,
+        first,
+        out,
+        n,
+        init,
+        op,
+        0, // Null stream, just for sizing.
+        THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after determining tmp storage "
+      "requirements for inclusive_scan");
+  }
+
+  // Allocate temporary storage.
+  auto content        = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+  void* const tmp_ptr = raw_pointer_cast(content.get());
+
+  // Set up stream with dependencies.
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    ev = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    ev = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run scan.
+  {
+    thrust::hip_rocprim::throw_on_error(
+      thrust::hip_rocprim::__scan::invoke_inclusive_scan(
+        policy, tmp_ptr, tmp_size, first, out, n, init, op, user_raw_stream, THRUST_HIP_DEBUG_SYNC_FLAG),
+      "after dispatching inclusive_scan kernel");
+  }
+
+  return ev;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
+auto async_inclusive_scan(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel&& last, OutputIt&& out, BinaryOp&& op)
+  THRUST_RETURNS(thrust::system::hip::detail::async_inclusive_scan_n(
+    policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(op)))
+
+  // ADL entry point.
+  template <typename DerivedPolicy,
+            typename ForwardIt,
+            typename Sentinel,
+            typename OutputIt,
+            typename InitialValueType,
+            typename BinaryOp>
+  auto async_inclusive_scan(
+    execution_policy<DerivedPolicy>& policy,
+    ForwardIt first,
+    Sentinel&& last,
+    OutputIt&& out,
+    InitialValueType&& init,
+    BinaryOp&& op)
+    THRUST_RETURNS(thrust::system::hip::detail::async_inclusive_scan_n(
+      policy, first, thrust::distance(first, THRUST_FWD(last)), THRUST_FWD(out), THRUST_FWD(init), THRUST_FWD(op)))
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#  endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/reduce.h b/projects/rocthrust/thrust/system/hip/detail/async/reduce.h
new file mode 100644
index 000000000000..ec00f2524f42
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/reduce.h
@@ -0,0 +1,250 @@
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Optimize for thrust::plus
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#  include <thrust/system/hip/config.h>
+
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/distance.h>
+#  include <thrust/iterator/iterator_traits.h>
+#  include <thrust/system/hip/detail/async/customization.h>
+#  include <thrust/system/hip/detail/reduce.h>
+#  include <thrust/system/hip/future.h>
+
+#  include <type_traits> // IWYU pragma: export
+
+// rocprim include
+#  include <rocprim/rocprim.hpp>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename T, typename BinaryOp>
+unique_eager_future<::internal::remove_cvref_t<T>>
+async_reduce_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, T init, BinaryOp op)
+{
+  using U = ::internal::remove_cvref_t<T>;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  using pointer = typename thrust::detail::allocator_traits<decltype(device_alloc)>::template rebind_traits<U>::pointer;
+
+  unique_eager_future_promise_pair<U, pointer> fp;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::hip_rocprim::throw_on_error(
+    rocprim::reduce(
+      nullptr,
+      tmp_size,
+      first,
+      static_cast<U*>(nullptr),
+      init,
+      n,
+      op,
+      nullptr // Null stream, just for sizing.
+      ,
+      THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after reduction sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, sizeof(U) + tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`hipMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+  U* const ret_ptr       = thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(content_ptr));
+  void* const tmp_ptr    = static_cast<void*>(raw_pointer_cast(content_ptr + sizeof(U)));
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    fp = make_dependent_future<U, pointer>(
+      [](decltype(content) const& c) {
+        return pointer(thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(c.get())));
+      },
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    fp = make_dependent_future<U, pointer>(
+      [](decltype(content) const& c) {
+        return pointer(thrust::detail::aligned_reinterpret_cast<U*>(raw_pointer_cast(c.get())));
+      },
+      std::tuple_cat(std::make_tuple(std::move(content)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run reduction.
+
+  thrust::hip_rocprim::throw_on_error(
+    rocprim::reduce(
+      tmp_ptr, tmp_size, first, ret_ptr, init, n, op, fp.future.stream().native_handle(), THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after reduction launch");
+
+  return std::move(fp.future);
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
+auto async_reduce(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, T init, BinaryOp op)
+  THRUST_RETURNS(thrust::system::hip::detail::async_reduce_n(policy, first, thrust::distance(first, last), init, op))
+
+} // namespace hip_rocprim
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename T, typename BinaryOp>
+unique_eager_event async_reduce_into_n(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt output, T init, BinaryOp op)
+{
+  using U = ::internal::remove_cvref_t<T>;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::hip_rocprim::throw_on_error(
+    rocprim::reduce(
+      nullptr,
+      tmp_size,
+      first,
+      static_cast<U*>(nullptr),
+      init,
+      n,
+      op,
+      nullptr // Null stream, just for sizing.
+      ,
+      THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after reduction sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`hipMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr));
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run reduction.
+
+  thrust::hip_rocprim::throw_on_error(
+    rocprim::reduce(
+      tmp_ptr, tmp_size, first, output, init, n, op, e.stream().native_handle(), THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after reduction launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
+auto async_reduce_into(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, OutputIt output, T init, BinaryOp op)
+  THRUST_RETURNS(
+    thrust::system::hip::detail::async_reduce_into_n(policy, first, thrust::distance(first, last), output, init, op))
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/cuda/detail/core/make_load_iterator.h b/projects/rocthrust/thrust/system/hip/detail/async/scan.h
similarity index 63%
rename from projects/rocthrust/thrust/system/cuda/detail/core/make_load_iterator.h
rename to projects/rocthrust/thrust/system/hip/detail/async/scan.h
index 9497ccacca97..fcab9dd546bd 100644
--- a/projects/rocthrust/thrust/system/cuda/detail/core/make_load_iterator.h
+++ b/projects/rocthrust/thrust/system/hip/detail/async/scan.h
@@ -1,5 +1,6 @@
 /******************************************************************************
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -24,37 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ******************************************************************************/
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/system/cuda/detail/core/load_iterator.h>
-
-THRUST_NAMESPACE_BEGIN
 
-namespace cuda_cub::core::detail
-{
-template <class PtxPlan, class It>
-typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE
-make_load_iterator_impl(It it, thrust::detail::true_type /* is_trivial */)
-{
-  return raw_pointer_cast(&*it);
-}
-
-template <class PtxPlan, class It>
-typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE
-make_load_iterator_impl(It it, thrust::detail::false_type /* is_trivial */)
-{
-  return it;
-}
-
-template <class PtxPlan, class It>
-typename LoadIterator<PtxPlan, It>::type _CCCL_DEVICE _CCCL_FORCEINLINE make_load_iterator(PtxPlan const&, It it)
-{
-  return make_load_iterator_impl<PtxPlan>(it, typename is_contiguous_iterator<It>::type());
-}
-
-} // namespace cuda_cub::core::detail
+#pragma once
 
-THRUST_NAMESPACE_END
+#include <thrust/system/hip/detail/async/exclusive_scan.h>
+#include <thrust/system/hip/detail/async/inclusive_scan.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/sort.h b/projects/rocthrust/thrust/system/hip/detail/async/sort.h
new file mode 100644
index 000000000000..345e2cbfe226
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/sort.h
@@ -0,0 +1,324 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#  include <thrust/system/hip/config.h>
+
+#  include <thrust/detail/alignment.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/distance.h>
+#  include <thrust/iterator/iterator_traits.h>
+#  include <thrust/system/hip/detail/async/copy.h>
+#  include <thrust/system/hip/detail/async/customization.h>
+#  include <thrust/system/hip/detail/sort.h>
+#  include <thrust/system/hip/future.h>
+#  include <thrust/type_traits/is_contiguous_iterator.h>
+#  include <thrust/type_traits/is_operator_less_or_greater_function_object.h>
+#  include <thrust/type_traits/is_trivially_relocatable.h>
+#  include <thrust/type_traits/logical_metafunctions.h>
+
+#  include <type_traits>
+
+// rocprim include
+#  include <rocprim/rocprim.hpp>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+// Non-ContiguousIterator input and output iterators
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<negation<is_contiguous_iterator<ForwardIt>>::value, unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  // Create device-side buffer.
+
+  // FIXME: Combine this temporary allocation with the main one for CUB.
+  auto device_buffer = uninitialized_allocate_unique_n<T>(device_alloc, n);
+
+  auto const device_buffer_ptr = device_buffer.get();
+
+  // Synthesize a suitable new execution policy, because we don't want to
+  // try and extract twice from the one we were passed.
+  typename ::internal::remove_cvref_t<decltype(policy)>::tag_type tag_policy{};
+
+  // Copy from the input into the buffer.
+
+  auto new_policy0 = thrust::detail::derived_cast(policy).rebind_after(std::move(device_buffer));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy0))>::value));
+
+  auto f0 = async_copy_n(new_policy0, tag_policy, first, n, device_buffer_ptr);
+
+  // Sort the buffer.
+
+  auto new_policy1 = thrust::detail::derived_cast(policy).rebind_after(std::move(f0));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy1))>::value));
+
+  auto f1 = async_sort_n(new_policy1, tag_policy, device_buffer_ptr, n, comp);
+
+  // Copy from the buffer into the input.
+  // FIXME: Combine this with the potential memcpy at the end of the main sort
+  // routine.
+
+  auto new_policy2 = thrust::detail::derived_cast(policy).rebind_after(std::move(f1));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy2))>::value));
+
+  return async_copy_n(new_policy2, tag_policy, device_buffer_ptr, n, first);
+}
+
+// ContiguousIterator iterators
+// Non-Scalar value type or user-defined StrictWeakOrdering
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<
+    conjunction<is_contiguous_iterator<ForwardIt>,
+                disjunction<negation<std::is_scalar<typename iterator_traits<ForwardIt>::value_type>>,
+                            negation<is_operator_less_or_greater_function_object<StrictWeakOrdering>>>>::value,
+    unique_eager_event>::type
+{
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  thrust::hip_rocprim::throw_on_error(
+    thrust::hip_rocprim::__merge_sort::dispatch<thrust::detail::false_type>::doit(
+      nullptr,
+      tmp_size,
+      first,
+      static_cast<std::uint8_t*>(nullptr) // Items.
+      ,
+      n,
+      comp,
+      nullptr // Null stream, just for sizing.
+      ,
+      THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after merge sort sizing");
+
+  // Allocate temporary storage.
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`hipMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr));
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run merge sort.
+
+  thrust::hip_rocprim::throw_on_error(
+    thrust::hip_rocprim::__merge_sort::dispatch<thrust::detail::false_type>::doit(
+      tmp_ptr,
+      tmp_size,
+      first,
+      static_cast<std::uint8_t*>(nullptr) // Items.
+      ,
+      n,
+      comp,
+      e.stream().native_handle(),
+      THRUST_HIP_DEBUG_SYNC_FLAG),
+    "after merge sort sizing");
+
+  return e;
+}
+
+template <typename T, typename Size, typename StrictWeakOrdering>
+typename std::enable_if<is_operator_less_function_object<StrictWeakOrdering>::value, hipError_t>::type invoke_radix_sort(
+  hipStream_t stream, void* tmp_ptr, std::size_t& tmp_size, T* keys_in, T* keys_out, Size& n, StrictWeakOrdering)
+{
+  return rocprim::radix_sort_keys(
+    tmp_ptr, tmp_size, keys_in, keys_out, n, 0, sizeof(T) * 8, stream, THRUST_HIP_DEBUG_SYNC_FLAG);
+}
+
+template <typename T, typename Size, typename StrictWeakOrdering>
+typename std::enable_if<is_operator_greater_function_object<StrictWeakOrdering>::value, hipError_t>::type
+invoke_radix_sort(
+  hipStream_t stream, void* tmp_ptr, std::size_t& tmp_size, T* keys_in, T* keys_out, Size& n, StrictWeakOrdering)
+{
+  return rocprim::radix_sort_keys_desc(
+    tmp_ptr, tmp_size, keys_in, keys_out, n, 0, sizeof(T) * 8, stream, THRUST_HIP_DEBUG_SYNC_FLAG);
+}
+
+// ContiguousIterator iterators
+// Scalar value type
+// operator< or operator>
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename StrictWeakOrdering>
+auto async_stable_sort_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, StrictWeakOrdering comp) ->
+  typename std::enable_if<conjunction<is_contiguous_iterator<ForwardIt>,
+                                      std::is_scalar<typename iterator_traits<ForwardIt>::value_type>,
+                                      is_operator_less_or_greater_function_object<StrictWeakOrdering>>::value,
+                          unique_eager_event>::type
+{
+  using T = typename iterator_traits<ForwardIt>::value_type;
+
+  auto const device_alloc = get_async_device_allocator(policy);
+
+  unique_eager_event e;
+
+  // Determine temporary device storage requirements.
+
+  size_t tmp_size = 0;
+  T* first_ptr    = raw_pointer_cast(&*first);
+  thrust::hip_rocprim::throw_on_error(
+    invoke_radix_sort(
+      nullptr // Null stream, just for sizing.
+      ,
+      nullptr,
+      tmp_size,
+      first_ptr,
+      static_cast<T*>(nullptr),
+      n,
+      comp),
+    "after radix sort sizing");
+
+  // Allocate temporary storage.
+
+  size_t keys_temp_storage = thrust::detail::aligned_storage_size(sizeof(T) * n, 128);
+
+  auto content = uninitialized_allocate_unique_n<std::uint8_t>(device_alloc, keys_temp_storage + tmp_size);
+
+  // The array was dynamically allocated, so we assume that it's suitably
+  // aligned for any type of data. `malloc`/`hipMalloc`/`new`/`std::allocator`
+  // make this guarantee.
+  auto const content_ptr = content.get();
+
+  T* keys_pointer = thrust::detail::aligned_reinterpret_cast<T*>(raw_pointer_cast(content_ptr));
+
+  void* const tmp_ptr = static_cast<void*>(raw_pointer_cast(content_ptr + keys_temp_storage));
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(
+      std::tuple_cat(std::make_tuple(std::move(content), unique_stream(nonowning, user_raw_stream)),
+                     extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(std::tuple_cat(
+      std::make_tuple(std::move(content)), extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+
+  // Run radix sort.
+
+  thrust::hip_rocprim::throw_on_error(
+    invoke_radix_sort(e.stream().native_handle(), tmp_ptr, tmp_size, first_ptr, keys_pointer, n, comp),
+    "after radix sort launch");
+
+  auto new_policy0 = thrust::detail::derived_cast(policy).rebind_after(std::move(e));
+
+  THRUST_STATIC_ASSERT((std::tuple_size<decltype(extract_dependencies(policy))>::value + 1
+                        <= std::tuple_size<decltype(extract_dependencies(new_policy0))>::value));
+
+  // Synthesize a suitable new execution policy, because we don't want to
+  // try and extract twice from the one we were passed.
+  typename ::internal::remove_cvref_t<decltype(policy)>::tag_type tag_policy{};
+
+  using return_future = decltype(e);
+  return return_future(
+    async_copy_n(new_policy0, tag_policy, reinterpret_cast<T*>(keys_pointer), n, reinterpret_cast<T*>(first_ptr)));
+
+  return e;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
+auto async_stable_sort(execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, StrictWeakOrdering comp)
+  // A GCC 5 bug requires an explicit trailing return type here, so stick with
+  // THRUST_DECLTYPE_RETURNS for now.
+  THRUST_DECLTYPE_RETURNS(
+    thrust::system::hip::detail::async_stable_sort_n(policy, first, thrust::distance(first, last), comp))
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/hip/detail/async/transform.h b/projects/rocthrust/thrust/system/hip/detail/async/transform.h
new file mode 100644
index 000000000000..995df837adc8
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/async/transform.h
@@ -0,0 +1,136 @@
+/******************************************************************************
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright© 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+// TODO: Move into system::hip
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+
+#  include <thrust/system/hip/config.h>
+
+#  include <thrust/advance.h>
+#  include <thrust/distance.h>
+#  include <thrust/iterator/iterator_traits.h>
+#  include <thrust/system/hip/detail/async/customization.h>
+#  include <thrust/system/hip/detail/parallel_for.h>
+#  include <thrust/system/hip/future.h>
+
+#  include <type_traits>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+template <typename ForwardIt, typename OutputIt, typename UnaryOperation>
+struct async_transform_fn
+{
+  ForwardIt first_;
+  OutputIt output_;
+  UnaryOperation op_;
+
+  THRUST_HOST_DEVICE async_transform_fn(ForwardIt&& first, OutputIt&& output, UnaryOperation&& op)
+      : first_(std::move(first))
+      , output_(std::move(output))
+      , op_(std::move(op))
+  {}
+
+  template <typename Index>
+  THRUST_HOST_DEVICE void operator()(Index idx)
+  {
+    output_[idx] = op_(thrust::raw_reference_cast(first_[idx]));
+  }
+};
+
+template <typename DerivedPolicy, typename ForwardIt, typename Size, typename OutputIt, typename UnaryOperation>
+unique_eager_event
+async_transform_n(execution_policy<DerivedPolicy>& policy, ForwardIt first, Size n, OutputIt output, UnaryOperation op)
+{
+  unique_eager_event e;
+
+  // Set up stream with dependencies.
+
+  hipStream_t const user_raw_stream = thrust::hip_rocprim::stream(policy);
+
+  if (thrust::hip_rocprim::default_stream() != user_raw_stream)
+  {
+    e = make_dependent_event(std::tuple_cat(std::make_tuple(unique_stream(nonowning, user_raw_stream)),
+                                            extract_dependencies(std::move(thrust::detail::derived_cast(policy)))));
+  }
+  else
+  {
+    e = make_dependent_event(extract_dependencies(std::move(thrust::detail::derived_cast(policy))));
+  }
+
+  // Run transform.
+
+  async_transform_fn<ForwardIt, OutputIt, UnaryOperation> wrapped(std::move(first), std::move(output), std::move(op));
+
+  thrust::hip_rocprim::throw_on_error(
+    thrust::hip_rocprim::__parallel_for::parallel_for(n, std::move(wrapped), e.stream().native_handle()),
+    "after transform launch");
+
+  return e;
+}
+
+} // namespace detail
+} // namespace hip
+} // namespace system
+
+namespace hip_rocprim
+{
+
+// ADL entry point.
+template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>
+auto async_transform(
+  execution_policy<DerivedPolicy>& policy, ForwardIt first, Sentinel last, OutputIt output, UnaryOperation&& op)
+  THRUST_RETURNS(thrust::system::hip::detail::async_transform_n(
+    policy, first, thrust::distance(first, last), output, THRUST_FWD(op)));
+
+} // namespace hip_rocprim
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/hip/detail/binary_search.h b/projects/rocthrust/thrust/system/hip/detail/binary_search.h
index f1cd44363cef..dd21618d1e9a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/binary_search.h
+++ b/projects/rocthrust/thrust/system/hip/detail/binary_search.h
@@ -1,33 +1,35 @@
-/*
- *  Copyright 2021 NVIDIA Corporation
- *  Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+/******************************************************************************
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the NVIDIA CORPORATION nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
+ ******************************************************************************/
 #pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <rocprim/rocprim.hpp>
 
 #  include <thrust/binary_search.h>
@@ -53,7 +55,7 @@ THRUST_HIP_RUNTIME_FUNCTION OutputIt lower_bound(
   OutputIt result,
   CompareOp compare_op)
 {
-  using size_type = thrust::detail::it_difference_t<NeedlesIt>;
+  using size_type = typename iterator_traits<NeedlesIt>::difference_type;
 
   const size_type needles_size  = thrust::distance(needles_begin, needles_end);
   const size_type haystack_size = thrust::distance(haystack_begin, haystack_end);
@@ -117,7 +119,7 @@ THRUST_HIP_RUNTIME_FUNCTION OutputIt upper_bound(
   OutputIt result,
   CompareOp compare_op)
 {
-  using size_type = thrust::detail::it_difference_t<NeedlesIt>;
+  using size_type = typename iterator_traits<NeedlesIt>::difference_type;
 
   const size_type needles_size  = thrust::distance(needles_begin, needles_end);
   const size_type haystack_size = thrust::distance(haystack_begin, haystack_end);
@@ -181,7 +183,7 @@ THRUST_HIP_RUNTIME_FUNCTION OutputIt binary_search(
   OutputIt result,
   CompareOp compare_op)
 {
-  using size_type = thrust::detail::it_difference_t<NeedlesIt>;
+  using size_type = typename iterator_traits<NeedlesIt>::difference_type;
 
   const size_type needles_size  = thrust::distance(needles_begin, needles_end);
   const size_type haystack_size = thrust::distance(haystack_begin, haystack_end);
@@ -267,7 +269,7 @@ OutputIt THRUST_HIP_FUNCTION lower_bound(
     {
       return __binary_search::lower_bound(policy, first, last, values_first, values_last, result, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy,
         HaystackIt first,
@@ -283,7 +285,7 @@ OutputIt THRUST_HIP_FUNCTION lower_bound(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, values_first, values_last, result, compare_op);
 #  else
   return workaround::seq(policy, first, last, values_first, values_last, result, compare_op);
@@ -326,7 +328,7 @@ OutputIt THRUST_HIP_FUNCTION upper_bound(
     {
       return __binary_search::upper_bound(policy, first, last, values_first, values_last, result, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy,
         HaystackIt first,
@@ -342,7 +344,7 @@ OutputIt THRUST_HIP_FUNCTION upper_bound(
 # endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, values_first, values_last, result, compare_op);
 #  else
   return workaround::seq(policy, first, last, values_first, values_last, result, compare_op);
@@ -385,7 +387,7 @@ OutputIt THRUST_HIP_FUNCTION binary_search(
     {
       return __binary_search::binary_search(policy, first, last, values_first, values_last, result, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy,
         HaystackIt first,
@@ -401,7 +403,7 @@ OutputIt THRUST_HIP_FUNCTION binary_search(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, values_first, values_last, result, compare_op);
 #  else
   return workaround::seq(policy, first, last, values_first, values_last, result, compare_op);
@@ -430,7 +432,9 @@ template <typename Derived, typename HaystackIt, typename T, typename CompareOp>
 THRUST_HIP_FUNCTION HaystackIt
 lower_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
 {
-  using difference_type = thrust::detail::it_difference_t<HaystackIt>;
+  using difference_type = typename thrust::iterator_traits<HaystackIt>::difference_type;
+  using values_type     = typename thrust::detail::temporary_array<T, Derived>;
+  using results_type    = typename thrust::detail::temporary_array<difference_type, Derived>;
 
   // struct workaround is required for HIP-clang
   struct workaround
@@ -438,8 +442,6 @@ lower_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
     THRUST_HOST static HaystackIt
     par(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
-      using values_type  = typename thrust::detail::temporary_array<T, Derived>;
-      using results_type = typename thrust::detail::temporary_array<difference_type, Derived>;
       values_type values(policy, 1);
       results_type result(policy, 1);
 
@@ -470,7 +472,7 @@ lower_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
 
       return first + h_result;
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static HaystackIt
     seq(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
@@ -481,7 +483,7 @@ lower_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
 # endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, value, compare_op);
 #  else
   return workaround::seq(policy, first, last, value, compare_op);
@@ -492,7 +494,9 @@ template <typename Derived, typename HaystackIt, typename T, typename CompareOp>
 THRUST_HIP_FUNCTION HaystackIt
 upper_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
 {
-  using difference_type = thrust::detail::it_difference_t<HaystackIt>;
+  using difference_type = typename thrust::iterator_traits<HaystackIt>::difference_type;
+  using values_type     = typename thrust::detail::temporary_array<T, Derived>;
+  using results_type    = typename thrust::detail::temporary_array<difference_type, Derived>;
 
   // struct workaround is required for HIP-clang
   struct workaround
@@ -500,8 +504,6 @@ upper_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
     THRUST_HOST static HaystackIt
     par(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
-      using values_type  = typename thrust::detail::temporary_array<T, Derived>;
-      using results_type = typename thrust::detail::temporary_array<difference_type, Derived>;
       values_type values(policy, 1);
       results_type result(policy, 1);
 
@@ -532,7 +534,7 @@ upper_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
 
       return first + h_result;
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static HaystackIt
     seq(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
@@ -543,7 +545,7 @@ upper_bound(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last
 # endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, value, compare_op);
 #  else
   return workaround::seq(policy, first, last, value, compare_op);
@@ -554,14 +556,15 @@ template <typename Derived, typename HaystackIt, typename T, typename CompareOp>
 THRUST_HIP_FUNCTION bool binary_search(
   execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
 {
+  using values_type  = typename thrust::detail::temporary_array<T, Derived>;
+  using results_type = typename thrust::detail::temporary_array<int, Derived>;
+
   // struct workaround is required for HIP-clang
   struct workaround
   {
     THRUST_HOST static bool
     par(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
-      using values_type  = typename thrust::detail::temporary_array<T, Derived>;
-      using results_type = typename thrust::detail::temporary_array<int, Derived>;
       values_type values(policy, 1);
       results_type result(policy, 1);
 
@@ -592,7 +595,7 @@ THRUST_HIP_FUNCTION bool binary_search(
 
       return h_result != 0;
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static bool
     seq(execution_policy<Derived>& policy, HaystackIt first, HaystackIt last, const T& value, CompareOp compare_op)
     {
@@ -603,7 +606,7 @@ THRUST_HIP_FUNCTION bool binary_search(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, value, compare_op);
 #  else
   return workaround::seq(policy, first, last, value, compare_op);
diff --git a/projects/rocthrust/thrust/system/hip/detail/copy.h b/projects/rocthrust/thrust/system/hip/detail/copy.h
index 6a0b689161ae..a7fa568ee20c 100644
--- a/projects/rocthrust/thrust/system/hip/detail/copy.h
+++ b/projects/rocthrust/thrust/system/hip/detail/copy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -84,7 +84,7 @@ THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 // D->D copy requires HIP compiler
 
 THRUST_EXEC_CHECK_DISABLE
@@ -100,7 +100,7 @@ copy(execution_policy<System>& system, InputIterator first, InputIterator last,
     {
       return result = __copy::device_to_device(system, first, last, result);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIterator
     seq(execution_policy<System>& system, InputIterator first, InputIterator last, OutputIterator result)
     {
@@ -108,7 +108,7 @@ copy(execution_policy<System>& system, InputIterator first, InputIterator last,
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(system, first, last, result);
 #  else
   return workaround::seq(system, first, last, result);
@@ -128,7 +128,7 @@ copy_n(execution_policy<System>& system, InputIterator first, Size n, OutputIter
     {
       return result = __copy::device_to_device(system, first, thrust::next(first, n), result);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIterator
     seq(execution_policy<System>& system, InputIterator first, Size n, OutputIterator result)
     {
@@ -136,7 +136,7 @@ copy_n(execution_policy<System>& system, InputIterator first, Size n, OutputIter
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(system, first, n, result);
 #  else
   return workaround::seq(system, first, n, result);
diff --git a/projects/rocthrust/thrust/system/hip/detail/copy_if.h b/projects/rocthrust/thrust/system/hip/detail/copy_if.h
index 21cea6a15f35..2e55a4db6fdf 100644
--- a/projects/rocthrust/thrust/system/hip/detail/copy_if.h
+++ b/projects/rocthrust/thrust/system/hip/detail/copy_if.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -36,14 +36,10 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
-#if THRUST_HAS_HIP_COMPILER()
-
-#  include <rocprim/rocprim.hpp>
 #  include <thrust/system/hip/config.h>
 
-#  include <rocprim/config.hpp>
-
 #  include <thrust/advance.h>
 #  include <thrust/detail/alignment.h>
 #  include <thrust/detail/function.h>
@@ -56,6 +52,9 @@
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
+// rocPRIM includes
+#  include <rocprim/rocprim.hpp>
+
 #  include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
@@ -107,12 +106,12 @@ ROCPRIM_KERNEL void copy_if_kernel(InputIt first, BoolIt flagsFirst, IntIt posFi
 }
 
 template <typename Derived, typename InputIt, typename OutputIt, typename Predicate>
-THRUST_HIP_RUNTIME_FUNCTION auto
+THRUST_RUNTIME_FUNCTION auto
 copy_if(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt output, Predicate predicate)
   -> std::enable_if_t<sizeof(typename std::iterator_traits<InputIt>::value_type) < 512, OutputIt>
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
 
   size_type num_items       = thrust::distance(first, last);
   size_t temp_storage_bytes = 0;
@@ -167,12 +166,12 @@ copy_if(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt
 }
 
 template <typename Derived, typename InputIt, typename OutputIt, typename Predicate>
-THRUST_HIP_RUNTIME_FUNCTION auto
+THRUST_RUNTIME_FUNCTION auto
 copy_if(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt output, Predicate predicate)
   -> std::enable_if_t<!(sizeof(typename std::iterator_traits<InputIt>::value_type) < 512), OutputIt>
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
 
   size_type num_items = thrust::distance(first, last);
   hipStream_t stream  = hip_rocprim::stream(policy);
@@ -207,7 +206,7 @@ copy_if(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt
 }
 
 template <typename Derived, typename InputIt, typename StencilIt, typename OutputIt, typename Predicate>
-THRUST_HIP_RUNTIME_FUNCTION OutputIt copy_if(
+THRUST_RUNTIME_FUNCTION OutputIt copy_if(
   execution_policy<Derived>& policy,
   InputIt first,
   InputIt last,
@@ -216,7 +215,7 @@ THRUST_HIP_RUNTIME_FUNCTION OutputIt copy_if(
   Predicate predicate)
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
 
   size_type num_items       = static_cast<size_type>(thrust::distance(first, last));
   size_t temp_storage_bytes = 0;
@@ -281,7 +280,7 @@ OutputIterator THRUST_HOST_DEVICE copy_if(
     {
       return __copy_if::copy_if(policy, first, last, result, pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIterator seq(
       execution_policy<Derived>& policy, InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
     {
@@ -290,7 +289,7 @@ OutputIterator THRUST_HOST_DEVICE copy_if(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, result, pred);
 #  else
   return workaround::seq(policy, first, last, result, pred);
@@ -320,7 +319,7 @@ OutputIterator THRUST_HOST_DEVICE copy_if(
     {
       return __copy_if::copy_if(policy, first, last, stencil, result, pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIterator
     seq(execution_policy<Derived>& policy,
         InputIterator first,
@@ -334,7 +333,7 @@ OutputIterator THRUST_HOST_DEVICE copy_if(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, stencil, result, pred);
 #  else
   return workaround::seq(policy, first, last, stencil, result, pred);
diff --git a/projects/rocthrust/thrust/system/hip/detail/count.h b/projects/rocthrust/thrust/system/hip/detail/count.h
index 05f6a0e8f430..6ddf69eb3f7b 100644
--- a/projects/rocthrust/thrust/system/hip/detail/count.h
+++ b/projects/rocthrust/thrust/system/hip/detail/count.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/distance.h>
@@ -50,10 +50,10 @@ namespace hip_rocprim
 {
 
 template <class Derived, class InputIt, class UnaryPred>
-thrust::detail::it_difference_t<InputIt> THRUST_HOST_DEVICE
+typename iterator_traits<InputIt>::difference_type THRUST_HOST_DEVICE
 count_if(execution_policy<Derived>& policy, InputIt first, InputIt last, UnaryPred unary_pred)
 {
-  using size_type       = thrust::detail::it_difference_t<InputIt>;
+  using size_type       = typename iterator_traits<InputIt>::difference_type;
   using flag_iterator_t = transform_iterator<UnaryPred, InputIt, size_type, size_type>;
 
   return hip_rocprim::reduce_n(
@@ -61,7 +61,7 @@ count_if(execution_policy<Derived>& policy, InputIt first, InputIt last, UnaryPr
 }
 
 template <class Derived, class InputIt, class Value>
-thrust::detail::it_difference_t<InputIt> THRUST_HOST_DEVICE
+typename iterator_traits<InputIt>::difference_type THRUST_HOST_DEVICE
 count(execution_policy<Derived>& policy, InputIt first, InputIt last, Value const& value)
 {
   return hip_rocprim::count_if(policy, first, last, thrust::detail::equal_to_value<Value>(value));
diff --git a/projects/rocthrust/thrust/system/hip/detail/cross_system.h b/projects/rocthrust/thrust/system/hip/detail/cross_system.h
index ad665decb0ec..2e317546188e 100644
--- a/projects/rocthrust/thrust/system/hip/detail/cross_system.h
+++ b/projects/rocthrust/thrust/system/hip/detail/cross_system.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,17 +29,9 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/type_deduction.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
 #include <thrust/system/hip/detail/execution_policy.h>
+#include <thrust/system/hip/detail/guarded_hip_runtime_api.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -89,19 +81,18 @@ direction_of_copy(thrust::system::hip::execution_policy<Sys1> const&, thrust::cp
     THRUST_DECLTYPE_RETURNS(thrust::detail::integral_constant<hipMemcpyKind, hipMemcpyDeviceToDevice>{})
 
       template <class Sys1, class Sys2>
-      constexpr
-  THRUST_HOST_DEVICE auto direction_of_copy(execution_policy<cross_system<Sys1, Sys2>> const& systems)
-    THRUST_DECLTYPE_RETURNS(
-      direction_of_copy(derived_cast(derived_cast(systems).sys1), derived_cast(derived_cast(systems).sys2)))
-
-      template <typename ExecutionPolicy0,
-                typename ExecutionPolicy1,
-                // MSVC2015 WAR: put decltype here instead of in trailing return type
-                typename Direction =
-                  decltype(direction_of_copy(std::declval<ExecutionPolicy0>(), std::declval<ExecutionPolicy1>()))>
-      constexpr THRUST_HOST_DEVICE thrust::detail::
-        integral_constant<bool, hipMemcpyDeviceToHost == Direction::value> is_device_to_host_copy(
-          ExecutionPolicy0 const& /*exec0*/, ExecutionPolicy1 const& /*exec1*/) noexcept
+      constexpr THRUST_HOST_DEVICE auto direction_of_copy(execution_policy<cross_system<Sys1, Sys2>> const& systems)
+        THRUST_DECLTYPE_RETURNS(
+          direction_of_copy(derived_cast(derived_cast(systems).sys1), derived_cast(derived_cast(systems).sys2)))
+
+          template <typename ExecutionPolicy0,
+                    typename ExecutionPolicy1,
+                    // MSVC2015 WAR: put decltype here instead of in trailing return type
+                    typename Direction =
+                      decltype(direction_of_copy(std::declval<ExecutionPolicy0>(), std::declval<ExecutionPolicy1>()))>
+          constexpr THRUST_HOST_DEVICE auto is_device_to_host_copy(
+            ExecutionPolicy0 const&, ExecutionPolicy1 const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyDeviceToHost == Direction::value>
 {
   return {};
 }
@@ -109,8 +100,8 @@ direction_of_copy(thrust::system::hip::execution_policy<Sys1> const&, thrust::cp
 template <typename ExecutionPolicy,
           // MSVC2015 WAR: put decltype here instead of in trailing return type
           typename Direction = decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-constexpr THRUST_HOST_DEVICE thrust::detail::integral_constant<bool, hipMemcpyDeviceToHost == Direction::value>
-is_device_to_host_copy(ExecutionPolicy const& /*exec*/) noexcept
+constexpr THRUST_HOST_DEVICE auto is_device_to_host_copy(ExecutionPolicy const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyDeviceToHost == Direction::value>
 {
   return {};
 }
@@ -120,8 +111,8 @@ template <
   typename ExecutionPolicy1,
   // MSVC2015 WAR: put decltype here instead of in trailing return type
   typename Direction = decltype(direction_of_copy(std::declval<ExecutionPolicy0>(), std::declval<ExecutionPolicy1>()))>
-constexpr THRUST_HOST_DEVICE thrust::detail::integral_constant<bool, hipMemcpyHostToDevice == Direction::value>
-is_host_to_device_copy(ExecutionPolicy0 const& /*exec0*/, ExecutionPolicy1 const& /*exec1*/) noexcept
+constexpr THRUST_HOST_DEVICE auto is_host_to_device_copy(ExecutionPolicy0 const&, ExecutionPolicy1 const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyHostToDevice == Direction::value>
 {
   return {};
 }
@@ -129,8 +120,8 @@ is_host_to_device_copy(ExecutionPolicy0 const& /*exec0*/, ExecutionPolicy1 const
 template <typename ExecutionPolicy,
           // MSVC2015 WAR: put decltype here instead of in trailing return type
           typename Direction = decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-constexpr THRUST_HOST_DEVICE thrust::detail::integral_constant<bool, hipMemcpyHostToDevice == Direction::value>
-is_host_to_device_copy(ExecutionPolicy const& /*exec*/) noexcept
+constexpr THRUST_HOST_DEVICE auto is_host_to_device_copy(ExecutionPolicy const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyHostToDevice == Direction::value>
 {
   return {};
 }
@@ -140,8 +131,8 @@ template <
   typename ExecutionPolicy1,
   // MSVC2015 WAR: put decltype here instead of in trailing return type
   typename Direction = decltype(direction_of_copy(std::declval<ExecutionPolicy0>(), std::declval<ExecutionPolicy1>()))>
-constexpr THRUST_HOST_DEVICE thrust::detail::integral_constant<bool, hipMemcpyDeviceToDevice == Direction::value>
-is_device_to_device_copy(ExecutionPolicy0 const& /*exec0*/, ExecutionPolicy1 const& /*exec1*/) noexcept
+constexpr THRUST_HOST_DEVICE auto is_device_to_device_copy(ExecutionPolicy0 const&, ExecutionPolicy1 const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyDeviceToDevice == Direction::value>
 {
   return {};
 }
@@ -149,8 +140,8 @@ is_device_to_device_copy(ExecutionPolicy0 const& /*exec0*/, ExecutionPolicy1 con
 template <typename ExecutionPolicy,
           // MSVC2015 WAR: put decltype here instead of in trailing return type
           typename Direction = decltype(direction_of_copy(std::declval<ExecutionPolicy>()))>
-constexpr THRUST_HOST_DEVICE thrust::detail::integral_constant<bool, hipMemcpyDeviceToDevice == Direction::value>
-is_device_to_device_copy(ExecutionPolicy const& /*exec*/) noexcept
+constexpr THRUST_HOST_DEVICE auto is_device_to_device_copy(ExecutionPolicy const&) noexcept
+  -> thrust::detail::integral_constant<bool, hipMemcpyDeviceToDevice == Direction::value>
 {
   return {};
 }
diff --git a/projects/rocthrust/thrust/system/hip/detail/dispatch.h b/projects/rocthrust/thrust/system/hip/detail/dispatch.h
index ad325ad39a57..c5047a0b8321 100644
--- a/projects/rocthrust/thrust/system/hip/detail/dispatch.h
+++ b/projects/rocthrust/thrust/system/hip/detail/dispatch.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2018 NVIDIA Corporation
- * Modifications Copyright (c) 2020-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2020-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,197 +17,68 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/integer_math.h>
-#include <thrust/detail/libcxx_wrapper/std/detail/libcxx/include/stdexcept.h>
+#include <thrust/detail/integer_traits.h>
 #include <thrust/detail/preprocessor.h>
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(limits)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#endif
-
-#include <cstdint>
-#include <string>
-
-#if defined(THRUST_FORCE_32_BIT_OFFSET_TYPE) && defined(THRUST_FORCE_64_BIT_OFFSET_TYPE)
-#  error "Only THRUST_FORCE_32_BIT_OFFSET_TYPE or THRUST_FORCE_64_BIT_OFFSET_TYPE may be defined!"
-#endif // THRUST_FORCE_32_BIT_OFFSET_TYPE && THRUST_FORCE_64_BIT_OFFSET_TYPE
-
-#define _THRUST_INDEX_TYPE_DISPATCH(index_type, status, call, count, arguments) \
-  {                                                                             \
-    auto THRUST_PP_CAT2(count, _fixed) = static_cast<index_type>(count);        \
-    status                             = call arguments;                        \
+/**
+ * Dispatch between 32-bit and 64-bit index based versions of the same algorithm
+ * implementation. This version assumes that callables for both branches consist
+ * of the same tokens, and is intended to be used with Thrust-style dispatch
+ * interfaces, that always deduce the size type from the arguments.
+ */
+#define THRUST_INDEX_TYPE_DISPATCH(status, call, count, arguments)                   \
+  if (count <= thrust::detail::integer_traits<thrust::detail::int32_t>::const_max()) \
+  {                                                                                  \
+    thrust::detail::int32_t THRUST_PP_CAT2(count, _fixed) = count;                   \
+    status                                                = call arguments;          \
+  }                                                                                  \
+  else                                                                               \
+  {                                                                                  \
+    thrust::detail::int64_t THRUST_PP_CAT2(count, _fixed) = count;                   \
+    status                                                = call arguments;          \
   }
 
-#define _THRUST_INDEX_TYPE_DISPATCH2(index_type, status, call, count1, count2, arguments) \
-  {                                                                                       \
-    auto THRUST_PP_CAT2(count1, _fixed) = static_cast<index_type>(count1);                \
-    auto THRUST_PP_CAT2(count2, _fixed) = static_cast<index_type>(count2);                \
-    status                              = call arguments;                                 \
+/**
+ * Dispatch between 32-bit and 64-bit index based versions of the same algorithm
+ * implementation. This version assumes that callables for both branches consist
+ * of the same tokens, and is intended to be used with Thrust-style dispatch
+ * interfaces, that always deduce the size type from the arguments.
+ *
+ * This version of the macro supports providing two count variables, which is
+ * necessary for set algorithms.
+ */
+#define THRUST_DOUBLE_INDEX_TYPE_DISPATCH(status, call, count1, count2, arguments)             \
+  if (count1 + count2 <= thrust::detail::integer_traits<thrust::detail::int32_t>::const_max()) \
+  {                                                                                            \
+    thrust::detail::int32_t THRUST_PP_CAT2(count1, _fixed) = count1;                           \
+    thrust::detail::int32_t THRUST_PP_CAT2(count2, _fixed) = count2;                           \
+    status                                                 = call arguments;                   \
+  }                                                                                            \
+  else                                                                                         \
+  {                                                                                            \
+    thrust::detail::int64_t THRUST_PP_CAT2(count1, _fixed) = count1;                           \
+    thrust::detail::int64_t THRUST_PP_CAT2(count2, _fixed) = count2;                           \
+    status                                                 = call arguments;                   \
   }
-
-#define _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                          \
-  if (thrust::detail::is_negative(count))                                           \
-  {                                                                                 \
-    ::internal::__throw_runtime_error("Invalid input range, passed negative size"); \
+/**
+ * Dispatch between 32-bit and 64-bit index based versions of the same algorithm
+ * implementation. This version allows using different token sequences for callables
+ * in both branches, and is intended to be used with CUB-style dispatch interfaces,
+ * where the "simple" interface always forces the size to be `int` (making it harder
+ * for us to use), but the complex interface that we end up using doesn't actually
+ * provide a way to fully deduce the type from just the call, making the size type
+ * appear in the token sequence of the callable.
+ *
+ * See reduce_n_impl to see an example of how this is meant to be used.
+ */
+#define THRUST_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments)      \
+  if (count <= thrust::detail::integer_traits<thrust::detail::int32_t>::const_max()) \
+  {                                                                                  \
+    thrust::detail::int32_t THRUST_PP_CAT2(count, _fixed) = count;                   \
+    status                                                = call_32 arguments;       \
+  }                                                                                  \
+  else                                                                               \
+  {                                                                                  \
+    thrust::detail::int64_t THRUST_PP_CAT2(count, _fixed) = count;                   \
+    status                                                = call_64 arguments;       \
   }
-
-#define _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2) \
-  _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count1)                \
-  _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count2)
-
-#if defined(THRUST_FORCE_64_BIT_OFFSET_TYPE)
-//! @brief Always dispatches to 64 bit offset version of an algorithm
-#  define THRUST_INDEX_TYPE_DISPATCH(status, call, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)               \
-    _THRUST_INDEX_TYPE_DISPATCH(std::int64_t, status, call, count, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH but with two counts
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH(status, call, count1, count2, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                     \
-    _THRUST_INDEX_TYPE_DISPATCH2(std::int64_t, status, call, count1, count2, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH but with two different call implementations
-#  define THRUST_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                            \
-    _THRUST_INDEX_TYPE_DISPATCH(std::int64_t, status, call_64, count, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH2 but uses two counts.
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count1, count2, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                                  \
-    _THRUST_INDEX_TYPE_DISPATCH2(std::int64_t, status, call_64, count1, count2, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH2 but always dispatching to uint64_t. `count` must not be negative.
-#  define THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                                     \
-    _THRUST_INDEX_TYPE_DISPATCH(std::uint64_t, status, call_64, count, arguments)
-
-#elif defined(THRUST_FORCE_32_BIT_OFFSET_TYPE)
-
-//! @brief Ensures that the size of the input does not overflow the offset type
-#  define _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW(index_type, count)                       \
-    if (static_cast<std::uint64_t>(count)                                                     \
-        > static_cast<std::uint64_t>(_THRUST_STD::numeric_limits<index_type>::max()))         \
-    {                                                                                         \
-      ::internal::__throw_runtime_error(                                                      \
-        "Input size exceeds the maximum allowable value for " #index_type                     \
-        ". It was used because the macro THRUST_FORCE_32_BIT_OFFSET_TYPE was defined. "       \
-        "To handle larger input sizes, either remove this macro to dynamically dispatch "     \
-        "between 32-bit and 64-bit index types, or define THRUST_FORCE_64_BIT_OFFSET_TYPE."); \
-    }
-
-//! @brief Ensures that the sizes of the inputs do not overflow the offset type, but two counts
-#  define _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW2(index_type, count1, count2)             \
-    if (static_cast<std::uint64_t>(count1) + static_cast<std::uint64_t>(count2)               \
-        > static_cast<std::uint64_t>(_THRUST_STD::numeric_limits<index_type>::max()))         \
-    {                                                                                         \
-      ::internal::__throw_runtime_error(                                                      \
-        "Input size exceeds the maximum allowable value for " #index_type                     \
-        ". It was used because the macro THRUST_FORCE_32_BIT_OFFSET_TYPE was defined. "       \
-        "To handle larger input sizes, either remove this macro to dynamically dispatch "     \
-        "between 32-bit and 64-bit index types, or define THRUST_FORCE_64_BIT_OFFSET_TYPE."); \
-    }
-
-//! @brief Always dispatches to 32 bit offset version of an algorithm but throws if count would overflow
-#  define THRUST_INDEX_TYPE_DISPATCH(status, call, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)               \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW(std::int32_t, count)  \
-    _THRUST_INDEX_TYPE_DISPATCH(std::int32_t, status, call, count, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH but with two counts
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH(status, call, count1, count2, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                     \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW2(std::int32_t, count1, count2)        \
-    _THRUST_INDEX_TYPE_DISPATCH2(std::int32_t, status, call, count1, count2, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH but with two different call implementations
-#  define THRUST_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                            \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW(std::int32_t, count)               \
-    _THRUST_INDEX_TYPE_DISPATCH(std::int32_t, status, call_32, count, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH2 but uses two counts.
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count1, count2, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                                  \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW2(std::int32_t, count1, count2)                     \
-    _THRUST_INDEX_TYPE_DISPATCH2(std::int32_t, status, call_32, count1, count2, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH but always dispatching to uint64_t. `count` must not be negative.
-#  define THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                                     \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_OVERFLOW(std::uint32_t, count)                       \
-    _THRUST_INDEX_TYPE_DISPATCH(std::uint32_t, status, call_32, count, arguments)
-
-#else // ^^^ THRUST_FORCE_32_BIT_OFFSET_TYPE ^^^ / vvv !THRUST_FORCE_32_BIT_OFFSET_TYPE vvv
-
-#  define _THRUST_INDEX_TYPE_DISPATCH_SELECT(index_type, count) \
-    (static_cast<std::uint64_t>(count) <= static_cast<std::uint64_t>(_THRUST_STD::numeric_limits<index_type>::max()))
-
-#  define _THRUST_INDEX_TYPE_DISPATCH_SELECT2(index_type, count1, count2)    \
-    (static_cast<std::uint64_t>(count1) + static_cast<std::uint64_t>(count2) \
-     <= static_cast<std::uint64_t>(_THRUST_STD::numeric_limits<index_type>::max()))
-
-//! Dispatch between 32-bit and 64-bit index_type based versions of the same algorithm implementation. This version
-//! assumes that callables for both branches consist of the same tokens, and is intended to be used with Thrust-style
-//! dispatch interfaces, that always deduce the size type from the arguments.
-#  define THRUST_INDEX_TYPE_DISPATCH(status, call, count, arguments)            \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                          \
-    if _THRUST_INDEX_TYPE_DISPATCH_SELECT (std::int32_t, count)                 \
-      _THRUST_INDEX_TYPE_DISPATCH(std::int32_t, status, call, count, arguments) \
-    else                                                                        \
-      _THRUST_INDEX_TYPE_DISPATCH(std::int64_t, status, call, count, arguments)
-
-//! Dispatch between 32-bit and 64-bit index_type based versions of the same algorithm implementation. This version
-//! assumes that callables for both branches consist of the same tokens, and is intended to be used with Thrust-style
-//! dispatch interfaces, that always deduce the size type from the arguments.
-//!
-//! This version of the macro supports providing two count variables, which is necessary for set algorithms.
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH(status, call, count1, count2, arguments)      \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                          \
-    if _THRUST_INDEX_TYPE_DISPATCH_SELECT2 (std::int32_t, count1, count2)                 \
-      _THRUST_INDEX_TYPE_DISPATCH2(std::int32_t, status, call, count1, count2, arguments) \
-    else                                                                                  \
-      _THRUST_INDEX_TYPE_DISPATCH2(std::int64_t, status, call, count1, count2, arguments)
-
-//! Dispatch between 32-bit and 64-bit index_type based versions of the same algorithm implementation. This version
-//! allows using different token sequences for callables in both branches, and is intended to be used with CUB-style
-//! dispatch interfaces, where the "simple" interface always forces the size to be `int` (making it harder for us to
-//! use), but the complex interface that we end up using doesn't actually provide a way to fully deduce the type from
-//! just the call, making the size type appear in the token sequence of the callable.
-//!
-//!  See reduce_n_impl to see an example of how this is meant to be used.
-#  define THRUST_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments)  \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                             \
-    if _THRUST_INDEX_TYPE_DISPATCH_SELECT (std::int32_t, count)                    \
-      _THRUST_INDEX_TYPE_DISPATCH(std::int32_t, status, call_32, count, arguments) \
-    else                                                                           \
-      _THRUST_INDEX_TYPE_DISPATCH(std::int64_t, status, call_64, count, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH2 but uses two counts.
-#  define THRUST_DOUBLE_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count1, count2, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW2(count1, count2)                                  \
-    if _THRUST_INDEX_TYPE_DISPATCH_SELECT2 (std::int32_t, count1, count2)                         \
-      _THRUST_INDEX_TYPE_DISPATCH2(std::int32_t, status, call_32, count1, count2, arguments)      \
-    else                                                                                          \
-      _THRUST_INDEX_TYPE_DISPATCH2(std::int64_t, status, call_64, count1, count2, arguments)
-
-//! Like \ref THRUST_INDEX_TYPE_DISPATCH2 but dispatching to uint32_t and uint64_t, respectively, depending on the
-//! `count` argument. `count` must not be negative.
-#  define THRUST_UNSIGNED_INDEX_TYPE_DISPATCH2(status, call_32, call_64, count, arguments) \
-    _THRUST_INDEX_TYPE_DISPATCH_GUARD_UNDERFLOW(count)                                     \
-    if _THRUST_INDEX_TYPE_DISPATCH_SELECT (std::uint32_t, count)                           \
-      _THRUST_INDEX_TYPE_DISPATCH(std::uint32_t, status, call_32, count, arguments)        \
-    else                                                                                   \
-      _THRUST_INDEX_TYPE_DISPATCH(std::uint64_t, status, call_64, count, arguments)
-
-#endif // !THRUST_FORCE_32_BIT_OFFSET_TYPE
diff --git a/projects/rocthrust/thrust/system/hip/detail/equal.h b/projects/rocthrust/thrust/system/hip/detail/equal.h
index aa34720f75f1..97a7bc225f8c 100644
--- a/projects/rocthrust/thrust/system/hip/detail/equal.h
+++ b/projects/rocthrust/thrust/system/hip/detail/equal.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/system/hip/detail/mismatch.h>
@@ -56,7 +56,7 @@ equal(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputI
 template <class Derived, class InputIt1, class InputIt2>
 bool THRUST_HOST_DEVICE equal(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2)
 {
-  using InputType1 = thrust::detail::it_value_t<InputIt1>;
+  using InputType1 = typename thrust::iterator_value<InputIt1>::type;
   return hip_rocprim::equal(policy, first1, last1, first2, equal_to<InputType1>());
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/error.inl b/projects/rocthrust/thrust/system/hip/detail/error.inl
index be1bd0f3439e..57527c0f0ed3 100644
--- a/projects/rocthrust/thrust/system/hip/detail/error.inl
+++ b/projects/rocthrust/thrust/system/hip/detail/error.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,79 +19,69 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
+#include <thrust/system/hip/detail/guarded_hip_runtime_api.h>
 #include <thrust/system/hip/error.h>
 
 THRUST_NAMESPACE_BEGIN
-
 namespace system
 {
 
 error_code make_error_code(hip_rocprim::errc::errc_t e)
 {
-  return error_code(static_cast<int>(e), hip_category());
+    return error_code(static_cast<int>(e), hip_category());
 } // end make_error_code()
 
 error_condition make_error_condition(hip_rocprim::errc::errc_t e)
 {
-  return error_condition(static_cast<int>(e), hip_category());
+    return error_condition(static_cast<int>(e), hip_category());
 } // end make_error_condition()
 
 namespace hip_rocprim
 {
-
 namespace detail
 {
-
-class hip_error_category : public error_category
-{
-public:
-  inline hip_error_category() {}
-
-  inline virtual const char* name() const
-  {
-    return "hip";
-  }
-
-  inline virtual std::string message(int ev) const
-  {
-    char const* const unknown_str  = "unknown error";
-    char const* const unknown_name = "hipErrorUnknown";
-    char const* c_str              = ::hipGetErrorString(static_cast<hipError_t>(ev));
-    char const* c_name             = ::hipGetErrorName(static_cast<hipError_t>(ev));
-    return std::string(c_name ? c_name : unknown_name) + ": " + (c_str ? c_str : unknown_str);
-  }
-
-  inline virtual error_condition default_error_condition(int ev) const
-  {
-    using namespace hip_rocprim::errc;
-
-    if (ev < ::hipErrorUnknown)
+    class hip_error_category : public error_category
     {
-      return make_error_condition(static_cast<errc_t>(ev));
-    }
-
-    return system_category().default_error_condition(ev);
-  }
-}; // end hip_error_category
-
-} // namespace detail
+    public:
+        inline hip_error_category(void) {}
+
+        inline virtual const char* name(void) const
+        {
+            return "hip";
+        }
+
+        inline virtual std::string message(int ev) const
+        {
+            char const* const unknown_str  = "unknown error";
+            char const* const unknown_name = "hipErrorUnknown";
+            char const* c_str  = ::hipGetErrorString(static_cast<hipError_t>(ev));
+            char const* c_name = ::hipGetErrorName(static_cast<hipError_t>(ev));
+            return std::string(c_name ? c_name : unknown_name)
+              + ": " + (c_str ? c_str : unknown_str);
+        }
+
+        inline virtual error_condition default_error_condition(int ev) const
+        {
+            using namespace hip_rocprim::errc;
+
+            if(ev < (::hipErrorMissingConfiguration - 1) /* ::hipErrorApiFailureBase */)
+            {
+                return make_error_condition(static_cast<errc_t>(ev));
+            }
+
+            return system_category().default_error_condition(ev);
+        }
+    }; // end hip_error_category
+
+} // end detail
 
 } // end namespace hip_rocprim
 
-const error_category& hip_category()
+const error_category& hip_category(void)
 {
-  static const thrust::system::hip_rocprim::detail::hip_error_category result;
-  return result;
+    static const thrust::system::hip_rocprim::detail::hip_error_category result;
+    return result;
 }
 
 } // end namespace system
-
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/hip/detail/execution_policy.h b/projects/rocthrust/thrust/system/hip/detail/execution_policy.h
index fa66f2187baf..4750d6949ea3 100644
--- a/projects/rocthrust/thrust/system/hip/detail/execution_policy.h
+++ b/projects/rocthrust/thrust/system/hip/detail/execution_policy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -41,6 +41,7 @@
 #include <thrust/system/hip/config.h>
 
 #include <thrust/detail/allocator_aware_execution_policy.h>
+#include <thrust/detail/dependencies_aware_execution_policy.h>
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/version.h>
@@ -61,10 +62,13 @@ struct execution_policy<tag> : thrust::execution_policy<tag>
   using tag_type = tag;
 };
 
+THRUST_SUPPRESS_DEPRECATED_PUSH
 struct tag
     : execution_policy<tag>
-    , detail::allocator_aware_execution_policy<hip_rocprim::execution_policy>
+    , thrust::detail::allocator_aware_execution_policy<hip_rocprim::execution_policy>
+    , thrust::detail::dependencies_aware_execution_policy<hip_rocprim::execution_policy>
 {};
+THRUST_SUPPRESS_DEPRECATED_POP
 
 template <class Derived>
 struct execution_policy : thrust::execution_policy<Derived>
diff --git a/projects/rocthrust/thrust/system/hip/detail/extrema.h b/projects/rocthrust/thrust/system/hip/detail/extrema.h
index a6cd5a532f43..98949a76671c 100644
--- a/projects/rocthrust/thrust/system/hip/detail/extrema.h
+++ b/projects/rocthrust/thrust/system/hip/detail/extrema.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
@@ -54,8 +54,6 @@
 // rocprim include
 #  include <rocprim/rocprim.hpp>
 
-#  include _THRUST_STD_INCLUDE(iterator)
-
 #  include <cstdint>
 
 THRUST_NAMESPACE_BEGIN
@@ -182,7 +180,7 @@ struct arg_minmax_f
 // this is an init-less reduce, needed for min/max-element functionality
 // this will avoid copying the first value from device->host
 template <typename Derived, typename InputIt, typename Size, typename BinaryOp, typename T>
-THRUST_HIP_RUNTIME_FUNCTION T
+THRUST_RUNTIME_FUNCTION T
 extrema(execution_policy<Derived>& policy, InputIt first, Size num_items, BinaryOp binary_op, T*)
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
@@ -229,7 +227,7 @@ extrema(execution_policy<Derived>& policy, InputIt first, Size num_items, Binary
 }
 
 template <template <class, class, class> class ArgFunctor, class Derived, class ItemsIt, class BinaryPred>
-ItemsIt THRUST_HIP_RUNTIME_FUNCTION
+ItemsIt THRUST_RUNTIME_FUNCTION
 element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPred binary_pred)
 {
   if (first == last)
@@ -237,8 +235,8 @@ element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPr
     return last;
   }
 
-  using InputType = thrust::detail::it_value_t<ItemsIt>;
-  using IndexType = thrust::detail::it_difference_t<ItemsIt>;
+  using InputType = typename iterator_traits<ItemsIt>::value_type;
+  using IndexType = typename iterator_traits<ItemsIt>::difference_type;
 
   IndexType num_items = static_cast<IndexType>(thrust::distance(first, last));
 
@@ -266,18 +264,18 @@ ItemsIt THRUST_HOST_DEVICE
 min_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPred binary_pred)
 {
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND((__extrema::element<__extrema::arg_min_f, Derived, ItemsIt, BinaryPred>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   last = __extrema::element<__extrema::arg_min_f>(policy, first, last, binary_pred);
-#  else // !defined(__HIP_DEVICE_COMPILE__)
+#  else // __THRUST_HAS_HIPRT__
   last = thrust::min_element(cvt_to_seq(derived_cast(policy)), first, last, binary_pred);
-#  endif // !defined(__HIP_DEVICE_COMPILE__)
+#  endif // __THRUST_HAS_HIPRT__
   return last;
 }
 
 template <class Derived, class ItemsIt>
 ItemsIt THRUST_HOST_DEVICE min_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return hip_rocprim::min_element(policy, first, last, less<value_type>());
 }
 
@@ -289,18 +287,18 @@ ItemsIt THRUST_HOST_DEVICE
 max_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, BinaryPred binary_pred)
 {
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND((__extrema::element<__extrema::arg_max_f, Derived, ItemsIt, BinaryPred>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   last = __extrema::element<__extrema::arg_max_f>(policy, first, last, binary_pred);
-#  else // !defined(__HIP_DEVICE_COMPILE__)
+#  else // __THRUST_HAS_HIPRT__
   last = thrust::max_element(cvt_to_seq(derived_cast(policy)), first, last, binary_pred);
-#  endif // !defined(__HIP_DEVICE_COMPILE__)
+#  endif // __THRUST_HAS_HIPRT__
   return last;
 }
 
 template <class Derived, class ItemsIt>
 ItemsIt THRUST_HOST_DEVICE max_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return hip_rocprim::max_element(policy, first, last, less<value_type>());
 }
 
@@ -313,8 +311,8 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
 {
   auto ret = thrust::make_pair(last, last);
 
-  using InputType = thrust::detail::it_value_t<ItemsIt>;
-  using IndexType = thrust::detail::it_difference_t<ItemsIt>;
+  using InputType = typename iterator_traits<ItemsIt>::value_type;
+  using IndexType = typename iterator_traits<ItemsIt>::difference_type;
 
   using iterator_tuple = tuple<ItemsIt, counting_iterator<IndexType>>;
   using zip_iterator   = zip_iterator<iterator_tuple>;
@@ -326,7 +324,7 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
 
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__extrema::extrema<Derived, transform_t, IndexType, arg_minmax_t, two_pairs_type>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   if (first == last)
   {
     return ret;
@@ -340,16 +338,16 @@ minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, B
   two_pairs_type result = __extrema::extrema(
     policy, transform_t(begin, duplicate_t()), num_items, arg_minmax_t(binary_pred), (two_pairs_type*) (nullptr));
   ret = thrust::make_pair(first + get<1>(get<0>(result)), first + get<1>(get<1>(result)));
-#  else // defined(__HIP_DEVICE_COMPILE__)
+#  else // __THRUST_HAS_HIPRT__
   ret = thrust::minmax_element(cvt_to_seq(derived_cast(policy)), first, last, binary_pred);
-#  endif // !defined(__HIP_DEVICE_COMPILE__)
+#  endif // __THRUST_HAS_HIPRT__
   return ret;
 }
 
 template <class Derived, class ItemsIt>
 pair<ItemsIt, ItemsIt> THRUST_HOST_DEVICE minmax_element(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt>;
+  using value_type = typename iterator_value<ItemsIt>::type;
   return hip_rocprim::minmax_element(policy, first, last, less<value_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/fill.h b/projects/rocthrust/thrust/system/hip/detail/fill.h
index f0acbfeec7ec..e4cc78c6770c 100644
--- a/projects/rocthrust/thrust/system/hip/detail/fill.h
+++ b/projects/rocthrust/thrust/system/hip/detail/fill.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/util.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/find.h b/projects/rocthrust/thrust/system/hip/detail/find.h
index ad3f4a8bb69c..808829713710 100644
--- a/projects/rocthrust/thrust/system/hip/detail/find.h
+++ b/projects/rocthrust/thrust/system/hip/detail/find.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,16 +37,16 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/counting_iterator.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
-#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#    include <thrust/detail/algorithm_wrapper.h>
 
+#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #    include <iterator>
 #  endif
 
@@ -86,7 +86,7 @@ struct functor
     // select the smallest index among true results
     if (thrust::get<0>(lhs) && thrust::get<0>(rhs))
     {
-      return TupleType(true, (_THRUST_STD::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
+      return TupleType(true, (thrust::min)(thrust::get<1>(lhs), thrust::get<1>(rhs)));
     }
     else if (thrust::get<0>(lhs))
     {
@@ -103,7 +103,7 @@ template <class ValueType, class InputIt, class UnaryOp>
 struct transform_input_iterator_t
 {
   using self_t            = transform_input_iterator_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt>;
+  using difference_type   = typename iterator_traits<InputIt>::difference_type;
   using value_type        = ValueType;
   using pointer           = void;
   using reference         = value_type;
@@ -142,13 +142,13 @@ struct transform_input_iterator_t
 
   THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
+    typename thrust::iterator_value<InputIt>::type x = *input;
     return op(x);
   }
 
   THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
   {
-    thrust::detail::it_value_t<InputIt> x = *input;
+    typename thrust::iterator_value<InputIt>::type x = *input;
     return op(x);
   }
 
@@ -216,7 +216,7 @@ find_if_n(execution_policy<Derived>& policy, InputIt first, Size num_items, Pred
 
   // TODO incorporate sizeof(InputType) into interval_threshold and round to multiple of 32
   const Size interval_threshold = 1 << 20;
-  const Size interval_size      = (_THRUST_STD::min)(interval_threshold, num_items);
+  const Size interval_size      = (thrust::min)(interval_threshold, num_items);
 
   // FIXME(bgruber): we should also be able to use transform_iterator here, but it makes nvc++ hang. See:
   // https://github.com/NVIDIA/cccl/issues/3594. The problem does not occur with nvcc, so we could not add a test :/
diff --git a/projects/rocthrust/thrust/system/hip/detail/for_each.h b/projects/rocthrust/thrust/system/hip/detail/for_each.h
index fb2fc19f4038..2ba0f1b138b2 100644
--- a/projects/rocthrust/thrust/system/hip/detail/for_each.h
+++ b/projects/rocthrust/thrust/system/hip/detail/for_each.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/function.h>
@@ -91,7 +91,7 @@ Input THRUST_HIP_FUNCTION for_each_n(execution_policy<Derived>& policy, Input fi
 template <class Derived, class Input, class UnaryOp>
 Input THRUST_HIP_FUNCTION for_each(execution_policy<Derived>& policy, Input first, Input last, UnaryOp op)
 {
-  using size_type = thrust::detail::it_difference_t<Input>;
+  using size_type = typename iterator_traits<Input>::difference_type;
   size_type count = static_cast<size_type>(thrust::distance(first, last));
 
   return THRUST_NS_QUALIFIER::hip_rocprim::for_each_n(policy, first, count, op);
diff --git a/projects/rocthrust/thrust/system/hip/detail/future.inl b/projects/rocthrust/thrust/system/hip/detail/future.inl
new file mode 100644
index 000000000000..010e4da97819
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/future.inl
@@ -0,0 +1,1242 @@
+// Copyright (c) 2018 NVIDIA Corporation
+// Modifications Copyright© 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
+//
+// Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
+
+// TODO: Split into more granular headers (move unique_stream/unique_marker to
+// another header, etc).
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/allocate_unique.h>
+#  include <thrust/detail/event_error.h>
+#  include <thrust/detail/execute_with_dependencies.h>
+#  include <thrust/detail/memory_wrapper.h>
+#  include <thrust/detail/static_assert.h>
+#  include <thrust/detail/tuple_algorithms.h>
+#  include <thrust/detail/type_deduction.h>
+#  include <thrust/detail/type_traits.h>
+#  include <thrust/detail/type_traits/pointer_traits.h>
+#  include <thrust/optional.h>
+#  include <thrust/system/hip/detail/get_value.h>
+#  include <thrust/system/hip/detail/util.h>
+#  include <thrust/system/hip/future.h>
+#  include <thrust/system/hip/memory.h>
+#  include <thrust/type_traits/integer_sequence.h>
+
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
+#  include _THRUST_STD_INCLUDE(__memory/unique_ptr.h)
+// clang-format on
+#else
+#  include <thrust/detail/memory_wrapper.h>
+#endif
+
+#  include <type_traits>
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_NAMESPACE_BEGIN
+
+// Forward declaration.
+struct THRUST_DEPRECATED new_stream_t;
+
+namespace system
+{
+namespace hip
+{
+namespace detail
+{
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct nonowning_t final
+{};
+
+THRUST_INLINE_CONSTANT nonowning_t nonowning{};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct marker_deleter final
+{
+  THRUST_HOST void operator()(hipEvent_t e) const
+  {
+    if (nullptr != e)
+    {
+      thrust::hip_rocprim::throw_on_error(hipEventDestroy(e));
+    }
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct unique_marker final
+{
+  using native_handle_type = hipEvent_t;
+
+private:
+  std::unique_ptr<ihipEvent_t, marker_deleter> handle_;
+
+public:
+  /// \brief Create a new stream and construct a handle to it. When the handle
+  ///        is destroyed, the stream is destroyed.
+  THRUST_HOST unique_marker()
+      : handle_(nullptr, marker_deleter())
+  {
+    native_handle_type e;
+    thrust::hip_rocprim::throw_on_error(hipEventCreateWithFlags(&e, hipEventDisableTiming));
+    handle_.reset(e);
+  }
+
+  THRUST_EXEC_CHECK_DISABLE
+  unique_marker(unique_marker const&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  unique_marker(unique_marker&&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  unique_marker& operator=(unique_marker const&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  unique_marker& operator=(unique_marker&&) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  ~unique_marker() = default;
+
+  THRUST_HOST auto get() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+  THRUST_HOST auto native_handle() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+
+  THRUST_HOST bool valid() const noexcept
+  {
+    return bool(handle_);
+  }
+
+  THRUST_HOST bool ready() const
+  {
+    hipError_t const err = hipEventQuery(handle_.get());
+
+    if (hipErrorNotReady == err)
+    {
+      return false;
+    }
+
+    // Throw on any other error.
+    thrust::hip_rocprim::throw_on_error(err);
+
+    return true;
+  }
+
+  THRUST_HOST void wait() const
+  {
+    thrust::hip_rocprim::throw_on_error(hipEventSynchronize(handle_.get()));
+  }
+
+  THRUST_HOST bool operator==(unique_marker const& other) const
+  {
+    return other.handle_ == handle_;
+  }
+
+  THRUST_HOST bool operator!=(unique_marker const& other) const
+  {
+    return !(other == *this);
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct stream_deleter final
+{
+  THRUST_HOST void operator()(hipStream_t s) const
+  {
+    if (nullptr != s)
+    {
+      thrust::hip_rocprim::throw_on_error(hipStreamDestroy(s));
+    }
+  }
+};
+
+struct stream_conditional_deleter final
+{
+private:
+  bool cond_;
+
+public:
+  THRUST_HOST constexpr stream_conditional_deleter() noexcept
+      : cond_(true)
+  {}
+
+  THRUST_HOST explicit constexpr stream_conditional_deleter(nonowning_t) noexcept
+      : cond_(false)
+  {}
+
+  THRUST_HOST void operator()(hipStream_t s) const
+  {
+    if (cond_ && nullptr != s)
+    {
+      thrust::hip_rocprim::throw_on_error(hipStreamDestroy(s));
+    }
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct unique_stream final
+{
+  using native_handle_type = hipStream_t;
+
+private:
+  std::unique_ptr<ihipStream_t, stream_conditional_deleter> handle_;
+
+public:
+  /// \brief Create a new stream and construct a handle to it. When the handle
+  ///        is destroyed, the stream is destroyed.
+  THRUST_HOST unique_stream()
+      : handle_(nullptr, stream_conditional_deleter())
+  {
+    native_handle_type s;
+    thrust::hip_rocprim::throw_on_error(hipStreamCreateWithFlags(&s, hipStreamNonBlocking));
+    handle_.reset(s);
+  }
+
+  /// \brief Construct a non-owning handle to an existing stream. When the
+  ///        handle is destroyed, the stream is not destroyed.
+  THRUST_HOST explicit unique_stream(nonowning_t, native_handle_type handle)
+      : handle_(handle, stream_conditional_deleter(nonowning))
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  unique_stream(unique_stream const&) = delete;
+
+  // GCC 10 complains if this is defaulted. See NVIDIA/thrust#1269.
+  THRUST_EXEC_CHECK_DISABLE
+  THRUST_HOST unique_stream(unique_stream&& o) noexcept
+      : handle_(std::move(o.handle_))
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  unique_stream& operator=(unique_stream const&) = delete;
+  THRUST_EXEC_CHECK_DISABLE
+  unique_stream& operator=(unique_stream&&) = default;
+
+  THRUST_EXEC_CHECK_DISABLE
+  ~unique_stream() = default;
+
+  THRUST_HOST auto get() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+  THRUST_HOST auto native_handle() const THRUST_DECLTYPE_RETURNS(native_handle_type(handle_.get()));
+
+  THRUST_HOST bool valid() const noexcept
+  {
+    return bool(handle_);
+  }
+
+  THRUST_HOST bool ready() const
+  {
+    hipError_t const err = hipStreamQuery(handle_.get());
+
+    if (hipErrorNotReady == err)
+    {
+      return false;
+    }
+
+    // Throw on any other error.
+    thrust::hip_rocprim::throw_on_error(err);
+
+    return true;
+  }
+
+  THRUST_HOST void wait() const
+  {
+    thrust::hip_rocprim::throw_on_error(hipStreamSynchronize(handle_.get()));
+  }
+
+  THRUST_HOST void depend_on(unique_marker& e)
+  {
+    thrust::hip_rocprim::throw_on_error(hipStreamWaitEvent(handle_.get(), e.get(), 0));
+  }
+
+  THRUST_HOST void depend_on(unique_stream& s)
+  {
+    if (s != *this)
+    {
+      unique_marker e;
+      s.record(e);
+      depend_on(e);
+    }
+  }
+
+  THRUST_HOST void record(unique_marker& e)
+  {
+    thrust::hip_rocprim::throw_on_error(hipEventRecord(e.get(), handle_.get()));
+  }
+
+  THRUST_HOST bool operator==(unique_stream const& other) const
+  {
+    return other.handle_ == handle_;
+  }
+
+  THRUST_HOST bool operator!=(unique_stream const& other) const
+  {
+    return !(other == *this);
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Inheritance hierarchy of future/event shared state types.
+
+struct async_signal;
+
+template <typename KeepAlives>
+struct async_keep_alives /* : virtual async_signal */;
+
+template <typename T>
+struct async_value /* : virtual async_signal */;
+
+template <typename T, typename Pointer, typename KeepAlives>
+struct async_addressable_value_with_keep_alives
+  /* : async_value<T>, async_keep_alives<KeepAlives> */;
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename Pointer>
+struct weak_promise;
+
+template <typename X, typename XPointer = pointer<X>>
+struct unique_eager_future_promise_pair final
+{
+  unique_eager_future<X> future;
+  weak_promise<X, XPointer> promise;
+};
+
+THRUST_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+
+  struct acquired_stream final
+{
+  unique_stream stream;
+  optional<std::size_t> const acquired_from;
+  // `acquired_from` contains the index in the tuple of dependencies from which
+  // the stream was acquired. If `acquired_from` is empty, no stream could be
+  // acquired from a dependency, and then the stream was newly created.
+};
+
+// Precondition: `device` is the current HIP device.
+template <typename X, typename Y, typename Deleter>
+THRUST_HOST optional<unique_stream> try_acquire_stream(int device, std::unique_ptr<Y, Deleter>&) noexcept;
+
+// Precondition: `device` is the current HIP device.
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int, unique_stream& stream) noexcept;
+
+// Precondition: `device` is the current HIP device.
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int device, ready_event&) noexcept;
+
+// Precondition: `device` is the current HIP device.
+template <typename X>
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int device, ready_future<X>&) noexcept;
+
+// Precondition: `device` is the current HIP device.
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int device, unique_eager_event& parent) noexcept;
+
+// Precondition: `device` is the current HIP device.
+template <typename X>
+THRUST_HOST optional<unique_stream> try_acquire_stream(int device, unique_eager_future<X>& parent) noexcept;
+
+THRUST_SUPPRESS_DEPRECATED_POP
+
+template <typename... Dependencies>
+THRUST_HOST acquired_stream acquire_stream(int device, Dependencies&... deps) noexcept;
+
+template <typename... Dependencies>
+THRUST_HOST unique_eager_event make_dependent_event(std::tuple<Dependencies...>&& deps);
+
+template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+THRUST_HOST unique_eager_future_promise_pair<X, XPointer>
+make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct async_signal
+{
+protected:
+  unique_stream stream_;
+
+public:
+  // Constructs an `async_signal` which uses `stream`.
+  THRUST_HOST explicit async_signal(unique_stream&& stream)
+      : stream_(std::move(stream))
+  {}
+
+  THRUST_HOST virtual ~async_signal() {}
+
+  unique_stream& stream() noexcept
+  {
+    return stream_;
+  }
+  unique_stream const& stream() const noexcept
+  {
+    return stream_;
+  }
+};
+
+template <typename... KeepAlives>
+struct async_keep_alives<std::tuple<KeepAlives...>> : virtual async_signal
+{
+  using keep_alives_type = std::tuple<KeepAlives...>;
+
+protected:
+  keep_alives_type keep_alives_;
+
+public:
+  // Constructs an `async_keep_alives` which uses `stream`, and keeps the
+  // objects in the tuple `keep_alives` alive until the asynchronous signal is
+  // destroyed.
+  THRUST_HOST explicit async_keep_alives(unique_stream&& stream, keep_alives_type&& keep_alives)
+      : async_signal(std::move(stream))
+      , keep_alives_(std::move(keep_alives))
+  {}
+
+  THRUST_HOST virtual ~async_keep_alives() {}
+};
+
+template <typename T>
+struct async_value : virtual async_signal
+{
+  using value_type        = T;
+  using raw_const_pointer = value_type const*;
+
+  // Constructs an `async_value` which uses `stream` and has no content.
+  THRUST_HOST explicit async_value(unique_stream stream)
+      : async_signal(std::move(stream))
+  {}
+
+  THRUST_HOST virtual ~async_value() {}
+
+  THRUST_HOST virtual bool valid_content() const noexcept
+  {
+    return false;
+  }
+
+  THRUST_HOST virtual value_type get()
+  {
+    throw thrust::event_error(event_errc::no_state);
+  }
+
+  THRUST_HOST virtual value_type extract()
+  {
+    throw thrust::event_error(event_errc::no_state);
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  THRUST_HOST virtual raw_const_pointer raw_data() const
+  {
+    return nullptr;
+  }
+#  endif
+};
+
+template <typename T, typename Pointer, typename... KeepAlives>
+struct async_addressable_value_with_keep_alives<T, Pointer, std::tuple<KeepAlives...>> final
+    : async_value<T>
+    , async_keep_alives<std::tuple<KeepAlives...>>
+{
+  using value_type        = typename async_value<T>::value_type;
+  using raw_const_pointer = typename async_value<T>::raw_const_pointer;
+
+  using keep_alives_type = typename async_keep_alives<std::tuple<KeepAlives...>>::keep_alives_type;
+
+  using pointer       = typename thrust::detail::pointer_traits<Pointer>::template rebind<value_type>::other;
+  using const_pointer = typename thrust::detail::pointer_traits<Pointer>::template rebind<value_type const>::other;
+
+private:
+  pointer content_;
+
+public:
+  // Constructs an `async_addressable_value_with_keep_alives` which uses
+  // `stream`, keeps the objects in the tuple `keep_alives` alive until the
+  // asynchronous value is destroyed, and determines the location of its
+  // content by evaluating `compute_content(content_keep_alive)`.
+  // NOTE: The use of a callback idiom is necessary if the content is stored in
+  // place in the content keep alive object, in which case we need to get its
+  // address after its been moved into the new signal we're constructing.
+  // NOTE: NVCC has a bug that causes it to reorder our base class initializers
+  // in generated host code, which leads to -Wreorder warnings.
+  THRUST_DIAG_PUSH
+  THRUST_DIAG_SUPPRESS_CLANG("-Wreorder")
+  THRUST_DIAG_SUPPRESS_GCC("-Wreorder")
+  THRUST_DIAG_SUPPRESS_ICC(2407)
+  template <typename ComputeContent>
+  THRUST_HOST explicit async_addressable_value_with_keep_alives(
+    unique_stream&& stream, keep_alives_type&& keep_alives, ComputeContent&& compute_content)
+      : async_signal(std::move(stream))
+      , async_value<T>(std::move(stream))
+      , async_keep_alives<keep_alives_type>(std::move(stream), std::move(keep_alives))
+  {
+    content_ = THRUST_FWD(compute_content)(std::get<0>(this->keep_alives_));
+  }
+  THRUST_DIAG_POP
+
+  THRUST_HOST bool valid_content() const noexcept final override
+  {
+    return nullptr != content_;
+  }
+
+  // Precondition: `true == valid_content()`.
+  THRUST_HOST pointer data()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return content_;
+  }
+
+  // Precondition: `true == valid_content()`.
+  THRUST_HOST const_pointer data() const
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return content_;
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  THRUST_HOST value_type get() final override
+  {
+    this->stream().wait();
+    return *data();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  THRUST_HOST value_type extract() final override
+  {
+    this->stream().wait();
+    return std::move(*data());
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  THRUST_HOST raw_const_pointer raw_data() const final override
+  {
+    return raw_pointer_cast(content_);
+  }
+#  endif
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename T, typename Pointer>
+struct weak_promise final
+{
+  using value_type = typename async_value<T>::value_type;
+
+  using pointer       = typename thrust::detail::pointer_traits<Pointer>::template rebind<T>::other;
+  using const_pointer = typename thrust::detail::pointer_traits<Pointer>::template rebind<T const>::other;
+
+private:
+  int device_ = 0;
+  pointer content_;
+
+  explicit weak_promise(int device_id, pointer content)
+      : device_(device_id)
+      , content_(std::move(content))
+  {}
+
+public:
+  THRUST_HOST_DEVICE weak_promise()
+      : device_(0)
+      , content_{}
+  {}
+
+  THRUST_EXEC_CHECK_DISABLE
+  weak_promise(weak_promise const&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  weak_promise(weak_promise&&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  weak_promise& operator=(weak_promise const&) = default;
+  THRUST_EXEC_CHECK_DISABLE
+  weak_promise& operator=(weak_promise&&) = default;
+
+  template <typename U>
+  THRUST_HOST_DEVICE void set_value(U&& value) &&
+  {
+    *content_ = THRUST_FWD(value);
+  }
+
+  template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+  friend THRUST_HOST unique_eager_future_promise_pair<X, XPointer>
+  thrust::system::hip::detail::make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace detail
+
+struct THRUST_DEPRECATED ready_event final
+{
+  ready_event() = default;
+
+  template <typename U>
+  THRUST_HOST_DEVICE explicit ready_event(ready_future<U>)
+  {}
+
+  THRUST_HOST_DEVICE static constexpr bool valid_content() noexcept
+  {
+    return true;
+  }
+
+  THRUST_HOST_DEVICE static constexpr bool ready() noexcept
+  {
+    return true;
+  }
+};
+
+template <typename T>
+struct THRUST_DEPRECATED ready_future final
+{
+  using value_type        = T;
+  using raw_const_pointer = T const*;
+
+private:
+  value_type value_;
+
+public:
+  THRUST_HOST_DEVICE ready_future()
+      : value_{}
+  {}
+
+  ready_future(ready_future&&)                 = default;
+  ready_future(ready_future const&)            = default;
+  ready_future& operator=(ready_future&&)      = default;
+  ready_future& operator=(ready_future const&) = default;
+
+  template <typename U>
+  THRUST_HOST_DEVICE explicit ready_future(U&& u)
+      : value_(THRUST_FWD(u))
+  {}
+
+  THRUST_HOST_DEVICE static constexpr bool valid_content() noexcept
+  {
+    return true;
+  }
+
+  THRUST_HOST_DEVICE static constexpr bool ready() noexcept
+  {
+    return true;
+  }
+
+  THRUST_HOST_DEVICE value_type get() const
+  {
+    return value_;
+  }
+
+  THRUST_NODISCARD THRUST_HOST_DEVICE value_type extract()
+  {
+    return std::move(value_);
+  }
+
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  // For testing only.
+  THRUST_HOST_DEVICE raw_const_pointer data() const
+  {
+    return addressof(value_);
+  }
+#  endif
+};
+
+struct THRUST_DEPRECATED unique_eager_event final
+{
+protected:
+  int device_ = 0;
+  std::unique_ptr<detail::async_signal> async_signal_;
+
+  THRUST_HOST explicit unique_eager_event(int device_id, std::unique_ptr<detail::async_signal> async_signal)
+      : device_(device_id)
+      , async_signal_(std::move(async_signal))
+  {}
+
+public:
+  THRUST_HOST unique_eager_event()
+      : device_(0)
+      , async_signal_()
+  {}
+
+  unique_eager_event(unique_eager_event&&)                 = default;
+  unique_eager_event(unique_eager_event const&)            = delete;
+  unique_eager_event& operator=(unique_eager_event&&)      = default;
+  unique_eager_event& operator=(unique_eager_event const&) = delete;
+
+  // Any `unique_eager_future<T>` can be explicitly converted to a
+  // `unique_eager_event<void>`.
+  template <typename U>
+  THRUST_HOST explicit unique_eager_event(unique_eager_future<U>&& other)
+      // NOTE: We upcast to `unique_ptr<async_signal>` here.
+      : device_(other.where())
+      , async_signal_(other.async_signal_.release())
+  {}
+
+  THRUST_HOST
+  // NOTE: We take `new_stream_t` by `const&` because it is incomplete here.
+  explicit unique_eager_event(new_stream_t const&)
+      : device_(0)
+      , async_signal_(new detail::async_signal(detail::unique_stream{}))
+  {
+    thrust::hip_rocprim::throw_on_error(hipGetDevice(&device_));
+  }
+
+  THRUST_HOST ~unique_eager_event()
+  {
+    // FIXME: If we could asynchronously handle destruction of keep alives, we
+    // could avoid doing this.
+    if (valid_stream())
+    {
+      wait();
+    }
+  }
+
+  THRUST_HOST bool valid_stream() const noexcept
+  {
+    return bool(async_signal_);
+  }
+
+  THRUST_HOST bool ready() const noexcept
+  {
+    if (valid_stream())
+    {
+      return stream().ready();
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST detail::unique_stream& stream()
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+  detail::unique_stream const& stream() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+
+  THRUST_HOST int where() const noexcept
+  {
+    return device_;
+  }
+
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST void wait()
+  {
+    stream().wait();
+  }
+
+  THRUST_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+    friend THRUST_HOST optional<detail::unique_stream>
+    thrust::system::hip::detail::try_acquire_stream(int device_id, unique_eager_event& parent) noexcept;
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <typename... Dependencies>
+  friend THRUST_HOST unique_eager_event
+  thrust::system::hip::detail::make_dependent_event(std::tuple<Dependencies...>&& deps);
+};
+
+template <typename T>
+struct THRUST_DEPRECATED unique_eager_future final
+{
+  THRUST_STATIC_ASSERT_MSG((!std::is_same<T, ::internal::remove_cvref_t<void>>::value),
+                           "`thrust::event` should be used to express valueless futures");
+
+  using value_type        = typename detail::async_value<T>::value_type;
+  using raw_const_pointer = typename detail::async_value<T>::raw_const_pointer;
+
+private:
+  int device_ = 0;
+  _THRUST_STD::unique_ptr<detail::async_value<value_type>> async_signal_;
+
+  THRUST_HOST explicit unique_eager_future(int device_id, std::unique_ptr<detail::async_value<value_type>> async_signal)
+      : device_(device_id)
+      , async_signal_(async_signal.release())
+  {}
+
+public:
+  THRUST_HOST unique_eager_future()
+      : device_(0)
+      , async_signal_()
+  {}
+
+  unique_eager_future(unique_eager_future&&)                 = default;
+  unique_eager_future(unique_eager_future const&)            = delete;
+  unique_eager_future& operator=(unique_eager_future&&)      = default;
+  unique_eager_future& operator=(unique_eager_future const&) = delete;
+
+  THRUST_HOST
+  // NOTE: We take `new_stream_t` by `const&` because it is incomplete here.
+  explicit unique_eager_future(new_stream_t const&)
+      : device_(0)
+      , async_signal_(new detail::async_value<value_type>(detail::unique_stream{}))
+  {
+    thrust::hip_rocprim::throw_on_error(hipGetDevice(&device_));
+  }
+
+  THRUST_HOST ~unique_eager_future()
+  {
+    // FIXME: If we could asynchronously handle destruction of keep alives, we
+    // could avoid doing this.
+    if (valid_stream())
+    {
+      wait();
+    }
+  }
+
+  THRUST_HOST bool valid_stream() const noexcept
+  {
+    return bool(async_signal_);
+  }
+
+  THRUST_HOST bool valid_content() const noexcept
+  {
+    if (!valid_stream())
+    {
+      return false;
+    }
+
+    // We might have been constructed with `new_stream_t`, in which case we'd
+    // have an async_value, but it doesn't have content.
+    return async_signal_->valid_content();
+  }
+
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST bool ready() const noexcept
+  {
+    if (valid_stream())
+    {
+      return stream().ready();
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST detail::unique_stream& stream()
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+  THRUST_HOST detail::unique_stream const& stream() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->stream();
+  }
+
+  THRUST_HOST int where() const noexcept
+  {
+    return device_;
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST void wait()
+  {
+    stream().wait();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  THRUST_HOST value_type get()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    return async_signal_->get();
+  }
+
+  // Blocks.
+  // Precondition: `true == valid_content()`.
+  THRUST_NODISCARD THRUST_HOST value_type extract()
+  {
+    if (!valid_content())
+    {
+      throw thrust::event_error(event_errc::no_content);
+    }
+
+    value_type tmp(async_signal_->extract());
+    async_signal_.reset();
+    return tmp;
+  }
+
+// For testing only.
+#  if defined(THRUST_ENABLE_FUTURE_RAW_DATA_MEMBER)
+  // Precondition: `true == valid_stream()`.
+  THRUST_HOST raw_const_pointer raw_data() const
+  {
+    if (!valid_stream())
+    {
+      throw thrust::event_error(event_errc::no_state);
+    }
+
+    return async_signal_->raw_data();
+  }
+#  endif
+
+  THRUST_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+    template <typename X>
+    friend THRUST_HOST optional<detail::unique_stream>
+    thrust::system::hip::detail::try_acquire_stream(int device_id, unique_eager_future<X>& parent) noexcept;
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+  friend THRUST_HOST detail::unique_eager_future_promise_pair<X, XPointer>
+  thrust::system::hip::detail::make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps);
+
+  friend struct unique_eager_event;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace detail
+{
+THRUST_SUPPRESS_DEPRECATED_PUSH // for thrust::optional
+
+  template <typename X, typename Deleter>
+  THRUST_HOST optional<unique_stream> try_acquire_stream(int, std::unique_ptr<X, Deleter>&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int, unique_stream& stream) noexcept
+{
+  return {std::move(stream)};
+}
+
+THRUST_HOST inline optional<unique_stream> try_acquire_stream(int, ready_event&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+template <typename X>
+THRUST_HOST optional<unique_stream> try_acquire_stream(int, ready_future<X>&) noexcept
+{
+  // There's no stream to acquire!
+  return {};
+}
+
+THRUST_HOST optional<unique_stream> try_acquire_stream(int device_id, unique_eager_event& parent) noexcept
+{
+  // We have unique ownership, so we can always steal the stream if the future
+  // has one as long as they are on the same device as us.
+  if (parent.valid_stream())
+  {
+    if (device_id == parent.device_)
+    {
+      return std::move(parent.async_signal_->stream());
+    }
+  }
+
+  return {};
+}
+
+template <typename X>
+THRUST_HOST optional<unique_stream> try_acquire_stream(int device_id, unique_eager_future<X>& parent) noexcept
+{
+  // We have unique ownership, so we can always steal the stream if the future
+  // has one as long as they are on the same device as us.
+  if (parent.valid_stream())
+  {
+    if (device_id == parent.device_)
+    {
+      return std::move(parent.async_signal_->stream());
+    }
+  }
+
+  return {};
+}
+
+THRUST_SUPPRESS_DEPRECATED_POP
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Dependencies>
+THRUST_HOST acquired_stream acquire_stream_impl(int, std::tuple<Dependencies...>&, index_sequence<>) noexcept
+{
+  // We tried to take a stream from all of our dependencies and failed every
+  // time, so we need to make a new stream.
+  return {unique_stream{}, {}};
+}
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+THRUST_HOST acquired_stream
+acquire_stream_impl(int device_id, std::tuple<Dependencies...>& deps, index_sequence<I0, Is...>) noexcept
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH // for thrust::optional (MSVC warnings here)
+    auto tr = try_acquire_stream(device_id, std::get<I0>(deps));
+
+  if (tr)
+  {
+    return {std::move(*tr), {I0}};
+  }
+  else
+  {
+    return acquire_stream_impl(device_id, deps, index_sequence<Is...>{});
+  }
+  THRUST_SUPPRESS_DEPRECATED_POP
+}
+
+template <typename... Dependencies>
+THRUST_HOST acquired_stream acquire_stream(int device_id, std::tuple<Dependencies...>& deps) noexcept
+{
+  return acquire_stream_impl(device_id, deps, make_index_sequence<sizeof...(Dependencies)>{});
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename X, typename Deleter>
+THRUST_HOST void create_dependency(unique_stream&, std::unique_ptr<X, Deleter>&) noexcept
+{}
+
+THRUST_HOST inline void create_dependency(unique_stream&, ready_event&) noexcept {}
+
+template <typename T>
+THRUST_HOST void create_dependency(unique_stream&, ready_future<T>&) noexcept
+{}
+
+THRUST_HOST inline void create_dependency(unique_stream& child, unique_stream& parent)
+{
+  child.depend_on(parent);
+}
+
+THRUST_HOST inline void create_dependency(unique_stream& child, unique_eager_event& parent)
+{
+  child.depend_on(parent.stream());
+}
+
+template <typename X>
+THRUST_HOST void create_dependency(unique_stream& child, unique_eager_future<X>& parent)
+{
+  child.depend_on(parent.stream());
+}
+
+template <typename... Dependencies>
+THRUST_HOST void create_dependencies_impl(acquired_stream&, std::tuple<Dependencies...>&, index_sequence<>)
+{}
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+THRUST_HOST void
+create_dependencies_impl(acquired_stream& as, std::tuple<Dependencies...>& deps, index_sequence<I0, Is...>)
+{
+  // We only need to wait on the current dependency if we didn't steal our
+  // stream from it.
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  if (!as.acquired_from || *as.acquired_from != I0)
+  {
+    create_dependency(as.stream, std::get<I0>(deps));
+  }
+  THRUST_SUPPRESS_DEPRECATED_POP
+
+  create_dependencies_impl(as, deps, index_sequence<Is...>{});
+}
+
+template <typename... Dependencies>
+THRUST_HOST void create_dependencies(acquired_stream& as, std::tuple<Dependencies...>& deps)
+{
+  create_dependencies_impl(as, deps, make_index_sequence<sizeof...(Dependencies)>{});
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Metafunction that determine which `Dependencies` need to be kept alive.
+// Returns the result as an `index_sequence` of indices into the parameter
+// pack.
+template <typename Tuple, typename Indices>
+struct find_keep_alives_impl;
+template <typename Tuple>
+using find_keep_alives =
+  typename find_keep_alives_impl<Tuple, make_index_sequence<std::tuple_size<Tuple>::value>>::type;
+
+template <>
+struct find_keep_alives_impl<std::tuple<>, index_sequence<>>
+{
+  using type = index_sequence<>;
+};
+
+// User-provided stream.
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_stream, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Nothing to keep alive, skip this index.
+  using type = typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type;
+};
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<ready_event, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Nothing to keep alive, skip this index.
+  using type = typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type;
+};
+
+template <typename T, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<ready_future<T>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+template <typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_eager_event, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+template <typename X, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<unique_eager_future<X>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+// Content storage.
+template <typename T, typename Deleter, typename... Dependencies, std::size_t I0, std::size_t... Is>
+struct find_keep_alives_impl<std::tuple<std::unique_ptr<T, Deleter>, Dependencies...>, index_sequence<I0, Is...>>
+{
+  // Add this index to the list.
+  using type = integer_sequence_push_front<
+    std::size_t,
+    I0,
+    typename find_keep_alives_impl<std::tuple<Dependencies...>, index_sequence<Is...>>::type>;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Dependencies>
+THRUST_HOST unique_eager_event make_dependent_event(std::tuple<Dependencies...>&& deps)
+{
+  int device_id = 0;
+  thrust::hip_rocprim::throw_on_error(hipGetDevice(&device_id));
+
+  // First, either steal a stream from one of our children or make a new one.
+  auto as = acquire_stream(device_id, deps);
+
+  // Then, make the stream we've acquired asynchronously wait on all of our
+  // dependencies, except the one we stole the stream from.
+  create_dependencies(as, deps);
+
+  // Then, we determine which subset of dependencies need to be kept alive.
+  auto ka = tuple_subset(std::move(deps), find_keep_alives<std::tuple<Dependencies...>>{});
+
+  // Next, we create the asynchronous signal.
+  using async_signal_type = async_keep_alives<decltype(ka)>;
+
+  std::unique_ptr<async_signal_type> sig(new async_signal_type(std::move(as.stream), std::move(ka)));
+
+  // Finally, we create the event object.
+  return unique_eager_event(device_id, std::move(sig));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename X, typename XPointer, typename ComputeContent, typename... Dependencies>
+THRUST_HOST unique_eager_future_promise_pair<X, XPointer>
+make_dependent_future(ComputeContent&& cc, std::tuple<Dependencies...>&& deps)
+{
+  int device_id = 0;
+  thrust::hip_rocprim::throw_on_error(hipGetDevice(&device_id));
+
+  // First, either steal a stream from one of our children or make a new one.
+  auto as = acquire_stream(device_id, deps);
+
+  // Then, make the stream we've acquired asynchronously wait on all of our
+  // dependencies, except the one we stole the stream from.
+  create_dependencies(as, deps);
+
+  // Then, we determine which subset of dependencies need to be kept alive.
+  auto ka = tuple_subset(std::move(deps), find_keep_alives<std::tuple<Dependencies...>>{});
+
+  // Next, we create the asynchronous value.
+  using async_signal_type = async_addressable_value_with_keep_alives<X, XPointer, decltype(ka)>;
+
+  std::unique_ptr<async_signal_type> sig(new async_signal_type(std::move(as.stream), std::move(ka), std::move(cc)));
+
+  // Finally, we create the promise and future objects.
+  weak_promise<X, XPointer> child_prom(device_id, sig->data());
+  unique_eager_future<X> child_fut(device_id, std::move(sig));
+
+  return unique_eager_future_promise_pair<X, XPointer>{std::move(child_fut), std::move(child_prom)};
+}
+
+} // namespace detail
+
+///////////////////////////////////////////////////////////////////////////////
+
+template <typename... Events>
+THRUST_DEPRECATED THRUST_HOST unique_eager_event when_all(Events&&... evs)
+// TODO: Constrain to events, futures, and maybe streams (currently allows keep
+// alives).
+{
+  return detail::make_dependent_event(std::make_tuple(std::move(evs)...));
+}
+
+// ADL hook for transparent `.after` move support.
+THRUST_DEPRECATED THRUST_HOST inline auto capture_as_dependency(unique_eager_event& dependency)
+  THRUST_DECLTYPE_RETURNS(std::move(dependency))
+
+  // ADL hook for transparent `.after` move support.
+  template <typename X>
+  THRUST_DEPRECATED THRUST_HOST auto capture_as_dependency(unique_eager_future<X>& dependency)
+    THRUST_DECLTYPE_RETURNS(std::move(dependency))
+
+} // namespace hip
+} // namespace system
+
+THRUST_SUPPRESS_DEPRECATED_POP
+THRUST_NAMESPACE_END
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/hip/detail/gather.h b/projects/rocthrust/thrust/system/hip/detail/gather.h
index 16c5e42a975f..7d46310208dc 100644
--- a/projects/rocthrust/thrust/system/hip/detail/gather.h
+++ b/projects/rocthrust/thrust/system/hip/detail/gather.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,8 +37,8 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
-#  include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#  include <thrust/functional.h>
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/hip/detail/transform.h>
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/general/various.h b/projects/rocthrust/thrust/system/hip/detail/general/various.h
index c22d725f0633..97f20d239d18 100644
--- a/projects/rocthrust/thrust/system/hip/detail/general/various.h
+++ b/projects/rocthrust/thrust/system/hip/detail/general/various.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <rocprim/rocprim.hpp>
 #include <thrust/detail/config.h>
 
 #include <thrust/detail/type_traits.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/generate.h b/projects/rocthrust/thrust/system/hip/detail/generate.h
index bad1d6c238e7..0c65c7561c64 100644
--- a/projects/rocthrust/thrust/system/hip/detail/generate.h
+++ b/projects/rocthrust/thrust/system/hip/detail/generate.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/distance.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/get_value.h b/projects/rocthrust/thrust/system/hip/detail/get_value.h
index f642e4e5111f..9ef9630c0566 100644
--- a/projects/rocthrust/thrust/system/hip/detail/get_value.h
+++ b/projects/rocthrust/thrust/system/hip/detail/get_value.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,38 +27,62 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
 #  include <thrust/iterator/iterator_traits.h>
 #  include <thrust/system/hip/detail/cross_system.h>
+#  include <thrust/system/hip/detail/nv/target.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
+
+namespace
+{
+
 template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE thrust::detail::it_value_t<Pointer>
-get_value([[maybe_unused]] execution_policy<DerivedPolicy>& exec, Pointer ptr)
+inline THRUST_HOST_DEVICE typename thrust::iterator_value<Pointer>::type
+get_value_msvc2005_war(execution_policy<DerivedPolicy>& exec, Pointer ptr)
 {
-  // Because of https://docs.nvidia.com/cuda/cuda-c-programming-guide/#cuda-arch point 2., if a call from a __host__
-  // __device__ function leads to the template instantiation of a __global__ function, then this instantiation needs to
-  // happen regardless of whether __CUDA_ARCH__ is defined. Therefore, we make the host path visible outside the
-  // _THRUST_IF_TARGET switch. See also NVBug 881631.
-  struct HostPath
+  using result_type = typename thrust::iterator_value<Pointer>::type;
+
+  // XXX war nvbugs/881631
+  struct war_nvbugs_881631
   {
-    THRUST_HOST auto operator()(execution_policy<DerivedPolicy>& exec, Pointer ptr)
+    THRUST_HOST inline static result_type host_path(execution_policy<DerivedPolicy>& exec, Pointer ptr)
     {
-      // implemented with assign_value, which requires a type with a default constructor
-      thrust::detail::it_value_t<Pointer> result;
-      host_system_tag host_tag;
-      cross_system<host_system_tag, DerivedPolicy> systems(host_tag, exec);
+      // when called from host code, implement with assign_value
+      // note that this requires a type with default constructor
+      result_type result;
+
+      thrust::host_system_tag host_tag;
+      cross_system<thrust::host_system_tag, DerivedPolicy> systems(host_tag, exec);
       assign_value(systems, &result, ptr);
+
       return result;
     }
+
+    THRUST_DEVICE inline static result_type device_path(execution_policy<DerivedPolicy>&, Pointer ptr)
+    {
+      // when called from device code, just do simple deref
+      return *thrust::raw_pointer_cast(ptr);
+    }
   };
-  _THRUST_IF_TARGET(_THRUST_IS_DEVICE, return *thrust::raw_pointer_cast(ptr);, (return HostPath{}(exec, ptr);))
-}
+
+  NV_IF_TARGET(
+    NV_IS_HOST, (return war_nvbugs_881631::host_path(exec, ptr);), (return war_nvbugs_881631::device_path(exec, ptr);))
+} // end get_value_msvc2005_war()
+} // namespace
+
+template <typename DerivedPolicy, typename Pointer>
+inline THRUST_HOST_DEVICE typename thrust::iterator_value<Pointer>::type
+get_value(execution_policy<DerivedPolicy>& exec, Pointer ptr)
+{
+  return get_value_msvc2005_war(exec, ptr);
+} // end get_value()
+
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/guarded_driver_types.h b/projects/rocthrust/thrust/system/hip/detail/guarded_driver_types.h
new file mode 100644
index 000000000000..2465876cf8bc
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/guarded_driver_types.h
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// the purpose of this header is to #include <driver_types.h> without causing
+// warnings from redefinitions of __host__ and __device__.
+// carefully save their definitions and restore them
+
+#ifdef THRUST_HOST
+#  pragma push_macro("THRUST_HOST")
+#  undef THRUST_HOST
+#  define THRUST_HOST_NEEDS_RESTORATION
+#endif
+#ifdef THRUST_DEVICE
+#  pragma push_macro("THRUST_DEVICE")
+#  undef THRUST_DEVICE
+#  define THRUST_DEVICE_NEEDS_RESTORATION
+#endif
+
+#include <hip/amd_detail/host_defines.h>
+
+#ifdef THRUST_HOST_NEEDS_RESTORATION
+#  pragma pop_macro("THRUST_HOST")
+#  undef THRUST_HOST_NEEDS_RESTORATION
+#endif
+#ifdef THRUST_DEVICE_NEEDS_RESTORATION
+#  pragma pop_macro("THRUST_DEVICE")
+#  undef THRUST_DEVICE_NEEDS_RESTORATION
+#endif
diff --git a/projects/rocthrust/thrust/system/hip/detail/guarded_hip_runtime_api.h b/projects/rocthrust/thrust/system/hip/detail/guarded_hip_runtime_api.h
new file mode 100644
index 000000000000..941848a2809c
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/guarded_hip_runtime_api.h
@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2008-2013 NVIDIA Corporation
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+// the purpose of this header is to check for the existence of macros
+// such as __host__ and __device__, which may already be defined by thrust
+// and to undefine them before entering hip/hip_runtime_api.h (which will redefine them)
+
+#if !defined(HIP_INCLUDE_HIP_AMD_DETAIL_HOST_DEFINES_H)
+
+#  ifdef THRUST_HOST
+#    undef THRUST_HOST
+#  endif // THRUST_HOST
+
+#  ifdef THRUST_DEVICE
+#    undef THRUST_DEVICE
+#  endif // THRUST_DEVICE
+
+#endif // __HOST_DEFINES_H__
+
+#include <hip/hip_runtime_api.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/inner_product.h b/projects/rocthrust/thrust/system/hip/detail/inner_product.h
index 462b159b0268..8396a8418591 100644
--- a/projects/rocthrust/thrust/system/hip/detail/inner_product.h
+++ b/projects/rocthrust/thrust/system/hip/detail/inner_product.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,8 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#  include <thrust/detail/minmax.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/transform_iterator.h>
 #  include <thrust/iterator/zip_iterator.h>
diff --git a/projects/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h b/projects/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
index ca4ff1b4dc2c..3b17534c74f9 100644
--- a/projects/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
+++ b/projects/rocthrust/thrust/system/hip/detail/internal/copy_cross_system.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -94,7 +94,7 @@ OutputIt THRUST_HOST cross_system_copy_n(
   thrust::detail::true_type) // trivial copy
 
 {
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename iterator_traits<InputIt>::value_type;
   if (n > 0)
   {
     trivial_device_copy(
@@ -119,7 +119,7 @@ OutputIt THRUST_HOST cross_system_copy_n(
   thrust::detail::false_type) // non-trivial copy
 {
   // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_value<InputIt>::type;
 
   // copy input data into host temp storage
   InputIt last = first;
@@ -146,7 +146,7 @@ OutputIt THRUST_HOST cross_system_copy_n(
   return ret;
 }
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 // non-trivial copy D->H, only supported with NVCC compiler
 // because copy ctor must have  __device__ annotations, which is nvcc-only
 // feature
@@ -161,7 +161,7 @@ OutputIt THRUST_HOST cross_system_copy_n(
 
 {
   // get type of the input data
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_value<InputIt>::type;
 
   // allocate device temp storage
   thrust::detail::temporary_array<InputTy, D> d_in_ptr(device_s, num_items);
diff --git a/projects/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h b/projects/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h
index cd43c6040e04..af95b2f1937f 100644
--- a/projects/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h
+++ b/projects/rocthrust/thrust/system/hip/detail/internal/copy_device_to_device.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,10 +37,9 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
@@ -59,10 +58,10 @@ transform(execution_policy<Derived>& policy, InputIt first, InputIt last, Output
 namespace __copy
 {
 template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION device_to_device(
+OutputIt THRUST_RUNTIME_FUNCTION device_to_device(
   execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, thrust::detail::true_type)
 {
-  using InputTy = thrust::detail::it_value_t<InputIt>;
+  using InputTy = typename thrust::iterator_traits<InputIt>::value_type;
   const auto n  = thrust::distance(first, last);
   if (n > 0)
   {
@@ -79,14 +78,14 @@ OutputIt THRUST_HIP_RUNTIME_FUNCTION device_to_device(
 }
 
 template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION device_to_device(
+OutputIt THRUST_RUNTIME_FUNCTION device_to_device(
   execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, thrust::detail::false_type)
 {
   return hip_rocprim::transform(policy, first, last, result, ::internal::identity{});
 }
 
 template <class Derived, class InputIt, class OutputIt>
-OutputIt THRUST_HIP_RUNTIME_FUNCTION
+OutputIt THRUST_RUNTIME_FUNCTION
 device_to_device(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
   return device_to_device(
diff --git a/projects/rocthrust/thrust/system/hip/detail/iter_swap.h b/projects/rocthrust/thrust/system/hip/detail/iter_swap.h
index aaa0032fab9d..8b20e11e3d8f 100644
--- a/projects/rocthrust/thrust/system/hip/detail/iter_swap.h
+++ b/projects/rocthrust/thrust/system/hip/detail/iter_swap.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,17 +27,14 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/raw_pointer_cast.h>
 #  include <thrust/swap.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
-
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(utility)
-#  endif
+#  include <thrust/system/hip/detail/nv/target.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
@@ -56,16 +53,12 @@ inline THRUST_HOST_DEVICE void iter_swap(thrust::hip::execution_policy<DerivedPo
 
     THRUST_DEVICE inline static void device_path(Pointer1 a, Pointer2 b)
     {
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-      using _THRUST_STD::swap;
-#  else
       using thrust::swap;
-#  endif
       swap(*thrust::raw_pointer_cast(a), *thrust::raw_pointer_cast(b));
     }
   };
 
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, (war_nvbugs_881631::host_path(a, b);), (war_nvbugs_881631::device_path(a, b);));
+  NV_IF_TARGET(NV_IS_HOST, (war_nvbugs_881631::host_path(a, b);), (war_nvbugs_881631::device_path(a, b);));
 
 } // end iter_swap()
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/logical.h b/projects/rocthrust/thrust/system/hip/detail/logical.h
index 5521a180bce5..89763aa8e28a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/logical.h
+++ b/projects/rocthrust/thrust/system/hip/detail/logical.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,12 +19,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/hip/detail/make_unsigned_special.h b/projects/rocthrust/thrust/system/hip/detail/make_unsigned_special.h
index 76a509ad9ed0..0d79079532ff 100644
--- a/projects/rocthrust/thrust/system/hip/detail/make_unsigned_special.h
+++ b/projects/rocthrust/thrust/system/hip/detail/make_unsigned_special.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2019 NVIDIA Corporation
- *  Modifications Copyright (c) 2020-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Modifications Copyright (c) 2020-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
diff --git a/projects/rocthrust/thrust/system/hip/detail/malloc_and_free.h b/projects/rocthrust/thrust/system/hip/detail/malloc_and_free.h
index 4b5fb9a89e21..a872868b6a1f 100644
--- a/projects/rocthrust/thrust/system/hip/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/hip/detail/malloc_and_free.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,59 +18,95 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/system/hip/config.h>
 
-#include <thrust/detail/malloc_and_free.h>
-#include <thrust/detail/malloc_and_free_fwd.h>
 #include <thrust/detail/raw_pointer_cast.h>
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/detail/seq.h>
+#include <thrust/system/hip/detail/guarded_hip_runtime_api.h>
+// No caching allocator in rocPRIM
+// #ifdef THRUST_CACHING_DEVICE_MALLOC
+// #include <thrust/system/cuda/detail/cub/util_allocator.cuh>
+// #endif
+#include <thrust/detail/malloc_and_free.h>
+#include <thrust/detail/malloc_and_free_fwd.h>
 #include <thrust/system/detail/bad_alloc.h>
+#include <thrust/system/hip/detail/nv/target.h>
 #include <thrust/system/hip/detail/util.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 
+// No caching allocator in rocPRIM
+// #ifdef THRUST_CACHING_DEVICE_MALLOC
+// #define __CUB_CACHING_MALLOC
+// #ifndef __CUDA_ARCH__
+// inline cub::CachingDeviceAllocator &get_allocator()
+// {
+//   static cub::CachingDeviceAllocator g_allocator(true);
+//   return g_allocator;
+// }
+// #endif
+// #endif
+
 // note that malloc returns a raw pointer to avoid
 // depending on the heavyweight thrust/system/hip/memory.h header
 template <typename DerivedPolicy>
-THRUST_HOST_DEVICE void* malloc(execution_policy<DerivedPolicy>&, std::size_t n)
+void* THRUST_HOST_DEVICE malloc(execution_policy<DerivedPolicy>&, std::size_t n)
 {
   void* result = 0;
 
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
+  // No caching allocator in rocPRIM
+  // #ifdef __CUB_CACHING_MALLOC
+  //   NV_IF_TARGET(NV_IS_HOST, (
+  //     cub::CachingDeviceAllocator &alloc = get_allocator();
+  //     cudaError_t status = alloc.DeviceAllocate(&result, n);
+
+  //     if (status != cudaSuccess)
+  //     {
+  //       cudaGetLastError(); // Clear global CUDA error state.
+  //       throw thrust::system::detail::bad_alloc(thrust::cuda_category().message(status).c_str());
+  //     }
+  //   ), ( // NV_IS_DEVICE
+  //     result = thrust::raw_pointer_cast(thrust::malloc(thrust::seq, n));
+  //   ));
+  // #else // not __CUB_CACHING_MALLOC
+  NV_IF_TARGET(
+    NV_IS_HOST,
     (hipError_t status = hipMalloc(&result, n);
 
      if (status != hipSuccess) {
-       (void) hipGetLastError(); // Clear global HIP error state.
+       // Clear global hip error state.
+       hipError_t clear_error_status = hipGetLastError();
+       THRUST_UNUSED_VAR(clear_error_status);
        throw thrust::system::detail::bad_alloc(thrust::hip_category().message(status).c_str());
      }),
-    ( // _THRUST_IS_DEVICE
+    ( // NV_IS_DEVICE
       result = thrust::raw_pointer_cast(thrust::malloc(thrust::seq, n));));
-
+  // #endif
   return result;
 } // end malloc()
 
 template <typename DerivedPolicy, typename Pointer>
-THRUST_HOST_DEVICE void free(execution_policy<DerivedPolicy>&, Pointer ptr)
+void THRUST_HOST_DEVICE free(execution_policy<DerivedPolicy>&, Pointer ptr)
 {
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST,
-    (hipError_t status = hipFree(thrust::raw_pointer_cast(ptr));
-     hip_rocprim::throw_on_error(status, "device free failed");),
-    ( // _THRUST_IS_DEVICE
-      thrust::free(thrust::seq, ptr);));
+  // No caching allocator in rocPRIM
+  // #ifdef __CUB_CACHING_MALLOC
+  //   NV_IF_TARGET(NV_IS_HOST, (
+  //     cub::CachingDeviceAllocator &alloc = get_allocator();
+  //     cudaError_t status = alloc.DeviceFree(thrust::raw_pointer_cast(ptr));
+  //     cuda_cub::throw_on_error(status, "device free failed");
+  //   ), ( // NV_IS_DEVICE
+  //     thrust::free(thrust::seq, ptr);
+  //   ));
+  // #else // not __CUB_CACHING_MALLOC
+  NV_IF_TARGET(NV_IS_HOST,
+               (hipError_t status = hipFree(thrust::raw_pointer_cast(ptr));
+                hip_rocprim::throw_on_error(status, "device free failed");),
+               ( // NV_IS_DEVICE
+                 thrust::free(thrust::seq, ptr);));
+  // #endif
 } // end free()
 
 } // namespace hip_rocprim
diff --git a/projects/rocthrust/thrust/system/hip/detail/memory.inl b/projects/rocthrust/thrust/system/hip/detail/memory.inl
index b7817f4ded9e..44e303371517 100644
--- a/projects/rocthrust/thrust/system/hip/detail/memory.inl
+++ b/projects/rocthrust/thrust/system/hip/detail/memory.inl
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright© 2018-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2018-2020 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,41 +18,31 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/hip/detail/malloc_and_free.h>
-#include <thrust/system/hip/memory.h>
-
 #include <limits>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
 
-THRUST_HOST_DEVICE pointer<void> malloc(std::size_t n)
+THRUST_HIP_FUNCTION pointer<void> malloc(std::size_t n)
 {
-  tag hip_tag;
-  return pointer<void>(thrust::hip_rocprim::malloc(hip_tag, n));
+    tag hip_tag;
+    return pointer<void>(thrust::hip_rocprim::malloc(hip_tag, n));
 } // end malloc()
 
 template <typename T>
-THRUST_HOST_DEVICE pointer<T> malloc(std::size_t n)
+THRUST_HIP_FUNCTION pointer<T> malloc(std::size_t n)
 {
-  pointer<void> raw_ptr = thrust::hip_rocprim::malloc(sizeof(T) * n);
-  return pointer<T>(reinterpret_cast<T*>(raw_ptr.get()));
+    pointer<void> raw_ptr = thrust::hip_rocprim::malloc(sizeof(T) * n);
+    return pointer<T>(reinterpret_cast<T*>(raw_ptr.get()));
 } // end malloc()
 
-THRUST_HOST_DEVICE void free(pointer<void> ptr)
+THRUST_HIP_FUNCTION void free(pointer<void> ptr)
 {
-  tag hip_tag;
-  return thrust::hip_rocprim::free(hip_tag, ptr.get());
+    tag hip_tag;
+    return thrust::hip_rocprim::free(hip_tag, ptr.get());
 } // end free()
 
-} // namespace hip_rocprim
+} // end hip_rocprim
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/hip/detail/merge.h b/projects/rocthrust/thrust/system/hip/detail/merge.h
index 035c3350fad1..eb654981727c 100644
--- a/projects/rocthrust/thrust/system/hip/detail/merge.h
+++ b/projects/rocthrust/thrust/system/hip/detail/merge.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
@@ -149,8 +149,8 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ItemsOutputIt> merge(
 {
   using size_type = size_t;
 
-  using KeyType   = thrust::detail::it_value_t<KeysIt1>;
-  using ValueType = thrust::detail::it_value_t<ItemsIt1>;
+  using KeyType   = typename iterator_traits<KeysIt1>::value_type;
+  using ValueType = typename iterator_traits<ItemsIt1>::value_type;
 
   predicate_wrapper<KeyType, ValueType, CompareOp> wrapped_binary_pred(compare_op);
 
@@ -234,7 +234,7 @@ merge(execution_policy<Derived>& policy,
     {
       return __merge::merge(policy, keys1_begin, keys1_end, keys2_begin, keys2_end, result_begin, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static ResultIt
     seq(execution_policy<Derived>& policy,
         KeysIt1 keys1_begin,
@@ -249,7 +249,7 @@ merge(execution_policy<Derived>& policy,
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, keys1_begin, keys1_end, keys2_begin, keys2_end, result_begin, compare_op);
 #  else
   return workaround::seq(policy, keys1_begin, keys1_end, keys2_begin, keys2_end, result_begin, compare_op);
@@ -304,7 +304,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
         items_out_begin,
         compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<KeysOutputIt, ItemsOutputIt> seq(
       execution_policy<Derived>& policy,
       KeysIt1 keys1_begin,
@@ -332,7 +332,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE merge_by_key(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(
     policy,
     keys1_begin,
diff --git a/projects/rocthrust/thrust/system/hip/detail/mismatch.h b/projects/rocthrust/thrust/system/hip/detail/mismatch.h
index 5de4d5a3bc10..708132a5ea60 100644
--- a/projects/rocthrust/thrust/system/hip/detail/mismatch.h
+++ b/projects/rocthrust/thrust/system/hip/detail/mismatch.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,11 +37,11 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
 #  include <thrust/distance.h>
+#  include <thrust/functional.h>
 #  include <thrust/iterator/zip_iterator.h>
 #  include <thrust/pair.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
@@ -71,7 +71,7 @@ template <class ValueType, class InputIt1, class InputIt2, class BinaryOp>
 struct transform_pair_of_input_iterators_t
 {
   using self_t            = transform_pair_of_input_iterators_t;
-  using difference_type   = thrust::detail::it_difference_t<InputIt1>;
+  using difference_type   = typename iterator_traits<InputIt1>::difference_type;
   using value_type        = ValueType;
   using pointer           = void;
   using reference         = value_type;
@@ -210,7 +210,7 @@ template <class Derived, class InputIt1, class InputIt2>
 pair<InputIt1, InputIt2> THRUST_HOST_DEVICE
 mismatch(execution_policy<Derived>& policy, InputIt1 first1, InputIt1 last1, InputIt2 first2)
 {
-  using InputType1 = thrust::detail::it_value_t<InputIt1>;
+  using InputType1 = typename thrust::iterator_value<InputIt1>::type;
   return hip_rocprim::mismatch(policy, first1, last1, first2, equal_to<InputType1>());
 }
 
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__preprocessor.h b/projects/rocthrust/thrust/system/hip/detail/nv/detail/__preprocessor.h
similarity index 89%
rename from projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__preprocessor.h
rename to projects/rocthrust/thrust/system/hip/detail/nv/detail/__preprocessor.h
index ed41d4c45d4c..2f70208c186e 100644
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__preprocessor.h
+++ b/projects/rocthrust/thrust/system/hip/detail/nv/detail/__preprocessor.h
@@ -5,14 +5,12 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIBCXX_WRAPPER_NV_DETAIL__PREPROCESSOR_H
-#define LIBCXX_WRAPPER_NV_DETAIL__PREPROCESSOR_H
-
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
+#ifndef _NV__PREPROCESSOR
+#define _NV__PREPROCESSOR
 
 #if defined(__GNUC__)
 #  pragma GCC system_header
@@ -66,4 +64,7 @@
 #define _NV_FIRST_ARG1(x, ...) x
 #define _NV_FIRST_ARG(x, ...)  _NV_FIRST_ARG1(x)
 
-#endif // LIBCXX_WRAPPER_NV_DETAIL__PREPROCESSOR_H
+#define _NV_REMOVE_FIRST_ARGS1(...)   __VA_ARGS__
+#define _NV_REMOVE_FIRST_ARGS(x, ...) _NV_REMOVE_FIRST_ARGS1(__VA_ARGS__)
+
+#endif // _NV__PREPROCESSOR
diff --git a/projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__target_macros.h b/projects/rocthrust/thrust/system/hip/detail/nv/detail/__target_macros.h
similarity index 65%
rename from projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__target_macros.h
rename to projects/rocthrust/thrust/system/hip/detail/nv/detail/__target_macros.h
index 4688dd19de2f..a901f31f1854 100644
--- a/projects/rocthrust/thrust/detail/libcxx_wrapper/nv/detail/__target_macros.h
+++ b/projects/rocthrust/thrust/system/hip/detail/nv/detail/__target_macros.h
@@ -5,16 +5,16 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
-// SPDX-FileCopyrightText: Modifications Copyright (c) 2023-2026 Advanced Micro Devices, Inc. All rights reserved.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LIBCXX_WRAPPER_NV_DETAIL__TARGET_MACROS_H
-#define LIBCXX_WRAPPER_NV_DETAIL__TARGET_MACROS_H
+#ifndef _NV__TARGET_MACROS
+#define _NV__TARGET_MACROS
 
-// TODO(libhipcxx): remove this file once libhipcxx gets ready
+#include <thrust/detail/config/cpp_compatibility.h>
 
-#include <thrust/detail/libcxx_wrapper/nv/detail/__preprocessor.h>
+#include "__preprocessor.h"
 
 #if defined(__GNUC__)
 #  pragma GCC system_header
@@ -33,11 +33,13 @@
 #define NV_ANY_TARGET NV_IS_HOST || NV_IS_DEVICE
 
 // NV_IF_TARGET invoke mechanisms.
-#define _NV_BLOCK_EXPAND(...)       {_NV_REMOVE_PAREN(__VA_ARGS__)}
+#define _NV_BLOCK_EXPAND(...)     \
+  {                               \
+    _NV_REMOVE_PAREN(__VA_ARGS__) \
+  }
 #define _NV_TARGET_IF(cond, t, ...) _NV_IF(cond, t, __VA_ARGS__)
 
 // NV_IF_TARGET supports a false statement provided as a variadic macro
-#define NV_IF_TARGET(cond, ...)       _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, __VA_ARGS__))
-#define NV_IF_ELSE_TARGET(cond, t, f) _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, t, f))
+#define NV_IF_TARGET(cond, ...) _NV_BLOCK_EXPAND(_NV_TARGET_IF(cond, __VA_ARGS__))
 
-#endif // LIBCXX_WRAPPER_NV_DETAIL__TARGET_MACROS_H
+#endif //_NV__TARGET_MACROS
diff --git a/projects/rocthrust/thrust/system/hip/detail/nv/target.h b/projects/rocthrust/thrust/system/hip/detail/nv/target.h
new file mode 100644
index 000000000000..7e0a124b506c
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/detail/nv/target.h
@@ -0,0 +1,21 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of libcu++, the C++ Standard Library for your entire system,
+// under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Modifications Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
+//
+//===----------------------------------------------------------------------===//
+
+// This header contains a preview of a portability system that enables
+// CUDA C++ development with NVC++, NVCC, and supported host compilers.
+// These interfaces are not guaranteed to be stable.
+
+#ifndef __NV_TARGET_H
+#define __NV_TARGET_H
+
+#include "detail/__target_macros.h" // IWYU pragma: export
+
+#endif // __NV_TARGET_H
diff --git a/projects/rocthrust/thrust/system/hip/detail/par.h b/projects/rocthrust/thrust/system/hip/detail/par.h
index cb0a1e237398..fa20c5f9aeca 100644
--- a/projects/rocthrust/thrust/system/hip/detail/par.h
+++ b/projects/rocthrust/thrust/system/hip/detail/par.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,6 +37,7 @@
 #  pragma system_header
 #endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
+#include <thrust/detail/dependencies_aware_execution_policy.h>
 #include <thrust/system/hip/detail/execution_policy.h>
 #include <thrust/system/hip/detail/util.h>
 
@@ -56,7 +57,8 @@ struct execute_on_stream_base : execution_policy<Derived>
       : stream(stream_)
   {}
 
-  THRUST_HIP_RUNTIME_FUNCTION Derived on(hipStream_t const& s) const
+  THRUST_HIP_RUNTIME_FUNCTION
+  Derived on(hipStream_t const& s) const
   {
     Derived result = derived_cast(*this);
     result.stream  = s;
@@ -120,9 +122,11 @@ struct execute_on_stream_nosync : execute_on_stream_nosync_base<execute_on_strea
       : base_t(stream){};
 };
 
+THRUST_SUPPRESS_DEPRECATED_PUSH
 struct par_t
     : execution_policy<par_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_base>
 {
   using base_t = execution_policy<par_t>;
 
@@ -132,15 +136,19 @@ struct par_t
 
   using stream_attachment_type = execute_on_stream;
 
-  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
+  THRUST_HIP_RUNTIME_FUNCTION
+  stream_attachment_type on(hipStream_t const& stream) const
   {
     return execute_on_stream(stream);
   }
 };
+THRUST_SUPPRESS_DEPRECATED_POP
 
+THRUST_SUPPRESS_DEPRECATED_PUSH
 struct par_nosync_t
     : execution_policy<par_nosync_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_nosync_base>
 {
   using base_t = execution_policy<par_nosync_t>;
 
@@ -150,7 +158,8 @@ struct par_nosync_t
 
   using stream_attachment_type = execute_on_stream_nosync;
 
-  THRUST_HIP_RUNTIME_FUNCTION stream_attachment_type on(hipStream_t const& stream) const
+  THRUST_HIP_RUNTIME_FUNCTION
+  stream_attachment_type on(hipStream_t const& stream) const
   {
     return execute_on_stream_nosync(stream);
   }
@@ -197,6 +206,7 @@ struct execute_on_stream_deterministic : execute_on_stream_deterministic_base<ex
 struct par_det_t
     : execution_policy<par_det_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_deterministic_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_deterministic_base>
 {
   using base_t = execution_policy<par_det_t>;
 
@@ -253,6 +263,7 @@ struct execute_on_stream_nosync_deterministic
 struct par_det_nosync_t
     : execution_policy<par_det_nosync_t>
     , thrust::detail::allocator_aware_execution_policy<execute_on_stream_nosync_deterministic_base>
+    , thrust::detail::dependencies_aware_execution_policy<execute_on_stream_nosync_deterministic_base>
 {
   using base_t = execution_policy<par_det_nosync_t>;
 
@@ -274,11 +285,12 @@ struct par_det_nosync_t
     return {};
   }
 };
+THRUST_SUPPRESS_DEPRECATED_POP
 
-THRUST_GLOBAL_CONSTANT par_t par;
+THRUST_INLINE_CONSTANT par_t par;
 
-/*! \p thrust::hip::par_nosync is a parallel execution policy targeting Thrust's CUDA device backend.
- *  Similar to \p thrust::hip::par it allows execution of Thrust algorithms in a specific CUDA stream.
+/*! \p thrust::hip::par_nosync is a parallel execution policy targeting Thrust's HIP device backend.
+ *  Similar to \p thrust::hip::par it allows execution of Thrust algorithms in a specific HIP stream.
  *
  *  \p thrust::hip::par_nosync indicates that an algorithm is free to avoid any synchronization of the
  *  associated stream that is not strictly required for correctness. Additionally, algorithms may return
@@ -324,9 +336,9 @@ THRUST_GLOBAL_CONSTANT par_t par;
  *  \endcode
  *
  */
-THRUST_GLOBAL_CONSTANT par_nosync_t par_nosync;
-THRUST_GLOBAL_CONSTANT par_det_t par_det;
-THRUST_GLOBAL_CONSTANT par_det_nosync_t par_det_nosync;
+THRUST_INLINE_CONSTANT par_nosync_t par_nosync;
+THRUST_INLINE_CONSTANT par_det_t par_det;
+THRUST_INLINE_CONSTANT par_det_nosync_t par_det_nosync;
 } // namespace hip_rocprim
 
 namespace system
diff --git a/projects/rocthrust/thrust/system/hip/detail/par_to_seq.h b/projects/rocthrust/thrust/system/hip/detail/par_to_seq.h
index cb80e7f56926..a86cb7f05d93 100644
--- a/projects/rocthrust/thrust/system/hip/detail/par_to_seq.h
+++ b/projects/rocthrust/thrust/system/hip/detail/par_to_seq.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,21 +29,12 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/detail/seq.h>
 #include <thrust/system/hip/detail/par.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
-
 template <int PAR>
 struct has_par : thrust::detail::true_type
 {};
@@ -57,7 +48,7 @@ struct cvt_to_seq_impl
 {
   using seq_t = thrust::detail::seq_t;
 
-  static seq_t THRUST_HOST_DEVICE doit(Policy&)
+  static seq_t THRUST_HIP_FUNCTION doit(Policy&)
   {
     return seq_t();
   }
@@ -70,27 +61,29 @@ struct cvt_to_seq_impl<
                                            execute_on_stream_base> >
 {
   using Policy = thrust::detail::execute_with_allocator<Allocator,
-                                                 execute_on_stream_base>
-     ;
-  using seq_t = thrust::detail::execute_with_allocator<
-      Allocator,
-      thrust::system::detail::sequential::execution_policy>
-     ;
+                                                        execute_on_stream_base>;
+  using seq_t = thrust::detail::execute_with_allocator<Allocator,
+                thrust::system::detail::sequential::execution_policy>;
 
-
-  static seq_t THRUST_HOST_DEVICE
-  doit(Policy& policy)
-  {
-    return seq_t(policy.m_alloc);
-  }
+    static seq_t THRUST_HIP_FUNCTION
+    doit(Policy& policy)
+    {
+        return seq_t(policy.m_alloc);
+    }
 };    // specialization of struct cvt_to_seq_impl
 #endif
 
 template <class Policy>
-typename cvt_to_seq_impl<Policy>::seq_t THRUST_HOST_DEVICE cvt_to_seq(Policy& policy)
+typename cvt_to_seq_impl<Policy>::seq_t THRUST_HIP_FUNCTION cvt_to_seq(Policy& policy)
 {
   return cvt_to_seq_impl<Policy>::doit(policy);
 }
 
+#if __THRUST_HAS_HIPRT__
+#  define THRUST_HIPRT_DISPATCH par
+#else
+#  define THRUST_HIPRT_DISPATCH seq
+#endif
+
 } // namespace hip_rocprim
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/hip/detail/parallel_for.h b/projects/rocthrust/thrust/system/hip/detail/parallel_for.h
index f07faa235650..fdfdcbd9ee60 100644
--- a/projects/rocthrust/thrust/system/hip/detail/parallel_for.h
+++ b/projects/rocthrust/thrust/system/hip/detail/parallel_for.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,12 +37,10 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
-#  include <rocprim/config.hpp>
-
 #  include <thrust/system/hip/detail/util.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -73,7 +71,7 @@ ROCPRIM_KERNEL THRUST_HIP_LAUNCH_BOUNDS(BlockSize) void kernel(F f, Size num_ite
 
   if (items_in_tile == items_per_block)
   {
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (unsigned int i = 0; i < ItemsPerThread; i++)
     {
       unsigned int idx = BlockSize * i + threadIdx.x;
@@ -82,7 +80,7 @@ ROCPRIM_KERNEL THRUST_HIP_LAUNCH_BOUNDS(BlockSize) void kernel(F f, Size num_ite
   }
   else
   {
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (unsigned int i = 0; i < ItemsPerThread; i++)
     {
       unsigned int idx = BlockSize * i + threadIdx.x;
@@ -157,7 +155,7 @@ void THRUST_HOST_DEVICE parallel_for(execution_policy<Derived>& policy, F f, Siz
       status = hip_rocprim::synchronize_optional(policy);
       hip_rocprim::throw_on_error(status, "parallel_for: failed to synchronize");
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static void seq(execution_policy<Derived>& policy, F f, Size count)
     {
       (void) policy;
@@ -170,7 +168,7 @@ void THRUST_HOST_DEVICE parallel_for(execution_policy<Derived>& policy, F f, Siz
   };
   // clang-format on
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   workaround::par(policy, f, count);
 #  else
   workaround::seq(policy, f, count);
diff --git a/projects/rocthrust/thrust/system/hip/detail/partition.h b/projects/rocthrust/thrust/system/hip/detail/partition.h
index ac899d350ad0..8a12a1ca217f 100644
--- a/projects/rocthrust/thrust/system/hip/detail/partition.h
+++ b/projects/rocthrust/thrust/system/hip/detail/partition.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
@@ -73,8 +73,8 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition(
   RejectedOutIt rejected_result,
   Predicate predicate)
 {
-  using size_type  = thrust::detail::it_difference_t<InputIt>;
-  using value_type = thrust::detail::it_value_t<InputIt>;
+  using size_type  = typename iterator_traits<InputIt>::difference_type;
+  using value_type = typename iterator_traits<InputIt>::value_type;
   using namespace thrust::system::hip_rocprim::temp_storage;
 
   size_t temp_storage_bytes     = 0;
@@ -136,8 +136,8 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HIP_RUNTIME_FUNCTION partition(
   RejectedOutIt rejected_result,
   Predicate predicate)
 {
-  using size_type  = thrust::detail::it_difference_t<InputIt>;
-  using value_type = thrust::detail::it_value_t<InputIt>;
+  using size_type  = typename iterator_traits<InputIt>::difference_type;
+  using value_type = typename iterator_traits<InputIt>::value_type;
   using namespace thrust::system::hip_rocprim::temp_storage;
 
   size_t temp_storage_bytes = 0;
@@ -199,7 +199,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
   RejectedOutIt rejected_result,
   Predicate predicate)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
   using namespace thrust::system::hip_rocprim::temp_storage;
 
   size_t temp_storage_bytes     = 0;
@@ -273,7 +273,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<SelectedOutIt, RejectedOutIt> partition_copy(
   RejectedOutIt rejected_result,
   Predicate predicate)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
   using namespace thrust::system::hip_rocprim::temp_storage;
 
   size_t temp_storage_bytes = 0;
@@ -348,7 +348,7 @@ inplace_partition(execution_policy<Derived>& policy, InputIt first, InputIt last
   }
 
   // Element type of the input iterator
-  using value_t         = thrust::detail::it_value_t<InputIt>;
+  using value_t         = typename iterator_traits<InputIt>::value_type;
   std::size_t num_items = static_cast<std::size_t>(thrust::distance(first, last));
 
   // Allocate temporary storage, which will serve as the input to the partition
@@ -374,7 +374,7 @@ THRUST_HIP_RUNTIME_FUNCTION InputIt inplace_partition(
   }
 
   // Element type of the input iterator
-  using value_t         = thrust::detail::it_value_t<InputIt>;
+  using value_t         = typename iterator_traits<InputIt>::value_type;
   std::size_t num_items = static_cast<std::size_t>(thrust::distance(first, last));
 
   // Allocate temporary storage, which will serve as the input to the partition
@@ -422,7 +422,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
       return detail::partition_copy(policy, first, last, stencil, selected_result, rejected_result, predicate);
     }
 
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
@@ -437,7 +437,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, stencil, selected_result, rejected_result, predicate);
 #  else
   return workaround::seq(policy, first, last, stencil, selected_result, rejected_result, predicate);
@@ -468,7 +468,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
       return detail::partition_copy(policy, first, last, selected_result, rejected_result, predicate);
     }
 
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
@@ -482,7 +482,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE partition_copy(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, selected_result, rejected_result, predicate);
 #  else
   return workaround::seq(policy, first, last, selected_result, rejected_result, predicate);
@@ -514,7 +514,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
     {
       return detail::partition_copy(policy, first, last, stencil, selected_result, rejected_result, predicate);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
@@ -529,7 +529,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, stencil, selected_result, rejected_result, predicate);
 #  else
   return workaround::seq(policy, first, last, stencil, selected_result, rejected_result, predicate);
@@ -560,7 +560,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
       return detail::partition_copy(policy, first, last, selected_result, rejected_result, predicate);
     }
 
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<SelectedOutIt, RejectedOutIt>
     seq(execution_policy<Derived>& policy,
         InputIt first,
@@ -574,7 +574,7 @@ pair<SelectedOutIt, RejectedOutIt> THRUST_HOST_DEVICE stable_partition_copy(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, selected_result, rejected_result, predicate);
 #  else
   return workaround::seq(policy, first, last, selected_result, rejected_result, predicate);
@@ -596,7 +596,7 @@ partition(execution_policy<Derived>& policy, Iterator first, Iterator last, Sten
     {
       return last = detail::inplace_partition(policy, first, last, stencil, predicate);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static Iterator
     seq(execution_policy<Derived>& policy, Iterator first, Iterator last, StencilIt stencil, Predicate predicate)
     {
@@ -604,7 +604,7 @@ partition(execution_policy<Derived>& policy, Iterator first, Iterator last, Sten
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, stencil, predicate);
 #  else
   return workaround::seq(policy, first, last, stencil, predicate);
@@ -624,7 +624,7 @@ partition(execution_policy<Derived>& policy, Iterator first, Iterator last, Pred
     {
       return last = detail::inplace_partition(policy, first, last, predicate);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static Iterator
     seq(execution_policy<Derived>& policy, Iterator first, Iterator last, Predicate predicate)
     {
@@ -632,7 +632,7 @@ partition(execution_policy<Derived>& policy, Iterator first, Iterator last, Pred
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, predicate);
 #  else
   return workaround::seq(policy, first, last, predicate);
@@ -657,7 +657,7 @@ Iterator THRUST_HOST_DEVICE stable_partition(
       hip_rocprim::reverse(policy, ret, last);
       return ret;
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static Iterator
     seq(execution_policy<Derived>& policy, Iterator first, Iterator last, StencilIt stencil, Predicate predicate)
     {
@@ -665,7 +665,7 @@ Iterator THRUST_HOST_DEVICE stable_partition(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, stencil, predicate);
 #  else
   return workaround::seq(policy, first, last, stencil, predicate);
@@ -690,7 +690,7 @@ stable_partition(execution_policy<Derived>& policy, Iterator first, Iterator las
       hip_rocprim::reverse(policy, ret, last);
       return ret;
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static Iterator
     seq(execution_policy<Derived>& policy, Iterator first, Iterator last, Predicate predicate)
     {
@@ -698,7 +698,7 @@ stable_partition(execution_policy<Derived>& policy, Iterator first, Iterator las
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, predicate);
 #  else
   return workaround::seq(policy, first, last, predicate);
diff --git a/projects/rocthrust/thrust/system/hip/detail/per_device_resource.h b/projects/rocthrust/thrust/system/hip/detail/per_device_resource.h
index 20d302e600ad..fc842f6faae6 100644
--- a/projects/rocthrust/thrust/system/hip/detail/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/hip/detail/per_device_resource.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2020-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2020-2025, Advanced Micro Devices, Inc.  All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/reduce.h b/projects/rocthrust/thrust/system/hip/detail/reduce.h
index df87dc1749ac..751a1adc9956 100644
--- a/projects/rocthrust/thrust/system/hip/detail/reduce.h
+++ b/projects/rocthrust/thrust/system/hip/detail/reduce.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,13 +37,15 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
+#  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/system/hip/detail/dispatch.h>
@@ -76,7 +78,7 @@ namespace __reduce
 {
 
 template <typename Derived, typename InputIt, typename Size, typename T, typename BinaryOp>
-THRUST_HIP_RUNTIME_FUNCTION T
+THRUST_RUNTIME_FUNCTION T
 reduce(execution_policy<Derived>& policy, InputIt first, Size num_items, T init, BinaryOp binary_op)
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
@@ -148,7 +150,7 @@ reduce_n(execution_policy<Derived>& policy, InputIt first, Size num_items, T ini
     {
       return init = __reduce::reduce(policy, first, num_items, init, binary_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static T
     seq(execution_policy<Derived>& policy, InputIt first, Size num_items, T init, BinaryOp binary_op)
     {
@@ -156,7 +158,7 @@ reduce_n(execution_policy<Derived>& policy, InputIt first, Size num_items, T ini
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, num_items, init, binary_op);
 #  else
   return workaround::seq(policy, first, num_items, init, binary_op);
@@ -166,7 +168,7 @@ reduce_n(execution_policy<Derived>& policy, InputIt first, Size num_items, T ini
 template <class Derived, class InputIt, class T, class BinaryOp>
 THRUST_HOST_DEVICE T reduce(execution_policy<Derived>& policy, InputIt first, InputIt last, T init, BinaryOp binary_op)
 {
-  using size_type = thrust::detail::it_difference_t<InputIt>;
+  using size_type = typename iterator_traits<InputIt>::difference_type;
   // FIXME: Check for RA iterator.
   size_type num_items = static_cast<size_type>(thrust::distance(first, last));
   return hip_rocprim::reduce_n(policy, first, num_items, init, binary_op);
@@ -179,10 +181,10 @@ THRUST_HOST_DEVICE T reduce(execution_policy<Derived>& policy, InputIt first, In
 }
 
 template <class Derived, class InputIt>
-THRUST_HOST_DEVICE thrust::detail::it_value_t<InputIt>
+THRUST_HOST_DEVICE typename iterator_traits<InputIt>::value_type
 reduce(execution_policy<Derived>& policy, InputIt first, InputIt last)
 {
-  using value_type = thrust::detail::it_value_t<InputIt>;
+  using value_type = typename iterator_traits<InputIt>::value_type;
   return hip_rocprim::reduce(policy, first, last, value_type(0));
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/reduce_by_key.h b/projects/rocthrust/thrust/system/hip/detail/reduce_by_key.h
index c373197cfbfd..f03a0386f40a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/hip/detail/reduce_by_key.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,12 +37,12 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
-#  include <thrust/detail/libcxx_wrapper/std/__type_traits/conditional.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
@@ -55,10 +55,6 @@
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(iterator)
-#  endif
-
 #  include <cstdint>
 
 // rocprim include
@@ -170,7 +166,7 @@ template <typename Derived,
           typename ValuesOutputIt,
           typename EqualityOp,
           typename ReductionOp>
-THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
+THRUST_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
   execution_policy<Derived>& policy,
   KeysInputIt keys_first,
   KeysInputIt keys_last,
@@ -182,7 +178,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> reduce_by_key(
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
 
-  using size_type = thrust::detail::it_difference_t<KeysInputIt>;
+  using size_type = typename iterator_traits<KeysInputIt>::difference_type;
 
   size_type num_items       = thrust::distance(keys_first, keys_last);
   size_t temp_storage_bytes = 0;
@@ -292,7 +288,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
         policy, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
     }
 
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<KeyOutputIt, ValOutputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
@@ -315,7 +311,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(
     policy, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
 #  else
@@ -334,9 +330,9 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   ValOutputIt values_output,
   BinaryPred binary_pred)
 {
-  using value_type = ::internal::If<thrust::detail::is_output_iterator<ValOutputIt>,
-                                    thrust::detail::it_value_t<ValInputIt>,
-                                    thrust::detail::it_value_t<ValOutputIt>>;
+  using value_type = typename thrust::detail::eval_if<thrust::detail::is_output_iterator<ValOutputIt>::value,
+                                                      thrust::iterator_value<ValInputIt>,
+                                                      thrust::iterator_value<ValOutputIt>>::type;
   return hip_rocprim::reduce_by_key(
     policy, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, plus<value_type>());
 }
@@ -350,7 +346,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE reduce_by_key(
   KeyOutputIt keys_output,
   ValOutputIt values_output)
 {
-  using KeyT = thrust::detail::it_value_t<KeyInputIt>;
+  using KeyT = typename thrust::iterator_value<KeyInputIt>::type;
   return hip_rocprim::reduce_by_key(
     policy, keys_first, keys_last, values_first, keys_output, values_output, equal_to<KeyT>());
 }
diff --git a/projects/rocthrust/thrust/system/hip/detail/remove.h b/projects/rocthrust/thrust/system/hip/detail/remove.h
index 82427babbf6d..7e8422d584b4 100644
--- a/projects/rocthrust/thrust/system/hip/detail/remove.h
+++ b/projects/rocthrust/thrust/system/hip/detail/remove.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/detail/copy_if.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/hip/detail/replace.h b/projects/rocthrust/thrust/system/hip/detail/replace.h
index fa828e7dd80d..64994f1dd725 100644
--- a/projects/rocthrust/thrust/system/hip/detail/replace.h
+++ b/projects/rocthrust/thrust/system/hip/detail/replace.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/detail/internal_functional.h>
 #  include <thrust/system/hip/detail/transform.h>
 
@@ -128,7 +128,7 @@ OutputIt THRUST_HOST_DEVICE replace_copy_if(
   Predicate predicate,
   T const& new_value)
 {
-  using output_type    = thrust::detail::it_value_t<OutputIt>;
+  using output_type    = typename iterator_traits<OutputIt>::value_type;
   using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
   return hip_rocprim::transform(policy, first, last, result, new_value_if_t(predicate, new_value));
 }
@@ -143,7 +143,7 @@ OutputIt THRUST_HOST_DEVICE replace_copy_if(
   Predicate predicate,
   T const& new_value)
 {
-  using output_type    = thrust::detail::it_value_t<OutputIt>;
+  using output_type    = typename iterator_traits<OutputIt>::value_type;
   using new_value_if_t = __replace::new_value_if_f<Predicate, T, output_type>;
   return hip_rocprim::transform(policy, first, last, stencil, result, new_value_if_t(predicate, new_value));
 }
diff --git a/projects/rocthrust/thrust/system/hip/detail/reverse.h b/projects/rocthrust/thrust/system/hip/detail/reverse.h
index 1652d399ee6b..8c6da0d248ad 100644
--- a/projects/rocthrust/thrust/system/hip/detail/reverse.h
+++ b/projects/rocthrust/thrust/system/hip/detail/reverse.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -60,10 +60,6 @@ THRUST_NAMESPACE_END
 #  include <thrust/system/hip/detail/copy.h>
 #  include <thrust/system/hip/detail/swap_ranges.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(iterator)
-#  endif
-
 THRUST_NAMESPACE_BEGIN
 namespace hip_rocprim
 {
@@ -77,7 +73,7 @@ ResultIt THRUST_HOST_DEVICE reverse_copy(execution_policy<Derived>& policy, Item
 template <class Derived, class ItemsIt>
 void THRUST_HOST_DEVICE reverse(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using difference_type = thrust::detail::it_difference_t<ItemsIt>;
+  using difference_type = typename thrust::iterator_difference<ItemsIt>::type;
 
   // find the midpoint of [first,last)
   difference_type N = thrust::distance(first, last);
diff --git a/projects/rocthrust/thrust/system/hip/detail/scan.h b/projects/rocthrust/thrust/system/hip/detail/scan.h
index f527d7722158..ee26dcf5f6a8 100644
--- a/projects/rocthrust/thrust/system/hip/detail/scan.h
+++ b/projects/rocthrust/thrust/system/hip/detail/scan.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
@@ -292,7 +292,7 @@ THRUST_HOST_DEVICE OutputIt inclusive_scan_n(
     {
       return result = __scan::inclusive_scan(policy, first, result, num_items, init, scan_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy, InputIt first, Size num_items, OutputIt result, T init, ScanOp scan_op)
     {
@@ -301,7 +301,7 @@ THRUST_HOST_DEVICE OutputIt inclusive_scan_n(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, num_items, result, init, scan_op);
 #  else
   return workaround::seq(policy, first, num_items, result, init, scan_op);
@@ -320,7 +320,7 @@ THRUST_HOST_DEVICE OutputIt inclusive_scan_n(
     {
       return result = __scan::inclusive_scan(policy, first, result, num_items, scan_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy, InputIt first, Size num_items, OutputIt result, ScanOp scan_op)
     {
@@ -329,7 +329,7 @@ THRUST_HOST_DEVICE OutputIt inclusive_scan_n(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, num_items, result, scan_op);
 #  else
   return workaround::seq(policy, first, num_items, result, scan_op);
@@ -340,7 +340,7 @@ template <typename Derived, typename InputIt, typename OutputIt, typename ScanOp
 THRUST_HOST_DEVICE OutputIt inclusive_scan(
   thrust::hip_rocprim::execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::hip_rocprim::inclusive_scan_n(policy, first, num_items, result, scan_op);
 }
@@ -354,7 +354,7 @@ THRUST_HOST_DEVICE OutputIt inclusive_scan(
   T init,
   ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::hip_rocprim::inclusive_scan_n(policy, first, num_items, result, init, scan_op);
 }
@@ -384,7 +384,7 @@ THRUST_HOST_DEVICE OutputIt exclusive_scan_n(
     {
       return result = __scan::exclusive_scan(policy, first, result, num_items, init, scan_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy, InputIt first, Size num_items, OutputIt result, T init, ScanOp scan_op)
     {
@@ -393,7 +393,7 @@ THRUST_HOST_DEVICE OutputIt exclusive_scan_n(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, num_items, result, init, scan_op);
 #  else
   return workaround::seq(policy, first, num_items, result, init, scan_op);
@@ -409,7 +409,7 @@ THRUST_HOST_DEVICE OutputIt exclusive_scan(
   T init,
   ScanOp scan_op)
 {
-  using diff_t           = thrust::detail::it_difference_t<InputIt>;
+  using diff_t           = typename thrust::iterator_traits<InputIt>::difference_type;
   diff_t const num_items = thrust::distance(first, last);
   return thrust::hip_rocprim::exclusive_scan_n(policy, first, num_items, result, init, scan_op);
 }
@@ -425,7 +425,7 @@ template <typename Derived, typename InputIt, typename OutputIt>
 THRUST_HOST_DEVICE OutputIt
 exclusive_scan(thrust::hip_rocprim::execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using init_type = thrust::detail::it_value_t<InputIt>;
+  using init_type = typename thrust::iterator_traits<InputIt>::value_type;
   return hip_rocprim::exclusive_scan(policy, first, last, result, init_type{});
 }
 
@@ -434,4 +434,4 @@ THRUST_NAMESPACE_END
 
 #  include <thrust/scan.h>
 
-#endif // THRUST_HAS_HIP_COMPILER()
+#endif // THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
diff --git a/projects/rocthrust/thrust/system/hip/detail/scan_by_key.h b/projects/rocthrust/thrust/system/hip/detail/scan_by_key.h
index 7b0084efd87b..29f8bedd936a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/hip/detail/scan_by_key.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,20 +37,15 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
-
-#  include <thrust/system/hip/config.h>
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/mpl/math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
-#  include <thrust/functional.h>
-#  include <thrust/iterator/iterator_traits.h>
-#  include <thrust/system/hip/detail/dispatch.h>
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
-#  include <thrust/type_traits/is_contiguous_iterator.h>
-#  include <thrust/type_traits/unwrap_contiguous_iterator.h>
+#  include <thrust/system/hip/execution_policy.h>
 
 #  include <cstdint>
 
@@ -382,7 +377,7 @@ ValOutputIt THRUST_HOST_DEVICE inclusive_scan_by_key(
       return thrust::hip_rocprim::__scan_by_key::inclusive_scan_by_key(
         policy, key_first, key_last, value_first, value_result, binary_pred, scan_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static ValOutputIt
     seq(execution_policy<Derived>& policy,
         KeyInputIt key_first,
@@ -397,7 +392,7 @@ ValOutputIt THRUST_HOST_DEVICE inclusive_scan_by_key(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, key_first, key_last, value_first, value_result, binary_pred, scan_op);
 #  else
   return workaround::seq(policy, key_first, key_last, value_first, value_result, binary_pred, scan_op);
@@ -461,7 +456,7 @@ ValOutputIt THRUST_HOST_DEVICE exclusive_scan_by_key(
       return thrust::hip_rocprim::__scan_by_key::exclusive_scan_by_key(
         policy, key_first, key_last, value_first, value_result, init, binary_pred, scan_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static ValOutputIt
     seq(execution_policy<Derived>& policy,
         KeyInputIt key_first,
@@ -478,7 +473,7 @@ ValOutputIt THRUST_HOST_DEVICE exclusive_scan_by_key(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, key_first, key_last, value_first, value_result, init, binary_pred, scan_op);
 #  else
   return workaround::seq(policy, key_first, key_last, value_first, value_result, init, binary_pred, scan_op);
@@ -520,7 +515,7 @@ ValOutputIt THRUST_HOST_DEVICE exclusive_scan_by_key(
   ValInputIt value_first,
   ValOutputIt value_result)
 {
-  using value_type = thrust::detail::it_value_t<ValInputIt>;
+  using value_type = typename thrust::iterator_traits<ValInputIt>::value_type;
   return hip_rocprim::exclusive_scan_by_key(policy, key_first, key_last, value_first, value_result, value_type{});
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/scatter.h b/projects/rocthrust/thrust/system/hip/detail/scatter.h
index 602ec26f03ab..2edf89e0cb6f 100644
--- a/projects/rocthrust/thrust/system/hip/detail/scatter.h
+++ b/projects/rocthrust/thrust/system/hip/detail/scatter.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,8 +37,8 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
-#  include <thrust/detail/libcxx_wrapper/std/__functional/identity.h>
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
+#  include <thrust/functional.h>
 #  include <thrust/iterator/permutation_iterator.h>
 #  include <thrust/system/hip/detail/transform.h>
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/sequence.h b/projects/rocthrust/thrust/system/hip/detail/sequence.h
index 5521a180bce5..89763aa8e28a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/sequence.h
+++ b/projects/rocthrust/thrust/system/hip/detail/sequence.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,12 +19,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special version of this algorithm
diff --git a/projects/rocthrust/thrust/system/hip/detail/set_operations.h b/projects/rocthrust/thrust/system/hip/detail/set_operations.h
index e4f098b2687b..495a5bb55bc5 100644
--- a/projects/rocthrust/thrust/system/hip/detail/set_operations.h
+++ b/projects/rocthrust/thrust/system/hip/detail/set_operations.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/detail/alignment.h>
 #  include <thrust/detail/mpl/math.h>
@@ -51,21 +51,12 @@
 #  include <thrust/system/hip/detail/get_value.h>
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/util.h>
-#  if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#    include <thrust/detail/algorithm_wrapper.h>
-#  endif
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(__algorithm/max.h)
-#    include _THRUST_STD_INCLUDE(__algorithm/min.h)
-#  endif
+#  include <cstdint>
 
+// rocprim include
 #  include <rocprim/rocprim.hpp>
 
-#  include <rocprim/config.hpp>
-
-#  include <cstdint>
-
 THRUST_NAMESPACE_BEGIN
 
 namespace hip_rocprim
@@ -137,10 +128,10 @@ THRUST_HIP_DEVICE_FUNCTION Size biased_binary_search(It data, Size count, T key,
 template <bool UpperBound, class Size, class It1, class It2, class Comp>
 THRUST_HIP_DEVICE_FUNCTION Size merge_path(It1 a, Size aCount, It2 b, Size bCount, Size diag, Comp comp)
 {
-  using T = thrust::detail::it_value_t<It1>;
+  using T = typename thrust::iterator_traits<It1>::value_type;
 
-  Size begin = _THRUST_STD::max<Size>(0, diag - bCount);
-  Size end   = _THRUST_STD::min<Size>(diag, aCount);
+  Size begin = thrust::max<Size>(0, diag - bCount);
+  Size end   = thrust::min<Size>(diag, aCount);
 
   while (begin < end)
   {
@@ -164,7 +155,7 @@ template <class It1, class It2, class Size, class Size2, class CompareOp>
 THRUST_HIP_DEVICE_FUNCTION pair<Size, Size>
 balanced_path(It1 keys1, It2 keys2, Size num_keys1, Size num_keys2, Size diag, Size2 levels, CompareOp compare_op)
 {
-  using T = thrust::detail::it_value_t<It1>;
+  using T = typename iterator_traits<It1>::value_type;
 
   Size index1 = merge_path<false>(keys1, num_keys1, keys2, num_keys2, diag, compare_op);
   Size index2 = diag - index1;
@@ -231,8 +222,8 @@ template <class Config,
           bool HAS_VALUES>
 struct SetOpAgent
 {
-  using key_type   = thrust::detail::it_value_t<KeysIt1>;
-  using value_type = thrust::detail::it_value_t<ValuesIt1>;
+  using key_type   = typename iterator_traits<KeysIt1>::value_type;
+  using value_type = typename iterator_traits<ValuesIt1>::value_type;
 
   static constexpr int BLOCK_THREADS    = Config::block_size;
   static constexpr int ITEMS_PER_THREAD = Config::items_per_thread;
@@ -248,7 +239,7 @@ struct SetOpAgent
     const unsigned int thread_id = ::rocprim::detail::block_thread_id<0>();
     if (IS_FULL_TILE)
     {
-      THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD - 1; ++ITEM)
       {
         int idx      = BLOCK_THREADS * ITEM + thread_id;
@@ -266,7 +257,7 @@ struct SetOpAgent
     }
     else
     {
-      THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         int idx = BLOCK_THREADS * ITEM + thread_id;
@@ -283,7 +274,7 @@ struct SetOpAgent
   reg_to_shared(rocprim::uninitialized_array<T, OutputSize>& output, T (&input)[ITEMS_PER_THREAD])
   {
     const unsigned int thread_id = ::rocprim::detail::block_thread_id<0>();
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
     {
       int idx = BLOCK_THREADS * ITEM + thread_id;
@@ -302,8 +293,7 @@ struct SetOpAgent
     int tile_output_count)
   {
     int local_scatter_idx = thread_output_prefix - tile_output_prefix;
-
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
     {
       if (active_mask & (1 << ITEM))
@@ -513,7 +503,7 @@ struct SetOpAgent
 
       // gather items from shared mem
       //
-      THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
       for (int ITEM = 0; ITEM < ITEMS_PER_THREAD; ++ITEM)
       {
         if (active_mask & (1 << ITEM))
@@ -571,7 +561,7 @@ struct serial_set_intersection
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pA = compare_op(aKey, bKey);
@@ -627,7 +617,7 @@ struct serial_set_symmetric_difference
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -689,7 +679,7 @@ struct serial_set_difference
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -751,7 +741,7 @@ struct serial_set_union
     T aKey = keys[aBegin];
     T bKey = keys[bBegin];
 
-    THRUST_PRAGMA_UNROLL_FULL()
+#  pragma unroll
     for (int i = 0; i < ITEMS_PER_THREAD; ++i)
     {
       bool pB = aBegin >= aEnd;
@@ -1044,7 +1034,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeysOutputIt, ValuesOutputIt> set_operations(
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
 
-  using size_type     = thrust::detail::it_difference_t<KeysIt1>;
+  using size_type     = typename iterator_traits<KeysIt1>::difference_type;
   size_type num_keys1 = static_cast<size_type>(thrust::distance(keys1_first, keys1_last));
   size_type num_keys2 = static_cast<size_type>(thrust::distance(keys2_first, keys2_last));
 
@@ -1136,7 +1126,7 @@ OutputIt THRUST_HOST_DEVICE set_difference(
   OutputIt result,
   CompareOp compare)
 {
-  using items1_t = thrust::detail::it_value_t<ItemsIt1>;
+  using items1_t = thrust::iterator_value_t<ItemsIt1>;
 
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
@@ -1150,7 +1140,7 @@ OutputIt THRUST_HOST_DEVICE set_difference(
       items1_t*,
       CompareOp,
       __set_operations::serial_set_difference>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   items1_t* null_ = nullptr;
   auto tmp        = __set_operations::set_operations<false>(
     policy,
@@ -1181,7 +1171,7 @@ OutputIt THRUST_HOST_DEVICE set_difference(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return hip_rocprim::set_difference(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1199,7 +1189,8 @@ OutputIt THRUST_HOST_DEVICE set_intersection(
   OutputIt result,
   CompareOp compare)
 {
-  using items1_t = thrust::detail::it_value_t<ItemsIt1>;
+  using items1_t = thrust::iterator_value_t<ItemsIt1>;
+
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       false,
@@ -1212,7 +1203,7 @@ OutputIt THRUST_HOST_DEVICE set_intersection(
       items1_t*,
       CompareOp,
       __set_operations::serial_set_intersection>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   items1_t* null_ = nullptr;
   auto tmp        = __set_operations::set_operations<false>(
     policy,
@@ -1243,7 +1234,7 @@ OutputIt THRUST_HOST_DEVICE set_intersection(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return hip_rocprim::set_intersection(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1261,7 +1252,8 @@ OutputIt THRUST_HOST_DEVICE set_symmetric_difference(
   OutputIt result,
   CompareOp compare)
 {
-  using items1_t = thrust::detail::it_value_t<ItemsIt1>;
+  using items1_t = thrust::iterator_value_t<ItemsIt1>;
+
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       false,
@@ -1274,7 +1266,7 @@ OutputIt THRUST_HOST_DEVICE set_symmetric_difference(
       items1_t*,
       CompareOp,
       __set_operations::serial_set_symmetric_difference>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   items1_t* null_ = nullptr;
   auto tmp        = __set_operations::set_operations<false>(
     policy,
@@ -1305,7 +1297,7 @@ OutputIt THRUST_HOST_DEVICE set_symmetric_difference(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return hip_rocprim::set_symmetric_difference(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1323,7 +1315,8 @@ OutputIt THRUST_HOST_DEVICE set_union(
   OutputIt result,
   CompareOp compare)
 {
-  using items1_t = thrust::detail::it_value_t<ItemsIt1>;
+  using items1_t = thrust::iterator_value_t<ItemsIt1>;
+
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       false,
@@ -1336,7 +1329,7 @@ OutputIt THRUST_HOST_DEVICE set_union(
       items1_t*,
       CompareOp,
       __set_operations::serial_set_union>) );
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   items1_t* null_ = nullptr;
   auto tmp        = __set_operations::set_operations<false>(
     policy,
@@ -1367,7 +1360,7 @@ OutputIt THRUST_HOST_DEVICE set_union(
   ItemsIt2 items2_last,
   OutputIt result)
 {
-  using value_type = thrust::detail::it_value_t<ItemsIt1>;
+  using value_type = typename thrust::iterator_value<ItemsIt1>::type;
   return hip_rocprim::set_union(
     policy, items1_first, items1_last, items2_first, items2_last, result, less<value_type>());
 }
@@ -1401,6 +1394,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
   ItemsOutputIt items_result,
   CompareOp compare_op)
 {
+  auto ret = thrust::make_pair(keys_result, items_result);
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       true,
@@ -1413,8 +1407,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_difference>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   ret = __set_operations::set_operations<true>(
     policy,
     keys1_first,
@@ -1455,7 +1448,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_difference_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return hip_rocprim::set_difference_by_key(
     policy,
     keys1_first,
@@ -1491,6 +1484,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
   ItemsOutputIt items_result,
   CompareOp compare_op)
 {
+  auto ret = thrust::make_pair(keys_result, items_result);
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       true,
@@ -1503,8 +1497,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_intersection>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   ret = __set_operations::set_operations<true>(
     policy,
     keys1_first,
@@ -1543,7 +1536,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_intersection_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return hip_rocprim::set_intersection_by_key(
     policy,
     keys1_first,
@@ -1579,6 +1572,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by
   ItemsOutputIt items_result,
   CompareOp compare_op)
 {
+  auto ret = thrust::make_pair(keys_result, items_result);
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       true,
@@ -1591,8 +1585,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_symmetric_difference>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   ret = __set_operations::set_operations<true>(
     policy,
     keys1_first,
@@ -1633,7 +1626,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_symmetric_difference_by
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return hip_rocprim::set_symmetric_difference_by_key(
     policy,
     keys1_first,
@@ -1670,6 +1663,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
   ItemsOutputIt items_result,
   CompareOp compare_op)
 {
+  auto ret = thrust::make_pair(keys_result, items_result);
   THRUST_HIP_PRESERVE_KERNELS_WORKAROUND(
     (__set_operations::set_operations<
       true,
@@ -1682,8 +1676,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
       ItemsOutputIt,
       CompareOp,
       __set_operations::serial_set_union>) );
-  auto ret = thrust::make_pair(keys_result, items_result);
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   ret = __set_operations::set_operations<true>(
     policy,
     keys1_first,
@@ -1724,7 +1717,7 @@ pair<KeysOutputIt, ItemsOutputIt> THRUST_HOST_DEVICE set_union_by_key(
   KeysOutputIt keys_result,
   ItemsOutputIt items_result)
 {
-  using value_type = thrust::detail::it_value_t<KeysIt1>;
+  using value_type = typename thrust::iterator_value<KeysIt1>::type;
   return hip_rocprim::set_union_by_key(
     policy,
     keys1_first,
diff --git a/projects/rocthrust/thrust/system/hip/detail/sort.h b/projects/rocthrust/thrust/system/hip/detail/sort.h
index 788ecc331286..7414c81a5afb 100644
--- a/projects/rocthrust/thrust/system/hip/detail/sort.h
+++ b/projects/rocthrust/thrust/system/hip/detail/sort.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
@@ -72,7 +72,7 @@ struct dispatch;
 
 // sort keys
 template <>
-struct dispatch<THRUST_NS_QUALIFIER::detail::false_type>
+struct dispatch<::thrust::detail::false_type>
 {
   template <class KeysIt, class ItemsIt, class Size, class CompareOp>
   static hipError_t THRUST_HIP_RUNTIME_FUNCTION doit(
@@ -92,7 +92,7 @@ struct dispatch<THRUST_NS_QUALIFIER::detail::false_type>
 
 // sort pairs
 template <>
-struct dispatch<THRUST_NS_QUALIFIER::detail::true_type>
+struct dispatch<::thrust::detail::true_type>
 {
   template <class KeysIt, class ItemsIt, class Size, class CompareOp>
   static hipError_t THRUST_HIP_RUNTIME_FUNCTION doit(
@@ -123,7 +123,7 @@ template <typename SORT_ITEMS, typename Derived, typename KeysIt, typename Items
 THRUST_HIP_RUNTIME_FUNCTION void merge_sort(
   execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 {
-  using size_type = thrust::detail::it_difference_t<KeysIt>;
+  using size_type = typename iterator_traits<KeysIt>::difference_type;
 
   size_type count = static_cast<size_type>(thrust::distance(keys_first, keys_last));
 
@@ -276,11 +276,19 @@ struct dispatch<thrust::detail::true_type, thrust::greater<KeyOrVoid>>
   }
 }; // struct dispatch -- sort pairs in descending order;
 
+template <class SORT_ITEMS, class KeyOrVoid>
+struct dispatch<SORT_ITEMS, ::std::less<KeyOrVoid>> : dispatch<SORT_ITEMS, thrust::less<KeyOrVoid>>
+{};
+
+template <class SORT_ITEMS, class KeyOrVoid>
+struct dispatch<SORT_ITEMS, ::std::greater<KeyOrVoid>> : dispatch<SORT_ITEMS, thrust::greater<KeyOrVoid>>
+{};
+
 template <typename SORT_ITEMS, typename Derived, typename KeysIt, typename ItemsIt, typename CompareOp>
 THRUST_HIP_RUNTIME_FUNCTION void
 radix_sort(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp)
 {
-  using size_type = thrust::detail::it_difference_t<KeysIt>;
+  using size_type = typename iterator_traits<KeysIt>::difference_type;
 
   const size_type count = static_cast<size_type>(thrust::distance(keys_first, keys_last));
 
@@ -333,7 +341,7 @@ template <class SORT_ITEMS,
           class KeysIt,
           class ItemsIt,
           class CompareOp,
-          ::std::enable_if_t<!can_use_primitive_sort<thrust::detail::it_value_t<KeysIt>, CompareOp>::value, int> = 0>
+          ::std::enable_if_t<!can_use_primitive_sort<typename iterator_value<KeysIt>::type, CompareOp>::value, int> = 0>
 THRUST_HIP_RUNTIME_FUNCTION void
 smart_sort(Policy& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 {
@@ -346,7 +354,7 @@ template <class SORT_ITEMS,
           class KeysIt,
           class ItemsIt,
           class CompareOp,
-          ::std::enable_if_t<can_use_primitive_sort<thrust::detail::it_value_t<KeysIt>, CompareOp>::value, int> = 0>
+          ::std::enable_if_t<can_use_primitive_sort<typename iterator_value<KeysIt>::type, CompareOp>::value, int> = 0>
 THRUST_HIP_RUNTIME_FUNCTION void smart_sort(
   execution_policy<Policy>& policy, KeysIt keys_first, KeysIt keys_last, ItemsIt items_first, CompareOp compare_op)
 {
@@ -367,19 +375,19 @@ void THRUST_HOST_DEVICE stable_sort(execution_policy<Derived>& policy, ItemsIt f
   {
     THRUST_HOST static void par(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, CompareOp compare_op)
     {
-      using item_t  = thrust::detail::it_value_t<ItemsIt>;
+      using item_t  = thrust::iterator_value_t<ItemsIt>;
       item_t* null_ = nullptr;
       __smart_sort::smart_sort<thrust::detail::false_type, thrust::detail::false_type>(
         policy, first, last, null_, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static void seq(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last, CompareOp compare_op)
     {
       thrust::stable_sort(cvt_to_seq(derived_cast(policy)), first, last, compare_op);
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   workaround::par(policy, first, last, compare_op);
 #  else
   workaround::seq(policy, first, last, compare_op);
@@ -407,7 +415,7 @@ void THRUST_HOST_DEVICE stable_sort_by_key(
       __smart_sort::smart_sort<thrust::detail::true_type, thrust::detail::false_type>(
         policy, keys_first, keys_last, values, compare_op);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static void
     seq(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ValuesIt values, CompareOp compare_op)
     {
@@ -416,7 +424,7 @@ void THRUST_HOST_DEVICE stable_sort_by_key(
 #  endif
   };
 
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   workaround::par(policy, keys_first, keys_last, values, compare_op);
 #  else
   workaround::seq(policy, keys_first, keys_last, values, compare_op);
@@ -436,14 +444,14 @@ void THRUST_HOST_DEVICE sort_by_key(
 template <class Derived, class ItemsIt>
 void THRUST_HOST_DEVICE sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using item_type = thrust::detail::it_value_t<ItemsIt>;
+  using item_type = typename thrust::iterator_value<ItemsIt>::type;
   hip_rocprim::sort(policy, first, last, less<item_type>());
 }
 
 template <class Derived, class ItemsIt>
 void THRUST_HOST_DEVICE stable_sort(execution_policy<Derived>& policy, ItemsIt first, ItemsIt last)
 {
-  using item_type = thrust::detail::it_value_t<ItemsIt>;
+  using item_type = typename thrust::iterator_value<ItemsIt>::type;
   hip_rocprim::stable_sort(policy, first, last, less<item_type>());
 }
 
@@ -451,7 +459,7 @@ template <class Derived, class KeysIt, class ValuesIt>
 void THRUST_HOST_DEVICE
 sort_by_key(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ValuesIt values)
 {
-  using key_type = thrust::detail::it_value_t<KeysIt>;
+  using key_type = typename thrust::iterator_value<KeysIt>::type;
   hip_rocprim::sort_by_key(policy, keys_first, keys_last, values, less<key_type>());
 }
 
@@ -459,7 +467,7 @@ template <class Derived, class KeysIt, class ValuesIt>
 void THRUST_HOST_DEVICE
 stable_sort_by_key(execution_policy<Derived>& policy, KeysIt keys_first, KeysIt keys_last, ValuesIt values)
 {
-  using key_type = thrust::detail::it_value_t<KeysIt>;
+  using key_type = typename thrust::iterator_value<KeysIt>::type;
   hip_rocprim::stable_sort_by_key(policy, keys_first, keys_last, values, less<key_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/swap_ranges.h b/projects/rocthrust/thrust/system/hip/detail/swap_ranges.h
index a107b24cf1e7..4f529c96cb5e 100644
--- a/projects/rocthrust/thrust/system/hip/detail/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/hip/detail/swap_ranges.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,17 +37,13 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/distance.h>
 #  include <thrust/swap.h>
 #  include <thrust/system/hip/detail/par_to_seq.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
 #  include <thrust/system/hip/detail/transform.h>
 
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-#    include _THRUST_STD_INCLUDE(utility)
-#  endif
-
 #  include <iterator>
 
 THRUST_NAMESPACE_BEGIN
@@ -64,8 +60,8 @@ struct swap_f
   ItemsIt1 items1;
   ItemsIt2 items2;
 
-  using value1_type = thrust::detail::it_value_t<ItemsIt1>;
-  using value2_type = thrust::detail::it_value_t<ItemsIt2>;
+  using value1_type = typename iterator_traits<ItemsIt1>::value_type;
+  using value2_type = typename iterator_traits<ItemsIt2>::value_type;
 
   THRUST_HIP_FUNCTION
   swap_f(ItemsIt1 items1_, ItemsIt2 items2_)
@@ -79,16 +75,12 @@ struct swap_f
     // TODO(bgruber): this should probably use _THRUST_STD::iter_swap(items1 + idx, items2 + idx);
     value1_type item1 = items1[idx];
     value2_type item2 = items2[idx];
-#  if _THRUST_HAS_DEVICE_SYSTEM_STD
-    using _THRUST_STD::swap;
-#  else
     // XXX thrust::swap is buggy
     // if reference_type of ItemIt1/ItemsIt2
     // is a proxy reference, then KABOOM!
     // to avoid this, just copy the value first before swap
     // *todo* specialize on real & proxy references
     using thrust::swap;
-#  endif
     swap(item1, item2);
     items1[idx] = item1;
     items2[idx] = item2;
@@ -100,7 +92,7 @@ template <class Derived, class ItemsIt1, class ItemsIt2>
 ItemsIt2 THRUST_HOST_DEVICE
 swap_ranges(execution_policy<Derived>& policy, ItemsIt1 first1, ItemsIt1 last1, ItemsIt2 first2)
 {
-  using size_type = thrust::detail::it_difference_t<ItemsIt1>;
+  using size_type = typename iterator_traits<ItemsIt1>::difference_type;
 
   size_type num_items = static_cast<size_type>(thrust::distance(first1, last1));
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/tabulate.h b/projects/rocthrust/thrust/system/hip/detail/tabulate.h
index c49dbd1afcf6..339e7398a339 100644
--- a/projects/rocthrust/thrust/system/hip/detail/tabulate.h
+++ b/projects/rocthrust/thrust/system/hip/detail/tabulate.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/distance.h>
@@ -74,7 +74,7 @@ template <class Derived, class Iterator, class TabulateOp>
 void THRUST_HOST_DEVICE
 tabulate(execution_policy<Derived>& policy, Iterator first, Iterator last, TabulateOp tabulate_op)
 {
-  using size_type = thrust::detail::it_difference_t<Iterator>;
+  using size_type = typename iterator_traits<Iterator>::difference_type;
 
   size_type count = thrust::distance(first, last);
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/temporary_buffer.h b/projects/rocthrust/thrust/system/hip/detail/temporary_buffer.h
index f4ecde7f5d17..3ceb8b8980d8 100644
--- a/projects/rocthrust/thrust/system/hip/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/hip/detail/temporary_buffer.h
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2025 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Copyright 2008-2016 NVIDIA Corporation
+ *  Modifications Copyright© 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,119 +19,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/type_traits/pointer_traits.h>
-#include <thrust/system/detail/bad_alloc.h>
-#include <thrust/system/hip/detail/par.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
-#endif
-
-THRUST_NAMESPACE_BEGIN
-namespace hip_rocprim
-{
-
-// If par_nosync does not have a user provided allocator attached, these
-// overloads should be selected.
-
-template <typename T>
-THRUST_HOST pair<T*, _THRUST_STD::ptrdiff_t> get_temporary_buffer(par_nosync_t&, _THRUST_STD::ptrdiff_t n)
-{
-  void* ptr;
-  hipError_t status = hipMallocAsync(&ptr, sizeof(T) * n, nullptr);
-
-  if (status != hipSuccess)
-  {
-    (void) hipGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with hipMalloc.
-    status = hipMalloc(&ptr, sizeof(T) * n);
-
-    if (status != hipSuccess)
-    {
-      throw system::detail::bad_alloc(hip_category().message(status).c_str());
-    }
-  }
-
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
-}
-
-template <typename Pointer>
-THRUST_HOST void return_temporary_buffer(par_nosync_t&, Pointer ptr, _THRUST_STD::ptrdiff_t)
-{
-  void* void_ptr = raw_pointer_cast(ptr);
-
-  hipError_t status = hipFreeAsync(void_ptr, nullptr);
-
-  if (status != hipSuccess)
-  {
-    (void) hipGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with hipFree.
-    status = hipFree(void_ptr);
-
-    if (status != hipSuccess)
-    {
-      throw system::detail::bad_alloc(hip_category().message(status).c_str());
-    }
-  }
-}
-
-template <typename T>
-THRUST_HOST pair<T*, _THRUST_STD::ptrdiff_t>
-get_temporary_buffer(execute_on_stream_nosync& system, _THRUST_STD::ptrdiff_t n)
-{
-  void* ptr;
-  hipError_t status = hipMallocAsync(&ptr, sizeof(T) * n, get_stream(system));
-
-  if (status != hipSuccess)
-  {
-    (void) hipGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with hipFree.
-    status = hipMalloc(&ptr, sizeof(T) * n);
-
-    if (status != hipSuccess)
-    {
-      throw system::detail::bad_alloc(hip_category().message(status).c_str());
-    }
-  }
-
-  return make_pair(reinterpret_pointer_cast<T*>(ptr), n);
-}
-
-template <typename Pointer>
-THRUST_HOST void return_temporary_buffer(execute_on_stream_nosync& system, Pointer ptr, _THRUST_STD::ptrdiff_t)
-{
-  void* void_ptr = raw_pointer_cast(ptr);
-
-  hipError_t status = hipFreeAsync(void_ptr, get_stream(system));
-
-  if (status != hipSuccess)
-  {
-    (void) hipGetLastError(); // Clear the CUDA global error state.
-
-    // That didn't work. We could be somewhere where async allocation isn't
-    // supported like Windows, so try again with hipMalloc.
-    status = hipFree(void_ptr);
-
-    if (status != hipSuccess)
-    {
-      throw system::detail::bad_alloc(hip_category().message(status).c_str());
-    }
-  }
-}
-
-} // namespace hip_rocprim
-THRUST_NAMESPACE_END
+// this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/hip/detail/terminate.h b/projects/rocthrust/thrust/system/hip/detail/terminate.h
index 7b0f154f2d6e..0844fc38c0ef 100644
--- a/projects/rocthrust/thrust/system/hip/detail/terminate.h
+++ b/projects/rocthrust/thrust/system/hip/detail/terminate.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -38,13 +38,12 @@
 #  pragma system_header
 #endif // no system header
 
-#include <thrust/detail/libcxx_wrapper/std/__exception/terminate.h>
+#include <thrust/system/hip/detail/nv/target.h>
 #include <thrust/system/hip/detail/util.h>
 
 #include <cstdio>
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstdlib>
-#endif
+#include <cstdlib>
+#include <exception>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -57,9 +56,14 @@ inline THRUST_HOST_DEVICE void terminate_with_message(const char* message)
 {
   THRUST_HIP_PRINTF("%s\n", message);
 #if THRUST_HIP_PRINTF_ENABLED == 0
-  (void) message;
+  THRUST_UNUSED_VAR(message);
+#endif
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+  _THRUST_STD::terminate();
+#else
+  NV_IF_TARGET(NV_IS_HOST, (::std::exit(-1);), (__builtin_trap();));
+  __builtin_unreachable();
 #endif
-  ::internal::terminate();
 }
 } // namespace detail
 } // namespace hip
diff --git a/projects/rocthrust/thrust/system/hip/detail/transform.h b/projects/rocthrust/thrust/system/hip/detail/transform.h
index a1d644a1fd08..deb12c5d4bad 100644
--- a/projects/rocthrust/thrust/system/hip/detail/transform.h
+++ b/projects/rocthrust/thrust/system/hip/detail/transform.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,10 +37,9 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
-#  include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/zip_iterator.h>
 #  include <thrust/system/hip/detail/dispatch.h>
@@ -265,7 +264,7 @@ OutputIt THRUST_HIP_FUNCTION transform_if(
   TransformOp transform_op,
   Predicate predicate)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt>;
+  using size_type     = typename iterator_traits<InputIt>::difference_type;
   size_type num_items = static_cast<size_type>(thrust::distance(first, last));
   return __transform::unary(policy, first, result, num_items, stencil, transform_op, predicate);
 } // func transform_if
@@ -310,7 +309,7 @@ OutputIt THRUST_HIP_FUNCTION transform_if(
   TransformOp transform_op,
   Predicate predicate)
 {
-  using size_type     = thrust::detail::it_difference_t<InputIt1>;
+  using size_type     = typename iterator_traits<InputIt1>::difference_type;
   size_type num_items = static_cast<size_type>(thrust::distance(first1, last1));
   return __transform::binary(policy, first1, first2, result, num_items, stencil, transform_op, predicate);
 } // func transform_if
@@ -333,7 +332,7 @@ OutputIt THRUST_HIP_FUNCTION transform(
     result,
     transform_op,
     __transform::always_true_predicate());
-}
+} // func transform
 } // namespace hip_rocprim
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/hip/detail/transform_reduce.h b/projects/rocthrust/thrust/system/hip/detail/transform_reduce.h
index 2c21208e3c28..aff811d39138 100644
--- a/projects/rocthrust/thrust/system/hip/detail/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/hip/detail/transform_reduce.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,12 +37,14 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/raw_reference_cast.h>
 #  include <thrust/detail/temporary_array.h>
+#  include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
 #  include <thrust/iterator/transform_iterator.h>
@@ -64,7 +66,7 @@ template <class Derived, class InputIt, class TransformOp, class T, class Reduce
 T THRUST_HOST_DEVICE transform_reduce(
   execution_policy<Derived>& policy, InputIt first, InputIt last, TransformOp transform_op, T init, ReduceOp reduce_op)
 {
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   const size_type num_items    = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, T, T>;
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/transform_scan.h b/projects/rocthrust/thrust/system/hip/detail/transform_scan.h
index da5db9656569..7d6ae5b0031e 100644
--- a/projects/rocthrust/thrust/system/hip/detail/transform_scan.h
+++ b/projects/rocthrust/thrust/system/hip/detail/transform_scan.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,7 +29,15 @@
 
 #include <thrust/detail/config.h>
 
-#if THRUST_HAS_HIP_COMPILER()
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/detail/type_traits.h>
 #  include <thrust/distance.h>
 #  include <thrust/iterator/transform_iterator.h>
@@ -37,9 +45,6 @@
 
 #  include <iterator> // IWYU pragma: export
 
-// rocprim include
-#  include <rocprim/rocprim.hpp>
-
 THRUST_NAMESPACE_BEGIN
 
 namespace hip_rocprim
@@ -55,11 +60,11 @@ OutputIt THRUST_HOST_DEVICE transform_inclusive_scan(
   ScanOp scan_op)
 {
   // Use the transformed input iterator's value type per https://wg21.link/P0571
-  using input_type  = thrust::detail::it_value_t<InputIt>;
+  using input_type  = typename thrust::iterator_value<InputIt>::type;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
   using value_type  = ::internal::remove_cvref_t<result_type>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, value_type, value_type>;
 
@@ -76,11 +81,11 @@ OutputIt THRUST_HOST_DEVICE transform_inclusive_scan(
   InitialValueType init,
   ScanOp scan_op)
 {
-  using input_type  = thrust::detail::it_value_t<InputIt>;
+  using input_type  = typename thrust::iterator_value<InputIt>::type;
   using result_type = thrust::detail::invoke_result_t<TransformOp, input_type>;
   using value_type  = ::internal::remove_cvref_t<result_type>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, value_type, value_type>;
 
@@ -101,7 +106,7 @@ OutputIt THRUST_HOST_DEVICE transform_exclusive_scan(
   // Use the initial value type per https://wg21.link/P0571
   using result_type = ::internal::remove_cvref_t<InitialValueType>;
 
-  using size_type              = thrust::detail::it_difference_t<InputIt>;
+  using size_type              = typename iterator_traits<InputIt>::difference_type;
   size_type num_items          = static_cast<size_type>(thrust::distance(first, last));
   using transformed_iterator_t = transform_iterator<TransformOp, InputIt, result_type, result_type>;
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/uninitialized_copy.h b/projects/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
index b83df3c7abfc..f56cbdc8bbe6 100644
--- a/projects/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/hip/detail/uninitialized_copy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
@@ -59,8 +59,8 @@ struct functor
   InputIt input;
   OutputIt output;
 
-  using InputType  = thrust::detail::it_value_t<InputIt>;
-  using OutputType = thrust::detail::it_value_t<OutputIt>;
+  using InputType  = typename iterator_traits<InputIt>::value_type;
+  using OutputType = typename iterator_traits<OutputIt>::value_type;
 
   THRUST_HIP_FUNCTION
   functor(InputIt input_, OutputIt output_)
diff --git a/projects/rocthrust/thrust/system/hip/detail/uninitialized_fill.h b/projects/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
index 22ab7d30b4f2..4d35fa36543a 100644
--- a/projects/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/hip/detail/uninitialized_fill.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ * Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,7 +37,7 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 #  include <thrust/distance.h>
 #  include <thrust/system/hip/detail/execution_policy.h>
 #  include <thrust/system/hip/detail/parallel_for.h>
@@ -59,7 +59,7 @@ struct functor
   Iterator items;
   T value;
 
-  using value_type = thrust::detail::it_value_t<Iterator>;
+  using value_type = typename iterator_traits<Iterator>::value_type;
 
   THRUST_HIP_FUNCTION
   functor(Iterator items_, T const& value_)
diff --git a/projects/rocthrust/thrust/system/hip/detail/unique.h b/projects/rocthrust/thrust/system/hip/detail/unique.h
index 1ba2322cd4aa..1f31fbca01fb 100644
--- a/projects/rocthrust/thrust/system/hip/detail/unique.h
+++ b/projects/rocthrust/thrust/system/hip/detail/unique.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,12 +37,13 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/advance.h>
 #  include <thrust/count.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
 #  include <thrust/functional.h>
@@ -74,7 +75,7 @@ THRUST_HOST_DEVICE OutputIterator unique_copy(
   BinaryPredicate binary_pred);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -90,7 +91,7 @@ namespace __unique
 {
 
 template <typename Derived, typename ItemsInputIt, typename ItemsOutputIt, typename BinaryPred>
-THRUST_HIP_RUNTIME_FUNCTION ItemsOutputIt unique(
+THRUST_RUNTIME_FUNCTION ItemsOutputIt unique(
   execution_policy<Derived>& policy,
   ItemsInputIt items_first,
   ItemsInputIt items_last,
@@ -98,7 +99,7 @@ THRUST_HIP_RUNTIME_FUNCTION ItemsOutputIt unique(
   BinaryPred binary_pred)
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
-  //  using size_type = thrust::detail::it_difference_t<ItemsInputIt>;
+  //  using size_type = typename iterator_traits<ItemsInputIt>::difference_type;
   using size_type = int;
 
   size_type num_items       = static_cast<size_type>(thrust::distance(items_first, items_last));
@@ -171,7 +172,7 @@ unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, Outp
     {
       return result = __unique::unique(policy, first, last, result, binary_pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static OutputIt
     seq(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result, BinaryPred binary_pred)
     {
@@ -179,7 +180,7 @@ unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, Outp
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, result, binary_pred);
 #  else
   return workaround::seq(policy, first, last, result, binary_pred);
@@ -189,7 +190,7 @@ unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, Outp
 template <class Derived, class InputIt, class OutputIt>
 OutputIt THRUST_HOST_DEVICE unique_copy(execution_policy<Derived>& policy, InputIt first, InputIt last, OutputIt result)
 {
-  using input_type = thrust::detail::it_value_t<InputIt>;
+  using input_type = typename iterator_traits<InputIt>::value_type;
   return hip_rocprim::unique_copy(policy, first, last, result, equal_to<input_type>());
 }
 
@@ -206,7 +207,7 @@ unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, Binar
     {
       return hip_rocprim::unique_copy(policy, first, last, first, binary_pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static ForwardIt
     seq(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, BinaryPred binary_pred)
     {
@@ -214,7 +215,7 @@ unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, Binar
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, first, last, binary_pred);
 #  else
   return workaround::seq(policy, first, last, binary_pred);
@@ -224,7 +225,7 @@ unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, Binar
 template <class Derived, class ForwardIt>
 ForwardIt THRUST_HOST_DEVICE unique(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last)
 {
-  using input_type = thrust::detail::it_value_t<ForwardIt>;
+  using input_type = typename iterator_traits<ForwardIt>::value_type;
   return hip_rocprim::unique(policy, first, last, equal_to<input_type>());
 }
 
@@ -242,7 +243,7 @@ struct zip_adj_not_predicate
 
 THRUST_EXEC_CHECK_DISABLE
 template <class Derived, class ForwardIt, class BinaryPred>
-thrust::detail::it_difference_t<ForwardIt> THRUST_HOST_DEVICE
+typename thrust::iterator_traits<ForwardIt>::difference_type THRUST_HOST_DEVICE
 unique_count(execution_policy<Derived>& policy, ForwardIt first, ForwardIt last, BinaryPred binary_pred)
 {
   if (first == last)
diff --git a/projects/rocthrust/thrust/system/hip/detail/unique_by_key.h b/projects/rocthrust/thrust/system/hip/detail/unique_by_key.h
index 09cdbf1ac90b..89e150309590 100644
--- a/projects/rocthrust/thrust/system/hip/detail/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/hip/detail/unique_by_key.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,11 +37,12 @@
 #  pragma system_header
 #endif // no system header
 
-#if THRUST_HAS_HIP_COMPILER()
+#if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
 
 #  include <thrust/system/hip/config.h>
 
 #  include <thrust/detail/alignment.h>
+#  include <thrust/detail/minmax.h>
 #  include <thrust/detail/mpl/math.h>
 #  include <thrust/detail/temporary_array.h>
 #  include <thrust/distance.h>
@@ -100,7 +101,7 @@ THRUST_HIP_RUNTIME_FUNCTION pair<KeyOutputIt, ValOutputIt> unique_by_key(
   BinaryPred binary_pred)
 {
   using namespace thrust::system::hip_rocprim::temp_storage;
-  using size_type = thrust::detail::it_difference_t<KeyInputIt>;
+  using size_type = typename iterator_traits<KeyInputIt>::difference_type;
 
   size_type num_items       = static_cast<size_type>(thrust::distance(keys_first, keys_last));
   size_t temp_storage_bytes = 0;
@@ -197,7 +198,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
     {
       return detail::unique_by_key(policy, keys_first, keys_last, values_first, keys_result, values_result, binary_pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<KeyOutputIt, ValOutputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
@@ -212,7 +213,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, keys_first, keys_last, values_first, keys_result, values_result, binary_pred);
 #  else
   return workaround::seq(policy, keys_first, keys_last, values_first, keys_result, values_result, binary_pred);
@@ -228,7 +229,7 @@ pair<KeyOutputIt, ValOutputIt> THRUST_HOST_DEVICE unique_by_key_copy(
   KeyOutputIt keys_result,
   ValOutputIt values_result)
 {
-  using key_type = thrust::detail::it_value_t<KeyInputIt>;
+  using key_type = typename iterator_traits<KeyInputIt>::value_type;
   return hip_rocprim::unique_by_key_copy(
     policy, keys_first, keys_last, values_first, keys_result, values_result, equal_to<key_type>());
 }
@@ -254,7 +255,7 @@ pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
       return hip_rocprim::unique_by_key_copy(
         policy, keys_first, keys_last, values_first, keys_first, values_first, binary_pred);
     }
-#  if defined(__HIP_DEVICE_COMPILE__)
+#  if !__THRUST_HAS_HIPRT__
     THRUST_DEVICE static pair<KeyInputIt, ValInputIt>
     seq(execution_policy<Derived>& policy,
         KeyInputIt keys_first,
@@ -266,7 +267,7 @@ pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE unique_by_key(
     }
 #  endif
   };
-#  if !defined(__HIP_DEVICE_COMPILE__)
+#  if __THRUST_HAS_HIPRT__
   return workaround::par(policy, keys_first, keys_last, values_first, binary_pred);
 #  else
   return workaround::seq(policy, keys_first, keys_last, values_first, binary_pred);
@@ -277,7 +278,7 @@ template <class Derived, class KeyInputIt, class ValInputIt>
 pair<KeyInputIt, ValInputIt> THRUST_HOST_DEVICE
 unique_by_key(execution_policy<Derived>& policy, KeyInputIt keys_first, KeyInputIt keys_last, ValInputIt values_first)
 {
-  using key_type = thrust::detail::it_value_t<KeyInputIt>;
+  using key_type = typename iterator_traits<KeyInputIt>::value_type;
   return hip_rocprim::unique_by_key(policy, keys_first, keys_last, values_first, equal_to<key_type>());
 }
 
diff --git a/projects/rocthrust/thrust/system/hip/detail/util.h b/projects/rocthrust/thrust/system/hip/detail/util.h
index 73f7278a7eba..4d24f731dc2b 100644
--- a/projects/rocthrust/thrust/system/hip/detail/util.h
+++ b/projects/rocthrust/thrust/system/hip/detail/util.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights meserved.
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -39,19 +39,14 @@
 
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/hip/detail/execution_policy.h>
+#include <thrust/system/hip/detail/nv/target.h>
+#include <thrust/system/hip/error.h>
+#include <thrust/system_error.h>
 
-#if !THRUST_COMPILER(NVRTC)
-#  include <thrust/system/hip/error.h>
-#  include <thrust/system_error.h>
-
-#  include <cstdio>
-#endif // !THRUST_COMPILER(NVRTC)
-
-#include <thrust/detail/libcxx_wrapper/std/__exception/terminate.h>
-
-#if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <iterator>
-#endif
+#include <cstdio>
+#include <cstdlib>
+#include <exception>
+#include <utility>
 
 // Define the value to 0, if you want to disable printf on device side.
 #ifndef THRUST_HIP_PRINTF_ENABLED
@@ -124,9 +119,9 @@ template <class Derived>
 THRUST_HOST_DEVICE hipError_t synchronize_stream(execution_policy<Derived>& policy)
 {
   hipError_t result;
-  // Can't use #if inside _THRUST_IF_TARGET, use a temp macro to hoist the device
+  // Can't use #if inside NV_IF_TARGET, use a temp macro to hoist the device
   // instructions out of the target logic.
-#if !defined(__HIP_DEVICE_COMPILE__)
+#if __THRUST_HAS_HIPRT__
 
 #  define THRUST_TEMP_DEVICE_CODE result = hipDeviceSynchronize();
 
@@ -136,8 +131,9 @@ THRUST_HOST_DEVICE hipError_t synchronize_stream(execution_policy<Derived>& poli
 
 #endif
 
-  _THRUST_IF_TARGET(
-    _THRUST_IS_HOST, (result = hipStreamSynchronize(stream(policy));), ((void) (policy); THRUST_TEMP_DEVICE_CODE;));
+  NV_IF_TARGET(NV_IS_HOST,
+               (result = hipStreamSynchronize(stream(policy));),
+               (THRUST_UNUSED_VAR(policy); THRUST_TEMP_DEVICE_CODE;));
 
 #undef THRUST_TEMP_DEVICE_CODE
 
@@ -148,10 +144,10 @@ THRUST_HOST_DEVICE hipError_t synchronize_stream(execution_policy<Derived>& poli
 template <class Policy>
 THRUST_HOST_DEVICE hipError_t synchronize(Policy& policy)
 {
-#if !defined(__HIP_DEVICE_COMPILE__)
+#if __THRUST_HAS_HIPRT__
   return synchronize_stream(derived_cast(policy));
 #else
-  (void) (policy);
+  THRUST_UNUSED_VAR(policy);
   return hipSuccess;
 #endif
 }
@@ -182,7 +178,6 @@ THRUST_HOST_DEVICE hipError_t synchronize_optional(Policy& policy)
   return synchronize_stream_optional(derived_cast(policy));
 }
 
-#if !THRUST_COMPILER(NVRTC)
 template <class Type>
 THRUST_HIP_HOST_FUNCTION hipError_t
 trivial_copy_from_device(Type* dst, Type const* src, size_t count, hipStream_t stream)
@@ -235,7 +230,7 @@ THRUST_HIP_HOST_FUNCTION hipError_t trivial_copy_to_device(Type* dst, Type const
 }
 
 template <class Policy, class Type>
-THRUST_HIP_RUNTIME_FUNCTION hipError_t
+THRUST_RUNTIME_FUNCTION hipError_t
 trivial_copy_device_to_device(Policy& policy, Type* dst, Type const* src, size_t count)
 {
   hipError_t status = hipSuccess;
@@ -254,21 +249,26 @@ trivial_copy_device_to_device(Policy& policy, Type* dst, Type const* src, size_t
   status = hip_rocprim::synchronize_optional(policy);
   return status;
 }
-#endif // !THRUST_COMPILER(NVRTC)
+
+THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::terminate() instead") inline void THRUST_HOST_DEVICE terminate()
+{
+  NV_IF_TARGET(NV_IS_HOST, (std::terminate();), (abort();));
+}
 
 THRUST_HOST_DEVICE inline void throw_on_error(hipError_t status)
 {
   // Clear the global HIP error state which may have been set by the last
   // call. Otherwise, errors may "leak" to unrelated kernel launches.
 #ifdef THRUST_RDC_ENABLED
-  (void) hipGetLastError();
+  hipError_t clear_error_status = hipGetLastError();
+  THRUST_UNUSED_VAR(clear_error_status);
 #else
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, ((void) hipGetLastError();));
+  NV_IF_TARGET(NV_IS_HOST, (hipError_t clear_error_status = hipGetLastError(); THRUST_UNUSED_VAR(clear_error_status);));
 #endif
 
   if (hipSuccess != status)
   {
-    // Can't use #if inside _THRUST_IF_TARGET, use a temp macro to hoist the device
+    // Can't use #if inside NV_IF_TARGET, use a temp macro to hoist the device
     // instructions out of the target logic.
 #if defined(THRUST_RDC_ENABLED) || THRUST_HIP_PRINTF_ENABLED == 0
 
@@ -281,9 +281,16 @@ THRUST_HOST_DEVICE inline void throw_on_error(hipError_t status)
 
 #endif
 
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                      (throw thrust::system_error(status, thrust::hip_category());),
-                      (THRUST_TEMP_DEVICE_CODE; ::internal::terminate();));
+    NV_IF_TARGET(NV_IS_HOST,
+                 (throw thrust::system_error(status, thrust::hip_category());),
+                 (THRUST_TEMP_DEVICE_CODE;
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+                  _THRUST_STD::terminate();
+#else
+                  __builtin_trap();
+                  __builtin_unreachable();
+#endif
+                  ));
 
 #undef THRUST_TEMP_DEVICE_CODE
   }
@@ -294,14 +301,15 @@ THRUST_HOST_DEVICE inline void throw_on_error(hipError_t status, char const* msg
   // Clear the global HIP error state which may have been set by the last
   // call. Otherwise, errors may "leak" to unrelated kernel launches.
 #ifdef THRUST_RDC_ENABLED
-  (void) hipGetLastError();
+  hipError_t clear_error_status = hipGetLastError();
+  THRUST_UNUSED_VAR(clear_error_status);
 #else
-  _THRUST_IF_TARGET(_THRUST_IS_HOST, ((void) hipGetLastError();));
+  NV_IF_TARGET(NV_IS_HOST, (hipError_t clear_error_status = hipGetLastError(); THRUST_UNUSED_VAR(clear_error_status);));
 #endif
 
   if (hipSuccess != status)
   {
-    // Can't use #if inside _THRUST_IF_TARGET, use a temp macro to hoist the device
+    // Can't use #if inside NV_IF_TARGET, use a temp macro to hoist the device
     // instructions out of the target logic.
 #if defined(THRUST_RDC_ENABLED) || THRUST_HIP_PRINTF_ENABLED == 0
 
@@ -314,13 +322,363 @@ THRUST_HOST_DEVICE inline void throw_on_error(hipError_t status, char const* msg
 
 #endif
 
-    _THRUST_IF_TARGET(_THRUST_IS_HOST,
-                      (throw thrust::system_error(status, thrust::hip_category(), msg);),
-                      (THRUST_TEMP_DEVICE_CODE; ::internal::terminate();));
+    NV_IF_TARGET(NV_IS_HOST,
+                 (throw thrust::system_error(status, thrust::hip_category(), msg);),
+                 (THRUST_TEMP_DEVICE_CODE;
+#if _THRUST_HAS_DEVICE_SYSTEM_STD
+                  _THRUST_STD::terminate();
+#else
+                  __builtin_trap();
+                  __builtin_unreachable();
+#endif
+                  ));
 
 #undef THRUST_TEMP_DEVICE_CODE
   }
 }
+
+// deprecated [Since 2.8]
+template <class ValueType, class InputIt, class UnaryOp>
+struct THRUST_DEPRECATED_BECAUSE("Use thrust::transform_iterator") transform_input_iterator_t
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  using self_t = transform_input_iterator_t;
+  THRUST_SUPPRESS_DEPRECATED_POP
+  using difference_type   = typename iterator_traits<InputIt>::difference_type;
+  using value_type        = ValueType;
+  using pointer           = void;
+  using reference         = value_type;
+  using iterator_category = _THRUST_STD::random_access_iterator_tag;
+
+  InputIt input;
+  mutable UnaryOp op;
+
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE transform_input_iterator_t(InputIt input, UnaryOp op)
+      : input(input)
+      , op(op)
+  {}
+
+  transform_input_iterator_t(const self_t&) = default;
+
+  // UnaryOp might not be copy assignable, such as when it is a lambda.  Define
+  // an explicit copy assignment operator that doesn't try to assign it.
+  THRUST_HOST_DEVICE self_t& operator=(const self_t& o)
+  {
+    input = o.input;
+    return *this;
+  }
+
+  /// Postfix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++input;
+    return retval;
+  }
+
+  /// Prefix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++()
+  {
+    ++input;
+    return *this;
+  }
+
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
+  {
+    typename thrust::iterator_value<InputIt>::type x = *input;
+    return op(x);
+  }
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
+  {
+    typename thrust::iterator_value<InputIt>::type x = *input;
+    return op(x);
+  }
+
+  /// Addition
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(input + n, op);
+  }
+
+  /// Addition assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    input += n;
+    return *this;
+  }
+
+  /// Subtraction
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(input - n, op);
+  }
+
+  /// Subtraction assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    input -= n;
+    return *this;
+  }
+
+  /// Distance
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return input - other.input;
+  }
+
+  /// Array subscript
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return op(input[n]);
+  }
+
+  /// Equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (input == rhs.input);
+  }
+
+  /// Not equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (input != rhs.input);
+  }
+}; // struct transform_input_iterarot_t
+
+// deprecated [Since 2.8]
+template <class ValueType, class InputIt1, class InputIt2, class BinaryOp>
+struct THRUST_DEPRECATED_BECAUSE("Use thrust::transform_iterator of a thrust::zip_iterator")
+  transform_pair_of_input_iterators_t
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  using self_t = transform_pair_of_input_iterators_t;
+  THRUST_SUPPRESS_DEPRECATED_POP
+  using difference_type   = typename iterator_traits<InputIt1>::difference_type;
+  using value_type        = ValueType;
+  using pointer           = void;
+  using reference         = value_type;
+  using iterator_category = _THRUST_STD::random_access_iterator_tag;
+
+  InputIt1 input1;
+  InputIt2 input2;
+  mutable BinaryOp op;
+
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE
+  transform_pair_of_input_iterators_t(InputIt1 input1_, InputIt2 input2_, BinaryOp op_)
+      : input1(input1_)
+      , input2(input2_)
+      , op(op_)
+  {}
+
+  transform_pair_of_input_iterators_t(const self_t&) = default;
+
+  // BinaryOp might not be copy assignable, such as when it is a lambda.
+  // Define an explicit copy assignment operator that doesn't try to assign it.
+  THRUST_HOST_DEVICE self_t& operator=(const self_t& o)
+  {
+    input1 = o.input1;
+    input2 = o.input2;
+    return *this;
+  }
+
+  /// Postfix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++input1;
+    ++input2;
+    return retval;
+  }
+
+  /// Prefix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++()
+  {
+    ++input1;
+    ++input2;
+    return *this;
+  }
+
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
+  {
+    return op(*input1, *input2);
+  }
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
+  {
+    return op(*input1, *input2);
+  }
+
+  /// Addition
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(input1 + n, input2 + n, op);
+  }
+
+  /// Addition assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    input1 += n;
+    input2 += n;
+    return *this;
+  }
+
+  /// Subtraction
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(input1 - n, input2 - n, op);
+  }
+
+  /// Subtraction assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    input1 -= n;
+    input2 -= n;
+    return *this;
+  }
+
+  /// Distance
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return input1 - other.input1;
+  }
+
+  /// Array subscript
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return op(input1[n], input2[n]);
+  }
+
+  /// Equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (input1 == rhs.input1) && (input2 == rhs.input2);
+  }
+
+  /// Not equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (input1 != rhs.input1) || (input2 != rhs.input2);
+  }
+
+}; // struct transform_pair_of_input_iterators_t
+
+// deprecated [Since 2.8]
+struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::identity") identity
+{
+  template <class T>
+  THRUST_HOST_DEVICE T const& operator()(T const& t) const
+  {
+    return t;
+  }
+
+  template <class T>
+  THRUST_HOST_DEVICE T& operator()(T& t) const
+  {
+    return t;
+  }
+};
+
+// deprecated [Since 2.8]
+template <class T>
+struct THRUST_DEPRECATED_BECAUSE("Use thrust::counting_iterator") counting_iterator_t
+{
+  THRUST_SUPPRESS_DEPRECATED_PUSH
+  using self_t = counting_iterator_t;
+  THRUST_SUPPRESS_DEPRECATED_POP
+  using difference_type   = T;
+  using value_type        = T;
+  using pointer           = void;
+  using reference         = T;
+  using iterator_category = _THRUST_STD::random_access_iterator_tag;
+
+  T count;
+
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE counting_iterator_t(T count_)
+      : count(count_)
+  {}
+
+  /// Postfix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++(int)
+  {
+    self_t retval = *this;
+    ++count;
+    return retval;
+  }
+
+  /// Prefix increment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator++()
+  {
+    ++count;
+    return *this;
+  }
+
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*() const
+  {
+    return count;
+  }
+
+  /// Indirection
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator*()
+  {
+    return count;
+  }
+
+  /// Addition
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator+(difference_type n) const
+  {
+    return self_t(count + n);
+  }
+
+  /// Addition assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator+=(difference_type n)
+  {
+    count += n;
+    return *this;
+  }
+
+  /// Subtraction
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t operator-(difference_type n) const
+  {
+    return self_t(count - n);
+  }
+
+  /// Subtraction assignment
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE self_t& operator-=(difference_type n)
+  {
+    count -= n;
+    return *this;
+  }
+
+  /// Distance
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE difference_type operator-(self_t other) const
+  {
+    return count - other.count;
+  }
+
+  /// Array subscript
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE reference operator[](difference_type n) const
+  {
+    return count + n;
+  }
+
+  /// Equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator==(const self_t& rhs) const
+  {
+    return (count == rhs.count);
+  }
+
+  /// Not equal to
+  THRUST_HOST_DEVICE THRUST_FORCEINLINE bool operator!=(const self_t& rhs) const
+  {
+    return (count != rhs.count);
+  }
+
+}; // struct count_iterator_t
+
 } // namespace hip_rocprim
 
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/hip/error.h b/projects/rocthrust/thrust/system/hip/error.h
index 266fb30b99f7..3279b01dd423 100644
--- a/projects/rocthrust/thrust/system/hip/error.h
+++ b/projects/rocthrust/thrust/system/hip/error.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,15 +23,9 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/system/error_code.h>
+#include <thrust/system/hip/detail/guarded_driver_types.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -41,13 +35,15 @@ namespace system
 namespace hip_rocprim
 {
 
+/*! \addtogroup system
+ *  \{
+ */
+
 // To construct an error_code after a HIP Runtime error:
 //
 //   error_code(::hipGetLastError(), hip_category())
 
 // XXX N3000 prefers enum class errc { ... }
-/*! Namespace for HIP Runtime errors.
- */
 namespace errc
 {
 
@@ -72,17 +68,17 @@ enum errc_t
   invalid_symbol                    = hipErrorInvalidSymbol,
   map_buffer_object_failed          = hipErrorMapBufferObjectFailed,
   unmap_buffer_object_failed        = hipErrorTbd,
-  invalid_texture                   = hipErrorInvalidTexture,
+  invalid_texture                   = hipErrorTbd,
   invalid_texture_binding           = hipErrorTbd,
-  invalid_channel_descriptor        = hipErrorInvalidChannelDescriptor,
+  invalid_channel_descriptor        = hipErrorTbd,
   invalid_memcpy_direction          = hipErrorInvalidMemcpyDirection,
   invalid_filter_setting            = hipErrorTbd,
   invalid_norm_setting              = hipErrorTbd,
-  hip_runtime_unloading             = hipErrorTbd,
+  cuda_runtime_unloading            = hipErrorTbd,
   unknown                           = hipErrorUnknown,
   invalid_resource_handle           = hipErrorInvalidResourceHandle,
   not_ready                         = hipErrorNotReady,
-  insufficient_driver               = hipErrorInsufficientDriver,
+  insufficient_driver               = hipErrorTbd,
   set_on_active_process_error       = hipErrorSetOnActiveProcess,
   no_device                         = hipErrorNoDevice,
   ecc_uncorrectable                 = hipErrorTbd,
@@ -99,25 +95,25 @@ enum errc_t
   peer_access_already_enabled       = hipErrorPeerAccessAlreadyEnabled,
   peer_access_not_enabled           = hipErrorPeerAccessNotEnabled,
   device_already_in_use             = hipErrorTbd,
-  profiler_disabled                 = hipErrorProfilerDisabled,
-  assert_triggered                  = hipErrorAssert,
+  profiler_disabled                 = hipErrorTbd,
+  assert_triggered                  = hipErrorTbd,
   too_many_peers                    = hipErrorTbd,
   host_memory_already_registered    = hipErrorHostMemoryAlreadyRegistered,
   host_memory_not_registered        = hipErrorHostMemoryNotRegistered,
-  operating_system_error            = hipErrorOperatingSystem,
-  peer_access_unsupported           = hipErrorPeerAccessUnsupported,
+  operating_system_error            = hipErrorTbd,
+  peer_access_unsupported           = hipErrorTbd,
   launch_max_depth_exceeded         = hipErrorTbd,
   launch_file_scoped_texture_used   = hipErrorTbd,
   launch_file_scoped_surface_used   = hipErrorTbd,
   sync_depth_exceeded               = hipErrorTbd,
   attempted_operation_not_permitted = hipErrorTbd,
-  attempted_operation_not_supported = hipErrorNotSupported,
+  attempted_operation_not_supported = hipErrorTbd,
   startup_failure                   = hipErrorTbd
 }; // end errc_t
 
 } // end namespace errc
 
-} // namespace hip_rocprim
+} // end namespace hip_rocprim
 
 /*! \return A reference to an object of a type derived from class \p thrust::error_category.
  *  \note The object's \p equivalent virtual functions shall behave as specified
@@ -129,7 +125,7 @@ enum errc_t
  *        shall return <tt>error_condition(ev,hip_category())</tt>.
  *        Otherwise, the function shall return <tt>system_category.default_error_condition(ev)</tt>.
  */
-inline const error_category& hip_category();
+inline const error_category& hip_category(void);
 
 // XXX N3000 prefers is_error_code_enum<hip::errc>
 
@@ -139,23 +135,27 @@ template <>
 struct is_error_code_enum<hip_rocprim::errc::errc_t> : thrust::detail::true_type
 {};
 
-// XXX replace hip_rocprim::errc::errc_t with hip_rocprim::errc upon c++0x
 /*! \return <tt>error_code(static_cast<int>(e), hip::error_category())</tt>
  */
 inline error_code make_error_code(hip_rocprim::errc::errc_t e);
 
-// XXX replace hip_rocprim::errc::errc_t with hip_rocprim::errc upon c++0x
 /*! \return <tt>error_condition(static_cast<int>(e), hip::error_category())</tt>.
  */
 inline error_condition make_error_condition(hip_rocprim::errc::errc_t e);
 
+/*! \} // end system
+ */
+
 } // namespace system
 
 namespace system
 {
 namespace hip
 {
-namespace errc = system::hip_rocprim::errc;
+namespace errc
+{
+using system::hip_rocprim::errc::errc_t;
+} // namespace errc
 } // namespace hip
 } // namespace system
 
diff --git a/projects/rocthrust/thrust/system/hip/execution_policy.h b/projects/rocthrust/thrust/system/hip/execution_policy.h
index e90e5395d994..8965de946f2d 100644
--- a/projects/rocthrust/thrust/system/hip/execution_policy.h
+++ b/projects/rocthrust/thrust/system/hip/execution_policy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- * Modifications Copyright (c) 2019-2026, Advanced Micro Devices, Inc.  All rights reserved.
+ * Modifications Copyright (c) 2019-2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -25,16 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ******************************************************************************/
+
 #pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/hip/detail/execution_policy.h>
 #include <thrust/system/hip/detail/par.h>
diff --git a/projects/rocthrust/thrust/system/hip/future.h b/projects/rocthrust/thrust/system/hip/future.h
new file mode 100644
index 000000000000..ea5df9d1b546
--- /dev/null
+++ b/projects/rocthrust/thrust/system/hip/future.h
@@ -0,0 +1,80 @@
+// Copyright (c) 2018 NVIDIA Corporation
+// Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Author: Bryce Adelstein Lelbach <brycelelbach@gmail.com>
+//
+// Distributed under the Boost Software License v1.0 (boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+#include <thrust/detail/cpp_version_check.h>
+
+#if THRUST_CPP_DIALECT >= 2017
+
+#  include <thrust/system/hip/detail/execution_policy.h>
+#  include <thrust/system/hip/pointer.h>
+
+THRUST_NAMESPACE_BEGIN
+
+namespace system
+{
+namespace hip
+{
+
+struct ready_event;
+
+template <typename T>
+struct ready_future;
+
+struct unique_eager_event;
+
+template <typename T>
+struct unique_eager_future;
+
+template <typename... Events>
+THRUST_HOST unique_eager_event when_all(Events&&... evs);
+
+} // namespace hip
+} // namespace system
+
+namespace hip
+{
+
+using thrust::system::hip::ready_event;
+
+using thrust::system::hip::ready_future;
+
+using thrust::system::hip::unique_eager_event;
+using event = unique_eager_event;
+
+using thrust::system::hip::unique_eager_future;
+template <typename T>
+using future = unique_eager_future<T>;
+
+using thrust::system::hip::when_all;
+
+} // namespace hip
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <typename DerivedPolicy>
+THRUST_HOST thrust::hip::unique_eager_event
+unique_eager_event_type(thrust::hip::execution_policy<DerivedPolicy> const&) noexcept;
+
+template <typename T, typename DerivedPolicy>
+THRUST_HOST thrust::hip::unique_eager_future<T>
+unique_eager_future_type(thrust::hip::execution_policy<DerivedPolicy> const&) noexcept;
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_NAMESPACE_END
+
+#  include <thrust/system/hip/detail/future.inl>
+
+#endif // C++17
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/batch.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/batch.hpp
index d941e82b0789..4fe43eb6021c 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/batch.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/batch.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/for_each.h>
 
@@ -66,23 +65,21 @@ inline void for_each(execution::parallel_unsequenced_policy, I f, I l, F fn)
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    THRUST_NS_QUALIFIER::for_each(THRUST_NS_QUALIFIER::device, f, l, ::std::move(fn));
+    ::thrust::for_each(::thrust::device, f, l, ::std::move(fn));
   }
   else
   {
     ::hipstd::detail::device_callable_guard<fn_t> guard(::std::move(fn));
     try
     {
-      THRUST_NS_QUALIFIER::for_each(
-        THRUST_NS_QUALIFIER::device, f, l, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      ::thrust::for_each(::thrust::device, f, l, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar for_each: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar for_each: failed to synchronize");
     guard.destroy_and_free();
   }
 }
@@ -119,7 +116,7 @@ inline I for_each_n(execution::parallel_unsequenced_policy, I f, N n, F fn)
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    return THRUST_NS_QUALIFIER::for_each_n(THRUST_NS_QUALIFIER::device, f, n, ::std::move(fn));
+    return ::thrust::for_each_n(::thrust::device, f, n, ::std::move(fn));
   }
   else
   {
@@ -127,16 +124,14 @@ inline I for_each_n(execution::parallel_unsequenced_policy, I f, N n, F fn)
     I result;
     try
     {
-      result = THRUST_NS_QUALIFIER::for_each_n(
-        THRUST_NS_QUALIFIER::device, f, n, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      result = ::thrust::for_each_n(::thrust::device, f, n, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar for_each_n: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar for_each_n: failed to synchronize");
     guard.destroy_and_free();
     return result;
   }
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/copy.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/copy.hpp
index f4c553afb263..824ab2ae8c29 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/copy.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/copy.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,6 @@
 #if defined(__HIPSTDPAR__)
 
 #  include <thrust/copy.h>
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 
 #  include <algorithm>
@@ -59,7 +58,7 @@ inline O copy(execution::parallel_unsequenced_policy, I fi, I li, O fo)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::copy(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::copy(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -82,7 +81,7 @@ inline O copy_if(execution::parallel_unsequenced_policy, I fi, I li, O fo, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::copy_if(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(p));
+  return ::thrust::copy_if(::thrust::device, fi, li, fo, ::std::move(p));
 }
 
 template <typename I,
@@ -112,7 +111,7 @@ inline O copy_n(execution::parallel_unsequenced_policy, I fi, N n, O fo)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::copy_n(THRUST_NS_QUALIFIER::device, fi, n, fo);
+  return ::thrust::copy_n(::thrust::device, fi, n, fo);
 }
 
 template <typename I, typename N, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -132,7 +131,7 @@ inline O move(execution::parallel_unsequenced_policy, I fi, I li, O fo)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::copy(THRUST_NS_QUALIFIER::device, make_move_iterator(fi), make_move_iterator(li), fo);
+  return ::thrust::copy(::thrust::device, make_move_iterator(fi), make_move_iterator(li), fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/generation.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/generation.hpp
index da3a1dcf8b90..d2a16c21949b 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/generation.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/generation.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/fill.h>
 #  include <thrust/generate.h>
@@ -61,7 +60,7 @@ inline void fill(execution::parallel_unsequenced_policy, I f, I l, const T& x)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::fill(THRUST_NS_QUALIFIER::device, f, l, x);
+  return ::thrust::fill(::thrust::device, f, l, x);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -80,7 +79,7 @@ inline void fill_n(execution::parallel_unsequenced_policy, I f, N n, const T& x)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::fill_n(THRUST_NS_QUALIFIER::device, f, n, x);
+  return ::thrust::fill_n(::thrust::device, f, n, x);
 }
 
 template <typename I, typename N, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -105,23 +104,21 @@ inline void generate(execution::parallel_unsequenced_policy, I f, I l, G g)
 
   if constexpr (::std::is_trivially_destructible_v<g_t>)
   {
-    THRUST_NS_QUALIFIER::generate(THRUST_NS_QUALIFIER::device, f, l, ::std::move(g));
+    ::thrust::generate(::thrust::device, f, l, ::std::move(g));
   }
   else
   {
     ::hipstd::detail::device_callable_guard<g_t> guard(::std::move(g));
     try
     {
-      THRUST_NS_QUALIFIER::generate(
-        THRUST_NS_QUALIFIER::device, f, l, ::hipstd::detail::callable_proxy<g_t>{guard.get()});
+      ::thrust::generate(::thrust::device, f, l, ::hipstd::detail::callable_proxy<g_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar generate: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar generate: failed to synchronize");
     guard.destroy_and_free();
   }
 }
@@ -158,23 +155,21 @@ inline void generate_n(execution::parallel_unsequenced_policy, I f, N n, G g)
 
   if constexpr (::std::is_trivially_destructible_v<g_t>)
   {
-    THRUST_NS_QUALIFIER::generate_n(THRUST_NS_QUALIFIER::device, f, n, ::std::move(g));
+    ::thrust::generate_n(::thrust::device, f, n, ::std::move(g));
   }
   else
   {
     ::hipstd::detail::device_callable_guard<g_t> guard(::std::move(g));
     try
     {
-      THRUST_NS_QUALIFIER::generate_n(
-        THRUST_NS_QUALIFIER::device, f, n, ::hipstd::detail::callable_proxy<g_t>{guard.get()});
+      ::thrust::generate_n(::thrust::device, f, n, ::hipstd::detail::callable_proxy<g_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar generate_n: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar generate_n: failed to synchronize");
     guard.destroy_and_free();
   }
 }
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/hipstd.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/hipstd.hpp
index 5fd708679d1e..21d7ea0c1bf2 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/hipstd.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/hipstd.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -43,11 +43,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
-#  include <thrust/system/hip/detail/util.h>
-
-#  include <hip/hip_runtime_api.h>
-
 #  include <cstddef>
 #  include <cstdio>
 #  include <cstdlib>
@@ -57,6 +52,9 @@
 #  include <type_traits>
 #  include <utility>
 
+#  include <hip/hip_runtime_api.h>
+#  include <thrust/system/hip/detail/util.h>
+
 namespace hipstd
 {
 // Emits a one-time stderr warning when host-allocated memory may not be directly
@@ -195,7 +193,7 @@ class device_callable_guard
 #  else
     hipError_t status = ::hipMalloc(reinterpret_cast<void**>(&fn_ptr_), sizeof(Fn));
 #  endif
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(status, "hipstdpar: failed to allocate device callable");
+    ::thrust::hip_rocprim::throw_on_error(status, "hipstdpar: failed to allocate device callable");
     ::new (static_cast<void*>(fn_ptr_)) Fn(::std::move(fn));
   }
 
@@ -225,7 +223,7 @@ class device_callable_guard
     fn_ptr_->~Fn();
     hipError_t status = ::hipFree(fn_ptr_);
     fn_ptr_           = nullptr;
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(status, "hipstdpar: failed to free device callable");
+    ::thrust::hip_rocprim::throw_on_error(status, "hipstdpar: failed to free device callable");
   }
 
 private:
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/lexicographical_comparison.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/lexicographical_comparison.hpp
index a3a7300c2328..d03b27186f9b 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/lexicographical_comparison.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/lexicographical_comparison.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/mismatch.h>
 
@@ -72,7 +71,7 @@ inline bool lexicographical_compare(execution::parallel_unsequenced_policy, I0 f
   const auto n1 = l1 - f1;
   const auto n  = ::std::min(n0, n1);
 
-  const auto m = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, f0 + n, f1);
+  const auto m = ::thrust::mismatch(::thrust::device, f0, f0 + n, f1);
 
   if (m.first == f0 + n)
   {
@@ -113,7 +112,7 @@ inline bool lexicographical_compare(execution::parallel_unsequenced_policy, I0 f
   const auto n1 = l1 - f1;
   const auto n  = ::std::min(n0, n1);
 
-  const auto m = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, f0 + n, f1, [=](auto&& x, auto&& y) {
+  const auto m = ::thrust::mismatch(::thrust::device, f0, f0 + n, f1, [=](auto&& x, auto&& y) {
     return !r(x, y) && !r(y, x);
   });
 
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/merge.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/merge.hpp
index 873c24c4f6ca..b90d66f47ffb 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/merge.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/merge.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/merge.h>
 
@@ -59,7 +58,7 @@ inline O merge(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1, I1 l
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::merge(THRUST_NS_QUALIFIER::device, f0, l0, f1, l1, fo);
+  return ::thrust::merge(::thrust::device, f0, l0, f1, l1, fo);
 }
 
 template <typename I0, typename I1, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1, O>()>* = nullptr>
@@ -83,7 +82,7 @@ inline O merge(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1, I1 l
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::merge(THRUST_NS_QUALIFIER::device, f0, l0, f1, l1, fo, ::std::move(r));
+  return ::thrust::merge(::thrust::device, f0, l0, f1, l1, fo, ::std::move(r));
 }
 
 template <
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/min_max.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/min_max.hpp
index 037610832b4d..afefe151f402 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/min_max.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/min_max.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/extrema.h>
 
@@ -59,7 +58,7 @@ inline I max_element(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::max_element(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::max_element(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -78,7 +77,7 @@ inline I max_element(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::max_element(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::max_element(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -106,7 +105,7 @@ inline I min_element(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::min_element(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::min_element(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -125,7 +124,7 @@ inline I min_element(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::min_element(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::min_element(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -153,7 +152,7 @@ inline pair<I, I> minmax_element(execution::parallel_unsequenced_policy, I f, I
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  auto [m, M] = THRUST_NS_QUALIFIER::minmax_element(THRUST_NS_QUALIFIER::device, f, l);
+  auto [m, M] = ::thrust::minmax_element(::thrust::device, f, l);
 
   return {::std::move(m), ::std::move(M)};
 }
@@ -174,7 +173,7 @@ inline pair<I, I> minmax_element(execution::parallel_unsequenced_policy, I f, I
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  auto [m, M] = THRUST_NS_QUALIFIER::minmax_element(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  auto [m, M] = ::thrust::minmax_element(::thrust::device, f, l, ::std::move(r));
 
   return {::std::move(m), ::std::move(M)};
 }
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/numeric.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/numeric.hpp
index 16d9b208d55b..626d233f516d 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/numeric.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/numeric.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,6 @@
 #if defined(__HIPSTDPAR__)
 
 #  include <thrust/adjacent_difference.h>
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/inner_product.h>
 #  include <thrust/reduce.h>
@@ -66,7 +65,7 @@ inline O adjacent_difference(execution::parallel_unsequenced_policy, I fi, I li,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::adjacent_difference(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::adjacent_difference(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -87,7 +86,7 @@ inline O adjacent_difference(execution::parallel_unsequenced_policy, I fi, I li,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::adjacent_difference(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(op));
+  return ::thrust::adjacent_difference(::thrust::device, fi, li, fo, ::std::move(op));
 }
 
 template <typename I,
@@ -117,7 +116,7 @@ inline typename iterator_traits<I>::value_type reduce(execution::parallel_unsequ
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::reduce(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::reduce(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -134,7 +133,7 @@ inline T reduce(execution::parallel_unsequenced_policy, I f, I l, T x)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::reduce(THRUST_NS_QUALIFIER::device, f, l, ::std::move(x));
+  return ::thrust::reduce(::thrust::device, f, l, ::std::move(x));
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -154,7 +153,7 @@ inline T reduce(execution::parallel_unsequenced_policy, I f, I l, T x, Op op)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::reduce(THRUST_NS_QUALIFIER::device, f, l, ::std::move(x), ::std::move(op));
+  return ::thrust::reduce(::thrust::device, f, l, ::std::move(x), ::std::move(op));
 }
 
 template <typename I,
@@ -183,7 +182,7 @@ inline O exclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::exclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(x));
+  return ::thrust::exclusive_scan(::thrust::device, fi, li, fo, ::std::move(x));
 }
 
 template <typename I, typename O, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -205,7 +204,7 @@ inline O exclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::exclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(x), ::std::move(op));
+  return ::thrust::exclusive_scan(::thrust::device, fi, li, fo, ::std::move(x), ::std::move(op));
 }
 
 template <typename I,
@@ -236,7 +235,7 @@ inline O inclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::inclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::inclusive_scan(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -257,7 +256,7 @@ inline O inclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::inclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(op));
+  return ::thrust::inclusive_scan(::thrust::device, fi, li, fo, ::std::move(op));
 }
 
 template <typename I,
@@ -295,14 +294,14 @@ inline O inclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
 
   ::hipstd::__maybe_bind_globals();
 
-  auto lo = THRUST_NS_QUALIFIER::inclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo, op);
+  auto lo = ::thrust::inclusive_scan(::thrust::device, fi, li, fo, op);
 
   auto fn   = [op = ::std::move(op), x = ::std::move(x)](auto&& y) { return op(x, y); };
   using fn_t = decltype(fn);
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    return THRUST_NS_QUALIFIER::transform(THRUST_NS_QUALIFIER::device, fo, lo, fo, ::std::move(fn));
+    return ::thrust::transform(::thrust::device, fo, lo, fo, ::std::move(fn));
   }
   else
   {
@@ -310,15 +309,15 @@ inline O inclusive_scan(execution::parallel_unsequenced_policy, I fi, I li, O fo
     O result;
     try
     {
-      result = THRUST_NS_QUALIFIER::transform(
-        THRUST_NS_QUALIFIER::device, fo, lo, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      result = ::thrust::transform(
+        ::thrust::device, fo, lo, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
+    ::thrust::hip_rocprim::throw_on_error(
       ::hipDeviceSynchronize(), "hipstdpar inclusive_scan: failed to synchronize");
     guard.destroy_and_free();
     return result;
@@ -353,7 +352,7 @@ inline T transform_reduce(execution::parallel_unsequenced_policy, I0 f0, I0 l0,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::inner_product(THRUST_NS_QUALIFIER::device, f0, l0, f1, ::std::move(x));
+  return ::thrust::inner_product(::thrust::device, f0, l0, f1, ::std::move(x));
 }
 
 template <typename I0, typename I1, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1>()>* = nullptr>
@@ -377,8 +376,7 @@ inline T transform_reduce(execution::parallel_unsequenced_policy, I0 f0, I0 l0,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::inner_product(
-    THRUST_NS_QUALIFIER::device, f0, l0, f1, ::std::move(x), ::std::move(op0), ::std::move(op1));
+  return ::thrust::inner_product(::thrust::device, f0, l0, f1, ::std::move(x), ::std::move(op0), ::std::move(op1));
 }
 
 template <
@@ -413,8 +411,7 @@ inline T transform_reduce(execution::parallel_unsequenced_policy, I f, I l, T x,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::transform_reduce(
-    THRUST_NS_QUALIFIER::device, f, l, ::std::move(op1), ::std::move(x), ::std::move(op0));
+  return ::thrust::transform_reduce(::thrust::device, f, l, ::std::move(op1), ::std::move(x), ::std::move(op0));
 }
 
 template <
@@ -451,8 +448,8 @@ inline O transform_exclusive_scan(execution::parallel_unsequenced_policy, I fi,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::transform_exclusive_scan(
-    THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(op1), ::std::move(x), ::std::move(op0));
+  return ::thrust::transform_exclusive_scan(
+    ::thrust::device, fi, li, fo, ::std::move(op1), ::std::move(x), ::std::move(op0));
 }
 
 template <
@@ -491,8 +488,7 @@ inline O transform_inclusive_scan(execution::parallel_unsequenced_policy, I fi,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::transform_inclusive_scan(
-    THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(op1), ::std::move(op0));
+  return ::thrust::transform_inclusive_scan(::thrust::device, fi, li, fo, ::std::move(op1), ::std::move(op0));
 }
 
 template <
@@ -533,15 +529,14 @@ inline O transform_inclusive_scan(execution::parallel_unsequenced_policy, I fi,
 
   ::hipstd::__maybe_bind_globals();
 
-  auto lo =
-    THRUST_NS_QUALIFIER::transform_inclusive_scan(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(op1), op0);
+  auto lo = ::thrust::transform_inclusive_scan(::thrust::device, fi, li, fo, ::std::move(op1), op0);
 
   auto fn    = [op0 = ::std::move(op0), x = ::std::move(x)](auto&& y) { return op0(x, y); };
   using fn_t = decltype(fn);
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    return THRUST_NS_QUALIFIER::transform(THRUST_NS_QUALIFIER::device, fo, lo, fo, ::std::move(fn));
+    return ::thrust::transform(::thrust::device, fo, lo, fo, ::std::move(fn));
   }
   else
   {
@@ -549,15 +544,15 @@ inline O transform_inclusive_scan(execution::parallel_unsequenced_policy, I fi,
     O result;
     try
     {
-      result = THRUST_NS_QUALIFIER::transform(
-        THRUST_NS_QUALIFIER::device, fo, lo, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      result = ::thrust::transform(
+        ::thrust::device, fo, lo, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
+    ::thrust::hip_rocprim::throw_on_error(
       ::hipDeviceSynchronize(), "hipstdpar transform_inclusive_scan: failed to synchronize");
     guard.destroy_and_free();
     return result;
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/order_changing.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/order_changing.hpp
index fcc13f04a99c..bee95f794cbf 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/order_changing.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/order_changing.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/reverse.h>
 
@@ -59,7 +58,7 @@ inline void reverse(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::reverse(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::reverse(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -78,7 +77,7 @@ inline void reverse_copy(execution::parallel_unsequenced_policy, I fi, I li, O f
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::reverse_copy(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::reverse_copy(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/partitioning.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/partitioning.hpp
index 125c3ed3fded..a02a96acfcf9 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/partitioning.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/partitioning.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/partition.h>
 
@@ -61,7 +60,7 @@ inline bool is_partitioned(execution::parallel_unsequenced_policy, I f, I l, P p
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::is_partitioned(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::is_partitioned(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -91,7 +90,7 @@ inline I partition(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::partition(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::partition(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -124,7 +123,7 @@ inline pair<O0, O1> partition_copy(execution::parallel_unsequenced_policy, I f,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  auto [r0, r1] = THRUST_NS_QUALIFIER::partition_copy(THRUST_NS_QUALIFIER::device, f, l, fo0, fo1, ::std::move(p));
+  auto [r0, r1] = ::thrust::partition_copy(::thrust::device, f, l, fo0, fo1, ::std::move(p));
 
   return {::std::move(r0), ::std::move(r1)};
 }
@@ -161,7 +160,7 @@ inline I stable_partition(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::stable_partition(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::stable_partition(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/removing.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/removing.hpp
index b966deb25077..499c0be9183c 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/removing.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/removing.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/remove.h>
 #  include <thrust/unique.h>
@@ -60,7 +59,7 @@ inline I remove(execution::parallel_unsequenced_policy, I f, I l, const T& x)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::remove(THRUST_NS_QUALIFIER::device, f, l, x);
+  return ::thrust::remove(::thrust::device, f, l, x);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -81,7 +80,7 @@ inline I remove_if(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::remove_if(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::remove_if(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -109,7 +108,7 @@ inline O remove_copy(execution::parallel_unsequenced_policy, I fi, I li, O fo, c
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::remove_copy(THRUST_NS_QUALIFIER::device, fi, li, fo, x);
+  return ::thrust::remove_copy(::thrust::device, fi, li, fo, x);
 }
 
 template <typename I, typename O, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -132,7 +131,7 @@ inline O remove_copy_if(execution::parallel_unsequenced_policy, I fi, I li, O fo
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::remove_copy_if(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(p));
+  return ::thrust::remove_copy_if(::thrust::device, fi, li, fo, ::std::move(p));
 }
 
 template <typename I,
@@ -162,7 +161,7 @@ inline I unique(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::unique(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::unique(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -181,7 +180,7 @@ inline I unique(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::unique(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::unique(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -209,7 +208,7 @@ inline O unique_copy(execution::parallel_unsequenced_policy, I fi, I li, O fo)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::unique_copy(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::unique_copy(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -230,7 +229,7 @@ inline O unique_copy(execution::parallel_unsequenced_policy, I fi, I li, O fo, R
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::unique_copy(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(r));
+  return ::thrust::unique_copy(::thrust::device, fi, li, fo, ::std::move(r));
 }
 
 template <typename I,
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/search.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/search.hpp
index 4902ad3526a3..f4126141f2e1 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/search.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/search.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@
 #  include <rocprim/rocprim.hpp>
 
 #  include <thrust/count.h>
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/equal.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/find.h>
@@ -362,7 +361,7 @@ inline bool all_of(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::all_of(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::all_of(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -392,7 +391,7 @@ inline bool any_of(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::any_of(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::any_of(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -422,7 +421,7 @@ inline bool none_of(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::none_of(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::none_of(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -450,7 +449,7 @@ inline I find(execution::parallel_unsequenced_policy, I f, I l, const T& x)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find(THRUST_NS_QUALIFIER::device, f, l, x);
+  return ::thrust::find(::thrust::device, f, l, x);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -471,7 +470,7 @@ inline I find_if(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_if(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::find_if(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -501,7 +500,7 @@ inline I find_if_not(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_if_not(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::find_if_not(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -533,7 +532,7 @@ inline ForwardIt1 find_end(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_end(first, last, s_first, s_last, thrust::equal_to<>{});
+  return ::thrust::find_end(first, last, s_first, s_last, thrust::equal_to<>{});
 }
 
 template <class ForwardIt1,
@@ -562,7 +561,7 @@ inline ForwardIt1 find_end(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_end(first, last, s_first, s_last, p);
+  return ::thrust::find_end(first, last, s_first, s_last, p);
 }
 
 template <class ForwardIt1,
@@ -593,7 +592,7 @@ inline ForwardIt1 find_first_of(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_first_of(first, last, s_first, s_last, thrust::equal_to<>{});
+  return ::thrust::find_first_of(first, last, s_first, s_last, thrust::equal_to<>{});
 }
 
 template <class ForwardIt1,
@@ -622,7 +621,7 @@ inline ForwardIt1 find_first_of(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::find_first_of(first, last, s_first, s_last, p);
+  return ::thrust::find_first_of(first, last, s_first, s_last, p);
 }
 
 template <class ForwardIt1,
@@ -649,7 +648,7 @@ inline I adjacent_find(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::adjacent_find(f, l, thrust::equal_to<>{});
+  return ::thrust::adjacent_find(f, l, thrust::equal_to<>{});
 }
 
 template <typename I, typename P, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -668,7 +667,7 @@ inline I adjacent_find(execution::parallel_unsequenced_policy, I f, I l, P p)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::adjacent_find(f, l, p);
+  return ::thrust::adjacent_find(f, l, p);
 }
 
 template <typename I,
@@ -696,7 +695,7 @@ inline typename iterator_traits<I>::difference_type count(execution::parallel_un
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::count(THRUST_NS_QUALIFIER::device, f, l, x);
+  return ::thrust::count(::thrust::device, f, l, x);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -717,7 +716,7 @@ inline typename iterator_traits<I>::difference_type count_if(execution::parallel
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::count_if(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p));
+  return ::thrust::count_if(::thrust::device, f, l, ::std::move(p));
 }
 
 template <typename I,
@@ -746,7 +745,7 @@ inline pair<I0, I1> mismatch(execution::parallel_unsequenced_policy, I0 f0, I0 l
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  auto [m0, m1] = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, l0, f1);
+  auto [m0, m1] = ::thrust::mismatch(::thrust::device, f0, l0, f1);
 
   return {::std::move(m0), ::std::move(m1)};
 }
@@ -769,7 +768,7 @@ inline pair<I0, I1> mismatch(execution::parallel_unsequenced_policy, I0 f0, I0 l
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  auto [m0, m1] = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, l0, f1, ::std::move(p));
+  auto [m0, m1] = ::thrust::mismatch(::thrust::device, f0, l0, f1, ::std::move(p));
 
   return {::std::move(m0), ::std::move(m1)};
 }
@@ -801,7 +800,7 @@ inline pair<I0, I1> mismatch(execution::parallel_unsequenced_policy, I0 f0, I0 l
   ::hipstd::warn_if_no_xnack();
   const auto n = ::std::min(l0 - f0, l1 - f1);
 
-  auto [m0, m1] = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, f0 + n, f1);
+  auto [m0, m1] = ::thrust::mismatch(::thrust::device, f0, f0 + n, f1);
 
   return {::std::move(m0), ::std::move(m1)};
 }
@@ -826,7 +825,7 @@ inline pair<I0, I1> mismatch(execution::parallel_unsequenced_policy, I0 f0, I0 l
   ::hipstd::warn_if_no_xnack();
   const auto n = ::std::min(l0 - f0, l1 - f1);
 
-  auto [m0, m1] = THRUST_NS_QUALIFIER::mismatch(THRUST_NS_QUALIFIER::device, f0, f0 + n, f1, ::std::move(p));
+  auto [m0, m1] = ::thrust::mismatch(::thrust::device, f0, f0 + n, f1, ::std::move(p));
 
   return {::std::move(m0), ::std::move(m1)};
 }
@@ -858,7 +857,7 @@ inline bool equal(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::equal(THRUST_NS_QUALIFIER::device, f0, l0, f1);
+  return ::thrust::equal(::thrust::device, f0, l0, f1);
 }
 
 template <typename I0, typename I1, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1>()>* = nullptr>
@@ -879,7 +878,7 @@ inline bool equal(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1, R
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::equal(THRUST_NS_QUALIFIER::device, f0, l0, f1, ::std::move(r));
+  return ::thrust::equal(::thrust::device, f0, l0, f1, ::std::move(r));
 }
 
 template <typename I0,
@@ -911,7 +910,7 @@ inline bool equal(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1, I
 
   ::hipstd::__maybe_bind_globals();
 
-  return THRUST_NS_QUALIFIER::equal(THRUST_NS_QUALIFIER::device, f0, l0, f1);
+  return ::thrust::equal(::thrust::device, f0, l0, f1);
 }
 
 template <typename I0, typename I1, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1>()>* = nullptr>
@@ -937,7 +936,7 @@ inline bool equal(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1, I
 
   ::hipstd::__maybe_bind_globals();
 
-  return THRUST_NS_QUALIFIER::equal(THRUST_NS_QUALIFIER::device, f0, l0, f1, ::std::move(r));
+  return ::thrust::equal(::thrust::device, f0, l0, f1, ::std::move(r));
 }
 
 template <typename I0,
@@ -970,7 +969,7 @@ search(execution::parallel_unsequenced_policy, ForwardIt1 first, ForwardIt1 last
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::search(first, last, s_first, s_last, thrust::equal_to<>{});
+  return ::thrust::search(first, last, s_first, s_last, thrust::equal_to<>{});
 }
 
 template <class ForwardIt1,
@@ -999,7 +998,7 @@ inline ForwardIt1 search(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::search(first, last, s_first, s_last, p);
+  return ::thrust::search(first, last, s_first, s_last, p);
 }
 
 template <class ForwardIt1,
@@ -1031,7 +1030,7 @@ inline ForwardIt search_n(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::search_n(first, last, count, value, thrust::equal_to<>{});
+  return ::thrust::search_n(first, last, count, value, thrust::equal_to<>{});
 }
 
 template <class ForwardIt, enable_if_t<!::hipstd::is_offloadable_iterator<ForwardIt>()>* = nullptr>
@@ -1060,7 +1059,7 @@ inline ForwardIt search_n(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::search_n(first, last, count, value, p);
+  return ::thrust::search_n(first, last, count, value, p);
 }
 
 template <class ForwardIt,
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/set.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/set.hpp
index cfd6da7305fa..f4f3271dea39 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/set.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/set.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/iterator/discard_iterator.h>
 #  include <thrust/set_operations.h>
@@ -60,9 +59,9 @@ inline bool includes(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::discard_iterator<> cnt{0};
+  ::thrust::discard_iterator<> cnt{0};
 
-  return THRUST_NS_QUALIFIER::set_difference(THRUST_NS_QUALIFIER::device, f1, l1, f0, l0, cnt) == cnt;
+  return ::thrust::set_difference(::thrust::device, f1, l1, f0, l0, cnt) == cnt;
 }
 
 template <typename I0, typename I1, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1>()>* = nullptr>
@@ -83,9 +82,9 @@ inline bool includes(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f1
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::discard_iterator<> cnt{0};
+  ::thrust::discard_iterator<> cnt{0};
 
-  return THRUST_NS_QUALIFIER::set_difference(THRUST_NS_QUALIFIER::device, f1, l1, f0, l0, cnt, ::std::move(r)) == cnt;
+  return ::thrust::set_difference(::thrust::device, f1, l1, f0, l0, cnt, ::std::move(r)) == cnt;
 }
 
 template <typename I0,
@@ -115,7 +114,7 @@ inline O set_union(execution::parallel_unsequenced_policy, I0 fi0, I0 li0, I1 fi
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_union(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo);
+  return ::thrust::set_union(::thrust::device, fi0, li0, fi1, li1, fo);
 }
 
 template <typename I0, typename I1, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1, O>>* = nullptr>
@@ -139,7 +138,7 @@ inline O set_union(execution::parallel_unsequenced_policy, I0 fi0, I0 li0, I1 fi
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_union(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo, ::std::move(r));
+  return ::thrust::set_union(::thrust::device, fi0, li0, fi1, li1, fo, ::std::move(r));
 }
 
 template <
@@ -172,7 +171,7 @@ inline O set_intersection(execution::parallel_unsequenced_policy, I0 fi0, I0 li0
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_intersection(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo);
+  return ::thrust::set_intersection(::thrust::device, fi0, li0, fi1, li1, fo);
 }
 
 template <typename I0, typename I1, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1, O>()>* = nullptr>
@@ -196,7 +195,7 @@ inline O set_intersection(execution::parallel_unsequenced_policy, I0 fi0, I0 li0
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_intersection(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo, ::std::move(r));
+  return ::thrust::set_intersection(::thrust::device, fi0, li0, fi1, li1, fo, ::std::move(r));
 }
 
 template <
@@ -229,7 +228,7 @@ inline O set_difference(execution::parallel_unsequenced_policy, I0 fi0, I0 li0,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_difference(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo);
+  return ::thrust::set_difference(::thrust::device, fi0, li0, fi1, li1, fo);
 }
 
 template <typename I0, typename I1, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1, O>()>* = nullptr>
@@ -253,7 +252,7 @@ inline O set_difference(execution::parallel_unsequenced_policy, I0 fi0, I0 li0,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_difference(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo, ::std::move(r));
+  return ::thrust::set_difference(::thrust::device, fi0, li0, fi1, li1, fo, ::std::move(r));
 }
 
 template <
@@ -286,7 +285,7 @@ inline O set_symmetric_difference(execution::parallel_unsequenced_policy, I0 fi0
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_symmetric_difference(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo);
+  return ::thrust::set_symmetric_difference(::thrust::device, fi0, li0, fi1, li1, fo);
 }
 
 template <typename I0, typename I1, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1, O>()>* = nullptr>
@@ -310,8 +309,7 @@ inline O set_symmetric_difference(execution::parallel_unsequenced_policy, I0 fi0
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::set_symmetric_difference(
-    THRUST_NS_QUALIFIER::device, fi0, li0, fi1, li1, fo, ::std::move(r));
+  return ::thrust::set_symmetric_difference(::thrust::device, fi0, li0, fi1, li1, fo, ::std::move(r));
 }
 
 template <
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/sorting.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/sorting.hpp
index f4b634f41bfe..1af9ff4fc242 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/sorting.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/sorting.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -42,7 +42,6 @@
 
 #  include <rocprim/rocprim.hpp>
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/sort.h>
 
@@ -183,7 +182,7 @@ inline void sort(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::sort(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::sort(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -202,7 +201,7 @@ inline void sort(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::sort(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::sort(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -230,7 +229,7 @@ inline void stable_sort(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::stable_sort(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::stable_sort(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -249,7 +248,7 @@ inline void stable_sort(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::stable_sort(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::stable_sort(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -300,7 +299,7 @@ partial_sort(execution::parallel_unsequenced_policy, KeysIt first, KeysIt middle
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::__partial_sort(THRUST_NS_QUALIFIER::device, first, middle, last, compare_op);
+  ::thrust::__partial_sort(::thrust::device, first, middle, last, compare_op);
 }
 
 template <typename KeysIt, typename CompareOp, enable_if_t<!hipstd::is_offloadable_iterator<KeysIt>()>* = nullptr>
@@ -318,7 +317,7 @@ template <typename KeysIt, enable_if_t<hipstd::is_offloadable_iterator<KeysIt>()
 inline void partial_sort(execution::parallel_unsequenced_policy policy, KeysIt first, KeysIt middle, KeysIt last)
 {
   ::hipstd::warn_if_no_xnack();
-  using item_type = thrust::detail::it_value_t<KeysIt>;
+  using item_type = typename thrust::iterator_value<KeysIt>::type;
   std::partial_sort(policy, first, middle, last, thrust::less<item_type>());
 }
 // END PARTIAL_SORT
@@ -366,7 +365,7 @@ inline void partial_sort_copy(
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::__partial_sort_copy(THRUST_NS_QUALIFIER::device, first, last, d_first, d_last, compare_op);
+  ::thrust::__partial_sort_copy(::thrust::device, first, last, d_first, d_last, compare_op);
 }
 
 template <typename ForwardIt,
@@ -391,7 +390,7 @@ inline void partial_sort_copy(
   execution::parallel_unsequenced_policy policy, ForwardIt first, ForwardIt last, RandomIt d_first, RandomIt d_last)
 {
   ::hipstd::warn_if_no_xnack();
-  using item_type = thrust::detail::it_value_t<ForwardIt>;
+  using item_type = typename thrust::iterator_value<ForwardIt>::type;
   std::partial_sort_copy(policy, first, last, d_first, d_last, thrust::less<item_type>());
 }
 // END PARTIAL_SORT_COPY
@@ -403,7 +402,7 @@ inline bool is_sorted(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::is_sorted(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::is_sorted(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -422,7 +421,7 @@ inline bool is_sorted(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::is_sorted(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::is_sorted(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -450,7 +449,7 @@ inline I is_sorted_until(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::is_sorted_until(THRUST_NS_QUALIFIER::device, f, l);
+  return ::thrust::is_sorted_until(::thrust::device, f, l);
 }
 
 template <typename I, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -469,7 +468,7 @@ inline I is_sorted_until(execution::parallel_unsequenced_policy, I f, I l, R r)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::is_sorted_until(THRUST_NS_QUALIFIER::device, f, l, ::std::move(r));
+  return ::thrust::is_sorted_until(::thrust::device, f, l, ::std::move(r));
 }
 
 template <typename I,
@@ -520,7 +519,7 @@ nth_element(execution::parallel_unsequenced_policy, KeysIt first, KeysIt nth, Ke
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::__nth_element(THRUST_NS_QUALIFIER::device, first, nth, last, compare_op);
+  ::thrust::__nth_element(::thrust::device, first, nth, last, compare_op);
 }
 
 template <typename KeysIt, enable_if_t<!hipstd::is_offloadable_iterator<KeysIt>()>* = nullptr>
@@ -538,7 +537,7 @@ template <typename KeysIt, enable_if_t<hipstd::is_offloadable_iterator<KeysIt>()
 inline void nth_element(execution::parallel_unsequenced_policy policy, KeysIt first, KeysIt nth, KeysIt last)
 {
   ::hipstd::warn_if_no_xnack();
-  using item_type = thrust::detail::it_value_t<KeysIt>;
+  using item_type = typename thrust::iterator_value<KeysIt>::type;
   std::nth_element(policy, first, nth, last, thrust::less<item_type>());
 }
 // END NTH_ELEMENT
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/swap.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/swap.hpp
index edc90b577e80..edf1857eec1f 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/swap.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/swap.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/swap.h>
 
@@ -59,7 +58,7 @@ inline I1 swap_ranges(execution::parallel_unsequenced_policy, I0 f0, I0 l0, I1 f
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::swap_ranges(THRUST_NS_QUALIFIER::device, f0, l0, f1);
+  return ::thrust::swap_ranges(::thrust::device, f0, l0, f1);
 }
 
 template <typename I0, typename I1, enable_if_t<!::hipstd::is_offloadable_iterator<I0, I1>()>* = nullptr>
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/transformation.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/transformation.hpp
index cec3d94763c1..fd68db53ea78 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/transformation.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/transformation.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/replace.h>
 #  include <thrust/transform.h>
@@ -68,7 +67,7 @@ inline O transform(execution::parallel_unsequenced_policy, I fi, I li, O fo, F f
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    return THRUST_NS_QUALIFIER::transform(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(fn));
+    return ::thrust::transform(::thrust::device, fi, li, fo, ::std::move(fn));
   }
   else
   {
@@ -76,16 +75,14 @@ inline O transform(execution::parallel_unsequenced_policy, I fi, I li, O fo, F f
     O result;
     try
     {
-      result = THRUST_NS_QUALIFIER::transform(
-        THRUST_NS_QUALIFIER::device, fi, li, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      result = ::thrust::transform(::thrust::device, fi, li, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar transform: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar transform: failed to synchronize");
     guard.destroy_and_free();
     return result;
   }
@@ -125,7 +122,7 @@ inline O transform(execution::parallel_unsequenced_policy, I0 fi0, I0 li0, I1 fi
 
   if constexpr (::std::is_trivially_destructible_v<fn_t>)
   {
-    return THRUST_NS_QUALIFIER::transform(THRUST_NS_QUALIFIER::device, fi0, li0, fi1, fo, ::std::move(fn));
+    return ::thrust::transform(::thrust::device, fi0, li0, fi1, fo, ::std::move(fn));
   }
   else
   {
@@ -133,16 +130,15 @@ inline O transform(execution::parallel_unsequenced_policy, I0 fi0, I0 li0, I1 fi
     O result;
     try
     {
-      result = THRUST_NS_QUALIFIER::transform(
-        THRUST_NS_QUALIFIER::device, fi0, li0, fi1, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
+      result =
+        ::thrust::transform(::thrust::device, fi0, li0, fi1, fo, ::hipstd::detail::callable_proxy<fn_t>{guard.get()});
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar transform: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar transform: failed to synchronize");
     guard.destroy_and_free();
     return result;
   }
@@ -178,7 +174,7 @@ inline void replace(execution::parallel_unsequenced_policy, I f, I l, const T& x
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::replace(THRUST_NS_QUALIFIER::device, f, l, x, y);
+  return ::thrust::replace(::thrust::device, f, l, x, y);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -204,23 +200,21 @@ inline void replace_if(execution::parallel_unsequenced_policy, I f, I l, P p, co
 
   if constexpr (::std::is_trivially_destructible_v<p_t>)
   {
-    THRUST_NS_QUALIFIER::replace_if(THRUST_NS_QUALIFIER::device, f, l, ::std::move(p), x);
+    ::thrust::replace_if(::thrust::device, f, l, ::std::move(p), x);
   }
   else
   {
     ::hipstd::detail::device_callable_guard<p_t> guard(::std::move(p));
     try
     {
-      THRUST_NS_QUALIFIER::replace_if(
-        THRUST_NS_QUALIFIER::device, f, l, ::hipstd::detail::callable_proxy<p_t>{guard.get()}, x);
+      ::thrust::replace_if(::thrust::device, f, l, ::hipstd::detail::callable_proxy<p_t>{guard.get()}, x);
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
-      ::hipDeviceSynchronize(), "hipstdpar replace_if: failed to synchronize");
+    ::thrust::hip_rocprim::throw_on_error(::hipDeviceSynchronize(), "hipstdpar replace_if: failed to synchronize");
     guard.destroy_and_free();
   }
 }
@@ -251,7 +245,7 @@ inline void replace_copy(execution::parallel_unsequenced_policy, I fi, I li, O f
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::replace_copy(THRUST_NS_QUALIFIER::device, fi, li, fo, x, y);
+  return ::thrust::replace_copy(::thrust::device, fi, li, fo, x, y);
 }
 
 template <typename I, typename O, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -279,22 +273,22 @@ inline void replace_copy_if(execution::parallel_unsequenced_policy, I fi, I li,
 
   if constexpr (::std::is_trivially_destructible_v<p_t>)
   {
-    THRUST_NS_QUALIFIER::replace_copy_if(THRUST_NS_QUALIFIER::device, fi, li, fo, ::std::move(p), x);
+    ::thrust::replace_copy_if(::thrust::device, fi, li, fo, ::std::move(p), x);
   }
   else
   {
     ::hipstd::detail::device_callable_guard<p_t> guard(::std::move(p));
     try
     {
-      THRUST_NS_QUALIFIER::replace_copy_if(
-        THRUST_NS_QUALIFIER::device, fi, li, fo, ::hipstd::detail::callable_proxy<p_t>{guard.get()}, x);
+      ::thrust::replace_copy_if(
+        ::thrust::device, fi, li, fo, ::hipstd::detail::callable_proxy<p_t>{guard.get()}, x);
     }
     catch (...)
     {
       (void) ::hipDeviceSynchronize();
       throw;
     }
-    THRUST_NS_QUALIFIER::hip_rocprim::throw_on_error(
+    ::thrust::hip_rocprim::throw_on_error(
       ::hipDeviceSynchronize(), "hipstdpar replace_copy_if: failed to synchronize");
     guard.destroy_and_free();
   }
diff --git a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/uninitialized.hpp b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/uninitialized.hpp
index 29ee94b447a9..37abf245cde9 100644
--- a/projects/rocthrust/thrust/system/hip/hipstdpar/impl/uninitialized.hpp
+++ b/projects/rocthrust/thrust/system/hip/hipstdpar/impl/uninitialized.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,6 @@
 
 #if defined(__HIPSTDPAR__)
 
-#  include <thrust/detail/config/namespace.h>
 #  include <thrust/execution_policy.h>
 #  include <thrust/for_each.h>
 #  include <thrust/uninitialized_copy.h>
@@ -61,7 +60,7 @@ inline O uninitialized_copy(execution::parallel_unsequenced_policy, I fi, I li,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_copy(THRUST_NS_QUALIFIER::device, fi, li, fo);
+  return ::thrust::uninitialized_copy(::thrust::device, fi, li, fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -81,7 +80,7 @@ inline O uninitialized_copy_n(execution::parallel_unsequenced_policy, I fi, N n,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_copy_n(THRUST_NS_QUALIFIER::device, fi, n, fo);
+  return ::thrust::uninitialized_copy_n(::thrust::device, fi, n, fo);
 }
 
 template <typename I, typename N, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -101,7 +100,7 @@ inline void uninitialized_fill(execution::parallel_unsequenced_policy, I f, I l,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_fill(THRUST_NS_QUALIFIER::device, f, l, x);
+  return ::thrust::uninitialized_fill(::thrust::device, f, l, x);
 }
 
 template <typename I, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -120,7 +119,7 @@ inline void uninitialized_fill(execution::parallel_unsequenced_policy, I f, N n,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_fill_n(THRUST_NS_QUALIFIER::device, f, n, x);
+  return ::thrust::uninitialized_fill_n(::thrust::device, f, n, x);
 }
 
 template <typename I, typename N, typename T, enable_if_t<!::hipstd::is_offloadable_iterator<I>()>* = nullptr>
@@ -139,8 +138,7 @@ inline O uninitialized_move(execution::parallel_unsequenced_policy, I fi, I li,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_copy(
-    THRUST_NS_QUALIFIER::device, make_move_iterator(fi), make_move_iterator(li), fo);
+  return ::thrust::uninitialized_copy(::thrust::device, make_move_iterator(fi), make_move_iterator(li), fo);
 }
 
 template <typename I, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -160,7 +158,7 @@ inline O uninitialized_move_n(execution::parallel_unsequenced_policy, I fi, N n,
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  return THRUST_NS_QUALIFIER::uninitialized_copy_n(THRUST_NS_QUALIFIER::device, make_move_iterator(fi), n, fo);
+  return ::thrust::uninitialized_copy_n(::thrust::device, make_move_iterator(fi), n, fo);
 }
 
 template <typename I, typename N, typename O, enable_if_t<!::hipstd::is_offloadable_iterator<I, O>()>* = nullptr>
@@ -180,7 +178,7 @@ inline void uninitialized_default_construct(execution::parallel_unsequenced_poli
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each(THRUST_NS_QUALIFIER::device, f, l, [](auto& x) {
+  ::thrust::for_each(::thrust::device, f, l, [](auto& x) {
     auto p = const_cast<void*>(static_cast<const volatile void*>((addressof(x))));
     ::new (p) typename iterator_traits<I>::value_type;
   });
@@ -202,7 +200,7 @@ inline void uninitialized_default_construct_n(execution::parallel_unsequenced_po
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each_n(THRUST_NS_QUALIFIER::device, f, n, [](auto& x) {
+  ::thrust::for_each_n(::thrust::device, f, n, [](auto& x) {
     auto p = const_cast<void*>(static_cast<const volatile void*>((addressof(x))));
     ::new (p) typename iterator_traits<I>::value_type;
   });
@@ -224,7 +222,7 @@ inline void uninitialized_value_construct(execution::parallel_unsequenced_policy
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each(THRUST_NS_QUALIFIER::device, f, l, [](auto& x) {
+  ::thrust::for_each(::thrust::device, f, l, [](auto& x) {
     auto p = const_cast<void*>(static_cast<const volatile void*>((addressof(x))));
     ::new (p) typename iterator_traits<I>::value_type{};
   });
@@ -246,7 +244,7 @@ inline void uninitialized_value_construct_n(execution::parallel_unsequenced_poli
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each_n(THRUST_NS_QUALIFIER::device, f, n, [](auto& x) {
+  ::thrust::for_each_n(::thrust::device, f, n, [](auto& x) {
     auto p = const_cast<void*>(static_cast<const volatile void*>((addressof(x))));
     ::new (p) typename iterator_traits<I>::value_type{};
   });
@@ -268,7 +266,7 @@ inline void destroy(execution::parallel_unsequenced_policy, I f, I l)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each(f, l, [](auto& x) {
+  ::thrust::for_each(f, l, [](auto& x) {
     destroy_at(addressof(x));
   });
 }
@@ -289,7 +287,7 @@ inline void destroy_n(execution::parallel_unsequenced_policy, I f, N n)
   ::hipstd::__maybe_bind_globals();
 
   ::hipstd::warn_if_no_xnack();
-  THRUST_NS_QUALIFIER::for_each_n(f, n, [](auto& x) {
+  ::thrust::for_each_n(f, n, [](auto& x) {
     destroy_at(addressof(x));
   });
 }
diff --git a/projects/rocthrust/thrust/system/hip/memory_resource.h b/projects/rocthrust/thrust/system/hip/memory_resource.h
index 41d9cbed5cf1..9b4a251f4939 100644
--- a/projects/rocthrust/thrust/system/hip/memory_resource.h
+++ b/projects/rocthrust/thrust/system/hip/memory_resource.h
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2018-2020 NVIDIA Corporation
- *  Modifications Copyright© 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+ *  Modifications Copyright© 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,25 +15,18 @@
  *  limitations under the License.
  */
 
-/*! \file hip/memory_resource.h
- *  \brief Memory resources for the HIP system.
+/*! \file thrust/system/hip/memory_resource.h
+ *  \brief Managing memory associated with Thrust's hip system.
  */
 
 #pragma once
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/mr/host_memory_resource.h>
 #include <thrust/mr/memory_resource.h>
 #include <thrust/system/detail/bad_alloc.h>
+#include <thrust/system/hip/detail/guarded_hip_runtime_api.h>
 #include <thrust/system/hip/detail/util.h>
 #include <thrust/system/hip/error.h>
 #include <thrust/system/hip/pointer.h>
@@ -44,7 +37,6 @@ namespace system
 {
 namespace hip
 {
-
 //! \cond
 namespace detail
 {
@@ -65,7 +57,9 @@ class hip_memory_resource final : public mr::memory_resource<Pointer>
 
     if (status != hipSuccess)
     {
-      (void) hipGetLastError(); // Clear the HIP global error state.
+      // Clear the HIP global error state.
+      hipError_t clear_error_status = hipGetLastError();
+      THRUST_UNUSED_VAR(clear_error_status);
       throw thrust::system::detail::bad_alloc(thrust::hip_category().message(status).c_str());
     }
 
@@ -129,5 +123,4 @@ using thrust::system::hip::memory_resource;
 using thrust::system::hip::universal_host_pinned_memory_resource;
 using thrust::system::hip::universal_memory_resource;
 } // namespace hip
-
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/adjacent_difference.h b/projects/rocthrust/thrust/system/omp/detail/adjacent_difference.h
index b05fb7b579e2..7881d0e1a560 100644
--- a/projects/rocthrust/thrust/system/omp/detail/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/omp/detail/adjacent_difference.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/adjacent_difference.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/assign_value.h b/projects/rocthrust/thrust/system/omp/detail/assign_value.h
index 7b95165e7480..c3f6a6f00513 100644
--- a/projects/rocthrust/thrust/system/omp/detail/assign_value.h
+++ b/projects/rocthrust/thrust/system/omp/detail/assign_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits assign_value
 #include <thrust/system/cpp/detail/assign_value.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/binary_search.h b/projects/rocthrust/thrust/system/omp/detail/binary_search.h
index c4a6a98afaa8..11cf990679dc 100644
--- a/projects/rocthrust/thrust/system/omp/detail/binary_search.h
+++ b/projects/rocthrust/thrust/system/omp/detail/binary_search.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/binary_search.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/copy.h b/projects/rocthrust/thrust/system/omp/detail/copy.h
index c08eccb9bc53..71a1a8453940 100644
--- a/projects/rocthrust/thrust/system/omp/detail/copy.h
+++ b/projects/rocthrust/thrust/system/omp/detail/copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/copy.inl b/projects/rocthrust/thrust/system/omp/detail/copy.inl
index 2f904a73d8ec..2de1361ce1ad 100644
--- a/projects/rocthrust/thrust/system/omp/detail/copy.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/copy.inl
@@ -17,58 +17,119 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/type_traits/minimum_type.h>
+#include <thrust/system/omp/detail/copy.h>
 #include <thrust/system/detail/generic/copy.h>
 #include <thrust/system/detail/sequential/copy.h>
-#include <thrust/system/omp/detail/copy.h>
+#include <thrust/detail/type_traits/minimum_type.h>
 
-#include <cuda/std/type_traits>
 
 THRUST_NAMESPACE_BEGIN
-namespace system::omp::detail
+namespace system
+{
+namespace omp
+{
+namespace detail
+{
+namespace dispatch
 {
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-OutputIterator
-copy(execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result)
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+  OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::incrementable_traversal_tag)
+{
+  return thrust::system::detail::sequential::copy(exec, first, last, result);
+} // end copy()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+  OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::random_access_traversal_tag)
+{
+  return thrust::system::detail::generic::copy(exec, first, last, result);
+} // end copy()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+  OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::incrementable_traversal_tag)
 {
-  using traversal1 = typename iterator_traversal<InputIterator>::type;
-  using traversal2 = typename iterator_traversal<OutputIterator>::type;
+  return thrust::system::detail::sequential::copy_n(exec, first, n, result);
+} // end copy_n()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+  OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::random_access_traversal_tag)
+{
+  return thrust::system::detail::generic::copy_n(exec, first, n, result);
+} // end copy_n()
+
+
+} // end dispatch
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                    InputIterator first,
+                    InputIterator last,
+                    OutputIterator result)
+{
+  using traversal1 = typename thrust::iterator_traversal<InputIterator>::type;
+  using traversal2 = typename thrust::iterator_traversal<OutputIterator>::type;
 
   using traversal = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
 
-  if constexpr (::cuda::std::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    return system::detail::generic::copy(exec, first, last, result);
-  }
-  else
-  {
-    return system::detail::sequential::copy(exec, first, last, result);
-  }
-}
-
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename OutputIterator>
-OutputIterator copy_n(execution_policy<DerivedPolicy>& exec, InputIterator first, Size n, OutputIterator result)
+  // dispatch on minimum traversal
+  return thrust::system::omp::detail::dispatch::copy(exec, first, last, result, traversal());
+} // end copy()
+
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      Size n,
+                      OutputIterator result)
 {
-  using traversal1 = typename iterator_traversal<InputIterator>::type;
-  using traversal2 = typename iterator_traversal<OutputIterator>::type;
-  using traversal  = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
-  if constexpr (::cuda::std::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    return system::detail::generic::copy_n(exec, first, n, result);
-  }
-  else
-  {
-    return system::detail::sequential::copy_n(exec, first, n, result);
-  }
-}
-} // namespace system::omp::detail
+  using traversal1 = typename thrust::iterator_traversal<InputIterator>::type;
+  using traversal2 = typename thrust::iterator_traversal<OutputIterator>::type;
+
+  using traversal = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
+
+  // dispatch on minimum traversal
+  return thrust::system::omp::detail::dispatch::copy_n(exec, first, n, result, traversal());
+} // end copy_n()
+
+
+} // end namespace detail
+} // end namespace omp
+} // end namespace system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/copy_if.h b/projects/rocthrust/thrust/system/omp/detail/copy_if.h
index e3cb1edce875..88d4387bb21f 100644
--- a/projects/rocthrust/thrust/system/omp/detail/copy_if.h
+++ b/projects/rocthrust/thrust/system/omp/detail/copy_if.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/copy_if.inl b/projects/rocthrust/thrust/system/omp/detail/copy_if.inl
index 3fc0c5116458..a677ee8dcef6 100644
--- a/projects/rocthrust/thrust/system/omp/detail/copy_if.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/copy_if.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/generic/copy_if.h>
 #include <thrust/system/omp/detail/copy_if.h>
+#include <thrust/system/detail/generic/copy_if.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -36,24 +28,25 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-OutputIterator copy_if(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator copy_if(execution_policy<DerivedPolicy> &exec,
+                         InputIterator1 first,
+                         InputIterator1 last,
+                         InputIterator2 stencil,
+                         OutputIterator result,
+                         Predicate pred)
 {
   // omp prefers generic::copy_if to cpp::copy_if
   return thrust::system::detail::generic::copy_if(exec, first, last, stencil, result, pred);
 } // end copy_if()
 
-} // namespace detail
-} // namespace omp
-} // namespace system
+
+} // end detail
+} // end omp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/count.h b/projects/rocthrust/thrust/system/omp/detail/count.h
index 2258d8a4a339..5062415e2ef4 100644
--- a/projects/rocthrust/thrust/system/omp/detail/count.h
+++ b/projects/rocthrust/thrust/system/omp/detail/count.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits count
 #include <thrust/system/cpp/detail/count.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/default_decomposition.h b/projects/rocthrust/thrust/system/omp/detail/default_decomposition.h
index 10a5f38560bd..99082296c5f9 100644
--- a/projects/rocthrust/thrust/system/omp/detail/default_decomposition.h
+++ b/projects/rocthrust/thrust/system/omp/detail/default_decomposition.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/internal/decompose.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/default_decomposition.inl b/projects/rocthrust/thrust/system/omp/detail/default_decomposition.inl
index ea1302b0adfb..b57661f42faf 100644
--- a/projects/rocthrust/thrust/system/omp/detail/default_decomposition.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/default_decomposition.inl
@@ -17,19 +17,11 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/default_decomposition.h>
 
 // don't attempt to #include this file without omp support
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
-#  include <omp.h>
+#include <omp.h>
 #endif // omp support
 
 THRUST_NAMESPACE_BEGIN
@@ -48,9 +40,12 @@ thrust::system::detail::internal::uniform_decomposition<IndexType> default_decom
   // X Note to the user: If you've found this line due to a compiler error, X
   // X you need to OpenMP support in your compiler.                         X
   // ========================================================================
-  static_assert(
-    thrust::detail::depend_on_instantiation<IndexType, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)>::value,
-    "OpenMP compiler support is not enabled");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<
+      IndexType, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
+    >::value)
+  , "OpenMP compiler support is not enabled"
+  );
 
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
   return thrust::system::detail::internal::uniform_decomposition<IndexType>(n, 1, omp_get_num_procs());
diff --git a/projects/rocthrust/thrust/system/omp/detail/equal.h b/projects/rocthrust/thrust/system/omp/detail/equal.h
index e2eee998de4f..c32d12a19ed5 100644
--- a/projects/rocthrust/thrust/system/omp/detail/equal.h
+++ b/projects/rocthrust/thrust/system/omp/detail/equal.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits equal
 #include <thrust/system/cpp/detail/equal.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/execution_policy.h b/projects/rocthrust/thrust/system/omp/detail/execution_policy.h
index 528c83470d1b..319f56234dbd 100644
--- a/projects/rocthrust/thrust/system/omp/detail/execution_policy.h
+++ b/projects/rocthrust/thrust/system/omp/detail/execution_policy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/extrema.h b/projects/rocthrust/thrust/system/omp/detail/extrema.h
index e50f14d0ff9a..6e8a710287d9 100644
--- a/projects/rocthrust/thrust/system/omp/detail/extrema.h
+++ b/projects/rocthrust/thrust/system/omp/detail/extrema.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/extrema.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/fill.h b/projects/rocthrust/thrust/system/omp/detail/fill.h
index d8cfca51b1df..e819e82d0ce4 100644
--- a/projects/rocthrust/thrust/system/omp/detail/fill.h
+++ b/projects/rocthrust/thrust/system/omp/detail/fill.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits fill
 #include <thrust/system/cpp/detail/fill.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/find.h b/projects/rocthrust/thrust/system/omp/detail/find.h
index 3d59962d6f66..eabb036a6125 100644
--- a/projects/rocthrust/thrust/system/omp/detail/find.h
+++ b/projects/rocthrust/thrust/system/omp/detail/find.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/find.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/for_each.h b/projects/rocthrust/thrust/system/omp/detail/for_each.h
index 40e9f7752abe..a733c63fca86 100644
--- a/projects/rocthrust/thrust/system/omp/detail/for_each.h
+++ b/projects/rocthrust/thrust/system/omp/detail/for_each.h
@@ -23,13 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/for_each.inl b/projects/rocthrust/thrust/system/omp/detail/for_each.inl
index 2e1f9a010766..f3eb5f77013c 100644
--- a/projects/rocthrust/thrust/system/omp/detail/for_each.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/for_each.inl
@@ -17,14 +17,6 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/detail/static_assert.h>
 #include <thrust/distance.h>
@@ -40,32 +32,40 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename Size, typename UnaryFunction>
-RandomAccessIterator for_each_n(execution_policy<DerivedPolicy>&, RandomAccessIterator first, Size n, UnaryFunction f)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename Size,
+         typename UnaryFunction>
+RandomAccessIterator for_each_n(execution_policy<DerivedPolicy> &,
+                                RandomAccessIterator first,
+                                Size n,
+                                UnaryFunction f)
 {
   // we're attempting to launch an omp kernel, assert we're compiling with omp support
   // ========================================================================
   // X Note to the user: If you've found this line due to a compiler error, X
   // X you need to enable OpenMP support in your compiler.                  X
   // ========================================================================
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator,
-                                                        (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)>::value,
-                "OpenMP compiler support is not enabled");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<
+      RandomAccessIterator, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
+    >::value)
+  , "OpenMP compiler support is not enabled"
+  );
 
-  if (n <= 0)
-  {
-    return first; // empty range
-  }
+  if (n <= 0) return first;  //empty range
 
   // create a wrapped function for f
-  thrust::detail::wrapped_function<UnaryFunction, void> wrapped_f{f};
+  thrust::detail::wrapped_function<UnaryFunction,void> wrapped_f{f};
 
   // use a signed type for the iteration variable or suffer the consequences of warnings
-  using DifferenceType    = thrust::detail::it_difference_t<RandomAccessIterator>;
+  using DifferenceType    = typename thrust::iterator_difference<RandomAccessIterator>::type;
   DifferenceType signed_n = n;
 
   THRUST_PRAGMA_OMP(parallel for)
-  for (DifferenceType i = 0; i < signed_n; ++i)
+  for(DifferenceType i = 0;
+      i < signed_n;
+      ++i)
   {
     RandomAccessIterator temp = first + i;
     wrapped_f(*temp);
@@ -74,11 +74,15 @@ RandomAccessIterator for_each_n(execution_policy<DerivedPolicy>&, RandomAccessIt
   return first + n;
 } // end for_each_n()
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename UnaryFunction>
-RandomAccessIterator
-for_each(execution_policy<DerivedPolicy>& s, RandomAccessIterator first, RandomAccessIterator last, UnaryFunction f)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename UnaryFunction>
+  RandomAccessIterator for_each(execution_policy<DerivedPolicy> &s,
+                                RandomAccessIterator first,
+                                RandomAccessIterator last,
+                                UnaryFunction f)
 {
-  return omp::detail::for_each_n(s, first, thrust::distance(first, last), f);
+  return omp::detail::for_each_n(s, first, thrust::distance(first,last), f);
 } // end for_each()
 
 } // end namespace detail
diff --git a/projects/rocthrust/thrust/system/omp/detail/gather.h b/projects/rocthrust/thrust/system/omp/detail/gather.h
index 13d2569f31e1..c2712dd1abc7 100644
--- a/projects/rocthrust/thrust/system/omp/detail/gather.h
+++ b/projects/rocthrust/thrust/system/omp/detail/gather.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits gather
 #include <thrust/system/cpp/detail/gather.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/generate.h b/projects/rocthrust/thrust/system/omp/detail/generate.h
index 3132859d07ff..73b8c9e6c91f 100644
--- a/projects/rocthrust/thrust/system/omp/detail/generate.h
+++ b/projects/rocthrust/thrust/system/omp/detail/generate.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits generate
 #include <thrust/system/cpp/detail/generate.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/get_value.h b/projects/rocthrust/thrust/system/omp/detail/get_value.h
index 6a2607e57c93..6357dd6bfaf9 100644
--- a/projects/rocthrust/thrust/system/omp/detail/get_value.h
+++ b/projects/rocthrust/thrust/system/omp/detail/get_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits get_value
 #include <thrust/system/cpp/detail/get_value.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/inner_product.h b/projects/rocthrust/thrust/system/omp/detail/inner_product.h
index 8abc2f44ef61..5602e8da4252 100644
--- a/projects/rocthrust/thrust/system/omp/detail/inner_product.h
+++ b/projects/rocthrust/thrust/system/omp/detail/inner_product.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits inner_product
 #include <thrust/system/cpp/detail/inner_product.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/iter_swap.h b/projects/rocthrust/thrust/system/omp/detail/iter_swap.h
index f0e6a6ef242d..22e68eb221f4 100644
--- a/projects/rocthrust/thrust/system/omp/detail/iter_swap.h
+++ b/projects/rocthrust/thrust/system/omp/detail/iter_swap.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits iter_swap
 #include <thrust/system/cpp/detail/iter_swap.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/logical.h b/projects/rocthrust/thrust/system/omp/detail/logical.h
index 4b1168fc8e09..f61ea9fafef9 100644
--- a/projects/rocthrust/thrust/system/omp/detail/logical.h
+++ b/projects/rocthrust/thrust/system/omp/detail/logical.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits logical
 #include <thrust/system/cpp/detail/logical.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/malloc_and_free.h b/projects/rocthrust/thrust/system/omp/detail/malloc_and_free.h
index a4b98b61ebd9..58bbdbacdf76 100644
--- a/projects/rocthrust/thrust/system/omp/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/omp/detail/malloc_and_free.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits malloc and free
 #include <thrust/system/cpp/detail/malloc_and_free.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/memory.inl b/projects/rocthrust/thrust/system/omp/detail/memory.inl
index 0057db7a02fb..dfb736c69a15 100644
--- a/projects/rocthrust/thrust/system/omp/detail/memory.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/memory.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/cpp/detail/execution_policy.h>
-#include <thrust/system/cpp/memory.h>
 #include <thrust/system/omp/memory.h>
+#include <thrust/system/cpp/memory.h>
 
 #include <limits>
 
@@ -43,8 +35,8 @@ namespace detail
 //     is not defined
 //     WAR the problem by using adl to call cpp::malloc, which requires it to depend
 //     on a template parameter
-template <typename Tag>
-pointer<void> malloc_workaround(Tag t, std::size_t n)
+template<typename Tag>
+  pointer<void> malloc_workaround(Tag t, std::size_t n)
 {
   return pointer<void>(malloc(t, n));
 } // end malloc_workaround()
@@ -53,13 +45,13 @@ pointer<void> malloc_workaround(Tag t, std::size_t n)
 //     is not defined
 //     WAR the problem by using adl to call cpp::free, which requires it to depend
 //     on a template parameter
-template <typename Tag>
-void free_workaround(Tag t, pointer<void> ptr)
+template<typename Tag>
+  void free_workaround(Tag t, pointer<void> ptr)
 {
   free(t, ptr.get());
 } // end free_workaround()
 
-} // namespace detail
+} // end detail
 
 inline pointer<void> malloc(std::size_t n)
 {
@@ -71,7 +63,7 @@ inline pointer<void> malloc(std::size_t n)
   return detail::malloc_workaround(cpp::tag(), n);
 } // end malloc()
 
-template <typename T>
+template<typename T>
 pointer<T> malloc(std::size_t n)
 {
   pointer<void> raw_ptr = thrust::system::omp::malloc(sizeof(T) * n);
@@ -88,6 +80,6 @@ inline void free(pointer<void> ptr)
   detail::free_workaround(cpp::tag(), ptr);
 } // end free()
 
-} // namespace omp
-} // namespace system
+} // end omp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/merge.h b/projects/rocthrust/thrust/system/omp/detail/merge.h
index c29c9ef85967..0a10dd5e233d 100644
--- a/projects/rocthrust/thrust/system/omp/detail/merge.h
+++ b/projects/rocthrust/thrust/system/omp/detail/merge.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits merge
 #include <thrust/system/cpp/detail/merge.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/mismatch.h b/projects/rocthrust/thrust/system/omp/detail/mismatch.h
index c6e447e8657f..13168ce33721 100644
--- a/projects/rocthrust/thrust/system/omp/detail/mismatch.h
+++ b/projects/rocthrust/thrust/system/omp/detail/mismatch.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits mismatch
 #include <thrust/system/cpp/detail/mismatch.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/par.h b/projects/rocthrust/thrust/system/omp/detail/par.h
index 32807a146186..437e1bf7619e 100644
--- a/projects/rocthrust/thrust/system/omp/detail/par.h
+++ b/projects/rocthrust/thrust/system/omp/detail/par.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/partition.h b/projects/rocthrust/thrust/system/omp/detail/partition.h
index d35b2e46cd95..bc68c92a98ee 100644
--- a/projects/rocthrust/thrust/system/omp/detail/partition.h
+++ b/projects/rocthrust/thrust/system/omp/detail/partition.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/partition.inl b/projects/rocthrust/thrust/system/omp/detail/partition.inl
index 32a141d8ff75..873a1ca7783f 100644
--- a/projects/rocthrust/thrust/system/omp/detail/partition.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/partition.inl
@@ -14,6 +14,7 @@
  *  limitations under the License.
  */
 
+
 /*! \file reduce.h
  *  \brief OpenMP implementation of reduce algorithms.
  */
@@ -21,16 +22,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/generic/partition.h>
 #include <thrust/system/omp/detail/partition.h>
+#include <thrust/system/detail/generic/partition.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -40,62 +33,73 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-ForwardIterator
-stable_partition(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   Predicate pred)
 {
   // omp prefers generic::stable_partition to cpp::stable_partition
   return thrust::system::detail::generic::stable_partition(exec, first, last, pred);
 } // end stable_partition()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator stable_partition(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   InputIterator stencil,
+                                   Predicate pred)
 {
   // omp prefers generic::stable_partition to cpp::stable_partition
   return thrust::system::detail::generic::stable_partition(exec, first, last, stencil, pred);
 } // end stable_partition()
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(execution_policy<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   // omp prefers generic::stable_partition_copy to cpp::stable_partition_copy
   return thrust::system::detail::generic::stable_partition_copy(exec, first, last, out_true, out_false, pred);
 } // end stable_partition_copy()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(execution_policy<DerivedPolicy> &exec,
+                          InputIterator1 first,
+                          InputIterator1 last,
+                          InputIterator2 stencil,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   // omp prefers generic::stable_partition_copy to cpp::stable_partition_copy
   return thrust::system::detail::generic::stable_partition_copy(exec, first, last, stencil, out_true, out_false, pred);
 } // end stable_partition_copy()
 
+
 } // end namespace detail
 } // end namespace omp
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/omp/detail/per_device_resource.h b/projects/rocthrust/thrust/system/omp/detail/per_device_resource.h
index f02fcfcdc3ff..8c4a903cd16b 100644
--- a/projects/rocthrust/thrust/system/omp/detail/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/omp/detail/per_device_resource.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special per device resource functions
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce.h b/projects/rocthrust/thrust/system/omp/detail/reduce.h
index 1f310f7dd75f..49b415473f07 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce.h
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce.inl b/projects/rocthrust/thrust/system/omp/detail/reduce.inl
index a899e58b1bb5..c81944461807 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce.inl
@@ -18,18 +18,11 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/temporary_array.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/system/omp/detail/default_decomposition.h>
 #include <thrust/system/omp/detail/reduce.h>
+#include <thrust/system/omp/detail/default_decomposition.h>
 #include <thrust/system/omp/detail/reduce_intervals.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -40,25 +33,28 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputType, typename BinaryFunction>
-OutputType reduce(execution_policy<DerivedPolicy>& exec,
-                  InputIterator first,
-                  InputIterator last,
-                  OutputType init,
-                  BinaryFunction binary_op)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputType,
+         typename BinaryFunction>
+  OutputType reduce(execution_policy<DerivedPolicy> &exec,
+                    InputIterator first,
+                    InputIterator last,
+                    OutputType init,
+                    BinaryFunction binary_op)
 {
-  using difference_type = thrust::detail::it_difference_t<InputIterator>;
+  using difference_type = typename thrust::iterator_difference<InputIterator>::type;
 
-  const difference_type n = thrust::distance(first, last);
+  const difference_type n = thrust::distance(first,last);
 
   // determine first and second level decomposition
-  thrust::system::detail::internal::uniform_decomposition<difference_type> decomp1 =
-    thrust::system::omp::detail::default_decomposition(n);
+  thrust::system::detail::internal::uniform_decomposition<difference_type> decomp1 = thrust::system::omp::detail::default_decomposition(n);
   thrust::system::detail::internal::uniform_decomposition<difference_type> decomp2(decomp1.size() + 1, 1, 1);
 
   // allocate storage for the initializer and partial sums
   // XXX use select_system for Tag
-  thrust::detail::temporary_array<OutputType, DerivedPolicy> partial_sums(exec, decomp1.size() + 1);
+  thrust::detail::temporary_array<OutputType,DerivedPolicy> partial_sums(exec, decomp1.size() + 1);
 
   // set first element of temp array to init
   partial_sums[0] = init;
@@ -72,7 +68,8 @@ OutputType reduce(execution_policy<DerivedPolicy>& exec,
   return partial_sums[0];
 } // end reduce()
 
-} // namespace detail
-} // namespace omp
-} // namespace system
+
+} // end detail
+} // end omp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.h b/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.h
index 0345db2b0fa5..c57c74c2d08b 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.inl b/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.inl
index ed19899972d5..a2656e50c42f 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce_by_key.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/distance.h>
-#include <thrust/system/detail/generic/reduce_by_key.h>
 #include <thrust/system/omp/detail/reduce_by_key.h>
+#include <thrust/system/detail/generic/reduce_by_key.h>
+#include <thrust/distance.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -44,22 +36,22 @@ template <typename DerivedPolicy,
           typename OutputIterator2,
           typename BinaryPredicate,
           typename BinaryFunction>
-thrust::pair<OutputIterator1, OutputIterator2> reduce_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred,
-  BinaryFunction binary_op)
+  thrust::pair<OutputIterator1,OutputIterator2>
+    reduce_by_key(execution_policy<DerivedPolicy> &exec,
+                  InputIterator1 keys_first,
+                  InputIterator1 keys_last,
+                  InputIterator2 values_first,
+                  OutputIterator1 keys_output,
+                  OutputIterator2 values_output,
+                  BinaryPredicate binary_pred,
+                  BinaryFunction binary_op)
 {
   // omp prefers generic::reduce_by_key to cpp::reduce_by_key
-  return thrust::system::detail::generic::reduce_by_key(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
+  return thrust::system::detail::generic::reduce_by_key(exec, keys_first, keys_last, values_first, keys_output, values_output, binary_pred, binary_op);
 } // end reduce_by_key()
 
-} // namespace detail
-} // namespace omp
-} // namespace system
+
+} // end detail
+} // end omp
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.h b/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.h
index edcbdb563899..ed31127ec2a9 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.h
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.inl b/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.inl
index b1c13ab9c760..3a96cdcc33ab 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/reduce_intervals.inl
@@ -18,18 +18,13 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
 #include <thrust/detail/static_assert.h> // for depend_on_instantiation
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/omp/detail/pragma_omp.h>
 #include <thrust/system/omp/detail/reduce_intervals.h>
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/detail/function.h>
 
 #include <cstdint>
 
@@ -46,34 +41,36 @@ template <typename DerivedPolicy,
           typename OutputIterator,
           typename BinaryFunction,
           typename Decomposition>
-void reduce_intervals(
-  execution_policy<DerivedPolicy>&,
-  InputIterator input,
-  OutputIterator output,
-  BinaryFunction binary_op,
-  Decomposition decomp)
+void reduce_intervals(execution_policy<DerivedPolicy> &,
+                      InputIterator input,
+                      OutputIterator output,
+                      BinaryFunction binary_op,
+                      Decomposition decomp)
 {
   // we're attempting to launch an omp kernel, assert we're compiling with omp support
   // ========================================================================
   // X Note to the user: If you've found this line due to a compiler error, X
   // X you need to enable OpenMP support in your compiler.                  X
   // ========================================================================
-  static_assert(
-    thrust::detail::depend_on_instantiation<InputIterator, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)>::value,
-    "OpenMP compiler support is not enabled");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<
+      InputIterator, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
+    >::value)
+  , "OpenMP compiler support is not enabled"
+  );
 
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
-  using OutputType = thrust::detail::it_value_t<OutputIterator>;
+  using OutputType = typename thrust::iterator_value<OutputIterator>::type;
 
   // wrap binary_op
-  thrust::detail::wrapped_function<BinaryFunction, OutputType> wrapped_binary_op{binary_op};
+  thrust::detail::wrapped_function<BinaryFunction,OutputType> wrapped_binary_op{binary_op};
 
   using index_type = std::intptr_t;
 
   index_type n = static_cast<index_type>(decomp.size());
 
   THRUST_PRAGMA_OMP(parallel for)
-  for (index_type i = 0; i < n; i++)
+  for(index_type i = 0; i < n; i++)
   {
     InputIterator begin = input + decomp[i].begin();
     InputIterator end   = input + decomp[i].end();
@@ -91,7 +88,7 @@ void reduce_intervals(
       }
 
       OutputIterator tmp = output + i;
-      *tmp               = sum;
+      *tmp = sum;
     }
   }
 #endif // THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE
diff --git a/projects/rocthrust/thrust/system/omp/detail/remove.h b/projects/rocthrust/thrust/system/omp/detail/remove.h
index e4d698e9a42e..70f0ddad4d27 100644
--- a/projects/rocthrust/thrust/system/omp/detail/remove.h
+++ b/projects/rocthrust/thrust/system/omp/detail/remove.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/remove.inl b/projects/rocthrust/thrust/system/omp/detail/remove.inl
index 7c2e505aeff9..4c301290f228 100644
--- a/projects/rocthrust/thrust/system/omp/detail/remove.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/remove.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/generic/remove.h>
 #include <thrust/system/omp/detail/remove.h>
+#include <thrust/system/detail/generic/remove.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -36,46 +28,59 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-ForwardIterator
-remove_if(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator remove_if(execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   // omp prefers generic::remove_if to cpp::remove_if
   return thrust::system::detail::generic::remove_if(exec, first, last, pred);
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator remove_if(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator remove_if(execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   // omp prefers generic::remove_if to cpp::remove_if
   return thrust::system::detail::generic::remove_if(exec, first, last, stencil, pred);
 }
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate>
-OutputIterator remove_copy_if(
-  execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(execution_policy<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                Predicate pred)
 {
   // omp prefers generic::remove_copy_if to cpp::remove_copy_if
   return thrust::system::detail::generic::remove_copy_if(exec, first, last, result, pred);
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-OutputIterator remove_copy_if(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(execution_policy<DerivedPolicy> &exec,
+                                InputIterator1 first,
+                                InputIterator1 last,
+                                InputIterator2 stencil,
+                                OutputIterator result,
+                                Predicate pred)
 {
   // omp prefers generic::remove_copy_if to cpp::remove_copy_if
   return thrust::system::detail::generic::remove_copy_if(exec, first, last, stencil, result, pred);
diff --git a/projects/rocthrust/thrust/system/omp/detail/replace.h b/projects/rocthrust/thrust/system/omp/detail/replace.h
index 9b23e5de64f6..6017bd22f2d7 100644
--- a/projects/rocthrust/thrust/system/omp/detail/replace.h
+++ b/projects/rocthrust/thrust/system/omp/detail/replace.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits this algorithm
 #include <thrust/system/cpp/detail/scatter.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/reverse.h b/projects/rocthrust/thrust/system/omp/detail/reverse.h
index 5140fb4cfe94..463dcd34f0bf 100644
--- a/projects/rocthrust/thrust/system/omp/detail/reverse.h
+++ b/projects/rocthrust/thrust/system/omp/detail/reverse.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits reverse
 #include <thrust/system/cpp/detail/reverse.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/scan.h b/projects/rocthrust/thrust/system/omp/detail/scan.h
index d0d5344e9453..51ad41b6d6ca 100644
--- a/projects/rocthrust/thrust/system/omp/detail/scan.h
+++ b/projects/rocthrust/thrust/system/omp/detail/scan.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits scan
 #include <thrust/system/cpp/detail/scan.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/scan_by_key.h b/projects/rocthrust/thrust/system/omp/detail/scan_by_key.h
index a05cd9be6af3..0a0088e4a467 100644
--- a/projects/rocthrust/thrust/system/omp/detail/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/omp/detail/scan_by_key.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits this algorithm
 #include <thrust/system/cpp/detail/scan_by_key.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/scatter.h b/projects/rocthrust/thrust/system/omp/detail/scatter.h
index 9b23e5de64f6..6017bd22f2d7 100644
--- a/projects/rocthrust/thrust/system/omp/detail/scatter.h
+++ b/projects/rocthrust/thrust/system/omp/detail/scatter.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits this algorithm
 #include <thrust/system/cpp/detail/scatter.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/sequence.h b/projects/rocthrust/thrust/system/omp/detail/sequence.h
index fa7973de8096..2149ac859556 100644
--- a/projects/rocthrust/thrust/system/omp/detail/sequence.h
+++ b/projects/rocthrust/thrust/system/omp/detail/sequence.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits sequence
 #include <thrust/system/cpp/detail/sequence.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/set_operations.h b/projects/rocthrust/thrust/system/omp/detail/set_operations.h
index 62d026ea5f7a..360c2a88f356 100644
--- a/projects/rocthrust/thrust/system/omp/detail/set_operations.h
+++ b/projects/rocthrust/thrust/system/omp/detail/set_operations.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits set_operations
 #include <thrust/system/cpp/detail/set_operations.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/sort.h b/projects/rocthrust/thrust/system/omp/detail/sort.h
index 89b8a6188f8e..7aefd92db63a 100644
--- a/projects/rocthrust/thrust/system/omp/detail/sort.h
+++ b/projects/rocthrust/thrust/system/omp/detail/sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/omp/detail/sort.inl b/projects/rocthrust/thrust/system/omp/detail/sort.inl
index b32751028cd3..b5aa8d665982 100644
--- a/projects/rocthrust/thrust/system/omp/detail/sort.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/sort.inl
@@ -18,26 +18,18 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // don't attempt to #include this file without omp support
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
-#  include <omp.h>
+#include <omp.h>
 #endif // omp support
 
-#include <thrust/detail/seq.h>
-#include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/merge.h>
-#include <thrust/sort.h>
-#include <thrust/system/detail/generic/select_system.h>
 #include <thrust/system/omp/detail/default_decomposition.h>
+#include <thrust/system/detail/generic/select_system.h>
+#include <thrust/sort.h>
+#include <thrust/merge.h>
+#include <thrust/detail/seq.h>
+#include <thrust/detail/temporary_array.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -49,71 +41,85 @@ namespace detail
 namespace sort_detail
 {
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-void inplace_merge(execution_policy<DerivedPolicy>& exec,
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+void inplace_merge(execution_policy<DerivedPolicy> &exec,
                    RandomAccessIterator first,
                    RandomAccessIterator middle,
                    RandomAccessIterator last,
                    StrictWeakOrdering comp)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator>::type;
 
-  thrust::detail::temporary_array<value_type, DerivedPolicy> a(exec, first, middle);
-  thrust::detail::temporary_array<value_type, DerivedPolicy> b(exec, middle, last);
+  thrust::detail::temporary_array<value_type,DerivedPolicy> a(exec, first, middle);
+  thrust::detail::temporary_array<value_type,DerivedPolicy> b(exec, middle, last);
 
   thrust::merge(thrust::seq, a.begin(), a.end(), b.begin(), b.end(), first, comp);
 }
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-void inplace_merge_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first1,
-  RandomAccessIterator1 middle1,
-  RandomAccessIterator1 last1,
-  RandomAccessIterator2 first2,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+void inplace_merge_by_key(execution_policy<DerivedPolicy> &exec,
+                          RandomAccessIterator1 first1,
+                          RandomAccessIterator1 middle1,
+                          RandomAccessIterator1 last1,
+                          RandomAccessIterator2 first2,
+                          StrictWeakOrdering comp)
 {
-  using value_type1 = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using value_type2 = thrust::detail::it_value_t<RandomAccessIterator2>;
+  using value_type1 = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using value_type2 = typename thrust::iterator_value<RandomAccessIterator2>::type;
 
   RandomAccessIterator2 middle2 = first2 + (middle1 - first1);
-  RandomAccessIterator2 last2   = first2 + (last1 - first1);
+  RandomAccessIterator2 last2   = first2 + (last1   - first1);
+
+  thrust::detail::temporary_array<value_type1,DerivedPolicy> lhs1(exec, first1, middle1);
+  thrust::detail::temporary_array<value_type1,DerivedPolicy> rhs1(exec, middle1, last1);
+  thrust::detail::temporary_array<value_type2,DerivedPolicy> lhs2(exec, first2, middle2);
+  thrust::detail::temporary_array<value_type2,DerivedPolicy> rhs2(exec, middle2, last2);
+
+  thrust::merge_by_key(thrust::seq,
+                       lhs1.begin(), lhs1.end(),
+                       rhs1.begin(), rhs1.end(),
+                       lhs2.begin(), rhs2.begin(),
+                       first1, first2,
+                       comp);
+}
 
-  thrust::detail::temporary_array<value_type1, DerivedPolicy> lhs1(exec, first1, middle1);
-  thrust::detail::temporary_array<value_type1, DerivedPolicy> rhs1(exec, middle1, last1);
-  thrust::detail::temporary_array<value_type2, DerivedPolicy> lhs2(exec, first2, middle2);
-  thrust::detail::temporary_array<value_type2, DerivedPolicy> rhs2(exec, middle2, last2);
 
-  thrust::merge_by_key(
-    thrust::seq, lhs1.begin(), lhs1.end(), rhs1.begin(), rhs1.end(), lhs2.begin(), rhs2.begin(), first1, first2, comp);
-}
+} // end sort_detail
 
-} // namespace sort_detail
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-void stable_sort(
-  execution_policy<DerivedPolicy>& exec, RandomAccessIterator first, RandomAccessIterator last, StrictWeakOrdering comp)
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+void stable_sort(execution_policy<DerivedPolicy> &exec,
+                 RandomAccessIterator first,
+                 RandomAccessIterator last,
+                 StrictWeakOrdering comp)
 {
   // we're attempting to launch an omp kernel, assert we're compiling with omp support
   // ========================================================================
   // X Note to the user: If you've found this line due to a compiler error, X
   // X you need to enable OpenMP support in your compiler.                  X
   // ========================================================================
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator,
-                                                        (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)>::value,
-                "OpenMP compiler support is not enabled");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<
+      RandomAccessIterator, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
+    >::value)
+  , "OpenMP compiler support is not enabled"
+  );
 
   // Avoid issues on compilers that don't provide `omp_get_num_threads()`.
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
-  using IndexType = thrust::detail::it_difference_t<RandomAccessIterator>;
+  using IndexType = typename thrust::iterator_difference<RandomAccessIterator>::type;
 
-  if (first == last)
-  {
+  if(first == last)
     return;
-  }
 
   THRUST_PRAGMA_OMP(parallel)
   {
@@ -123,33 +129,37 @@ void stable_sort(
     IndexType p_i = omp_get_thread_num();
 
     // every thread sorts its own tile
-    if (p_i < decomp.size())
+    if(p_i < decomp.size())
     {
-      thrust::stable_sort(thrust::seq, first + decomp[p_i].begin(), first + decomp[p_i].end(), comp);
+      thrust::stable_sort(thrust::seq,
+                          first + decomp[p_i].begin(),
+                          first + decomp[p_i].end(),
+                          comp);
     }
 
     THRUST_PRAGMA_OMP(barrier)
 
-    // #5020: For some reason, MSVC may yield an error unless we include this meaningless semicolon here
+    // XXX For some reason, MSVC 2015 yields an error unless we include this meaningless semicolon here
     ;
 
     IndexType nseg = decomp.size();
-    IndexType h    = 2;
+    IndexType h = 2;
 
     // keep track of which sub-range we're processing
-    IndexType a = p_i, b = p_i, c = p_i + 1;
+    IndexType a=p_i, b=p_i, c=p_i+1;
 
-    while (nseg > 1)
+    while(nseg>1)
     {
-      if (c >= decomp.size())
-      {
+      if(c >= decomp.size())
         c = decomp.size() - 1;
-      }
 
-      if ((p_i % h) == 0 && c > b)
+      if((p_i % h) == 0 && c > b)
       {
-        sort_detail::inplace_merge(
-          exec, first + decomp[a].begin(), first + decomp[b].end(), first + decomp[c].end(), comp);
+        sort_detail::inplace_merge(exec,
+                                   first + decomp[a].begin(),
+                                   first + decomp[b].end(),
+                                   first + decomp[c].end(),
+                                   comp);
 
         b = c;
         c += h;
@@ -159,89 +169,82 @@ void stable_sort(
       h *= 2;
 
       THRUST_PRAGMA_OMP(barrier)
-
-      // #5020: For some reason, MSVC may yield an error unless we include this meaningless semicolon here
-      ;
     }
   }
 #endif // THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE
 }
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-void stable_sort_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 keys_first,
-  RandomAccessIterator1 keys_last,
-  RandomAccessIterator2 values_first,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+void stable_sort_by_key(execution_policy<DerivedPolicy> &exec,
+                        RandomAccessIterator1 keys_first,
+                        RandomAccessIterator1 keys_last,
+                        RandomAccessIterator2 values_first,
+                        StrictWeakOrdering comp)
 {
   // we're attempting to launch an omp kernel, assert we're compiling with omp support
   // ========================================================================
   // X Note to the user: If you've found this line due to a compiler error, X
   // X you need to enable OpenMP support in your compiler.                  X
   // ========================================================================
-  static_assert(thrust::detail::depend_on_instantiation<RandomAccessIterator1,
-                                                        (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)>::value,
-                "OpenMP compiler support is not enabled");
+  THRUST_STATIC_ASSERT_MSG(
+    (thrust::detail::depend_on_instantiation<
+      RandomAccessIterator1, (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
+    >::value)
+  , "OpenMP compiler support is not enabled"
+  );
 
   // Avoid issues on compilers that don't provide `omp_get_num_threads()`.
 #if (THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE == THRUST_TRUE)
-  using IndexType = thrust::detail::it_difference_t<RandomAccessIterator1>;
+  using IndexType = typename thrust::iterator_difference<RandomAccessIterator1>::type;
 
-  if (keys_first == keys_last)
-  {
+  if(keys_first == keys_last)
     return;
-  }
 
   THRUST_PRAGMA_OMP(parallel)
   {
-    thrust::system::detail::internal::uniform_decomposition<IndexType> decomp(
-      keys_last - keys_first, 1, omp_get_num_threads());
+    thrust::system::detail::internal::uniform_decomposition<IndexType> decomp(keys_last - keys_first, 1, omp_get_num_threads());
 
     // process id
     IndexType p_i = omp_get_thread_num();
 
     // every thread sorts its own tile
-    if (p_i < decomp.size())
+    if(p_i < decomp.size())
     {
-      thrust::stable_sort_by_key(
-        thrust::seq,
-        keys_first + decomp[p_i].begin(),
-        keys_first + decomp[p_i].end(),
-        values_first + decomp[p_i].begin(),
-        comp);
+      thrust::stable_sort_by_key(thrust::seq,
+                                 keys_first + decomp[p_i].begin(),
+                                 keys_first + decomp[p_i].end(),
+                                 values_first + decomp[p_i].begin(),
+                                 comp);
     }
 
     THRUST_PRAGMA_OMP(barrier)
 
-    // #5020: For some reason, MSVC may yield an error unless we include this meaningless semicolon here
+    // XXX For some reason, MSVC 2015 yields an error unless we include this meaningless semicolon here
     ;
 
     IndexType nseg = decomp.size();
-    IndexType h    = 2;
+    IndexType h = 2;
 
     // keep track of which sub-range we're processing
-    IndexType a = p_i, b = p_i, c = p_i + 1;
+    IndexType a=p_i, b=p_i, c=p_i+1;
 
-    while (nseg > 1)
+    while(nseg>1)
     {
-      if (c >= decomp.size())
-      {
+      if(c >= decomp.size())
         c = decomp.size() - 1;
-      }
 
-      if ((p_i % h) == 0 && c > b)
+      if((p_i % h) == 0 && c > b)
       {
-        sort_detail::inplace_merge_by_key(
-          exec,
-          keys_first + decomp[a].begin(),
-          keys_first + decomp[b].end(),
-          keys_first + decomp[c].end(),
-          values_first + decomp[a].begin(),
-          comp);
+        sort_detail::inplace_merge_by_key(exec,
+                                          keys_first + decomp[a].begin(),
+                                          keys_first + decomp[b].end(),
+                                          keys_first + decomp[c].end(),
+                                          values_first + decomp[a].begin(),
+                                          comp);
 
         b = c;
         c += h;
@@ -251,14 +254,12 @@ void stable_sort_by_key(
       h *= 2;
 
       THRUST_PRAGMA_OMP(barrier)
-
-      // #5020: For some reason, MSVC may yield an error unless we include this meaningless semicolon here
-      ;
     }
   }
 #endif // THRUST_DEVICE_COMPILER_IS_OMP_CAPABLE
 }
 
+
 } // end namespace detail
 } // end namespace omp
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/omp/detail/swap_ranges.h b/projects/rocthrust/thrust/system/omp/detail/swap_ranges.h
index ba252a07d484..505c422f4822 100644
--- a/projects/rocthrust/thrust/system/omp/detail/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/omp/detail/swap_ranges.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // omp inherits swap_ranges
 #include <thrust/system/cpp/detail/swap_ranges.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/tabulate.h b/projects/rocthrust/thrust/system/omp/detail/tabulate.h
index 8b26140153a4..5952a435929c 100644
--- a/projects/rocthrust/thrust/system/omp/detail/tabulate.h
+++ b/projects/rocthrust/thrust/system/omp/detail/tabulate.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits tabulate
 #include <thrust/system/cpp/detail/tabulate.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/temporary_buffer.h b/projects/rocthrust/thrust/system/omp/detail/temporary_buffer.h
index 8da64673cb33..a32c5aed28de 100644
--- a/projects/rocthrust/thrust/system/omp/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/omp/detail/temporary_buffer.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/omp/detail/transform.h b/projects/rocthrust/thrust/system/omp/detail/transform.h
index ba29642fdfe3..e46a0cda3406 100644
--- a/projects/rocthrust/thrust/system/omp/detail/transform.h
+++ b/projects/rocthrust/thrust/system/omp/detail/transform.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // omp inherits transform
 #include <thrust/system/cpp/detail/transform.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/transform_reduce.h b/projects/rocthrust/thrust/system/omp/detail/transform_reduce.h
index 6b095061ae3d..08ab6281d207 100644
--- a/projects/rocthrust/thrust/system/omp/detail/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/omp/detail/transform_reduce.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits transform_reduce
 #include <thrust/system/cpp/detail/transform_reduce.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/transform_scan.h b/projects/rocthrust/thrust/system/omp/detail/transform_scan.h
index 0a8831232235..2b949479aab4 100644
--- a/projects/rocthrust/thrust/system/omp/detail/transform_scan.h
+++ b/projects/rocthrust/thrust/system/omp/detail/transform_scan.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits transform_scan
 #include <thrust/system/cpp/detail/transform_scan.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/uninitialized_copy.h b/projects/rocthrust/thrust/system/omp/detail/uninitialized_copy.h
index 11ad5f131bae..11f93129db20 100644
--- a/projects/rocthrust/thrust/system/omp/detail/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/omp/detail/uninitialized_copy.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits uninitialized_copy
 #include <thrust/system/cpp/detail/uninitialized_copy.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/uninitialized_fill.h b/projects/rocthrust/thrust/system/omp/detail/uninitialized_fill.h
index 168d13c35169..fb8228e4f93e 100644
--- a/projects/rocthrust/thrust/system/omp/detail/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/omp/detail/uninitialized_fill.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits uninitialized_fill
 #include <thrust/system/cpp/detail/uninitialized_fill.h>
diff --git a/projects/rocthrust/thrust/system/omp/detail/unique.h b/projects/rocthrust/thrust/system/omp/detail/unique.h
index 1c70e789762e..3ab46970ddab 100644
--- a/projects/rocthrust/thrust/system/omp/detail/unique.h
+++ b/projects/rocthrust/thrust/system/omp/detail/unique.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
@@ -49,7 +42,7 @@ OutputIterator unique_copy(
   BinaryPredicate binary_pred);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::detail::it_difference_t<ForwardIterator> unique_count(
+typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred);
 
 } // end namespace detail
diff --git a/projects/rocthrust/thrust/system/omp/detail/unique.inl b/projects/rocthrust/thrust/system/omp/detail/unique.inl
index 39bf8427f6bb..bf871fe3a549 100644
--- a/projects/rocthrust/thrust/system/omp/detail/unique.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/unique.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/pair.h>
-#include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/omp/detail/unique.h>
+#include <thrust/system/detail/generic/unique.h>
+#include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,34 +29,49 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-ForwardIterator
-unique(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+  ForwardIterator unique(execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last,
+                         BinaryPredicate binary_pred)
 {
   // omp prefers generic::unique to cpp::unique
-  return thrust::system::detail::generic::unique(exec, first, last, binary_pred);
+  return thrust::system::detail::generic::unique(exec,first,last,binary_pred);
 } // end unique()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryPredicate>
-OutputIterator unique_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator output,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename BinaryPredicate>
+  OutputIterator unique_copy(execution_policy<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator output,
+                             BinaryPredicate binary_pred)
 {
   // omp prefers generic::unique_copy to cpp::unique_copy
-  return thrust::system::detail::generic::unique_copy(exec, first, last, output, binary_pred);
+  return thrust::system::detail::generic::unique_copy(exec,first,last,output,binary_pred);
 } // end unique_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::detail::it_difference_t<ForwardIterator> unique_count(
-  execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+  typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 BinaryPredicate binary_pred)
 {
   // omp prefers generic::unique_count to cpp::unique_count
-  return thrust::system::detail::generic::unique_count(exec, first, last, binary_pred);
+  return thrust::system::detail::generic::unique_count(exec,first,last,binary_pred);
 } // end unique_count()
 
+
 } // end namespace detail
 } // end namespace omp
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/omp/detail/unique_by_key.h b/projects/rocthrust/thrust/system/omp/detail/unique_by_key.h
index 574f5bc6ebc2..61981097f2b4 100644
--- a/projects/rocthrust/thrust/system/omp/detail/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/omp/detail/unique_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/omp/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/omp/detail/unique_by_key.inl b/projects/rocthrust/thrust/system/omp/detail/unique_by_key.inl
index 76760d122468..1e88e5053efd 100644
--- a/projects/rocthrust/thrust/system/omp/detail/unique_by_key.inl
+++ b/projects/rocthrust/thrust/system/omp/detail/unique_by_key.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/pair.h>
-#include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/system/omp/detail/unique_by_key.h>
+#include <thrust/system/detail/generic/unique_by_key.h>
+#include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,38 +29,43 @@ namespace omp
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2,
+         typename BinaryPredicate>
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+    unique_by_key(execution_policy<DerivedPolicy> &exec,
+                  ForwardIterator1 keys_first,
+                  ForwardIterator1 keys_last,
+                  ForwardIterator2 values_first,
+                  BinaryPredicate binary_pred)
 {
   // omp prefers generic::unique_by_key to cpp::unique_by_key
-  return thrust::system::detail::generic::unique_by_key(exec, keys_first, keys_last, values_first, binary_pred);
+  return thrust::system::detail::generic::unique_by_key(exec,keys_first,keys_last,values_first,binary_pred);
 } // end unique_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    unique_by_key_copy(execution_policy<DerivedPolicy> &exec,
+                       InputIterator1 keys_first,
+                       InputIterator1 keys_last,
+                       InputIterator2 values_first,
+                       OutputIterator1 keys_output,
+                       OutputIterator2 values_output,
+                       BinaryPredicate binary_pred)
 {
   // omp prefers generic::unique_by_key_copy to cpp::unique_by_key_copy
-  return thrust::system::detail::generic::unique_by_key_copy(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
+  return thrust::system::detail::generic::unique_by_key_copy(exec,keys_first,keys_last,values_first,keys_output,values_output,binary_pred);
 } // end unique_by_key_copy()
 
+
 } // end namespace detail
 } // end namespace omp
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/omp/execution_policy.h b/projects/rocthrust/thrust/system/omp/execution_policy.h
index a067b5a97a80..4015762abbd3 100644
--- a/projects/rocthrust/thrust/system/omp/execution_policy.h
+++ b/projects/rocthrust/thrust/system/omp/execution_policy.h
@@ -16,20 +16,12 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 /*! \file thrust/system/omp/execution_policy.h
  *  \brief Execution policies for Thrust's OpenMP system.
  */
 
+#include <thrust/detail/config.h>
+
 // get the execution policies definitions first
 #include <thrust/system/omp/detail/execution_policy.h>
 
@@ -132,7 +124,7 @@ struct tag : thrust::system::omp::execution_policy<tag> { unspecified };
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
  *      printf("%d\n", x);
diff --git a/projects/rocthrust/thrust/system/omp/memory_resource.h b/projects/rocthrust/thrust/system/omp/memory_resource.h
index 57e5e9aae36d..c8f889aaee9e 100644
--- a/projects/rocthrust/thrust/system/omp/memory_resource.h
+++ b/projects/rocthrust/thrust/system/omp/memory_resource.h
@@ -62,9 +62,9 @@ using memory_resource = detail::native_resource;
  *  \p mr::new_delete_resource and tags it with \p omp::universal_pointer.
  */
 using universal_memory_resource = detail::universal_native_resource;
-
+// FIXME(bgruber): comment below is wrong or alias should be to universal_memory_resource
 /*! An alias for \p omp::universal_memory_resource. */
-using universal_host_pinned_memory_resource = universal_memory_resource;
+using universal_host_pinned_memory_resource = detail::native_resource;
 
 /*! \}
  */
diff --git a/projects/rocthrust/thrust/system/omp/vector.h b/projects/rocthrust/thrust/system/omp/vector.h
index b0a55dcc492f..e7b940815b97 100644
--- a/projects/rocthrust/thrust/system/omp/vector.h
+++ b/projects/rocthrust/thrust/system/omp/vector.h
@@ -77,14 +77,11 @@ using vector = thrust::detail::vector_base<T, Allocator>;
  *  \see host_vector For the documentation of the complete interface which is
  *                   shared by \p omp::universal_vector
  *  \see device_vector
- *  \see universal_host_pinned_vector
+ *  \see universal_vector
  */
 template <typename T, typename Allocator = thrust::system::omp::universal_allocator<T>>
 using universal_vector = thrust::detail::vector_base<T, Allocator>;
 
-//! Like \ref universal_vector but uses pinned memory when the system supports it.
-//! \see device_vector
-//! \see universal_vector
 template <typename T>
 using universal_host_pinned_vector = thrust::detail::vector_base<T, universal_host_pinned_allocator<T>>;
 } // namespace omp
diff --git a/projects/rocthrust/thrust/system/system_error.h b/projects/rocthrust/thrust/system/system_error.h
index 70ed79124953..1d6f2ab13632 100644
--- a/projects/rocthrust/thrust/system/system_error.h
+++ b/projects/rocthrust/thrust/system/system_error.h
@@ -23,13 +23,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/error_code.h>
 
 #include <stdexcept>
@@ -54,7 +47,7 @@ namespace system
  *  originate from the operating system or other low-level application program interfaces.
  *
  *  Thrust uses \p system_error to report the error codes returned from device backends
- *  such as the CUDA or HIP runtime.
+ *  such as the HIP runtime.
  *
  *  The following code listing demonstrates how to catch a \p system_error to recover
  *  from an error.
@@ -65,13 +58,13 @@ namespace system
  *  #include <thrust/system.h>
  *  #include <thrust/sort.h>
  *
- *  void terminate_gracefully()
+ *  void terminate_gracefully(void)
  *  {
  *    // application-specific termination code here
  *    ...
  *  }
  *
- *  int main()
+ *  int main(void)
  *  {
  *    try
  *    {
@@ -146,19 +139,19 @@ class system_error : public std::runtime_error
 
   /*! Destructor does not throw.
    */
-  inline virtual ~system_error() noexcept {};
+  inline virtual ~system_error(void) noexcept {};
 
   /*! Returns an object encoding the error.
    *  \return <tt>ec</tt> or <tt>error_code(ev, ecat)</tt>, from the
    *          constructor, as appropriate.
    */
-  inline const error_code& code() const noexcept;
+  inline const error_code& code(void) const noexcept;
 
   /*! Returns a human-readable string indicating the nature of the error.
    *  \return a string incorporating <tt>code().message()</tt> and the
    *          arguments supplied in the constructor.
    */
-  inline const char* what() const noexcept;
+  inline const char* what(void) const noexcept;
 
   /*! \cond
    */
diff --git a/projects/rocthrust/thrust/system/tbb/detail/adjacent_difference.h b/projects/rocthrust/thrust/system/tbb/detail/adjacent_difference.h
index 0ad22863b574..f9d5d3347edc 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/adjacent_difference.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/adjacent_difference.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/adjacent_difference.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/assign_value.h b/projects/rocthrust/thrust/system/tbb/detail/assign_value.h
index 7b95165e7480..c3f6a6f00513 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/assign_value.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/assign_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits assign_value
 #include <thrust/system/cpp/detail/assign_value.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/binary_search.h b/projects/rocthrust/thrust/system/tbb/detail/binary_search.h
index 5596b7cc3caa..0f8ae2d21b62 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/binary_search.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/binary_search.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits binary_search
 #include <thrust/system/cpp/detail/binary_search.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/copy.h b/projects/rocthrust/thrust/system/tbb/detail/copy.h
index 6594c2beb163..acb5ee0e3e28 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/copy.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/copy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/copy.inl b/projects/rocthrust/thrust/system/tbb/detail/copy.inl
index 5bcc39738a51..9818f1f6ae22 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/copy.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/copy.inl
@@ -17,57 +17,119 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/detail/copy.h>
-#include <thrust/detail/type_traits/minimum_type.h>
+#include <thrust/system/tbb/detail/copy.h>
 #include <thrust/system/detail/generic/copy.h>
 #include <thrust/system/detail/sequential/copy.h>
-#include <thrust/system/tbb/detail/copy.h>
-
-#include _THRUST_STD_INCLUDE(type_traits)
+#include <thrust/detail/type_traits/minimum_type.h>
+#include <thrust/detail/copy.h>
 
 THRUST_NAMESPACE_BEGIN
-namespace system::tbb::detail
+namespace system
+{
+namespace tbb
 {
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator>
-OutputIterator
-copy(execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result)
+namespace detail
 {
-  using traversal1 = typename iterator_traversal<InputIterator>::type;
-  using traversal2 = typename iterator_traversal<OutputIterator>::type;
-  using traversal  = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
-  if constexpr (_THRUST_STD::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    return system::detail::generic::copy(exec, first, last, result);
-  }
-  else
-  {
-    return system::detail::sequential::copy(exec, first, last, result);
-  }
-}
-
-template <typename DerivedPolicy, typename InputIterator, typename Size, typename OutputIterator>
-OutputIterator copy_n(execution_policy<DerivedPolicy>& exec, InputIterator first, Size n, OutputIterator result)
+namespace dispatch
+{
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+  OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::incrementable_traversal_tag)
+{
+  return thrust::system::detail::sequential::copy(exec, first, last, result);
+} // end copy()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+  OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      InputIterator last,
+                      OutputIterator result,
+                      thrust::random_access_traversal_tag)
+{
+  return thrust::system::detail::generic::copy(exec, first, last, result);
+} // end copy()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+  OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::incrementable_traversal_tag)
 {
-  using traversal1 = typename iterator_traversal<InputIterator>::type;
-  using traversal2 = typename iterator_traversal<OutputIterator>::type;
-  using traversal  = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
-  if constexpr (_THRUST_STD::is_convertible_v<traversal, random_access_traversal_tag>)
-  {
-    return system::detail::generic::copy_n(exec, first, n, result);
-  }
-  else
-  {
-    return system::detail::sequential::copy_n(exec, first, n, result);
-  }
-}
-} // namespace system::tbb::detail
+  return thrust::system::detail::sequential::copy_n(exec, first, n, result);
+} // end copy_n()
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+  OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                        InputIterator first,
+                        Size n,
+                        OutputIterator result,
+                        thrust::random_access_traversal_tag)
+{
+  return thrust::system::detail::generic::copy_n(exec, first, n, result);
+} // end copy_n()
+
+
+} // end dispatch
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator>
+OutputIterator copy(execution_policy<DerivedPolicy> &exec,
+                    InputIterator first,
+                    InputIterator last,
+                    OutputIterator result)
+{
+  using traversal1 = typename thrust::iterator_traversal<InputIterator>::type;
+  using traversal2 = typename thrust::iterator_traversal<OutputIterator>::type;
+
+  using traversal = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
+
+  // dispatch on minimum traversal
+  return thrust::system::tbb::detail::dispatch::copy(exec,first,last,result,traversal());
+} // end copy()
+
+
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename Size,
+         typename OutputIterator>
+OutputIterator copy_n(execution_policy<DerivedPolicy> &exec,
+                      InputIterator first,
+                      Size n,
+                      OutputIterator result)
+{
+  using traversal1 = typename thrust::iterator_traversal<InputIterator>::type;
+  using traversal2 = typename thrust::iterator_traversal<OutputIterator>::type;
+
+  using traversal = typename thrust::detail::minimum_type<traversal1, traversal2>::type;
+
+  // dispatch on minimum traversal
+  return thrust::system::tbb::detail::dispatch::copy_n(exec,first,n,result,traversal());
+} // end copy_n()
+
+
+} // end namespace detail
+} // end namespace tbb
+} // end namespace system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/tbb/detail/copy_if.h b/projects/rocthrust/thrust/system/tbb/detail/copy_if.h
index a84605103e89..69a9b700aec8 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/copy_if.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/copy_if.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/copy_if.inl b/projects/rocthrust/thrust/system/tbb/detail/copy_if.inl
index 1557e6a2b4bf..b9efb39d522e 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/copy_if.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/copy_if.inl
@@ -17,19 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/function.h>
-#include <thrust/distance.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/tbb/detail/copy_if.h>
-
+#include <thrust/iterator/iterator_traits.h>
+#include <thrust/distance.h>
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_scan.h>
 
@@ -43,29 +34,26 @@ namespace detail
 namespace copy_if_detail
 {
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate, typename Size>
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate,
+         typename Size>
 struct body
 {
+
   InputIterator1 first;
   InputIterator2 stencil;
   OutputIterator result;
-  thrust::detail::wrapped_function<Predicate, bool> pred;
+  thrust::detail::wrapped_function<Predicate,bool> pred;
   Size sum;
 
   body(InputIterator1 first, InputIterator2 stencil, OutputIterator result, Predicate pred)
-      : first(first)
-      , stencil(stencil)
-      , result(result)
-      , pred{pred}
-      , sum(0)
+    : first(first), stencil(stencil), result(result), pred{pred}, sum(0)
   {}
 
   body(body& b, ::tbb::split)
-      : first(b.first)
-      , stencil(b.stencil)
-      , result(b.result)
-      , pred{b.pred}
-      , sum(0)
+    : first(b.first), stencil(b.stencil), result(b.result), pred{b.pred}, sum(0)
   {}
 
   void operator()(const ::tbb::blocked_range<Size>& r, ::tbb::pre_scan_tag)
@@ -75,17 +63,15 @@ struct body
     for (Size i = r.begin(); i != r.end(); ++i, ++iter)
     {
       if (pred(*iter))
-      {
         ++sum;
-      }
     }
   }
 
   void operator()(const ::tbb::blocked_range<Size>& r, ::tbb::final_scan_tag)
   {
-    InputIterator1 iter1 = first + r.begin();
-    InputIterator2 iter2 = stencil + r.begin();
-    OutputIterator iter3 = result + sum;
+    InputIterator1  iter1 = first   + r.begin();
+    InputIterator2  iter2 = stencil + r.begin();
+    OutputIterator  iter3 = result  + sum;
 
     for (Size i = r.begin(); i != r.end(); ++i, ++iter1, ++iter2)
     {
@@ -109,13 +95,20 @@ struct body
   }
 }; // end body
 
-} // namespace copy_if_detail
-
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Predicate>
-OutputIterator
-copy_if(tag, InputIterator1 first, InputIterator1 last, InputIterator2 stencil, OutputIterator result, Predicate pred)
+} // end copy_if_detail
+
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator copy_if(tag,
+                         InputIterator1 first,
+                         InputIterator1 last,
+                         InputIterator2 stencil,
+                         OutputIterator result,
+                         Predicate pred)
 {
-  using Size = thrust::detail::it_difference_t<InputIterator1>;
+  using Size = typename thrust::iterator_difference<InputIterator1>::type;
   using Body = typename copy_if_detail::body<InputIterator1, InputIterator2, OutputIterator, Predicate, Size>;
 
   Size n = thrust::distance(first, last);
@@ -123,14 +116,14 @@ copy_if(tag, InputIterator1 first, InputIterator1 last, InputIterator2 stencil,
   if (n != 0)
   {
     Body body(first, stencil, result, pred);
-    ::tbb::parallel_scan(::tbb::blocked_range<Size>(0, n), body);
+    ::tbb::parallel_scan(::tbb::blocked_range<Size>(0,n), body);
     thrust::advance(result, body.sum);
   }
 
   return result;
 } // end copy_if()
 
-} // namespace detail
-} // namespace tbb
-} // namespace system
+} // end detail
+} // end tbb
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/tbb/detail/count.h b/projects/rocthrust/thrust/system/tbb/detail/count.h
index 2258d8a4a339..5062415e2ef4 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/count.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/count.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits count
 #include <thrust/system/cpp/detail/count.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/equal.h b/projects/rocthrust/thrust/system/tbb/detail/equal.h
index e2eee998de4f..c32d12a19ed5 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/equal.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/equal.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits equal
 #include <thrust/system/cpp/detail/equal.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/execution_policy.h b/projects/rocthrust/thrust/system/tbb/detail/execution_policy.h
index e173a0634304..2b9672438edc 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/execution_policy.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/execution_policy.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/iterator/detail/any_system_tag.h>
 #include <thrust/system/cpp/detail/execution_policy.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/extrema.h b/projects/rocthrust/thrust/system/tbb/detail/extrema.h
index 8e891833cca7..b6a7f0f2a53e 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/extrema.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/extrema.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/extrema.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/fill.h b/projects/rocthrust/thrust/system/tbb/detail/fill.h
index d8cfca51b1df..e819e82d0ce4 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/fill.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/fill.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits fill
 #include <thrust/system/cpp/detail/fill.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/find.h b/projects/rocthrust/thrust/system/tbb/detail/find.h
index c69327f2a092..4a662ed77d04 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/find.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/find.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/detail/generic/find.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/for_each.h b/projects/rocthrust/thrust/system/tbb/detail/for_each.h
index 04b2cf37adfa..fe5f6fe43e33 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/for_each.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/for_each.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/for_each.inl b/projects/rocthrust/thrust/system/tbb/detail/for_each.inl
index 0a0a12e1eaff..0cf322989e29 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/for_each.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/for_each.inl
@@ -17,17 +17,10 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/static_assert.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/distance.h>
 #include <thrust/system/detail/sequential/execution_policy.h>
 
 #include <tbb/blocked_range.h>
@@ -43,48 +36,65 @@ namespace detail
 namespace for_each_detail
 {
 
-template <typename RandomAccessIterator, typename Size, typename UnaryFunction>
-struct body
+template<typename RandomAccessIterator,
+         typename Size,
+         typename UnaryFunction>
+  struct body
 {
   RandomAccessIterator m_first;
   UnaryFunction m_f;
 
   body(RandomAccessIterator first, UnaryFunction f)
-      : m_first(first)
-      , m_f(f)
+    : m_first(first), m_f(f)
   {}
 
-  void operator()(const ::tbb::blocked_range<Size>& r) const
+  void operator()(const ::tbb::blocked_range<Size> &r) const
   {
     // we assume that blocked_range specifies a contiguous range of integers
     thrust::for_each_n(thrust::system::detail::sequential::seq, m_first + r.begin(), r.size(), m_f);
   } // end operator()()
 }; // end body
 
-template <typename Size, typename RandomAccessIterator, typename UnaryFunction>
-body<RandomAccessIterator, Size, UnaryFunction> make_body(RandomAccessIterator first, UnaryFunction f)
+
+template<typename Size, typename RandomAccessIterator, typename UnaryFunction>
+  body<RandomAccessIterator,Size,UnaryFunction>
+    make_body(RandomAccessIterator first, UnaryFunction f)
 {
-  return body<RandomAccessIterator, Size, UnaryFunction>(first, f);
+  return body<RandomAccessIterator,Size,UnaryFunction>(first, f);
 } // end make_body()
 
-} // namespace for_each_detail
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename Size, typename UnaryFunction>
-RandomAccessIterator for_each_n(execution_policy<DerivedPolicy>&, RandomAccessIterator first, Size n, UnaryFunction f)
+} // end for_each_detail
+
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename Size,
+         typename UnaryFunction>
+RandomAccessIterator for_each_n(execution_policy<DerivedPolicy> &,
+                                RandomAccessIterator first,
+                                Size n,
+                                UnaryFunction f)
 {
-  ::tbb::parallel_for(::tbb::blocked_range<Size>(0, n), for_each_detail::make_body<Size>(first, f));
+  ::tbb::parallel_for(::tbb::blocked_range<Size>(0,n), for_each_detail::make_body<Size>(first,f));
 
   // return the end of the range
   return first + n;
 } // end for_each_n
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename UnaryFunction>
-RandomAccessIterator
-for_each(execution_policy<DerivedPolicy>& s, RandomAccessIterator first, RandomAccessIterator last, UnaryFunction f)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename UnaryFunction>
+  RandomAccessIterator for_each(execution_policy<DerivedPolicy> &s,
+                                RandomAccessIterator first,
+                                RandomAccessIterator last,
+                                UnaryFunction f)
 {
-  return tbb::detail::for_each_n(s, first, thrust::distance(first, last), f);
+  return tbb::detail::for_each_n(s, first, thrust::distance(first,last), f);
 } // end for_each()
 
+
 } // end namespace detail
 } // end namespace tbb
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/tbb/detail/gather.h b/projects/rocthrust/thrust/system/tbb/detail/gather.h
index 13d2569f31e1..c2712dd1abc7 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/gather.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/gather.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits gather
 #include <thrust/system/cpp/detail/gather.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/generate.h b/projects/rocthrust/thrust/system/tbb/detail/generate.h
index 3132859d07ff..73b8c9e6c91f 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/generate.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/generate.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits generate
 #include <thrust/system/cpp/detail/generate.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/get_value.h b/projects/rocthrust/thrust/system/tbb/detail/get_value.h
index 6a2607e57c93..6357dd6bfaf9 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/get_value.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/get_value.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits get_value
 #include <thrust/system/cpp/detail/get_value.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/inner_product.h b/projects/rocthrust/thrust/system/tbb/detail/inner_product.h
index 8abc2f44ef61..5602e8da4252 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/inner_product.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/inner_product.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits inner_product
 #include <thrust/system/cpp/detail/inner_product.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/iter_swap.h b/projects/rocthrust/thrust/system/tbb/detail/iter_swap.h
index f0e6a6ef242d..22e68eb221f4 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/iter_swap.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/iter_swap.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits iter_swap
 #include <thrust/system/cpp/detail/iter_swap.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/logical.h b/projects/rocthrust/thrust/system/tbb/detail/logical.h
index 4b1168fc8e09..f61ea9fafef9 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/logical.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/logical.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits logical
 #include <thrust/system/cpp/detail/logical.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/malloc_and_free.h b/projects/rocthrust/thrust/system/tbb/detail/malloc_and_free.h
index a4b98b61ebd9..58bbdbacdf76 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/malloc_and_free.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/malloc_and_free.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits malloc and free
 #include <thrust/system/cpp/detail/malloc_and_free.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/memory.inl b/projects/rocthrust/thrust/system/tbb/detail/memory.inl
index 3c0f4c661ff1..fcc6e8fc6ac2 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/memory.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/memory.inl
@@ -17,18 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/cpp/detail/execution_policy.h>
-#include <thrust/system/cpp/memory.h>
 #include <thrust/system/tbb/memory.h>
-
+#include <thrust/system/cpp/memory.h>
 #include <limits>
 
 THRUST_NAMESPACE_BEGIN
@@ -37,6 +28,7 @@ namespace system
 namespace tbb
 {
 
+
 namespace detail
 {
 
@@ -44,8 +36,8 @@ namespace detail
 //     is not defined
 //     WAR the problem by using adl to call cpp::malloc, which requires it to depend
 //     on a template parameter
-template <typename Tag>
-pointer<void> malloc_workaround(Tag t, std::size_t n)
+template<typename Tag>
+  pointer<void> malloc_workaround(Tag t, std::size_t n)
 {
   return pointer<void>(malloc(t, n));
 } // end malloc_workaround()
@@ -54,13 +46,13 @@ pointer<void> malloc_workaround(Tag t, std::size_t n)
 //     is not defined
 //     WAR the problem by using adl to call cpp::free, which requires it to depend
 //     on a template parameter
-template <typename Tag>
-void free_workaround(Tag t, pointer<void> ptr)
+template<typename Tag>
+  void free_workaround(Tag t, pointer<void> ptr)
 {
   free(t, ptr.get());
 } // end free_workaround()
 
-} // namespace detail
+} // end detail
 
 inline pointer<void> malloc(std::size_t n)
 {
@@ -72,7 +64,7 @@ inline pointer<void> malloc(std::size_t n)
   return detail::malloc_workaround(cpp::tag(), n);
 } // end malloc()
 
-template <typename T>
+template<typename T>
 pointer<T> malloc(std::size_t n)
 {
   pointer<void> raw_ptr = thrust::system::tbb::malloc(sizeof(T) * n);
@@ -89,6 +81,6 @@ inline void free(pointer<void> ptr)
   detail::free_workaround(cpp::tag(), ptr);
 } // end free()
 
-} // namespace tbb
-} // namespace system
+} // end tbb
+} // end system
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/system/tbb/detail/merge.h b/projects/rocthrust/thrust/system/tbb/detail/merge.h
index f99cab612485..68b35c02fde5 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/merge.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/merge.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/merge.inl b/projects/rocthrust/thrust/system/tbb/detail/merge.inl
index 4d793c9eb7b8..b58d8e040bb6 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/merge.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/merge.inl
@@ -18,21 +18,12 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include <thrust/binary_search.h>
-#include <thrust/detail/seq.h>
-#include <thrust/detail/temporary_array.h>
 #include <thrust/iterator/iterator_traits.h>
-#include <thrust/merge.h>
+#include <thrust/detail/temporary_array.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
-
+#include <thrust/merge.h>
+#include <thrust/binary_search.h>
+#include <thrust/detail/seq.h>
 #include <tbb/parallel_for.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -45,7 +36,10 @@ namespace detail
 namespace merge_detail
 {
 
-template <typename InputIterator1, typename InputIterator2, typename OutputIterator, typename StrictWeakOrdering>
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
 struct range
 {
   InputIterator1 first1, last1;
@@ -54,30 +48,20 @@ struct range
   StrictWeakOrdering comp;
   size_t grain_size;
 
-  range(InputIterator1 first1,
-        InputIterator1 last1,
-        InputIterator2 first2,
-        InputIterator2 last2,
+  range(InputIterator1 first1, InputIterator1 last1,
+        InputIterator2 first2, InputIterator2 last2,
         OutputIterator result,
         StrictWeakOrdering comp,
         size_t grain_size = 1024)
-      : first1(first1)
-      , last1(last1)
-      , first2(first2)
-      , last2(last2)
-      , result(result)
-      , comp(comp)
-      , grain_size(grain_size)
+    : first1(first1), last1(last1),
+      first2(first2), last2(last2),
+      result(result), comp(comp), grain_size(grain_size)
   {}
 
   range(range& r, ::tbb::split)
-      : first1(r.first1)
-      , last1(r.last1)
-      , first2(r.first2)
-      , last2(r.last2)
-      , result(r.result)
-      , comp(r.comp)
-      , grain_size(r.grain_size)
+    : first1(r.first1), last1(r.last1),
+      first2(r.first2), last2(r.last2),
+      result(r.result), comp(r.comp), grain_size(r.grain_size)
   {
     // we can assume n1 and n2 are not both 0
     size_t n1 = thrust::distance(first1, last1);
@@ -107,12 +91,12 @@ struct range
     result += thrust::distance(r.first1, mid1) + thrust::distance(r.first2, mid2);
   }
 
-  bool empty() const
+  bool empty(void) const
   {
     return (first1 == last1) && (first2 == last2);
   }
 
-  bool is_divisible() const
+  bool is_divisible(void) const
   {
     return static_cast<size_t>(thrust::distance(first1, last1) + thrust::distance(first2, last2)) > grain_size;
   }
@@ -123,7 +107,11 @@ struct body
   template <typename Range>
   void operator()(Range& r) const
   {
-    thrust::merge(thrust::seq, r.first1, r.last1, r.first2, r.last2, r.result, r.comp);
+    thrust::merge(thrust::seq,
+                  r.first1, r.last1,
+                  r.first2, r.last2,
+                  r.result,
+                  r.comp);
   }
 };
 
@@ -132,13 +120,13 @@ struct body
 namespace merge_by_key_detail
 {
 
-template <typename InputIterator1,
-          typename InputIterator2,
-          typename InputIterator3,
-          typename InputIterator4,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename StrictWeakOrdering>
+template<typename InputIterator1,
+         typename InputIterator2,
+         typename InputIterator3,
+         typename InputIterator4,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename StrictWeakOrdering>
 struct range
 {
   InputIterator1 keys_first1, keys_last1;
@@ -150,39 +138,29 @@ struct range
   StrictWeakOrdering comp;
   size_t grain_size;
 
-  range(InputIterator1 keys_first1,
-        InputIterator1 keys_last1,
-        InputIterator2 keys_first2,
-        InputIterator2 keys_last2,
+  range(InputIterator1 keys_first1, InputIterator1 keys_last1,
+        InputIterator2 keys_first2, InputIterator2 keys_last2,
         InputIterator3 values_first1,
         InputIterator4 values_first2,
         OutputIterator1 keys_result,
         OutputIterator2 values_result,
         StrictWeakOrdering comp,
         size_t grain_size = 1024)
-      : keys_first1(keys_first1)
-      , keys_last1(keys_last1)
-      , keys_first2(keys_first2)
-      , keys_last2(keys_last2)
-      , values_first1(values_first1)
-      , values_first2(values_first2)
-      , keys_result(keys_result)
-      , values_result(values_result)
-      , comp(comp)
-      , grain_size(grain_size)
+    : keys_first1(keys_first1), keys_last1(keys_last1),
+      keys_first2(keys_first2), keys_last2(keys_last2),
+      values_first1(values_first1),
+      values_first2(values_first2),
+      keys_result(keys_result), values_result(values_result),
+      comp(comp), grain_size(grain_size)
   {}
 
   range(range& r, ::tbb::split)
-      : keys_first1(r.keys_first1)
-      , keys_last1(r.keys_last1)
-      , keys_first2(r.keys_first2)
-      , keys_last2(r.keys_last2)
-      , values_first1(r.values_first1)
-      , values_first2(r.values_first2)
-      , keys_result(r.keys_result)
-      , values_result(r.values_result)
-      , comp(r.comp)
-      , grain_size(r.grain_size)
+    : keys_first1(r.keys_first1), keys_last1(r.keys_last1),
+      keys_first2(r.keys_first2), keys_last2(r.keys_last2),
+      values_first1(r.values_first1),
+      values_first2(r.values_first2),
+      keys_result(r.keys_result), values_result(r.values_result),
+      comp(r.comp), grain_size(r.grain_size)
   {
     // we can assume n1 and n2 are not both 0
     size_t n1 = thrust::distance(keys_first1, keys_last1);
@@ -206,8 +184,7 @@ struct range
     r.keys_last1 = mid1;
     r.keys_last2 = mid2;
 
-    // set second range to [mid1, keys_last1), [mid2, keys_last2), keys_result + (mid1 - keys_first1) + (mid2 -
-    // keys_first2), values_result + (mid1 - keys_first1) + (mid2 - keys_first2)
+    // set second range to [mid1, keys_last1), [mid2, keys_last2), keys_result + (mid1 - keys_first1) + (mid2 - keys_first2), values_result + (mid1 - keys_first1) + (mid2 - keys_first2)
     keys_first1 = mid1;
     keys_first2 = mid2;
     values_first1 += thrust::distance(r.keys_first1, mid1);
@@ -216,15 +193,14 @@ struct range
     values_result += thrust::distance(r.keys_first1, mid1) + thrust::distance(r.keys_first2, mid2);
   }
 
-  bool empty() const
+  bool empty(void) const
   {
     return (keys_first1 == keys_last1) && (keys_first2 == keys_last2);
   }
 
-  bool is_divisible() const
+  bool is_divisible(void) const
   {
-    return static_cast<size_t>(thrust::distance(keys_first1, keys_last1) + thrust::distance(keys_first2, keys_last2))
-         > grain_size;
+    return static_cast<size_t>(thrust::distance(keys_first1, keys_last1) + thrust::distance(keys_first2, keys_last2)) > grain_size;
   }
 };
 
@@ -233,40 +209,37 @@ struct body
   template <typename Range>
   void operator()(Range& r) const
   {
-    thrust::merge_by_key(
-      thrust::seq,
-      r.keys_first1,
-      r.keys_last1,
-      r.keys_first2,
-      r.keys_last2,
-      r.values_first1,
-      r.values_first2,
-      r.keys_result,
-      r.values_result,
-      r.comp);
+    thrust::merge_by_key(thrust::seq,
+                         r.keys_first1, r.keys_last1,
+                         r.keys_first2, r.keys_last2,
+                         r.values_first1,
+                         r.values_first2,
+                         r.keys_result,
+                         r.values_result,
+                         r.comp);
   }
 };
 
 } // end namespace merge_by_key_detail
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename StrictWeakOrdering>
-OutputIterator
-merge(execution_policy<DerivedPolicy>&,
-      InputIterator1 first1,
-      InputIterator1 last1,
-      InputIterator2 first2,
-      InputIterator2 last2,
-      OutputIterator result,
-      StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename StrictWeakOrdering>
+OutputIterator merge(execution_policy<DerivedPolicy> &,
+                     InputIterator1 first1,
+                     InputIterator1 last1,
+                     InputIterator2 first2,
+                     InputIterator2 last2,
+                     OutputIterator result,
+                     StrictWeakOrdering comp)
 {
   using Range = typename merge_detail::range<InputIterator1, InputIterator2, OutputIterator, StrictWeakOrdering>;
   using Body  = merge_detail::body;
   Range range(first1, last1, first2, last2, result, comp);
-  Body body;
+  Body  body;
 
   ::tbb::parallel_for(range, body);
 
@@ -283,17 +256,17 @@ template <typename DerivedPolicy,
           typename OutputIterator1,
           typename OutputIterator2,
           typename StrictWeakOrdering>
-thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
-  execution_policy<DerivedPolicy>&,
-  InputIterator1 keys_first1,
-  InputIterator1 keys_last1,
-  InputIterator2 keys_first2,
-  InputIterator2 keys_last2,
-  InputIterator3 values_first3,
-  InputIterator4 values_first4,
-  OutputIterator1 keys_result,
-  OutputIterator2 values_result,
-  StrictWeakOrdering comp)
+thrust::pair<OutputIterator1,OutputIterator2>
+  merge_by_key(execution_policy<DerivedPolicy> &,
+               InputIterator1 keys_first1,
+               InputIterator1 keys_last1,
+               InputIterator2 keys_first2,
+               InputIterator2 keys_last2,
+               InputIterator3 values_first3,
+               InputIterator4 values_first4,
+               OutputIterator1 keys_result,
+               OutputIterator2 values_result,
+               StrictWeakOrdering comp)
 {
   using Range = typename merge_by_key_detail::range<
     InputIterator1,
@@ -305,16 +278,15 @@ thrust::pair<OutputIterator1, OutputIterator2> merge_by_key(
     StrictWeakOrdering>;
   using Body = merge_by_key_detail::body;
 
-  Range range(
-    keys_first1, keys_last1, keys_first2, keys_last2, values_first3, values_first4, keys_result, values_result, comp);
-  Body body;
+  Range range(keys_first1, keys_last1, keys_first2, keys_last2, values_first3, values_first4, keys_result, values_result, comp);
+  Body  body;
 
   ::tbb::parallel_for(range, body);
 
-  thrust::advance(keys_result, thrust::distance(keys_first1, keys_last1) + thrust::distance(keys_first2, keys_last2));
+  thrust::advance(keys_result,   thrust::distance(keys_first1, keys_last1) + thrust::distance(keys_first2, keys_last2));
   thrust::advance(values_result, thrust::distance(keys_first1, keys_last1) + thrust::distance(keys_first2, keys_last2));
 
-  return thrust::make_pair(keys_result, values_result);
+  return thrust::make_pair(keys_result,values_result);
 }
 
 } // end namespace detail
diff --git a/projects/rocthrust/thrust/system/tbb/detail/mismatch.h b/projects/rocthrust/thrust/system/tbb/detail/mismatch.h
index c6e447e8657f..13168ce33721 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/mismatch.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/mismatch.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits mismatch
 #include <thrust/system/cpp/detail/mismatch.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/par.h b/projects/rocthrust/thrust/system/tbb/detail/par.h
index 75e32bb8eeda..b49835ce3ae0 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/par.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/par.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/allocator_aware_execution_policy.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/partition.h b/projects/rocthrust/thrust/system/tbb/detail/partition.h
index 2edef271f9c9..6b75fbc4e471 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/partition.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/partition.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/partition.inl b/projects/rocthrust/thrust/system/tbb/detail/partition.inl
index 2fec1e3637f3..193d2e6ffcb9 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/partition.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/partition.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/generic/partition.h>
 #include <thrust/system/tbb/detail/partition.h>
+#include <thrust/system/detail/generic/partition.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -36,62 +28,72 @@ namespace tbb
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-ForwardIterator
-stable_partition(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   Predicate pred)
 {
   // tbb prefers generic::stable_partition to cpp::stable_partition
   return thrust::system::detail::generic::stable_partition(exec, first, last, pred);
 } // end stable_partition()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator stable_partition(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator stable_partition(execution_policy<DerivedPolicy> &exec,
+                                   ForwardIterator first,
+                                   ForwardIterator last,
+                                   InputIterator stencil,
+                                   Predicate pred)
 {
   // tbb prefers generic::stable_partition to cpp::stable_partition
   return thrust::system::detail::generic::stable_partition(exec, first, last, stencil, pred);
 } // end stable_partition()
 
-template <typename DerivedPolicy,
-          typename InputIterator,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(execution_policy<DerivedPolicy> &exec,
+                          InputIterator first,
+                          InputIterator last,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   // tbb prefers generic::stable_partition_copy to cpp::stable_partition_copy
   return thrust::system::detail::generic::stable_partition_copy(exec, first, last, out_true, out_false, pred);
 } // end stable_partition_copy()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename Predicate>
-thrust::pair<OutputIterator1, OutputIterator2> stable_partition_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator1 out_true,
-  OutputIterator2 out_false,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename Predicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    stable_partition_copy(execution_policy<DerivedPolicy> &exec,
+                          InputIterator1 first,
+                          InputIterator1 last,
+                          InputIterator2 stencil,
+                          OutputIterator1 out_true,
+                          OutputIterator2 out_false,
+                          Predicate pred)
 {
   // tbb prefers generic::stable_partition_copy to cpp::stable_partition_copy
   return thrust::system::detail::generic::stable_partition_copy(exec, first, last, stencil, out_true, out_false, pred);
 } // end stable_partition_copy()
 
+
 } // end namespace detail
 } // end namespace tbb
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/tbb/detail/per_device_resource.h b/projects/rocthrust/thrust/system/tbb/detail/per_device_resource.h
index f02fcfcdc3ff..8c4a903cd16b 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/per_device_resource.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/per_device_resource.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special per device resource functions
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reduce.h b/projects/rocthrust/thrust/system/tbb/detail/reduce.h
index 1af75a04dc33..3a8ed1c742df 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reduce.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/reduce.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reduce.inl b/projects/rocthrust/thrust/system/tbb/detail/reduce.inl
index 6241dad50588..3a45ab246cb9 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reduce.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/reduce.inl
@@ -114,7 +114,7 @@ template <typename DerivedPolicy, typename InputIterator, typename OutputType, t
 OutputType reduce(
   execution_policy<DerivedPolicy>&, InputIterator begin, InputIterator end, OutputType init, BinaryFunction binary_op)
 {
-  using Size = thrust::detail::it_difference_t<InputIterator>;
+  using Size = typename thrust::iterator_difference<InputIterator>::type;
 
   Size n = thrust::distance(begin, end);
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.h b/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
index d1d70759e00b..7e2d539134b5 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.inl b/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.inl
index 100e8e18bbce..7d1d706ee478 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/reduce_by_key.inl
@@ -18,28 +18,21 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/minmax.h>
 #include <thrust/detail/range/tail_flags.h>
 #include <thrust/detail/seq.h>
 #include <thrust/detail/temporary_array.h>
+#include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #include <thrust/iterator/reverse_iterator.h>
 #include <thrust/scan.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 #include <thrust/system/tbb/detail/reduce_by_key.h>
 #include <thrust/system/tbb/detail/reduce_intervals.h>
-
-#include <cuda/std/__algorithm/max.h>
-#include <cuda/std/__algorithm/min.h>
-#include <cuda/std/__type_traits/void_t.h>
+#include <thrust/type_traits/void_t.h>
 
 #include <cassert>
 #include <thread>
+#include <type_traits>
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
@@ -63,12 +56,12 @@ inline L divide_ri(const L x, const R y)
 template <typename InputIterator, typename BinaryFunction, typename SFINAE = void>
 struct partial_sum_type
 {
-  using type = thrust::detail::it_value_t<InputIterator>;
+  using type = thrust::iterator_value<InputIterator>;
 };
 
 template <typename InputIterator1, typename InputIterator2, typename BinaryPredicate, typename BinaryFunction>
 thrust::pair<InputIterator1,
-             thrust::pair<thrust::detail::it_value_t<InputIterator1>,
+             thrust::pair<thrust::iterator_value_t<InputIterator1>,
                           typename partial_sum_type<InputIterator2, BinaryFunction>::type>>
 reduce_last_segment_backward(
   InputIterator1 keys_first,
@@ -77,14 +70,14 @@ reduce_last_segment_backward(
   BinaryPredicate binary_pred,
   BinaryFunction binary_op)
 {
-  thrust::detail::it_difference_t<InputIterator1> n = keys_last - keys_first;
+  typename thrust::iterator_difference<InputIterator1>::type n = keys_last - keys_first;
 
   // reverse the ranges and consume from the end
   thrust::reverse_iterator<InputIterator1> keys_first_r(keys_last);
   thrust::reverse_iterator<InputIterator1> keys_last_r(keys_first);
   thrust::reverse_iterator<InputIterator2> values_first_r(values_first + n);
 
-  thrust::detail::it_value_t<InputIterator1> result_key                        = *keys_first_r;
+  typename thrust::iterator_value_t<InputIterator1> result_key                      = *keys_first_r;
   typename partial_sum_type<InputIterator2, BinaryFunction>::type result_value = *values_first_r;
 
   // consume the entirety of the first key's sequence
@@ -105,7 +98,7 @@ template <typename InputIterator1,
           typename BinaryFunction>
 thrust::tuple<OutputIterator1,
               OutputIterator2,
-              thrust::detail::it_value_t<InputIterator1>,
+              typename thrust::iterator_value_t<InputIterator1>,
               typename partial_sum_type<InputIterator2, BinaryFunction>::type>
 reduce_by_key_with_carry(
   InputIterator1 keys_first,
@@ -118,8 +111,7 @@ reduce_by_key_with_carry(
 {
   // first, consume the last sequence to produce the carry
   // XXX is there an elegant way to pose this such that we don't need to default construct carry?
-  thrust::pair<thrust::detail::it_value_t<InputIterator1>,
-               typename partial_sum_type<InputIterator2, BinaryFunction>::type>
+  thrust::pair<thrust::iterator_value_t<InputIterator1>, typename partial_sum_type<InputIterator2, BinaryFunction>::type>
     carry;
 
   thrust::tie(keys_last, carry) =
@@ -150,7 +142,7 @@ template <typename Iterator1,
           typename BinaryFunction>
 struct serial_reduce_by_key_body
 {
-  using size_type = thrust::detail::it_difference_t<Iterator1>;
+  using size_type = typename thrust::iterator_difference<Iterator1>::type;
 
   Iterator1 keys_first;
   Iterator2 values_first;
@@ -198,7 +190,7 @@ struct serial_reduce_by_key_body
     const size_type interval_idx = r.begin();
 
     const size_type offset_to_first = interval_size * interval_idx;
-    const size_type offset_to_last  = ::cuda::std::min(n, offset_to_first + interval_size);
+    const size_type offset_to_last  = (thrust::min) (n, offset_to_first + interval_size);
 
     Iterator1 my_keys_first    = keys_first + offset_to_first;
     Iterator1 my_keys_last     = keys_first + offset_to_last;
@@ -209,7 +201,7 @@ struct serial_reduce_by_key_body
     Iterator6 my_carry_result  = carry_result + interval_idx;
 
     // consume the rest of the interval with reduce_by_key
-    using key_type   = thrust::detail::it_value_t<Iterator1>;
+    using key_type   = typename thrust::iterator_value_t<Iterator1>;
     using value_type = typename partial_sum_type<Iterator2, BinaryFunction>::type;
 
     // XXX is there a way to pose this so that we don't require default construction of carry?
@@ -255,7 +247,7 @@ make_serial_reduce_by_key_body(
   Iterator4 keys_result,
   Iterator5 values_result,
   Iterator6 carry_result,
-  thrust::detail::it_difference_t<Iterator1> n,
+  typename thrust::iterator_difference<Iterator1>::type n,
   size_t interval_size,
   size_t num_intervals,
   BinaryPredicate binary_pred,
@@ -302,7 +294,7 @@ thrust::pair<Iterator3, Iterator4> reduce_by_key(
   BinaryPredicate binary_pred,
   BinaryFunction binary_op)
 {
-  using difference_type = thrust::detail::it_difference_t<Iterator1>;
+  using difference_type = typename thrust::iterator_difference<Iterator1>::type;
   difference_type n     = keys_last - keys_first;
   if (n == 0)
   {
@@ -320,13 +312,13 @@ thrust::pair<Iterator3, Iterator4> reduce_by_key(
   }
 
   // count the number of processors
-  const unsigned int p = ::cuda::std::max<unsigned int>(1u, std::thread::hardware_concurrency());
+  const unsigned int p = thrust::max<unsigned int>(1u, std::thread::hardware_concurrency());
 
   // generate O(P) intervals of sequential work
   // XXX oversubscribing is a tuning opportunity
   const unsigned int subscription_rate = 1;
-  difference_type interval_size        = ::cuda::std::min<difference_type>(
-    parallelism_threshold, ::cuda::std::max<difference_type>(n, n / (subscription_rate * p)));
+  difference_type interval_size =
+    thrust::min<difference_type>(parallelism_threshold, thrust::max<difference_type>(n, n / (subscription_rate * p)));
   difference_type num_intervals = reduce_by_key_detail::divide_ri(n, interval_size);
 
   // decompose the input into intervals of size N / num_intervals
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reduce_intervals.h b/projects/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
index e3552aca2fb0..d31d6dfddbb5 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/reduce_intervals.h
@@ -18,21 +18,13 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+#include <thrust/detail/minmax.h>
 #include <thrust/detail/seq.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/reduce.h>
 #include <thrust/system/cpp/memory.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
-#include <cuda/std/__algorithm/min.h>
-
 #include <cassert>
 #include <type_traits>
 
@@ -77,7 +69,7 @@ struct body
     Size interval_idx = r.begin();
 
     Size offset_to_first = interval_size * interval_idx;
-    Size offset_to_last  = (::cuda::std::min)(n, offset_to_first + interval_size);
+    Size offset_to_last  = (thrust::min)(n, offset_to_first + interval_size);
 
     RandomAccessIterator1 my_first = first + offset_to_first;
     RandomAccessIterator1 my_last  = first + offset_to_last;
@@ -112,7 +104,7 @@ void reduce_intervals(
   RandomAccessIterator2 result,
   BinaryFunction binary_op)
 {
-  thrust::detail::it_difference_t<RandomAccessIterator1> n = last - first;
+  typename thrust::iterator_difference<RandomAccessIterator1>::type n = last - first;
 
   Size num_intervals = reduce_intervals_detail::divide_ri(n, interval_size);
 
@@ -129,7 +121,7 @@ void reduce_intervals(
   Size interval_size,
   RandomAccessIterator2 result)
 {
-  using value_type = thrust::detail::it_value_t<RandomAccessIterator1>;
+  using value_type = typename thrust::iterator_value<RandomAccessIterator1>::type;
 
   return thrust::system::tbb::detail::reduce_intervals(
     exec, first, last, interval_size, result, thrust::plus<value_type>());
diff --git a/projects/rocthrust/thrust/system/tbb/detail/remove.h b/projects/rocthrust/thrust/system/tbb/detail/remove.h
index 739b0ab41031..499f7a3b2df9 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/remove.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/remove.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/omp/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/remove.inl b/projects/rocthrust/thrust/system/tbb/detail/remove.inl
index cb1dbbe99359..b98a0fc64593 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/remove.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/remove.inl
@@ -17,16 +17,8 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/system/detail/generic/remove.h>
 #include <thrust/system/tbb/detail/remove.h>
+#include <thrust/system/detail/generic/remove.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -36,46 +28,59 @@ namespace tbb
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename Predicate>
-ForwardIterator
-remove_if(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, Predicate pred)
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename Predicate>
+  ForwardIterator remove_if(execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            Predicate pred)
 {
   // tbb prefers generic::remove_if to cpp::remove_if
   return thrust::system::detail::generic::remove_if(exec, first, last, pred);
 }
 
-template <typename DerivedPolicy, typename ForwardIterator, typename InputIterator, typename Predicate>
-ForwardIterator remove_if(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator first,
-  ForwardIterator last,
-  InputIterator stencil,
-  Predicate pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename InputIterator,
+         typename Predicate>
+  ForwardIterator remove_if(execution_policy<DerivedPolicy> &exec,
+                            ForwardIterator first,
+                            ForwardIterator last,
+                            InputIterator stencil,
+                            Predicate pred)
 {
   // tbb prefers generic::remove_if to cpp::remove_if
   return thrust::system::detail::generic::remove_if(exec, first, last, stencil, pred);
 }
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename Predicate>
-OutputIterator remove_copy_if(
-  execution_policy<DerivedPolicy>& exec, InputIterator first, InputIterator last, OutputIterator result, Predicate pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(execution_policy<DerivedPolicy> &exec,
+                                InputIterator first,
+                                InputIterator last,
+                                OutputIterator result,
+                                Predicate pred)
 {
   // tbb prefers generic::remove_copy_if to cpp::remove_copy_if
   return thrust::system::detail::generic::remove_copy_if(exec, first, last, result, pred);
 }
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator,
-          typename Predicate>
-OutputIterator remove_copy_if(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 first,
-  InputIterator1 last,
-  InputIterator2 stencil,
-  OutputIterator result,
-  Predicate pred)
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator,
+         typename Predicate>
+  OutputIterator remove_copy_if(execution_policy<DerivedPolicy> &exec,
+                                InputIterator1 first,
+                                InputIterator1 last,
+                                InputIterator2 stencil,
+                                OutputIterator result,
+                                Predicate pred)
 {
   // tbb prefers generic::remove_copy_if to cpp::remove_copy_if
   return thrust::system::detail::generic::remove_copy_if(exec, first, last, stencil, result, pred);
diff --git a/projects/rocthrust/thrust/system/tbb/detail/replace.h b/projects/rocthrust/thrust/system/tbb/detail/replace.h
index 9b23e5de64f6..6017bd22f2d7 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/replace.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/replace.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits this algorithm
 #include <thrust/system/cpp/detail/scatter.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/reverse.h b/projects/rocthrust/thrust/system/tbb/detail/reverse.h
index 5140fb4cfe94..463dcd34f0bf 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/reverse.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/reverse.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits reverse
 #include <thrust/system/cpp/detail/reverse.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/scan.h b/projects/rocthrust/thrust/system/tbb/detail/scan.h
index 18a3ec3ee2c6..9e8768e9c228 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/scan.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/scan.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/scan.inl b/projects/rocthrust/thrust/system/tbb/detail/scan.inl
index 09cbc3a6eb45..f26076ca4d22 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/scan.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/scan.inl
@@ -28,11 +28,14 @@
 #include <thrust/advance.h>
 #include <thrust/detail/function.h>
 #include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/iterator/is_output_iterator.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/system/tbb/detail/scan.h>
 
-#include <cuda/std/__functional/invoke.h>
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
+#  include <iterator>
+#endif
 
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_scan.h>
@@ -106,7 +109,7 @@ struct inclusive_body
 
     if (first_call)
     {
-      if constexpr (HasInit)
+      THRUST_IF_CONSTEXPR (HasInit)
       {
         *iter2 = sum = binary_op(sum, *iter1);
       }
@@ -240,9 +243,9 @@ inclusive_scan(tag, InputIterator first, InputIterator last, OutputIterator resu
   using namespace thrust::detail;
 
   // Use the input iterator's value type per https://wg21.link/P0571
-  using ValueType = thrust::detail::it_value_t<InputIterator>;
+  using ValueType = typename thrust::iterator_value<InputIterator>::type;
 
-  using Size = thrust::detail::it_difference_t<InputIterator>;
+  using Size = typename thrust::iterator_difference<InputIterator>::type;
   Size n     = thrust::distance(first, last);
 
   if (n != 0)
@@ -264,10 +267,10 @@ OutputIterator inclusive_scan(
   using namespace thrust::detail;
 
   // Use the input iterator's value type and the initial value type per wg21.link/p2322
-  using ValueType =
-    typename ::cuda::std::__accumulator_t<BinaryFunction, thrust::detail::it_value_t<InputIterator>, InitialValueType>;
+  using ValueType = typename ::internal::
+    accumulator_t<BinaryFunction, typename _THRUST_STD::iterator_traits<InputIterator>::value_type, InitialValueType>;
 
-  using Size = thrust::detail::it_difference_t<InputIterator>;
+  using Size = typename thrust::iterator_difference<InputIterator>::type;
   Size n     = thrust::distance(first, last);
 
   if (n != 0)
@@ -291,7 +294,7 @@ OutputIterator exclusive_scan(
   // Use the initial value type per https://wg21.link/P0571
   using ValueType = InitialValueType;
 
-  using Size = thrust::detail::it_difference_t<InputIterator>;
+  using Size = typename thrust::iterator_difference<InputIterator>::type;
   Size n     = thrust::distance(first, last);
 
   if (n != 0)
diff --git a/projects/rocthrust/thrust/system/tbb/detail/scan_by_key.h b/projects/rocthrust/thrust/system/tbb/detail/scan_by_key.h
index 2e04e972e73e..cc65aa8039c6 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/scan_by_key.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/scan_by_key.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits scan_by_key
 #include <thrust/system/cpp/detail/scan_by_key.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/scatter.h b/projects/rocthrust/thrust/system/tbb/detail/scatter.h
index 9b23e5de64f6..6017bd22f2d7 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/scatter.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/scatter.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits this algorithm
 #include <thrust/system/cpp/detail/scatter.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/sequence.h b/projects/rocthrust/thrust/system/tbb/detail/sequence.h
index fa7973de8096..2149ac859556 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/sequence.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/sequence.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits sequence
 #include <thrust/system/cpp/detail/sequence.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/set_operations.h b/projects/rocthrust/thrust/system/tbb/detail/set_operations.h
index 62d026ea5f7a..360c2a88f356 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/set_operations.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/set_operations.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits set_operations
 #include <thrust/system/cpp/detail/set_operations.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/sort.h b/projects/rocthrust/thrust/system/tbb/detail/sort.h
index a9811a0a376c..fdadd0c2a48a 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/sort.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/sort.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/system/tbb/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/system/tbb/detail/sort.inl b/projects/rocthrust/thrust/system/tbb/detail/sort.inl
index aa7c148713da..48ed9b219f29 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/sort.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/sort.inl
@@ -17,22 +17,13 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/detail/copy.h>
-#include <thrust/detail/seq.h>
 #include <thrust/detail/temporary_array.h>
-#include <thrust/distance.h>
+#include <thrust/detail/copy.h>
 #include <thrust/iterator/iterator_traits.h>
+#include <thrust/distance.h>
 #include <thrust/merge.h>
 #include <thrust/sort.h>
-
+#include <thrust/detail/seq.h>
 #include <tbb/parallel_invoke.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -45,39 +36,26 @@ namespace detail
 namespace sort_detail
 {
 
+
 // TODO tune this based on data type and comp
 const static int threshold = 128 * 1024;
 
-template <typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
-void merge_sort(execution_policy<DerivedPolicy>& exec,
-                Iterator1 first1,
-                Iterator1 last1,
-                Iterator2 first2,
-                StrictWeakOrdering comp,
-                bool inplace);
 
-template <typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
+template<typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
+void merge_sort(execution_policy<DerivedPolicy> &exec, Iterator1 first1, Iterator1 last1, Iterator2 first2, StrictWeakOrdering comp, bool inplace);
+
+
+template<typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
 struct merge_sort_closure
 {
-  execution_policy<DerivedPolicy>& exec;
+  execution_policy<DerivedPolicy> &exec;
   Iterator1 first1, last1;
   Iterator2 first2;
   StrictWeakOrdering comp;
   bool inplace;
 
-  merge_sort_closure(
-    execution_policy<DerivedPolicy>& exec,
-    Iterator1 first1,
-    Iterator1 last1,
-    Iterator2 first2,
-    StrictWeakOrdering comp,
-    bool inplace)
-      : exec(exec)
-      , first1(first1)
-      , last1(last1)
-      , first2(first2)
-      , comp(comp)
-      , inplace(inplace)
+  merge_sort_closure(execution_policy<DerivedPolicy> &exec, Iterator1 first1, Iterator1 last1, Iterator2 first2, StrictWeakOrdering comp, bool inplace)
+    : exec(exec), first1(first1), last1(last1), first2(first2), comp(comp), inplace(inplace)
   {}
 
   void operator()(void) const
@@ -86,15 +64,11 @@ struct merge_sort_closure
   }
 };
 
-template <typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
-void merge_sort(execution_policy<DerivedPolicy>& exec,
-                Iterator1 first1,
-                Iterator1 last1,
-                Iterator2 first2,
-                StrictWeakOrdering comp,
-                bool inplace)
+
+template<typename DerivedPolicy, typename Iterator1, typename Iterator2, typename StrictWeakOrdering>
+void merge_sort(execution_policy<DerivedPolicy> &exec, Iterator1 first1, Iterator1 last1, Iterator2 first2, StrictWeakOrdering comp, bool inplace)
 {
-  using difference_type = thrust::detail::it_difference_t<Iterator1>;
+  using difference_type = typename thrust::iterator_difference<Iterator1>::type;
 
   difference_type n = thrust::distance(first1, last1);
 
@@ -102,7 +76,7 @@ void merge_sort(execution_policy<DerivedPolicy>& exec,
   {
     thrust::stable_sort(thrust::seq, first1, last1, comp);
 
-    if (!inplace)
+    if(!inplace)
     {
       thrust::copy(thrust::seq, first1, last1, first2);
     }
@@ -116,54 +90,52 @@ void merge_sort(execution_policy<DerivedPolicy>& exec,
 
   using Closure = merge_sort_closure<DerivedPolicy, Iterator1, Iterator2, StrictWeakOrdering>;
 
-  Closure left(exec, first1, mid1, first2, comp, !inplace);
-  Closure right(exec, mid1, last1, mid2, comp, !inplace);
+  Closure left (exec, first1, mid1,  first2, comp, !inplace);
+  Closure right(exec, mid1,   last1, mid2,   comp, !inplace);
 
   ::tbb::parallel_invoke(left, right);
 
-  if (inplace)
-  {
-    thrust::merge(exec, first2, mid2, mid2, last2, first1, comp);
-  }
-  else
-  {
-    thrust::merge(exec, first1, mid1, mid1, last1, first2, comp);
-  }
+  if(inplace) thrust::merge(exec, first2, mid2, mid2, last2, first1, comp);
+  else	      thrust::merge(exec, first1, mid1, mid1, last1, first2, comp);
 }
 
+
 } // end namespace sort_detail
 
+
 namespace sort_by_key_detail
 {
 
+
 // TODO tune this based on data type and comp
 const static int threshold = 128 * 1024;
 
-template <typename DerivedPolicy,
-          typename Iterator1,
-          typename Iterator2,
-          typename Iterator3,
-          typename Iterator4,
-          typename StrictWeakOrdering>
-void merge_sort_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  Iterator1 first1,
-  Iterator1 last1,
-  Iterator2 first2,
-  Iterator3 first3,
-  Iterator4 first4,
-  StrictWeakOrdering comp,
-  bool inplace);
-
-template <typename DerivedPolicy,
-          typename Iterator1,
-          typename Iterator2,
-          typename Iterator3,
-          typename Iterator4,
-          typename StrictWeakOrdering>
+
+template<typename DerivedPolicy,
+         typename Iterator1,
+         typename Iterator2,
+         typename Iterator3,
+         typename Iterator4,
+         typename StrictWeakOrdering>
+void merge_sort_by_key(execution_policy<DerivedPolicy> &exec,
+                       Iterator1 first1,
+                       Iterator1 last1,
+                       Iterator2 first2,
+                       Iterator3 first3,
+                       Iterator4 first4,
+                       StrictWeakOrdering comp,
+                       bool inplace);
+
+
+template<typename DerivedPolicy,
+         typename Iterator1,
+         typename Iterator2,
+         typename Iterator3,
+         typename Iterator4,
+         typename StrictWeakOrdering>
 struct merge_sort_by_key_closure
 {
-  execution_policy<DerivedPolicy>& exec;
+  execution_policy<DerivedPolicy> &exec;
   Iterator1 first1, last1;
   Iterator2 first2;
   Iterator3 first3;
@@ -171,23 +143,15 @@ struct merge_sort_by_key_closure
   StrictWeakOrdering comp;
   bool inplace;
 
-  merge_sort_by_key_closure(
-    execution_policy<DerivedPolicy>& exec,
-    Iterator1 first1,
-    Iterator1 last1,
-    Iterator2 first2,
-    Iterator3 first3,
-    Iterator4 first4,
-    StrictWeakOrdering comp,
-    bool inplace)
-      : exec(exec)
-      , first1(first1)
-      , last1(last1)
-      , first2(first2)
-      , first3(first3)
-      , first4(first4)
-      , comp(comp)
-      , inplace(inplace)
+  merge_sort_by_key_closure(execution_policy<DerivedPolicy> &exec,
+                            Iterator1 first1,
+                            Iterator1 last1,
+                            Iterator2 first2,
+                            Iterator3 first3,
+                            Iterator4 first4,
+                            StrictWeakOrdering comp,
+                            bool inplace)
+    : exec(exec), first1(first1), last1(last1), first2(first2), first3(first3), first4(first4), comp(comp), inplace(inplace)
   {}
 
   void operator()(void) const
@@ -196,23 +160,23 @@ struct merge_sort_by_key_closure
   }
 };
 
-template <typename DerivedPolicy,
-          typename Iterator1,
-          typename Iterator2,
-          typename Iterator3,
-          typename Iterator4,
-          typename StrictWeakOrdering>
-void merge_sort_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  Iterator1 first1,
-  Iterator1 last1,
-  Iterator2 first2,
-  Iterator3 first3,
-  Iterator4 first4,
-  StrictWeakOrdering comp,
-  bool inplace)
+
+template<typename DerivedPolicy,
+         typename Iterator1,
+         typename Iterator2,
+         typename Iterator3,
+         typename Iterator4,
+         typename StrictWeakOrdering>
+void merge_sort_by_key(execution_policy<DerivedPolicy> &exec,
+                       Iterator1 first1,
+                       Iterator1 last1,
+                       Iterator2 first2,
+                       Iterator3 first3,
+                       Iterator4 first4,
+                       StrictWeakOrdering comp,
+                       bool inplace)
 {
-  using difference_type = thrust::detail::it_difference_t<Iterator1>;
+  using difference_type = typename thrust::iterator_difference<Iterator1>::type;
 
   difference_type n = thrust::distance(first1, last1);
 
@@ -227,7 +191,7 @@ void merge_sort_by_key(
   {
     thrust::stable_sort_by_key(thrust::seq, first1, last1, first2, comp);
 
-    if (!inplace)
+    if(!inplace)
     {
       thrust::copy(thrust::seq, first1, last1, first3);
       thrust::copy(thrust::seq, first2, last2, first4);
@@ -239,12 +203,12 @@ void merge_sort_by_key(
   using Closure =
     merge_sort_by_key_closure<DerivedPolicy, Iterator1, Iterator2, Iterator3, Iterator4, StrictWeakOrdering>;
 
-  Closure left(exec, first1, mid1, first2, first3, first4, comp, !inplace);
-  Closure right(exec, mid1, last1, mid2, mid3, mid4, comp, !inplace);
+  Closure left (exec, first1, mid1,  first2, first3, first4, comp, !inplace);
+  Closure right(exec, mid1,   last1, mid2,   mid3,   mid4,   comp, !inplace);
 
   ::tbb::parallel_invoke(left, right);
 
-  if (inplace)
+  if(inplace)
   {
     thrust::merge_by_key(exec, first3, mid3, mid3, last3, first4, mid4, first1, first2, comp);
   }
@@ -254,32 +218,38 @@ void merge_sort_by_key(
   }
 }
 
-} // namespace sort_by_key_detail
 
-template <typename DerivedPolicy, typename RandomAccessIterator, typename StrictWeakOrdering>
-void stable_sort(
-  execution_policy<DerivedPolicy>& exec, RandomAccessIterator first, RandomAccessIterator last, StrictWeakOrdering comp)
+} // end namespace sort_detail
+
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator,
+         typename StrictWeakOrdering>
+void stable_sort(execution_policy<DerivedPolicy> &exec,
+                 RandomAccessIterator first,
+                 RandomAccessIterator last,
+                 StrictWeakOrdering comp)
 {
-  using key_type = thrust::detail::it_value_t<RandomAccessIterator>;
+  using key_type = typename thrust::iterator_value<RandomAccessIterator>::type;
 
   thrust::detail::temporary_array<key_type, DerivedPolicy> temp(exec, first, last);
 
   sort_detail::merge_sort(exec, first, last, temp.begin(), comp, true);
 }
 
-template <typename DerivedPolicy,
-          typename RandomAccessIterator1,
-          typename RandomAccessIterator2,
-          typename StrictWeakOrdering>
-void stable_sort_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  RandomAccessIterator1 first1,
-  RandomAccessIterator1 last1,
-  RandomAccessIterator2 first2,
-  StrictWeakOrdering comp)
+
+template<typename DerivedPolicy,
+         typename RandomAccessIterator1,
+         typename RandomAccessIterator2,
+         typename StrictWeakOrdering>
+  void stable_sort_by_key(execution_policy<DerivedPolicy> &exec,
+                          RandomAccessIterator1 first1,
+                          RandomAccessIterator1 last1,
+                          RandomAccessIterator2 first2,
+                          StrictWeakOrdering comp)
 {
-  using key_type = thrust::detail::it_value_t<RandomAccessIterator1>;
-  using val_type = thrust::detail::it_value_t<RandomAccessIterator2>;
+  using key_type = typename thrust::iterator_value<RandomAccessIterator1>::type;
+  using val_type = typename thrust::iterator_value<RandomAccessIterator2>::type;
 
   RandomAccessIterator2 last2 = first2 + thrust::distance(first1, last1);
 
@@ -289,6 +259,7 @@ void stable_sort_by_key(
   sort_by_key_detail::merge_sort_by_key(exec, first1, last1, first2, temp1.begin(), temp2.begin(), comp, true);
 }
 
+
 } // end namespace detail
 } // end namespace tbb
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/tbb/detail/swap_ranges.h b/projects/rocthrust/thrust/system/tbb/detail/swap_ranges.h
index 600fbe4ced18..eade2034ab90 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/swap_ranges.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/swap_ranges.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // tbb inherits swap_ranges
 #include <thrust/system/cpp/detail/swap_ranges.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/tabulate.h b/projects/rocthrust/thrust/system/tbb/detail/tabulate.h
index 8b26140153a4..5952a435929c 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/tabulate.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/tabulate.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits tabulate
 #include <thrust/system/cpp/detail/tabulate.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/temporary_buffer.h b/projects/rocthrust/thrust/system/tbb/detail/temporary_buffer.h
index 8da64673cb33..a32c5aed28de 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/temporary_buffer.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/temporary_buffer.h
@@ -18,12 +18,4 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system has no special temporary buffer functions
diff --git a/projects/rocthrust/thrust/system/tbb/detail/transform.h b/projects/rocthrust/thrust/system/tbb/detail/transform.h
index ba29642fdfe3..e46a0cda3406 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/transform.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/transform.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // omp inherits transform
 #include <thrust/system/cpp/detail/transform.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/transform_reduce.h b/projects/rocthrust/thrust/system/tbb/detail/transform_reduce.h
index 6b095061ae3d..08ab6281d207 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/transform_reduce.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/transform_reduce.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits transform_reduce
 #include <thrust/system/cpp/detail/transform_reduce.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/transform_scan.h b/projects/rocthrust/thrust/system/tbb/detail/transform_scan.h
index 0a8831232235..2b949479aab4 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/transform_scan.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/transform_scan.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits transform_scan
 #include <thrust/system/cpp/detail/transform_scan.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/uninitialized_copy.h b/projects/rocthrust/thrust/system/tbb/detail/uninitialized_copy.h
index 11ad5f131bae..11f93129db20 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/uninitialized_copy.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits uninitialized_copy
 #include <thrust/system/cpp/detail/uninitialized_copy.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/uninitialized_fill.h b/projects/rocthrust/thrust/system/tbb/detail/uninitialized_fill.h
index 168d13c35169..fb8228e4f93e 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/uninitialized_fill.h
@@ -18,13 +18,5 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 // this system inherits uninitialized_fill
 #include <thrust/system/cpp/detail/uninitialized_fill.h>
diff --git a/projects/rocthrust/thrust/system/tbb/detail/unique.h b/projects/rocthrust/thrust/system/tbb/detail/unique.h
index 17730cb7d94b..7f5ac692887b 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/unique.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/unique.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
@@ -49,7 +42,7 @@ OutputIterator unique_copy(
   BinaryPredicate binary_pred);
 
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::detail::it_difference_t<ForwardIterator> unique_count(
+typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred);
 
 } // end namespace detail
diff --git a/projects/rocthrust/thrust/system/tbb/detail/unique.inl b/projects/rocthrust/thrust/system/tbb/detail/unique.inl
index 0fe6171f3d6f..311fb5610bea 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/unique.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/unique.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/pair.h>
-#include <thrust/system/detail/generic/unique.h>
 #include <thrust/system/tbb/detail/unique.h>
+#include <thrust/system/detail/generic/unique.h>
+#include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,34 +29,49 @@ namespace tbb
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-ForwardIterator
-unique(execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+  ForwardIterator unique(execution_policy<DerivedPolicy> &exec,
+                         ForwardIterator first,
+                         ForwardIterator last,
+                         BinaryPredicate binary_pred)
 {
   // tbb prefers generic::unique to cpp::unique
-  return thrust::system::detail::generic::unique(exec, first, last, binary_pred);
+  return thrust::system::detail::generic::unique(exec,first,last,binary_pred);
 } // end unique()
 
-template <typename DerivedPolicy, typename InputIterator, typename OutputIterator, typename BinaryPredicate>
-OutputIterator unique_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator first,
-  InputIterator last,
-  OutputIterator output,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator,
+         typename OutputIterator,
+         typename BinaryPredicate>
+  OutputIterator unique_copy(execution_policy<DerivedPolicy> &exec,
+                             InputIterator first,
+                             InputIterator last,
+                             OutputIterator output,
+                             BinaryPredicate binary_pred)
 {
   // tbb prefers generic::unique_copy to cpp::unique_copy
-  return thrust::system::detail::generic::unique_copy(exec, first, last, output, binary_pred);
+  return thrust::system::detail::generic::unique_copy(exec,first,last,output,binary_pred);
 } // end unique_copy()
 
-template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-thrust::detail::it_difference_t<ForwardIterator> unique_count(
-  execution_policy<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator,
+         typename BinaryPredicate>
+  typename thrust::iterator_traits<ForwardIterator>::difference_type
+    unique_count(execution_policy<DerivedPolicy> &exec,
+                 ForwardIterator first,
+                 ForwardIterator last,
+                 BinaryPredicate binary_pred)
 {
   // tbb prefers generic::unique_count to cpp::unique_count
-  return thrust::system::detail::generic::unique_count(exec, first, last, binary_pred);
+  return thrust::system::detail::generic::unique_count(exec,first,last,binary_pred);
 } // end unique_count()
 
+
 } // end namespace detail
 } // end namespace tbb
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.h b/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.h
index ac08d1e78e25..92e8e199e727 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.h
+++ b/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.h
@@ -18,13 +18,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/pair.h>
 #include <thrust/system/tbb/detail/execution_policy.h>
 
diff --git a/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.inl b/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.inl
index 4ec00b2bf9dd..d0d2d4abe053 100644
--- a/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.inl
+++ b/projects/rocthrust/thrust/system/tbb/detail/unique_by_key.inl
@@ -17,17 +17,9 @@
 #pragma once
 
 #include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-#include <thrust/pair.h>
-#include <thrust/system/detail/generic/unique_by_key.h>
 #include <thrust/system/tbb/detail/unique_by_key.h>
+#include <thrust/system/detail/generic/unique_by_key.h>
+#include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 namespace system
@@ -37,38 +29,43 @@ namespace tbb
 namespace detail
 {
 
-template <typename DerivedPolicy, typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
-thrust::pair<ForwardIterator1, ForwardIterator2> unique_by_key(
-  execution_policy<DerivedPolicy>& exec,
-  ForwardIterator1 keys_first,
-  ForwardIterator1 keys_last,
-  ForwardIterator2 values_first,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename ForwardIterator1,
+         typename ForwardIterator2,
+         typename BinaryPredicate>
+  thrust::pair<ForwardIterator1,ForwardIterator2>
+    unique_by_key(execution_policy<DerivedPolicy> &exec,
+                  ForwardIterator1 keys_first,
+                  ForwardIterator1 keys_last,
+                  ForwardIterator2 values_first,
+                  BinaryPredicate binary_pred)
 {
   // tbb prefers generic::unique_by_key to cpp::unique_by_key
-  return thrust::system::detail::generic::unique_by_key(exec, keys_first, keys_last, values_first, binary_pred);
+  return thrust::system::detail::generic::unique_by_key(exec,keys_first,keys_last,values_first,binary_pred);
 } // end unique_by_key()
 
-template <typename DerivedPolicy,
-          typename InputIterator1,
-          typename InputIterator2,
-          typename OutputIterator1,
-          typename OutputIterator2,
-          typename BinaryPredicate>
-thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
-  execution_policy<DerivedPolicy>& exec,
-  InputIterator1 keys_first,
-  InputIterator1 keys_last,
-  InputIterator2 values_first,
-  OutputIterator1 keys_output,
-  OutputIterator2 values_output,
-  BinaryPredicate binary_pred)
+
+template<typename DerivedPolicy,
+         typename InputIterator1,
+         typename InputIterator2,
+         typename OutputIterator1,
+         typename OutputIterator2,
+         typename BinaryPredicate>
+  thrust::pair<OutputIterator1,OutputIterator2>
+    unique_by_key_copy(execution_policy<DerivedPolicy> &exec,
+                       InputIterator1 keys_first,
+                       InputIterator1 keys_last,
+                       InputIterator2 values_first,
+                       OutputIterator1 keys_output,
+                       OutputIterator2 values_output,
+                       BinaryPredicate binary_pred)
 {
   // tbb prefers generic::unique_by_key_copy to cpp::unique_by_key_copy
-  return thrust::system::detail::generic::unique_by_key_copy(
-    exec, keys_first, keys_last, values_first, keys_output, values_output, binary_pred);
+  return thrust::system::detail::generic::unique_by_key_copy(exec,keys_first,keys_last,values_first,keys_output,values_output,binary_pred);
 } // end unique_by_key_copy()
 
+
 } // end namespace detail
 } // end namespace tbb
 } // end namespace system
diff --git a/projects/rocthrust/thrust/system/tbb/execution_policy.h b/projects/rocthrust/thrust/system/tbb/execution_policy.h
index a21e0604ad89..96167a82a933 100644
--- a/projects/rocthrust/thrust/system/tbb/execution_policy.h
+++ b/projects/rocthrust/thrust/system/tbb/execution_policy.h
@@ -16,20 +16,12 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 /*! \file thrust/system/tbb/execution_policy.h
  *  \brief Execution policies for Thrust's TBB system.
  */
 
+#include <thrust/detail/config.h>
+
 // get the execution policies definitions first
 #include <thrust/system/tbb/detail/execution_policy.h>
 
@@ -132,7 +124,7 @@ struct tag : thrust::system::tbb::execution_policy<tag> { unspecified };
  *
  *  struct printf_functor
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    void operator()(int x)
  *    {
  *      printf("%d\n", x);
diff --git a/projects/rocthrust/thrust/system/tbb/memory_resource.h b/projects/rocthrust/thrust/system/tbb/memory_resource.h
index ede982cb0c31..a7ad064dc5c3 100644
--- a/projects/rocthrust/thrust/system/tbb/memory_resource.h
+++ b/projects/rocthrust/thrust/system/tbb/memory_resource.h
@@ -62,9 +62,9 @@ using memory_resource = detail::native_resource;
  *  \p mr::new_delete_resource and tags it with \p tbb::universal_pointer.
  */
 using universal_memory_resource = detail::universal_native_resource;
-
+// FIXME(bgruber): comment below is wrong or alias should be to universal_memory_resource
 /*! An alias for \p tbb::universal_memory_resource. */
-using universal_host_pinned_memory_resource = universal_memory_resource;
+using universal_host_pinned_memory_resource = detail::native_resource;
 
 /*! \} // memory_resources
  */
diff --git a/projects/rocthrust/thrust/system/tbb/vector.h b/projects/rocthrust/thrust/system/tbb/vector.h
index 92dc23911e31..2ee6a445f65a 100644
--- a/projects/rocthrust/thrust/system/tbb/vector.h
+++ b/projects/rocthrust/thrust/system/tbb/vector.h
@@ -77,14 +77,11 @@ using vector = thrust::detail::vector_base<T, Allocator>;
  *  \see host_vector For the documentation of the complete interface which is
  *                   shared by \p tbb::universal_vector
  *  \see device_vector
- *  \see universal_host_pinned_vector
+ *  \see universal_vector
  */
 template <typename T, typename Allocator = thrust::system::tbb::universal_allocator<T>>
 using universal_vector = thrust::detail::vector_base<T, Allocator>;
 
-//! Like \ref universal_vector but uses pinned memory when the system supports it.
-//! \see device_vector
-//! \see universal_vector
 template <typename T>
 using universal_host_pinned_vector = thrust::detail::vector_base<T, universal_host_pinned_allocator<T>>;
 } // namespace tbb
diff --git a/projects/rocthrust/thrust/system_error.h b/projects/rocthrust/thrust/system_error.h
index 529abfa75a24..2bd0e05914b3 100644
--- a/projects/rocthrust/thrust/system_error.h
+++ b/projects/rocthrust/thrust/system_error.h
@@ -22,25 +22,13 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 THRUST_NAMESPACE_BEGIN
 
-/*! \addtogroup system
- *  \{
- */
-
 /*! \namespace thrust::system
  *  \brief \p thrust::system is the namespace which contains specific Thrust
  *         backend systems. It also contains functionality for reporting error
  *         conditions originating from the operating system or other low-level
- *         application program interfaces such as the CUDA or HIP runtime. They are
+ *         application program interfaces such as the HIP runtime. They are
  *         provided in a separate namespace for import convenience but are
  *         also aliased in the top-level \p thrust namespace for easy access.
  */
@@ -48,9 +36,6 @@ namespace system
 {
 } // namespace system
 
-/*! \} // end system
- */
-
 THRUST_NAMESPACE_END
 
 #include <thrust/system/error_code.h>
diff --git a/projects/rocthrust/thrust/tabulate.h b/projects/rocthrust/thrust/tabulate.h
index 691bd8e9c4f1..a278d5842f41 100644
--- a/projects/rocthrust/thrust/tabulate.h
+++ b/projects/rocthrust/thrust/tabulate.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -54,8 +47,9 @@ THRUST_NAMESPACE_BEGIN
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable, and if \c x and \c y are objects of \c ForwardIterator's \c
  * value_type, then <tt>x + y</tt> is defined, and if \c T is \p ForwardIterator's \c value_type, then <tt>T(0)</tt> is
- * defined.
- *  \tparam UnaryOperation The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * defined. \tparam UnaryOperation is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a> and \c UnaryFunction's
+ * \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  The following code snippet demonstrates how to use \p tabulate to generate the first \c n non-positive integers
  *  using the \p thrust::host execution policy for parallelization:
@@ -95,8 +89,9 @@ tabulate(const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable, and if \c x and \c y are objects of \c ForwardIterator's \c
  * value_type, then <tt>x + y</tt> is defined, and if \c T is \p ForwardIterator's \c value_type, then <tt>T(0)</tt> is
- * defined.
- *  \tparam UnaryOperation The function's return type must be convertible to \c OutputIterator's \c value_type.
+ * defined. \tparam UnaryOperation is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a> and \c UnaryFunction's
+ * \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  The following code snippet demonstrates how to use \p tabulate to generate the first \c n non-positive integers:
  *
diff --git a/projects/rocthrust/thrust/transform.h b/projects/rocthrust/thrust/transform.h
index f16a9c8820fe..8390dde3bdb7 100644
--- a/projects/rocthrust/thrust/transform.h
+++ b/projects/rocthrust/thrust/transform.h
@@ -59,7 +59,7 @@ THRUST_NAMESPACE_BEGIN
 //!
 //! \tparam DerivedPolicy The name of the derived execution policy.
 //! \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator's \c value_type is convertible to \c UnaryFunction's argument type. \tparam
+//! Iterator</a> and \c InputIterator's \c value_type is convertible to \c UnaryFunction's \c argument_type. \tparam
 //! OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
 //! Iterator</a>.
 //! \tparam UnaryFunction is a unary function type which's return type is convertible to \c OutputIterator's \c
@@ -111,7 +111,7 @@ THRUST_HOST_DEVICE OutputIterator transform(
 //! \return The end of the output sequence.
 //!
 //! \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator's \c value_type is convertible to \c UnaryFunction's argument type.
+//! Iterator</a> and \c InputIterator's \c value_type is convertible to \c UnaryFunction's \c argument_type.
 //! \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
 //! Iterator</a>.
 //! \tparam UnaryFunction is a unary function type which's return type is convertible to \c OutputIterator's \c
@@ -161,9 +161,9 @@ OutputIterator transform(InputIterator first, InputIterator last, OutputIterator
 //!
 //! \tparam DerivedPolicy The name of the derived execution policy.
 //! \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's first argument type.
+//! Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's \c first_argument_type.
 //! \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's second argument type.
+//! Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's \c second_argument_type.
 //! \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
 //! Iterator</a>.
 //! \tparam BinaryFunction is a binary function type which's return type is convertible to \c OutputIterator's \c
@@ -225,9 +225,9 @@ THRUST_HOST_DEVICE OutputIterator transform(
 //! \return The end of the output sequence.
 //!
 //! \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's first argument type.
+//! Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's \c first_argument_type.
 //! \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
-//! Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's second argument type.
+//! Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's \c second_argument_type.
 //! \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
 //! Iterator</a>.
 //! \tparam BinaryFunction is a binary function type which's return type is convertible to \c OutputIterator's \c
@@ -288,11 +288,12 @@ transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, Ou
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \c InputIterator's \c value_type is convertible to \c Predicate's argument type, and \c
- * InputIterator's \c value_type is convertible to \c UnaryFunction's argument type. \tparam ForwardIterator is a
- * model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward Iterator</a>.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>, and \c InputIterator's \c value_type is convertible to \c Predicate's \c argument_type, and \c
+ * InputIterator's \c value_type is convertible to \c UnaryFunction's \c argument_type. \tparam ForwardIterator is a
+ * model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and \c UnaryFunction's \c result_type is convertible to \c OutputIterator's \c value_type. \tparam
+ * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> shall not overlap the range <tt>[result,
  * result + (last - first))</tt> otherwise.
@@ -364,11 +365,12 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
  *  \return The end of the output sequence.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \c InputIterator's \c value_type is convertible to \c Predicate's argument type, and \c
- * InputIterator's \c value_type is convertible to \c UnaryFunction's argument type. \tparam ForwardIterator is a
- * model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward Iterator</a>.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>, and \c InputIterator's \c value_type is convertible to \c Predicate's \c argument_type, and \c
+ * InputIterator's \c value_type is convertible to \c UnaryFunction's \c argument_type. \tparam ForwardIterator is a
+ * model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and \c UnaryFunction's \c result_type is convertible to \c OutputIterator's \c value_type. \tparam
+ * Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> shall not overlap the range <tt>[result,
  * result + (last - first))</tt> otherwise.
@@ -434,13 +436,14 @@ transform_if(InputIterator first, InputIterator last, ForwardIterator result, Un
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c UnaryFunction's argument type. \tparam
+ * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c UnaryFunction's \c argument_type. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>
- *                         and \c InputIterator2's \c value_type is convertible to \c Predicate's argument type.
+ *                         and \c InputIterator2's \c value_type is convertible to \c Predicate's \c argument_type.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>. \tparam UnaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a> and \c UnaryFunction's
+ * \c result_type is convertible to \c OutputIterator's \c value_type. \tparam Predicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> shall not overlap the range <tt>[result,
  * result + (last - first))</tt> otherwise. \pre \p stencil may equal \p result, but the range <tt>[stencil, stencil +
@@ -509,13 +512,14 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
  *  \return The end of the output sequence.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c UnaryFunction's argument type. \tparam
+ * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c UnaryFunction's \c argument_type. \tparam
  * InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input Iterator</a>
- *                         and \c InputIterator2's \c value_type is convertible to \c Predicate's argument type.
+ *                         and \c InputIterator2's \c value_type is convertible to \c Predicate's \c argument_type.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>. \tparam UnaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary Function</a> and \c UnaryFunction's
+ * \c result_type is convertible to \c OutputIterator's \c value_type. \tparam Predicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> shall not overlap the range <tt>[result,
  * result + (last - first))</tt> otherwise. \pre \p stencil may equal \p result, but the range <tt>[stencil, stencil +
@@ -584,13 +588,14 @@ ForwardIterator transform_if(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's first argument type.
+ * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's second argument type.
+ * Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's \c second_argument_type.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>.
- *  \tparam BinaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * BinaryFunction's \c result_type is convertible to \c OutputIterator's \c value_type. \tparam Predicate is a model of
+ * <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first1 may equal \p result, but the range <tt>[first1, last1)</tt> shall not overlap the range <tt>[result,
  * result + (last1 - first1))</tt> otherwise. \pre \p first2 may equal \p result, but the range <tt>[first2, first2 +
@@ -667,13 +672,14 @@ THRUST_HOST_DEVICE ForwardIterator transform_if(
  *  \return The end of the output sequence.
  *
  *  \tparam InputIterator1 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's first argument type.
+ * Iterator</a> and \c InputIterator1's \c value_type is convertible to \c BinaryFunction's \c first_argument_type.
  *  \tparam InputIterator2 is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's second argument type.
+ * Iterator</a> and \c InputIterator2's \c value_type is convertible to \c BinaryFunction's \c second_argument_type.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>.
- *  \tparam BinaryFunction The function's return type must be convertible to \c OutputIterator's \c value_type.
- *  \tparam Predicate is a model of <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
+ * Iterator</a>. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * BinaryFunction's \c result_type is convertible to \c OutputIterator's \c value_type. \tparam Predicate is a model of
+ * <a href="https://en.cppreference.com/w/cpp/concepts/predicate">Predicate</a>.
  *
  *  \pre \p first1 may equal \p result, but the range <tt>[first1, last1)</tt> shall not overlap the range <tt>[result,
  * result + (last1 - first1))</tt> otherwise. \pre \p first2 may equal \p result, but the range <tt>[first2, first2 +
diff --git a/projects/rocthrust/thrust/transform_reduce.h b/projects/rocthrust/thrust/transform_reduce.h
index 129ad48dbf69..6e77b7843c62 100644
--- a/projects/rocthrust/thrust/transform_reduce.h
+++ b/projects/rocthrust/thrust/transform_reduce.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -66,12 +59,13 @@ THRUST_NAMESPACE_BEGIN
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputType.
- *  \tparam OutputType is a model of
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a>, and \p UnaryFunction's \c result_type is convertible to \c OutputType. \tparam OutputType is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is convertible to \p
- * BinaryFunction's first and second argument type.
- *  \tparam BinaryFunction The function's return type must be convertible to \p OutputType.
+ * BinaryFunction's \c first_argument_type and \c second_argument_type. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction's \c result_type is convertible to \p OutputType.
  *
  *  The following code snippet demonstrates how to use \p transform_reduce
  *  to compute the maximum value of the absolute value of the elements
@@ -83,9 +77,9 @@ THRUST_NAMESPACE_BEGIN
  *  #include <thrust/execution_policy.h>
  *
  *  template<typename T>
- *  struct absolute_value
+ *  struct absolute_value : public unary_function<T,T>
  *  {
- *    __host__ __device__ T operator()(const T &x) const
+ *    THRUST_HOST_DEVICE T operator()(const T &x) const
  *    {
  *      return x < T(0) ? -x : x;
  *    }
@@ -140,12 +134,13 @@ THRUST_HOST_DEVICE OutputType transform_reduce(
  *  \return The result of the transformed reduction.
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
- * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's argument type.
- *  \tparam UnaryFunction The function's return type must be convertible to \c OutputType.
- *  \tparam OutputType is a model of
+ * Iterator</a>, and \p InputIterator's \c value_type is convertible to \p UnaryFunction's \c argument_type. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a>, and \p UnaryFunction's \c result_type is convertible to \c OutputType. \tparam OutputType is a model of
  * <a href="https://en.cppreference.com/w/cpp/named_req/CopyAssignable">Assignable</a>, and is convertible to \p
- * BinaryFunction's first and second argument type.
- *  \tparam BinaryFunction The function's return type must be convertible to \p OutputType.
+ * BinaryFunction's \c first_argument_type and \c second_argument_type. \tparam BinaryFunction is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a>, and \p
+ * BinaryFunction's \c result_type is convertible to \p OutputType.
  *
  *  The following code snippet demonstrates how to use \p transform_reduce
  *  to compute the maximum value of the absolute value of the elements
@@ -156,9 +151,9 @@ THRUST_HOST_DEVICE OutputType transform_reduce(
  *  #include <thrust/functional.h>
  *
  *  template<typename T>
- *  struct absolute_value
+ *  struct absolute_value : public unary_function<T,T>
  *  {
- *    __host__ __device__ T operator()(const T &x) const
+ *    THRUST_HOST_DEVICE T operator()(const T &x) const
  *    {
  *      return x < T(0) ? -x : x;
  *    }
diff --git a/projects/rocthrust/thrust/transform_scan.h b/projects/rocthrust/thrust/transform_scan.h
index c471533cda6b..3109fe3b8284 100644
--- a/projects/rocthrust/thrust/transform_scan.h
+++ b/projects/rocthrust/thrust/transform_scan.h
@@ -70,11 +70,12 @@ THRUST_NAMESPACE_BEGIN
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type. \tparam OutputIterator
- * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The functions return type must be
- *  convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is convertible
+ * to \c OutputIterator's \c value_type. \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -134,11 +135,12 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type. \tparam OutputIterator
- * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The function's return type is convertible
- * to \c OutputIterator's \c value_type.
- * \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is convertible
+ * to \c OutputIterator's \c value_type. \tparam AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -193,11 +195,13 @@ OutputIterator transform_inclusive_scan(
  *  Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  *  Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The function's return type is
+ *  \tparam UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">
+ *  Unary Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is
  *  convertible to \c OutputIterator's \c value_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of
+ *  <ahref="https://en.cppreference.com/w/cpp/utility/functional/binary_function"> Binary Function</a> and \c
+ *  AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  *  first))</tt> shall not overlap otherwise.
@@ -262,11 +266,13 @@ THRUST_HOST_DEVICE OutputIterator transform_inclusive_scan(
  *  Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type.
  *  \tparam OutputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output
  *  Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The function's return type is
+ *  \tparam UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">
+ *  Unary Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is
  * convertible to \c OutputIterator's \c value_type.
  *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ *  \tparam AssociativeOperator is a model of
+ * <ahref="https://en.cppreference.com/w/cpp/utility/functional/binary_function"> Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -325,12 +331,13 @@ OutputIterator transform_inclusive_scan(
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type. \tparam OutputIterator
- * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The function's return type must be
- * convertible to \c OutputIterator's \c value_type.
- *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is convertible
+ * to \c OutputIterator's \c value_type. \tparam T is convertible to \c OutputIterator's \c value_type. \tparam
+ * AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
@@ -393,12 +400,13 @@ THRUST_HOST_DEVICE OutputIterator transform_exclusive_scan(
  *
  *  \tparam InputIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/input_iterator">Input
  * Iterator</a> and \c InputIterator's \c value_type is convertible to \c unary_op's input type. \tparam OutputIterator
- * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>.
- *  \tparam UnaryFunction accepts inputs of \c InputIterator's \c value_type. The function's return type must be
- * convertible to \c OutputIterator's \c value_type.
- *  \tparam T is convertible to \c OutputIterator's \c value_type.
- *  \tparam AssociativeOperator is a binary function and the function's return type must be convertible to \c
- * OutputIterator's \c value_type.
+ * is a model of <a href="https://en.cppreference.com/w/cpp/iterator/output_iterator">Output Iterator</a>. \tparam
+ * UnaryFunction is a model of <a href="https://en.cppreference.com/w/cpp/utility/functional/unary_function">Unary
+ * Function</a> and accepts inputs of \c InputIterator's \c value_type.  \c UnaryFunction's result_type is convertible
+ * to \c OutputIterator's \c value_type. \tparam T is convertible to \c OutputIterator's \c value_type. \tparam
+ * AssociativeOperator is a model of <a
+ * href="https://en.cppreference.com/w/cpp/utility/functional/binary_function">Binary Function</a> and \c
+ * AssociativeOperator's \c result_type is convertible to \c OutputIterator's \c value_type.
  *
  *  \pre \p first may equal \p result, but the range <tt>[first, last)</tt> and the range <tt>[result, result + (last -
  * first))</tt> shall not overlap otherwise.
diff --git a/projects/rocthrust/thrust/tuple.h b/projects/rocthrust/thrust/tuple.h
index 43ccb1be03f8..b62c0a40e42c 100644
--- a/projects/rocthrust/thrust/tuple.h
+++ b/projects/rocthrust/thrust/tuple.h
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2008-2018 NVIDIA Corporation
- *  Modifications Copyright (c) 2026, Advanced Micro Devices, Inc.  All rights reserved.
+ *  Copyright 2008-2025 NVIDIA Corporation
+ *  Modifications Copyright (c) 2025, Advanced Micro Devices, Inc.  All rights reserved.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -45,9 +45,54 @@
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <cstddef>
 #  include <type_traits>
-#  include <utility>
 #endif
 
+THRUST_NAMESPACE_BEGIN
+
+// define null_type for backwards compatibility
+struct THRUST_DEPRECATED_BECAUSE("Please remove null_type from parameters to tuple<...>") null_type
+{};
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+#ifndef THRUST_DOXYGEN_INVOKED
+
+THRUST_HOST_DEVICE inline bool operator==(const null_type&, const null_type&)
+{
+  return true;
+}
+
+THRUST_HOST_DEVICE inline bool operator>=(const null_type&, const null_type&)
+{
+  return true;
+}
+
+THRUST_HOST_DEVICE inline bool operator<=(const null_type&, const null_type&)
+{
+  return true;
+}
+
+THRUST_HOST_DEVICE inline bool operator!=(const null_type&, const null_type&)
+{
+  return false;
+}
+
+THRUST_HOST_DEVICE inline bool operator<(const null_type&, const null_type&)
+{
+  return false;
+}
+
+THRUST_HOST_DEVICE inline bool operator>(const null_type&, const null_type&)
+{
+  return false;
+}
+
+#endif
+
+THRUST_SUPPRESS_DEPRECATED_POP
+
+THRUST_NAMESPACE_END
+
 // If 'libcudacxx' or 'libhipcxx' is available (_THRUST_HAS_DEVICE_SYSTEM_STD), we will
 // use the implementations provided there. Otherwise we will fall back to an older
 // implementation of thrust::tuple.
@@ -153,13 +198,128 @@ using _THRUST_STD::tie;
 
 THRUST_NAMESPACE_END
 
-#else // TODO(libhipcxx): remove this path of code once libhipcxx gets ready
+_THRUST_STD_NAMESPACE_BEGIN
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
+template <>
+struct tuple_size<tuple<THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<>>
+{};
+
+template <class T0>
+struct tuple_size<tuple<T0,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0>>
+{};
+
+template <class T0, class T1>
+struct tuple_size<tuple<T0,
+                        T1,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1>>
+{};
+
+template <class T0, class T1, class T2>
+struct tuple_size<tuple<T0,
+                        T1,
+                        T2,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2>>
+{};
+
+template <class T0, class T1, class T2, class T3>
+struct tuple_size<tuple<T0,
+                        T1,
+                        T2,
+                        T3,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3>>
+{};
+
+template <class T0, class T1, class T2, class T3, class T4>
+struct tuple_size<tuple<T0,
+                        T1,
+                        T2,
+                        T3,
+                        T4,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3, T4>>
+{};
+
+template <class T0, class T1, class T2, class T3, class T4, class T5>
+struct tuple_size<tuple<T0,
+                        T1,
+                        T2,
+                        T3,
+                        T4,
+                        T5,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type,
+                        THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3, T4, T5>>
+{};
+
+template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
+struct tuple_size<
+  tuple<T0, T1, T2, T3, T4, T5, T6, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type>>
+    : tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6>>
+{};
+
+template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
+struct tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type>>
+    : tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7>>
+{};
+
+template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
+struct tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, THRUST_NS_QUALIFIER::null_type>>
+    : tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8>>
+{};
+
+THRUST_SUPPRESS_DEPRECATED_POP
+_THRUST_STD_NAMESPACE_END
+
+#else
 
 #  include <thrust/detail/tuple.inl>
 #  include <thrust/pair.h>
 
 THRUST_NAMESPACE_BEGIN
 
+THRUST_SUPPRESS_DEPRECATED_PUSH
+
 /*! \addtogroup utility
  *  \{
  */
@@ -256,7 +416,7 @@ get(const detail::cons<HT, TT>& t);
  *  \see tuple
  */
 template <class... Ts>
-tuple(Ts...) -> tuple<Ts...>;
+THRUST_HOST_DEVICE tuple(Ts...) -> tuple<Ts...>;
 
 /*! \cond
  */
@@ -285,9 +445,7 @@ struct pair;
  *  \see tuple
  */
 template <class T1, class T2>
-tuple(pair<T1, T2>) -> tuple<T1, T2>;
-
-THRUST_SUPPRESS_DEPRECATED_PUSH
+THRUST_HOST_DEVICE tuple(pair<T1, T2>) -> tuple<T1, T2>;
 
 /*! \brief \p tuple is a class template that can be instantiated with up to ten
  *  arguments. Each template argument specifies the type of element in the \p
@@ -588,8 +746,6 @@ class tuple<null_type, null_type, null_type, null_type, null_type, null_type, nu
 /*! \endcond
  */
 
-THRUST_SUPPRESS_DEPRECATED_POP
-
 /*! This version of \p make_tuple creates a new \c tuple object from a
  *  single object.
  *
@@ -762,23 +918,7 @@ tie(T0& t0, T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8, T9&
 /*! \} // utility
  */
 
-#  ifndef THRUST_DOXYGEN_INVOKED
-namespace internal
-{
-template <typename F, typename Tuple, size_t... Is>
-constexpr auto apply_tuple_impl(F&& f, Tuple&& t, ::std::index_sequence<Is...>)
-{
-  return f(get<Is>(::std::forward<Tuple>(t))...);
-}
-} // namespace internal
-
-template <typename F, typename Tuple>
-constexpr auto apply(F&& f, Tuple&& t)
-{
-  constexpr ::std::size_t N = tuple_size<::std::remove_reference_t<Tuple>>::value;
-  return internal::apply_tuple_impl(::std::forward<F>(f), ::std::forward<Tuple>(t), ::std::make_index_sequence<N>{});
-}
-#  endif
+THRUST_SUPPRESS_DEPRECATED_POP
 
 THRUST_NAMESPACE_END
 
@@ -918,6 +1058,7 @@ struct tuple_size<THRUST_NS_QUALIFIER::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8,
 {};
 
 THRUST_SUPPRESS_DEPRECATED_POP
+
 _THRUST_STD_NAMESPACE_END
 
 #endif // _THRUST_HAS_DEVICE_SYSTEM_STD
diff --git a/projects/rocthrust/thrust/type_traits/integer_sequence.h b/projects/rocthrust/thrust/type_traits/integer_sequence.h
index 971e6951bc30..461b3dc16925 100644
--- a/projects/rocthrust/thrust/type_traits/integer_sequence.h
+++ b/projects/rocthrust/thrust/type_traits/integer_sequence.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2024 NVIDIA Corporation
+ *  Copyright 2008-2021 NVIDIA Corporation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,21 +24,9 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
-#include _THRUST_STD_INCLUDE(utility)
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_STD_INCLUDE(cstdint)
-#  include _THRUST_STD_INCLUDE(type_traits)
-#else
-#  include <cstddef>
-#endif
+#include <cstdint>
+#include <type_traits>
+#include <utility>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -61,8 +49,23 @@ THRUST_NAMESPACE_BEGIN
  * integer_sequence_push_back \see <a
  * href="https://en.cppreference.com/w/cpp/utility/integer_sequence"><tt>std::integer_sequence</tt></a>
  */
+#if THRUST_CPP_DIALECT >= 2017
 template <typename T, T... Is>
-using integer_sequence = _THRUST_STD::integer_sequence<T, Is...>;
+using integer_sequence = std::integer_sequence<T, Is...>;
+#else
+template <typename T, T... Is>
+struct integer_sequence
+{
+  using type       = integer_sequence;
+  using value_type = T;
+  using size_type  = std::size_t;
+
+  THRUST_HOST_DEVICE static constexpr size_type size() noexcept
+  {
+    return sizeof...(Is);
+  }
+};
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -79,8 +82,46 @@ using integer_sequence = _THRUST_STD::integer_sequence<T, Is...>;
  *  \see integer_sequence_push_back
  *  \see <a href="https://en.cppreference.com/w/cpp/utility/integer_sequence"><tt>std::index_sequence</tt></a>
  */
-template <_THRUST_STD::size_t... Is>
-using index_sequence = _THRUST_STD::index_sequence<Is...>;
+#if THRUST_CPP_DIALECT >= 2017
+template <std::size_t... Is>
+using index_sequence = std::index_sequence<Is...>;
+#else
+template <std::size_t... Is>
+using index_sequence = integer_sequence<std::size_t, Is...>;
+#endif
+
+#if THRUST_CPP_DIALECT < 2017
+/*! \cond
+ */
+
+namespace detail
+{
+
+/*! \brief Create a new \c integer_sequence containing the elements of \c
+ * Sequence0 followed by the elements of \c Sequence1. \c Sequence0::size() is
+ * added to each element from \c Sequence1 in the new sequence.
+ *
+ *  \see integer_sequence
+ *  \see index_sequence
+ *  \see make_reversed_integer_sequence
+ *  \see make_index_sequence
+ *  \see make_reversed_index_sequence
+ *  \see merge_and_renumber_reversed_integer_sequences_impl
+ */
+template <typename Sequence0, typename Sequence1>
+struct merge_and_renumber_integer_sequences_impl;
+template <typename Sequence0, typename Sequence1>
+using merge_and_renumber_integer_sequences =
+  typename merge_and_renumber_integer_sequences_impl<Sequence0, Sequence1>::type;
+
+template <typename T, std::size_t N>
+struct make_integer_sequence_impl;
+
+} // namespace detail
+
+/*! \endcond
+ */
+#endif
 
 /*! \brief Create a new \c integer_sequence with elements
  *  <tt>0, 1, 2, ..., N - 1</tt> of type \c T.
@@ -92,8 +133,49 @@ using index_sequence = _THRUST_STD::index_sequence<Is...>;
  *  \see make_reversed_index_sequence
  *  \see <a href="https://en.cppreference.com/w/cpp/utility/integer_sequence"><tt>std::make_integer_sequence</tt></a>
  */
-template <typename T, _THRUST_STD::size_t N>
-using make_integer_sequence = _THRUST_STD::make_integer_sequence<T, N>;
+#if THRUST_CPP_DIALECT >= 2017
+template <typename T, std::size_t N>
+using make_integer_sequence = std::make_integer_sequence<T, N>;
+#else
+template <typename T, std::size_t N>
+using make_integer_sequence = typename detail::make_integer_sequence_impl<T, N>::type;
+
+/*! \cond
+ */
+
+namespace detail
+{
+
+template <typename T, T... Is0, T... Is1>
+struct merge_and_renumber_integer_sequences_impl<integer_sequence<T, Is0...>, integer_sequence<T, Is1...>>
+{
+  using type = integer_sequence<T, Is0..., (sizeof...(Is0) + Is1)...>;
+};
+
+template <typename T, std::size_t N>
+struct make_integer_sequence_impl
+{
+  using type =
+    merge_and_renumber_integer_sequences<make_integer_sequence<T, N / 2>, make_integer_sequence<T, N - N / 2>>;
+};
+
+template <typename T>
+struct make_integer_sequence_impl<T, 0>
+{
+  using type = integer_sequence<T>;
+};
+
+template <typename T>
+struct make_integer_sequence_impl<T, 1>
+{
+  using type = integer_sequence<T, 0>;
+};
+
+} // namespace detail
+
+/*! \endcond
+ */
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -108,8 +190,13 @@ using make_integer_sequence = _THRUST_STD::make_integer_sequence<T, N>;
  *  \see make_reversed_index_sequence
  *  \see <a href="https://en.cppreference.com/w/cpp/utility/integer_sequence"><tt>std::make_index_sequence</tt></a>
  */
-template <_THRUST_STD::size_t N>
-using make_index_sequence = _THRUST_STD::make_index_sequence<N>;
+#if THRUST_CPP_DIALECT >= 2017
+template <std::size_t N>
+using make_index_sequence = std::make_index_sequence<N>;
+#else
+template <std::size_t N>
+using make_index_sequence = make_integer_sequence<std::size_t, N>;
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -138,7 +225,7 @@ template <typename Sequence0, typename Sequence1>
 using merge_and_renumber_reversed_integer_sequences =
   typename merge_and_renumber_reversed_integer_sequences_impl<Sequence0, Sequence1>::type;
 
-template <typename T, _THRUST_STD::size_t N>
+template <typename T, std::size_t N>
 struct make_reversed_integer_sequence_impl;
 
 template <typename T, T Value, typename Sequence>
@@ -169,7 +256,7 @@ struct merge_and_renumber_reversed_integer_sequences_impl<integer_sequence<T, Is
  *  \see make_index_sequence
  *  \see make_reversed_index_sequence
  */
-template <typename T, _THRUST_STD::size_t N>
+template <typename T, std::size_t N>
 using make_reversed_integer_sequence = typename detail::make_reversed_integer_sequence_impl<T, N>::type;
 
 /*! \brief Create a new \c index_sequence with elements
@@ -181,8 +268,8 @@ using make_reversed_integer_sequence = typename detail::make_reversed_integer_se
  *  \see make_reversed_integer_sequence
  *  \see make_reversed_index_sequence
  */
-template <_THRUST_STD::size_t N>
-using make_reversed_index_sequence = make_reversed_integer_sequence<_THRUST_STD::size_t, N>;
+template <std::size_t N>
+using make_reversed_index_sequence = make_reversed_integer_sequence<std::size_t, N>;
 
 /*! \brief Add a new element to the front of an \c integer_sequence.
  *
@@ -212,7 +299,7 @@ using integer_sequence_push_back = typename detail::integer_sequence_push_back_i
 namespace detail
 {
 
-template <typename T, _THRUST_STD::size_t N>
+template <typename T, std::size_t N>
 struct make_reversed_integer_sequence_impl
 {
   using type = merge_and_renumber_reversed_integer_sequences<make_reversed_integer_sequence<T, N / 2>,
diff --git a/projects/rocthrust/thrust/type_traits/is_contiguous_iterator.h b/projects/rocthrust/thrust/type_traits/is_contiguous_iterator.h
index 5cf307ed0487..594c2531aaa4 100644
--- a/projects/rocthrust/thrust/type_traits/is_contiguous_iterator.h
+++ b/projects/rocthrust/thrust/type_traits/is_contiguous_iterator.h
@@ -31,14 +31,27 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
-#include <thrust/detail/type_traits/is_thrust_pointer.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER > 2020
-#  include _THRUST_STD_INCLUDE(iterator)
-#else
+#include <thrust/detail/raw_pointer_cast.h>
+#include <thrust/detail/type_traits.h>
+#include <thrust/detail/type_traits/pointer_traits.h>
+
+#include <iterator>
+#include <type_traits>
+#include <utility>
+#if !_THRUST_HAS_DEVICE_SYSTEM_STD
 #  include <type_traits>
 #endif
 
+#if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC && _MSC_VER < 1916 // MSVC 2017 version 15.9
+#  include <array>
+#  include <string>
+#  include <vector>
+
+#  if THRUST_CPP_DIALECT >= 2017
+#    include <string_view>
+#  endif
+#endif
+
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup utility
@@ -128,7 +141,7 @@ struct is_libcxx_wrap_iter : false_type
 #if defined(_LIBCPP_VERSION)
 template <typename Iterator>
 struct is_libcxx_wrap_iter<
-#  if _LIBCPP_VERSION < 14000
+#  if _LIBCPP_VERSION < 14000 || THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_HIP
   _VSTD::__wrap_iter<Iterator>
 #  else
   std::__wrap_iter<Iterator>
@@ -147,36 +160,122 @@ struct is_libstdcxx_normal_iterator<::__gnu_cxx::__normal_iterator<Iterator, Con
 {};
 #endif
 
-// Use defined(_MSC_VER) due to Windows CI failures
-#if defined(_MSC_VER)
-
+#if defined(_MSC_VER) && _MSC_VER >= 1916 // MSVC 2017 version 15.9.
 template <typename Iterator>
 struct is_msvc_contiguous_iterator : _THRUST_STD::is_pointer<::std::_Unwrapped_t<Iterator>>
 {};
+#elif defined(_MSC_VER) && _MSC_VER >= 1700 // MSVC 2012.
+template <typename Iterator>
+struct is_msvc_contiguous_iterator : false_type
+{};
 
-#else
+template <typename Vector>
+struct is_msvc_contiguous_iterator<::std::_Vector_const_iterator<Vector>> : true_type
+{};
 
+template <typename Vector>
+struct is_msvc_contiguous_iterator<::std::_Vector_iterator<Vector>> : true_type
+{};
+
+template <typename String>
+struct is_msvc_contiguous_iterator<::std::_String_const_iterator<String>> : true_type
+{};
+
+template <typename String>
+struct is_msvc_contiguous_iterator<::std::_String_iterator<String>> : true_type
+{};
+
+template <typename T, std::size_t N>
+struct is_msvc_contiguous_iterator<::std::_Array_const_iterator<T, N>> : true_type
+{};
+
+template <typename T, std::size_t N>
+struct is_msvc_contiguous_iterator<::std::_Array_iterator<T, N>> : true_type
+{};
+
+template <typename Traits>
+struct is_msvc_contiguous_iterator<::std::_String_view_iterator<Traits>> : true_type
+{};
+#else
 template <typename Iterator>
 struct is_msvc_contiguous_iterator : false_type
 {};
-
 #endif
 
 template <typename Iterator>
 struct is_contiguous_iterator_impl
     : integral_constant<
         bool,
-#if _THRUST_HAS_DEVICE_SYSTEM_STD || THRUST_STD_VER > 2020
-        _THRUST_STD::contiguous_iterator<Iterator> || is_thrust_pointer<Iterator>::value
-#else
         _THRUST_STD::is_pointer<Iterator>::value || is_thrust_pointer<Iterator>::value
-#endif
           || is_libcxx_wrap_iter<Iterator>::value || is_libstdcxx_normal_iterator<Iterator>::value
           || is_msvc_contiguous_iterator<Iterator>::value || proclaim_contiguous_iterator<Iterator>::value>
 {};
 
+// Type traits for contiguous iterators:
+template <typename Iterator>
+struct contiguous_iterator_traits
+{
+  static_assert(thrust::is_contiguous_iterator<Iterator>::value,
+                "contiguous_iterator_traits requires a contiguous iterator.");
+
+  using raw_pointer = typename thrust::detail::pointer_traits<decltype(&*std::declval<Iterator>())>::raw_pointer;
+};
+} // namespace detail
+
+//! Converts a contiguous iterator type to its underlying raw pointer type.
+template <typename ContiguousIterator>
+using unwrap_contiguous_iterator_t = typename detail::contiguous_iterator_traits<ContiguousIterator>::raw_pointer;
+
+//! Converts a contiguous iterator to its underlying raw pointer.
+template <typename ContiguousIterator>
+THRUST_HOST_DEVICE auto unwrap_contiguous_iterator(ContiguousIterator it)
+  -> unwrap_contiguous_iterator_t<ContiguousIterator>
+{
+  static_assert(thrust::is_contiguous_iterator<ContiguousIterator>::value,
+                "unwrap_contiguous_iterator called with non-contiguous iterator.");
+  return thrust::raw_pointer_cast(&*it);
+}
+
+namespace detail
+{
+// Implementation for non-contiguous iterators -- passthrough.
+template <typename Iterator, bool IsContiguous = thrust::is_contiguous_iterator<Iterator>::value>
+struct try_unwrap_contiguous_iterator_impl
+{
+  using type = Iterator;
+
+  static THRUST_HOST_DEVICE type get(Iterator it)
+  {
+    return it;
+  }
+};
+
+// Implementation for contiguous iterators -- unwraps to raw pointer.
+template <typename Iterator>
+struct try_unwrap_contiguous_iterator_impl<Iterator, true /*is_contiguous*/>
+{
+  using type = unwrap_contiguous_iterator_t<Iterator>;
+
+  static THRUST_HOST_DEVICE type get(Iterator it)
+  {
+    return unwrap_contiguous_iterator(it);
+  }
+};
 } // namespace detail
 
+//! Takes an iterator type and, if it is contiguous, yields the raw pointer type it represents. Otherwise returns the
+//! iterator type unmodified.
+template <typename Iterator>
+using try_unwrap_contiguous_iterator_t = typename detail::try_unwrap_contiguous_iterator_impl<Iterator>::type;
+
+//! Takes an iterator and, if it is contiguous, unwraps it to the raw pointer it represents. Otherwise returns the
+//! iterator unmodified.
+template <typename Iterator>
+THRUST_HOST_DEVICE auto try_unwrap_contiguous_iterator(Iterator it) -> try_unwrap_contiguous_iterator_t<Iterator>
+{
+  return detail::try_unwrap_contiguous_iterator_impl<Iterator>::get(it);
+}
+
 /*! \endcond
  */
 
diff --git a/projects/rocthrust/thrust/type_traits/is_execution_policy.h b/projects/rocthrust/thrust/type_traits/is_execution_policy.h
index ad7e2875c926..84c723bf64ab 100644
--- a/projects/rocthrust/thrust/type_traits/is_execution_policy.h
+++ b/projects/rocthrust/thrust/type_traits/is_execution_policy.h
@@ -54,11 +54,13 @@ THRUST_NAMESPACE_BEGIN
 template <typename T>
 using is_execution_policy = _THRUST_STD::is_base_of<detail::execution_policy_marker, T>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is an
  *  \a ExecutionPolicy and \c false otherwise.
  */
 template <typename T>
 constexpr bool is_execution_policy_v = is_execution_policy<T>::value;
+#endif
 
 /*! \} // type traits
  */
diff --git a/projects/rocthrust/thrust/type_traits/is_operator_less_or_greater_function_object.h b/projects/rocthrust/thrust/type_traits/is_operator_less_or_greater_function_object.h
index bf684af388bc..fb2906a9d910 100644
--- a/projects/rocthrust/thrust/type_traits/is_operator_less_or_greater_function_object.h
+++ b/projects/rocthrust/thrust/type_traits/is_operator_less_or_greater_function_object.h
@@ -24,13 +24,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/functional.h>
@@ -75,6 +68,7 @@ struct is_operator_greater_function_object_impl;
 template <typename T>
 using is_operator_less_function_object = detail::is_operator_less_function_object_impl<T>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is a
  *  <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">BinaryPredicate</a>
  *  equivalent to \c operator<, and \c false otherwise.
@@ -86,6 +80,7 @@ using is_operator_less_function_object = detail::is_operator_less_function_objec
  */
 template <typename T>
 constexpr bool is_operator_less_function_object_v = is_operator_less_function_object<T>::value;
+#endif
 
 /*! \brief <a href="https://en.cppreference.com/w/cpp/named_req/UnaryTypeTrait"><i>UnaryTypeTrait</i></a>
  *  that returns \c true_type if \c T is a
@@ -100,6 +95,7 @@ constexpr bool is_operator_less_function_object_v = is_operator_less_function_ob
 template <typename T>
 using is_operator_greater_function_object = detail::is_operator_greater_function_object_impl<T>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is a
  *  <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">BinaryPredicate</a>
  *  equivalent to \c operator>, and \c false otherwise.
@@ -111,6 +107,7 @@ using is_operator_greater_function_object = detail::is_operator_greater_function
  */
 template <typename T>
 constexpr bool is_operator_greater_function_object_v = is_operator_greater_function_object<T>::value;
+#endif
 
 /*! \brief <a href="https://en.cppreference.com/w/cpp/named_req/UnaryTypeTrait"><i>UnaryTypeTrait</i></a>
  *  that returns \c true_type if \c T is a
@@ -128,6 +125,7 @@ using is_operator_less_or_greater_function_object =
                     detail::is_operator_less_function_object_impl<T>::value
                       || detail::is_operator_greater_function_object_impl<T>::value>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is a
  *  <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">BinaryPredicate</a>
  *  equivalent to \c operator< or \c operator>, and \c false otherwise.
@@ -139,6 +137,7 @@ using is_operator_less_or_greater_function_object =
  */
 template <typename T>
 constexpr bool is_operator_less_or_greater_function_object_v = is_operator_less_or_greater_function_object<T>::value;
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -154,11 +153,9 @@ struct is_operator_less_function_object_impl : false_type
 template <typename T>
 struct is_operator_less_function_object_impl<thrust::less<T>> : true_type
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <typename T>
 struct is_operator_less_function_object_impl<std::less<T>> : true_type
 {};
-#endif
 
 template <typename T>
 struct is_operator_greater_function_object_impl : false_type
@@ -166,11 +163,9 @@ struct is_operator_greater_function_object_impl : false_type
 template <typename T>
 struct is_operator_greater_function_object_impl<thrust::greater<T>> : true_type
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <typename T>
 struct is_operator_greater_function_object_impl<std::greater<T>> : true_type
 {};
-#endif
 
 } // namespace detail
 
diff --git a/projects/rocthrust/thrust/type_traits/is_operator_plus_function_object.h b/projects/rocthrust/thrust/type_traits/is_operator_plus_function_object.h
index 37a770428402..2c4d720c99bc 100644
--- a/projects/rocthrust/thrust/type_traits/is_operator_plus_function_object.h
+++ b/projects/rocthrust/thrust/type_traits/is_operator_plus_function_object.h
@@ -24,13 +24,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/type_traits.h>
 #include <thrust/detail/type_traits/pointer_traits.h>
 #include <thrust/functional.h>
@@ -72,6 +65,7 @@ struct is_operator_plus_function_object_impl;
 template <typename T>
 using is_operator_plus_function_object = detail::is_operator_plus_function_object_impl<T>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is a
  *  <a href="https://en.cppreference.com/w/cpp/named_req/FunctionObject">FunctionObject</a>
  *  equivalent to \c operator<, and \c false otherwise.
@@ -83,6 +77,7 @@ using is_operator_plus_function_object = detail::is_operator_plus_function_objec
  */
 template <typename T>
 constexpr bool is_operator_plus_function_object_v = is_operator_plus_function_object<T>::value;
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -98,11 +93,9 @@ struct is_operator_plus_function_object_impl : false_type
 template <typename T>
 struct is_operator_plus_function_object_impl<thrust::plus<T>> : true_type
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
 template <typename T>
 struct is_operator_plus_function_object_impl<std::plus<T>> : true_type
 {};
-#endif
 
 } // namespace detail
 
diff --git a/projects/rocthrust/thrust/type_traits/is_trivially_relocatable.h b/projects/rocthrust/thrust/type_traits/is_trivially_relocatable.h
index 8c6754393beb..3f5ef9c8ffa0 100644
--- a/projects/rocthrust/thrust/type_traits/is_trivially_relocatable.h
+++ b/projects/rocthrust/thrust/type_traits/is_trivially_relocatable.h
@@ -34,18 +34,18 @@
 #endif // no system header
 #include <thrust/detail/static_assert.h>
 #include <thrust/detail/type_traits.h>
-#include <thrust/iterator/iterator_traits.h>
 #include <thrust/type_traits/is_contiguous_iterator.h>
 
-#include _THRUST_STD_INCLUDE(type_traits)
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
 #  include _THRUST_STD_INCLUDE(__fwd/pair.h)
 #  include _THRUST_STD_INCLUDE(__fwd/tuple.h)
 #  include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
+// clang-format on
 #endif
 
+#include <type_traits>
 #if !_THRUST_HAS_DEVICE_SYSTEM_STD
-#  include <cstddef>
 #  include <tuple>
 #  include <utility>
 #endif
@@ -90,6 +90,7 @@ struct is_trivially_relocatable_impl;
 template <typename T>
 using is_trivially_relocatable = detail::is_trivially_relocatable_impl<T>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c T is
  *  <a href="https://wg21.link/P1144"><i>TriviallyRelocatable</i></a>,
  *  aka can be bitwise copied with a facility like
@@ -104,6 +105,7 @@ using is_trivially_relocatable = detail::is_trivially_relocatable_impl<T>;
  */
 template <typename T>
 constexpr bool is_trivially_relocatable_v = is_trivially_relocatable<T>::value;
+#endif
 
 /*! \brief <a href="https://en.cppreference.com/w/cpp/named_req/BinaryTypeTrait"><i>BinaryTypeTrait</i></a>
  *  that returns \c true_type if \c From is
@@ -122,6 +124,7 @@ template <typename From, typename To>
 using is_trivially_relocatable_to =
   integral_constant<bool, _THRUST_STD::is_same<From, To>::value && is_trivially_relocatable<To>::value>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if \c From is
  *  <a href="https://wg21.link/P1144"><i>TriviallyRelocatable</i></a>,
  *  to \c To, aka can be bitwise copied with a facility like
@@ -136,6 +139,7 @@ using is_trivially_relocatable_to =
  */
 template <typename From, typename To>
 constexpr bool is_trivially_relocatable_to_v = is_trivially_relocatable_to<From, To>::value;
+#endif
 
 /*! \brief <a href="https://en.cppreference.com/w/cpp/named_req/BinaryTypeTrait"><i>BinaryTypeTrait</i></a>
  *  that returns \c true_type if the element type of \c FromIterator is
@@ -152,11 +156,13 @@ constexpr bool is_trivially_relocatable_to_v = is_trivially_relocatable_to<From,
  * \see THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE
  */
 template <typename FromIterator, typename ToIterator>
-using is_indirectly_trivially_relocatable_to = integral_constant<
-  bool,
-  is_contiguous_iterator<FromIterator>::value && is_contiguous_iterator<ToIterator>::value
-    && is_trivially_relocatable_to<detail::it_value_t<FromIterator>, detail::it_value_t<ToIterator>>::value>;
+using is_indirectly_trivially_relocatable_to =
+  integral_constant<bool,
+                    is_contiguous_iterator<FromIterator>::value && is_contiguous_iterator<ToIterator>::value
+                      && is_trivially_relocatable_to<typename thrust::iterator_traits<FromIterator>::value_type,
+                                                     typename thrust::iterator_traits<ToIterator>::value_type>::value>;
 
+#if THRUST_CPP_DIALECT >= 2017
 /*! \brief <tt>constexpr bool</tt> that is \c true if the element type of
  *  \c FromIterator is
  *  <a href="https://wg21.link/P1144"><i>TriviallyRelocatable</i></a>,
@@ -174,6 +180,7 @@ using is_indirectly_trivially_relocatable_to = integral_constant<
 template <typename FromIterator, typename ToIterator>
 constexpr bool is_indirectly_trivially_relocate_to_v =
   is_indirectly_trivially_relocatable_to<FromIterator, ToIterator>::value;
+#endif
 
 /*! \brief <a href="http://eel.is/c++draft/namespace.std#def:customization_point"><i>customization point</i></a>
  *  that can be specialized customized to indicate that a type \c T is
@@ -223,7 +230,7 @@ struct is_trivially_relocatable_impl
     : integral_constant<bool, _THRUST_STD::is_trivially_copyable<T>::value || proclaim_trivially_relocatable<T>::value>
 {};
 
-template <typename T, _THRUST_STD::size_t N>
+template <typename T, std::size_t N>
 struct is_trivially_relocatable_impl<T[N]> : is_trivially_relocatable_impl<T>
 {};
 
@@ -260,43 +267,19 @@ THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(uint4)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long1)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long2)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long3)
-THRUST_SUPPRESS_DEPRECATED_PUSH
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long4)
-THRUST_SUPPRESS_DEPRECATED_POP
-#  if THRUST_CTK_AT_LEAST(13, 0)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long4_16a)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(long4_32a)
-#  endif // THRUST_CTK_AT_LEAST(13, 0)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong1)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong2)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong3)
-THRUST_SUPPRESS_DEPRECATED_PUSH
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong4)
-THRUST_SUPPRESS_DEPRECATED_POP
-#  if THRUST_CTK_AT_LEAST(13, 0)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong4_16a)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulong4_32a)
-#  endif // THRUST_CTK_AT_LEAST(13, 0)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong1)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong2)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong3)
-THRUST_SUPPRESS_DEPRECATED_PUSH
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong4)
-THRUST_SUPPRESS_DEPRECATED_POP
-#  if THRUST_CTK_AT_LEAST(13, 0)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong4_16a)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(longlong4_32a)
-#  endif // THRUST_CTK_AT_LEAST(13, 0)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong1)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong2)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong3)
-THRUST_SUPPRESS_DEPRECATED_PUSH
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong4)
-THRUST_SUPPRESS_DEPRECATED_POP
-#  if THRUST_CTK_AT_LEAST(13, 0)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong4_16a)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(ulonglong4_32a)
-#  endif // THRUST_CTK_AT_LEAST(13, 0)
 
 struct __half;
 struct __half2;
@@ -311,13 +294,7 @@ THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(float4)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double1)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double2)
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double3)
-THRUST_SUPPRESS_DEPRECATED_PUSH
 THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double4)
-THRUST_SUPPRESS_DEPRECATED_POP
-#  if THRUST_CTK_AT_LEAST(13, 0)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double4_16a)
-THRUST_PROCLAIM_TRIVIALLY_RELOCATABLE(double4_32a)
-#  endif // THRUST_CTK_AT_LEAST(13, 0)
 #endif
 
 THRUST_NAMESPACE_BEGIN
diff --git a/projects/rocthrust/thrust/type_traits/logical_metafunctions.h b/projects/rocthrust/thrust/type_traits/logical_metafunctions.h
index ca8851ce4896..a731be6f17a3 100644
--- a/projects/rocthrust/thrust/type_traits/logical_metafunctions.h
+++ b/projects/rocthrust/thrust/type_traits/logical_metafunctions.h
@@ -27,9 +27,11 @@
 #endif // no system header
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
+// clang-format off
 #  include _THRUST_STD_INCLUDE(__type_traits/conjunction.h)
 #  include _THRUST_STD_INCLUDE(__type_traits/disjunction.h)
 #  include _THRUST_STD_INCLUDE(__type_traits/negation.h)
+// clang-format on
 #else
 #  include <type_traits>
 #endif
@@ -43,4 +45,28 @@ using _THRUST_STD::disjunction_v;
 using _THRUST_STD::negation;
 using _THRUST_STD::negation_v;
 
+template <bool... Bs>
+using conjunction_value THRUST_DEPRECATED_BECAUSE("Use: _THRUST_STD::bool_constant<(Bs && ...)>") =
+  conjunction<_THRUST_STD::bool_constant<Bs>...>;
+
+template <bool... Bs>
+using disjunction_value THRUST_DEPRECATED_BECAUSE("Use: _THRUST_STD::bool_constant<(Bs || ...)>") =
+  disjunction<_THRUST_STD::bool_constant<Bs>...>;
+
+template <bool B>
+using negation_value THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::bool_constant<!B>") = _THRUST_STD::bool_constant<!B>;
+
+THRUST_SUPPRESS_DEPRECATED_PUSH
+template <bool... Bs>
+constexpr bool
+  conjunction_value_v THRUST_DEPRECATED_BECAUSE("Use a fold expression: Bs && ...") = conjunction_value<Bs...>::value;
+
+template <bool... Bs>
+constexpr bool
+  disjunction_value_v THRUST_DEPRECATED_BECAUSE("Use a fold expression: Bs || ...") = disjunction_value<Bs...>::value;
+
+template <bool B>
+constexpr bool negation_value_v THRUST_DEPRECATED_BECAUSE("Use a plain negation !B") = negation_value<B>::value;
+THRUST_SUPPRESS_DEPRECATED_POP
+
 THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/type_traits/remove_cvref.h b/projects/rocthrust/thrust/type_traits/remove_cvref.h
new file mode 100644
index 000000000000..262cb2e999e7
--- /dev/null
+++ b/projects/rocthrust/thrust/type_traits/remove_cvref.h
@@ -0,0 +1,43 @@
+/*
+ *  Copyright 2018-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+#if THRUST_HAS_INCLUDE(<version>)
+#  include <version>
+#endif // THRUST_HAS_INCLUDE(<version>)
+
+#include <thrust/detail/type_traits.h>
+
+THRUST_NAMESPACE_BEGIN
+
+template <typename T>
+using remove_cvref THRUST_DEPRECATED_BECAUSE("Use internal::remove_cvref") = ::internal::remove_cvref<T>;
+
+template <typename T>
+using remove_cvref_t THRUST_DEPRECATED_BECAUSE("Use internal::remove_cvref_t") = ::internal::remove_cvref_t<T>;
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h b/projects/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h
deleted file mode 100644
index 837ce4ea4de6..000000000000
--- a/projects/rocthrust/thrust/type_traits/unwrap_contiguous_iterator.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright 2008-2021 NVIDIA Corporation
- *  Modifications Copyright© 2026 Advanced Micro Devices, Inc. All rights reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#pragma once
-
-#include <thrust/detail/config.h>
-
-#include <thrust/detail/raw_pointer_cast.h>
-#include <thrust/type_traits/is_contiguous_iterator.h>
-
-THRUST_NAMESPACE_BEGIN
-
-namespace detail
-{
-// Type traits for contiguous iterators:
-template <typename Iterator>
-struct contiguous_iterator_traits
-{
-  static_assert(thrust::is_contiguous_iterator_v<Iterator>,
-                "contiguous_iterator_traits requires a contiguous iterator.");
-
-  using raw_pointer = typename thrust::detail::pointer_traits<decltype(&*std::declval<Iterator>())>::raw_pointer;
-};
-} // namespace detail
-
-//! Converts a contiguous iterator type to its underlying raw pointer type.
-template <typename ContiguousIterator>
-using unwrap_contiguous_iterator_t = typename detail::contiguous_iterator_traits<ContiguousIterator>::raw_pointer;
-
-//! Converts a contiguous iterator to its underlying raw pointer.
-template <typename ContiguousIterator>
-THRUST_HOST_DEVICE auto
-unwrap_contiguous_iterator(ContiguousIterator it) -> unwrap_contiguous_iterator_t<ContiguousIterator>
-{
-  static_assert(thrust::is_contiguous_iterator_v<ContiguousIterator>,
-                "unwrap_contiguous_iterator called with non-contiguous iterator.");
-  return thrust::raw_pointer_cast(&*it);
-}
-
-namespace detail
-{
-// Implementation for non-contiguous iterators -- passthrough.
-template <typename Iterator, bool IsContiguous = thrust::is_contiguous_iterator_v<Iterator>>
-struct try_unwrap_contiguous_iterator_impl
-{
-  using type = Iterator;
-
-  static THRUST_HOST_DEVICE type get(Iterator it)
-  {
-    return it;
-  }
-};
-
-// Implementation for contiguous iterators -- unwraps to raw pointer.
-template <typename Iterator>
-struct try_unwrap_contiguous_iterator_impl<Iterator, true /*is_contiguous*/>
-{
-  using type = unwrap_contiguous_iterator_t<Iterator>;
-
-  static THRUST_HOST_DEVICE type get(Iterator it)
-  {
-    return unwrap_contiguous_iterator(it);
-  }
-};
-} // namespace detail
-
-//! Takes an iterator type and, if it is contiguous, yields the raw pointer type it represents. Otherwise returns the
-//! iterator type unmodified.
-template <typename Iterator>
-using try_unwrap_contiguous_iterator_t = typename detail::try_unwrap_contiguous_iterator_impl<Iterator>::type;
-
-//! Takes an iterator and, if it is contiguous, unwraps it to the raw pointer it represents. Otherwise returns the
-//! iterator unmodified.
-template <typename Iterator>
-THRUST_HOST_DEVICE auto try_unwrap_contiguous_iterator(Iterator it) -> try_unwrap_contiguous_iterator_t<Iterator>
-{
-  return detail::try_unwrap_contiguous_iterator_impl<Iterator>::get(it);
-}
-
-THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/type_traits/void_t.h b/projects/rocthrust/thrust/type_traits/void_t.h
new file mode 100644
index 000000000000..20590dc2423f
--- /dev/null
+++ b/projects/rocthrust/thrust/type_traits/void_t.h
@@ -0,0 +1,63 @@
+/*
+ *  Copyright 2018-2021 NVIDIA Corporation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*! \file
+ *  \brief C++17's `void_t`.
+ */
+
+#pragma once
+
+#include <thrust/detail/config.h>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+THRUST_NAMESPACE_BEGIN
+
+/*! \addtogroup utility
+ *  \{
+ */
+
+/*! \addtogroup type_traits Type Traits
+ *  \{
+ */
+
+/*! \brief Utility trait that maps a sequence of any types to the type void.
+ */
+template <typename...>
+struct THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::void_t") voider
+{
+  /*! \brief The resulting type (always void). */
+  using type = void;
+};
+
+/*! \brief Utility alias that maps a sequence of types to the type void.
+ */
+template <typename... Ts>
+using void_t THRUST_DEPRECATED_BECAUSE("Use _THRUST_STD::void_t") = void;
+
+/*! \} // type traits
+ */
+
+/*! \} // utility
+ */
+
+THRUST_NAMESPACE_END
diff --git a/projects/rocthrust/thrust/uninitialized_copy.h b/projects/rocthrust/thrust/uninitialized_copy.h
index 1dbcb9fa15bf..38bb8dd8f6c7 100644
--- a/projects/rocthrust/thrust/uninitialized_copy.h
+++ b/projects/rocthrust/thrust/uninitialized_copy.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -77,7 +70,7 @@ THRUST_NAMESPACE_BEGIN
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -140,7 +133,7 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_copy(
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -205,7 +198,7 @@ ForwardIterator uninitialized_copy(InputIterator first, InputIterator last, Forw
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -266,7 +259,7 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_copy_n(
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
diff --git a/projects/rocthrust/thrust/uninitialized_fill.h b/projects/rocthrust/thrust/uninitialized_fill.h
index 0c033c9ad266..4af743dbc405 100644
--- a/projects/rocthrust/thrust/uninitialized_fill.h
+++ b/projects/rocthrust/thrust/uninitialized_fill.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 
 THRUST_NAMESPACE_BEGIN
@@ -70,7 +63,7 @@ THRUST_NAMESPACE_BEGIN
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -125,7 +118,7 @@ THRUST_HOST_DEVICE void uninitialized_fill(
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -182,7 +175,7 @@ void uninitialized_fill(ForwardIterator first, ForwardIterator last, const T& x)
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
@@ -235,7 +228,7 @@ THRUST_HOST_DEVICE ForwardIterator uninitialized_fill_n(
  *
  *  struct Int
  *  {
- *    __host__ __device__
+ *    THRUST_HOST_DEVICE
  *    Int(int x) : val(x) {}
  *    int val;
  *  };
diff --git a/projects/rocthrust/thrust/unique.h b/projects/rocthrust/thrust/unique.h
index 892d033b61e7..a94f64b38494 100644
--- a/projects/rocthrust/thrust/unique.h
+++ b/projects/rocthrust/thrust/unique.h
@@ -22,13 +22,6 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
 #include <thrust/detail/execution_policy.h>
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/pair.h>
@@ -145,7 +138,7 @@ ForwardIterator unique(ForwardIterator first, ForwardIterator last);
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p
- * BinaryPredicate's first argument type and to \p BinaryPredicate's second argument type. \tparam BinaryPredicate
+ * BinaryPredicate's \c first_argument_type and to \p BinaryPredicate's \c second_argument_type. \tparam BinaryPredicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p unique to
@@ -192,7 +185,7 @@ THRUST_HOST_DEVICE ForwardIterator unique(
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
  * Iterator</a>, and \p ForwardIterator is mutable, and \p ForwardIterator's \c value_type is convertible to \p
- * BinaryPredicate's first argument type and to \p BinaryPredicate's second argument type. \tparam BinaryPredicate
+ * BinaryPredicate's \c first_argument_type and to \p BinaryPredicate's \c second_argument_type. \tparam BinaryPredicate
  * is a model of <a href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p unique to
@@ -938,9 +931,10 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's first argument type
- * and to \p BinaryPredicate's second argument type. \tparam BinaryPredicate is a model of <a
- * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
+ *  Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type
+ *  and to \p BinaryPredicate's \c second_argument_type.
+ *  \tparam BinaryPredicate is a model of <a
+ *  href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p unique_count to
  *  determine a number of runs of equal elements using the \p thrust::host execution policy
@@ -961,7 +955,7 @@ thrust::pair<OutputIterator1, OutputIterator2> unique_by_key_copy(
  *  \see reduce_by_key_copy
  */
 template <typename DerivedPolicy, typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec,
   ForwardIterator first,
   ForwardIterator last,
@@ -981,8 +975,8 @@ THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count
  *
  *  \tparam DerivedPolicy The name of the derived execution policy.
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's first argument type
- * and to \p BinaryPredicate's second argument type. \tparam BinaryPredicate is a model of <a
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type
+ * and to \p BinaryPredicate's \c second_argument_type. \tparam BinaryPredicate is a model of <a
  * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p unique_count to
@@ -1004,7 +998,7 @@ THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count
  *  \see reduce_by_key_copy
  */
 template <typename DerivedPolicy, typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count(
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type unique_count(
   const thrust::detail::execution_policy_base<DerivedPolicy>& exec, ForwardIterator first, ForwardIterator last);
 
 /*! \p unique_count counts runs of equal elements in the range <tt>[first, last)</tt>
@@ -1018,8 +1012,8 @@ THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count
  *  \return The number of runs of equal elements in <tt>[first, new_last)</tt>
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- *  Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's first argument type
- *  and to \p BinaryPredicate's second argument type.
+ *  Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type
+ *  and to \p BinaryPredicate's \c second_argument_type.
  *  \tparam BinaryPredicate is a model of <a
  *  href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
@@ -1041,7 +1035,7 @@ THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator> unique_count
  *  \see reduce_by_key_copy
  */
 template <typename ForwardIterator, typename BinaryPredicate>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type
 unique_count(ForwardIterator first, ForwardIterator last, BinaryPredicate binary_pred);
 
 /*! \p unique_count counts runs of equal elements in the range <tt>[first, last)</tt>
@@ -1054,10 +1048,9 @@ unique_count(ForwardIterator first, ForwardIterator last, BinaryPredicate binary
  *  \return The number of runs of equal elements in <tt>[first, new_last)</tt>
  *
  *  \tparam ForwardIterator is a model of <a href="https://en.cppreference.com/w/cpp/iterator/forward_iterator">Forward
- *  Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's first argument type
- *  and to \p BinaryPredicate's second argument type.
- *  \tparam BinaryPredicate is a model of <a
- *  href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
+ * Iterator</a>, and \p ForwardIterator's \c value_type is convertible to \p BinaryPredicate's \c first_argument_type
+ * and to \p BinaryPredicate's \c second_argument_type. \tparam BinaryPredicate is a model of <a
+ * href="https://en.cppreference.com/w/cpp/named_req/BinaryPredicate">Binary Predicate</a>.
  *
  *  The following code snippet demonstrates how to use \p unique_count to
  *  determine the number of runs of equal elements:
@@ -1077,7 +1070,7 @@ unique_count(ForwardIterator first, ForwardIterator last, BinaryPredicate binary
  *  \see reduce_by_key_copy
  */
 template <typename ForwardIterator>
-THRUST_HOST_DEVICE thrust::detail::it_difference_t<ForwardIterator>
+THRUST_HOST_DEVICE typename thrust::iterator_traits<ForwardIterator>::difference_type
 unique_count(ForwardIterator first, ForwardIterator last);
 
 /*! \} // end stream_compaction
diff --git a/projects/rocthrust/thrust/unique_ptr.h b/projects/rocthrust/thrust/unique_ptr.h
index 4444c2b7ec73..899532e22597 100644
--- a/projects/rocthrust/thrust/unique_ptr.h
+++ b/projects/rocthrust/thrust/unique_ptr.h
@@ -23,20 +23,6 @@
 #include <type_traits>
 #include <utility>
 
-#ifndef THRUST_DOXYGEN_INVOKED
-namespace internal
-{
-struct destroy_device_functor
-{
-  template <typename T>
-  THRUST_DEVICE void operator()(T& x) const noexcept
-  {
-    x.~T();
-  }
-};
-} // namespace internal
-#endif
-
 THRUST_NAMESPACE_BEGIN
 
 /*! \addtogroup memory_management Memory Management
@@ -70,7 +56,7 @@ struct default_delete<T, std::enable_if_t<!std::is_array_v<T>>>
    */
   using pointer = thrust::device_ptr<T>;
 
-  THRUST_HOST constexpr default_delete() noexcept;
+  THRUST_HOST constexpr default_delete() noexcept = default;
 
   /*! \brief Converting constructor from compatible deleter.
    *
@@ -110,15 +96,14 @@ struct default_delete<T, std::enable_if_t<!std::is_array_v<T>>>
     // `thrust::for_each_n` and then separately free the memory.
     if constexpr (!std::is_trivially_destructible_v<T>)
     {
-      thrust::for_each_n(ptr, 1, ::internal::destroy_device_functor{});
+      thrust::for_each_n(ptr, 1, [] __device__(T & x) {
+        x.~T();
+      });
     }
     thrust::device_free(ptr);
   }
 };
 
-template <class T>
-THRUST_HOST constexpr default_delete<T, std::enable_if_t<!std::is_array_v<T>>>::default_delete() noexcept = default;
-
 /*! \brief Default deleter specialization for arrays of non-trivially destructible types.
  *
  *  This specialization handles deletion of arrays where element destructors must be called.
@@ -152,8 +137,9 @@ struct default_delete<T[], std::enable_if_t<!std::is_trivially_destructible_v<T>
    *  \param other The deleter to copy from.
    */
   template <class U>
-  THRUST_HOST default_delete(const default_delete<U[]>& other,
-                             std::enable_if_t<std::is_convertible_v<U (*)[], T (*)[]>>* = nullptr) noexcept
+  THRUST_HOST
+  default_delete(const default_delete<U[]>& other,
+                 std::enable_if_t<std::is_convertible_v<U (*)[], T (*)[]>>* = nullptr) noexcept
       : m_size(other.m_size)
   {}
 
@@ -184,7 +170,9 @@ struct default_delete<T[], std::enable_if_t<!std::is_trivially_destructible_v<T>
     // using `thrust::for_each_n` and then separately free the memory.
     if (m_size)
     {
-      thrust::for_each_n(ptr, m_size, ::internal::destroy_device_functor{});
+      thrust::for_each_n(ptr, m_size, [] __device__(T & x) {
+        x.~T();
+      });
     }
     thrust::device_free(ptr);
   }
@@ -300,7 +288,7 @@ struct unique_ptr_deleter_sfinae<Deleter&>
  *  The object is disposed of by calling `get_deleter()(get())`. The default deleter,
  *  `thrust::default_delete`, calls the destructor (if needed) and deallocates memory
  *  using `thrust::device_free`.
- *
+ * 
  *  A `unique_ptr` may alternatively own no object, in which case it is described as
  *  *empty*.
  *
@@ -324,19 +312,16 @@ struct unique_ptr_deleter_sfinae<Deleter&>
  *  \see thrust::device_free
  *  \see https://en.cppreference.com/w/cpp/memory/unique_ptr
  */
+
 template <class T, class D = default_delete<T>>
-#if THRUST_HAS_ATTRIBUTE(trivial_abi)
 class __attribute__((trivial_abi)) unique_ptr
-#else
-class unique_ptr
-#endif
 {
 public:
   /*! \typedef pointer
    *  \brief The type of the stored pointer (defaults to `thrust::device_ptr<T>`).
    */
-  using pointer = typename thrust::detail::pointer_detector<T, D>::type;
-
+  using pointer      = typename thrust::detail::pointer_detector<T, D>::type;
+  
   /*! \typedef element_type
    *  \brief The type of the managed object (`T`).
    */
@@ -352,13 +337,7 @@ class unique_ptr
 
 private:
   pointer m_ptr;
-#if THRUST_COMPILER(MSVC) && THRUST_HAS_CPP_ATTRIBUTE(msvc::no_unique_address)
-  [[msvc::no_unique_address]] deleter_type m_deleter;
-#elif THRUST_HAS_CPP_ATTRIBUTE(no_unique_address)
   [[no_unique_address]] deleter_type m_deleter;
-#else
-  deleter_type m_deleter;
-#endif
 
   using DeleterSFINAE = thrust::detail::unique_ptr_deleter_sfinae<D>;
 
@@ -438,7 +417,7 @@ class unique_ptr
    *  \param p A pointer to the object in device memory to manage.
    */
   template <bool Dummy = true, class = EnableIfDeleterDefaultConstructible<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(pointer p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(pointer p) noexcept
       : m_ptr(p)
       , m_deleter()
   {}
@@ -449,7 +428,7 @@ class unique_ptr
   template <bool Dummy = true,
             class      = EnableIfDeleterDefaultConstructible<Dummy>,
             class      = EnableIfDeleterDefaultDelete<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(T* raw_p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(T* raw_p) noexcept
       : m_ptr(device_pointer_cast(raw_p))
       , m_deleter()
   {}
@@ -459,7 +438,7 @@ class unique_ptr
    *  \param d The deleter to use.
    */
   template <bool Dummy = true, class = EnableIfDeleterConstructible<LValRefType<Dummy>>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(pointer p, LValRefType<Dummy> d) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer p, LValRefType<Dummy> d) noexcept
       : m_ptr(p)
       , m_deleter(d)
   {}
@@ -469,7 +448,7 @@ class unique_ptr
    *  \param d The deleter to use.
    */
   template <bool Dummy = true, class = EnableIfDeleterConstructible<GoodRValRefType<Dummy>>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(pointer p, GoodRValRefType<Dummy> d) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer p, GoodRValRefType<Dummy> d) noexcept
       : m_ptr(p)
       , m_deleter(std::move(d))
   {
@@ -482,7 +461,7 @@ class unique_ptr
   /*! \brief Move constructor. Constructs a \p unique_ptr by taking ownership of the object managed by \p u.
    *  \param u The \p unique_ptr to move from.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(unique_ptr&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& u) noexcept
       : m_ptr(u.release())
       , m_deleter(std::forward<deleter_type>(u.get_deleter()))
   {}
@@ -495,7 +474,7 @@ class unique_ptr
    *  \param u The \p unique_ptr to move from.
    */
   template <class U, class E, class = EnableIfMoveConvertible<unique_ptr<U, E>, U>, class = EnableIfDeleterConvertible<E>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(unique_ptr<U, E>&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr<U, E>&& u) noexcept
       : m_ptr(u.release())
       , m_deleter(std::forward<E>(u.get_deleter()))
   {}
@@ -507,7 +486,7 @@ class unique_ptr
    *  \param u The \p unique_ptr to move from.
    *  \return `*this`
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(unique_ptr&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& u) noexcept
   {
     reset(u.release());
     m_deleter = std::forward<deleter_type>(u.get_deleter());
@@ -519,7 +498,7 @@ class unique_ptr
    *  \return `*this`
    */
   template <class U, class E, class = EnableIfMoveConvertible<unique_ptr<U, E>, U>, class = EnableIfDeleterAssignable<E>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept
   {
     reset(u.release());
     m_deleter = std::forward<E>(u.get_deleter());
@@ -529,7 +508,7 @@ class unique_ptr
   /*! \brief Assigns a null pointer, deallocating the managed object. Effectively the same as calling reset().
    *  \return `*this`
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(std::nullptr_t) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(std::nullptr_t) noexcept
   {
     reset();
     return *this;
@@ -540,7 +519,7 @@ class unique_ptr
   //==========================================================================
   /*! \brief Destroys the \p unique_ptr, the managed object is destroyed via `get_deleter()(get())`. If get() == nullptr there are no effects.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 ~unique_ptr()
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 ~unique_ptr()
   {
     reset();
   }
@@ -551,7 +530,7 @@ class unique_ptr
   /*! \brief Returns a pointer to the managed object or `nullptr` if no object is owned.
    *  \return Pointer to the managed object.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 pointer get() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 pointer get() const noexcept
   {
     return m_ptr;
   }
@@ -560,7 +539,7 @@ class unique_ptr
    *  \return Raw pointer to the managed object.
    */
   template <bool Dummy = true, class = EnableIfDeleterDefaultDelete<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 T* get_raw() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 T* get_raw() const noexcept
   {
     return raw_pointer_cast(m_ptr);
   }
@@ -568,7 +547,7 @@ class unique_ptr
   /*! \brief Returns a reference to the deleter object which would be used for destruction of the managed object.
    *  \return A reference to the stored deleter.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 deleter_type& get_deleter() noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 deleter_type& get_deleter() noexcept
   {
     return m_deleter;
   }
@@ -576,7 +555,7 @@ class unique_ptr
   /*! \brief Returns a reference to the deleter object which would be used for destruction of the managed object.
    *  \return A reference to the stored deleter.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 const deleter_type& get_deleter() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 const deleter_type& get_deleter() const noexcept
   {
     return m_deleter;
   }
@@ -587,7 +566,7 @@ class unique_ptr
    *
    *  \return `true` if an object is owned, `false` otherwise.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit operator bool() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit operator bool() const noexcept
   {
     return m_ptr != nullptr;
   }
@@ -600,7 +579,7 @@ class unique_ptr
    *
    *  \return A reference to the managed object.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 auto operator*() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 auto operator*() const noexcept
   {
     return *m_ptr;
   }
@@ -617,10 +596,9 @@ class unique_ptr
    *
    *  \return This function does not return; it triggers a compile-time error.
    */
-  template <bool NotUsed = false>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 pointer operator->() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 pointer operator->() const noexcept
   {
-    static_assert(NotUsed,
+    static_assert(false,
                   "thrust::unique_ptr<T>::operator->(): cannot dereference device memory from host. "
                   "Copy the object to host first (T host = *ptr) or access members inside device code.");
 
@@ -633,7 +611,7 @@ class unique_ptr
   /*! \brief Releases ownership of the managed object, if any.
    *  \return A pointer to the released object.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 pointer release() noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 pointer release() noexcept
   {
     pointer temp = m_ptr;
     m_ptr        = pointer();
@@ -643,7 +621,7 @@ class unique_ptr
   /*! \brief Replaces the managed object.
    *  \param p The new object to manage.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 void reset(pointer p = pointer()) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 void reset(pointer p = pointer()) noexcept
   {
     pointer temp = m_ptr;
     m_ptr        = p;
@@ -660,7 +638,7 @@ class unique_ptr
    *
    *  \param u The \p unique_ptr to swap with.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 void swap(unique_ptr& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 void swap(unique_ptr& u) noexcept
   {
     using std::swap;
     swap(m_ptr, u.m_ptr);
@@ -700,18 +678,14 @@ class unique_ptr
  *  \see https://en.cppreference.com/w/cpp/memory/unique_ptr
  */
 template <class T, class D>
-#if THRUST_HAS_ATTRIBUTE(trivial_abi)
 class __attribute__((trivial_abi)) unique_ptr<T[], D>
-#else
-class unique_ptr<T[], D>
-#endif
 {
 public:
   /*! \typedef pointer
    *  \brief The type of the stored pointer (defaults to `thrust::device_ptr<T>`).
    */
-  using pointer = typename thrust::detail::pointer_detector<T, D>::type;
-
+  using pointer      = typename thrust::detail::pointer_detector<T, D>::type;
+  
   /*! \typedef element_type
    *  \brief The type of the array elements (`T`).
    */
@@ -727,13 +701,7 @@ class unique_ptr<T[], D>
   friend class unique_ptr;
 
   pointer m_ptr;
-#if THRUST_COMPILER(MSVC) && THRUST_HAS_CPP_ATTRIBUTE(msvc::no_unique_address)
-  [[msvc::no_unique_address]] deleter_type m_deleter;
-#elif THRUST_HAS_CPP_ATTRIBUTE(no_unique_address)
   [[no_unique_address]] deleter_type m_deleter;
-#else
-  deleter_type m_deleter;
-#endif
 
   using DeleterSFINAE = thrust::detail::unique_ptr_deleter_sfinae<D>;
 
@@ -771,13 +739,15 @@ class unique_ptr<T[], D>
   using EnableIfNotTriviallyDestructible = std::enable_if_t<!std::is_trivially_destructible_v<Tp>>;
 
   template <class UPtr, class Up, class ElemT = typename UPtr::element_type>
-  using EnableIfMoveConvertible = std::enable_if_t<
-    std::is_array_v<Up> && std::is_same_v<pointer, element_type*> && std::is_same_v<typename UPtr::pointer, ElemT*>
-    && std::is_convertible_v<ElemT (*)[], element_type (*)[]>>;
+  using EnableIfMoveConvertible =
+    std::enable_if_t<std::is_array_v<Up> && std::is_same_v<pointer, element_type*>
+                            && std::is_same_v<typename UPtr::pointer, ElemT*>
+                            && std::is_convertible_v<ElemT (*)[], element_type (*)[]>>;
 
   template <class E>
-  using EnableIfDeleterConvertible = std::enable_if_t<
-    (std::is_reference_v<D> && std::is_same_v<D, E>) || (!std::is_reference_v<D> && std::is_convertible_v<E, D>)>;
+  using EnableIfDeleterConvertible =
+    std::enable_if_t<(std::is_reference_v<D> && std::is_same_v<D, E>)
+                            || (!std::is_reference_v<D> && std::is_convertible_v<E, D>)>;
 
   template <class E>
   using EnableIfDeleterAssignable = std::enable_if_t<std::is_assignable_v<D&, E&&>>;
@@ -819,7 +789,7 @@ class unique_ptr<T[], D>
             class      = EnableIfDeleterDefaultConstructible<Dummy>,
             class      = EnableIfPointerConvertible<Pp>,
             class      = EnableIfTriviallyDestructible<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(Pp p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(Pp p) noexcept
       : m_ptr(p)
       , m_deleter()
   {}
@@ -836,7 +806,7 @@ class unique_ptr<T[], D>
             class      = EnableIfPointerConvertible<device_ptr<T>>,
             class      = EnableIfTriviallyDestructible<Dummy>,
             class      = EnableIfDeleterDefaultDelete<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(Pp* raw_p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(Pp* raw_p) noexcept
       : m_ptr(device_pointer_cast(raw_p))
       , m_deleter()
   {}
@@ -853,7 +823,7 @@ class unique_ptr<T[], D>
             bool Dummy = true,
             class      = EnableIfDeleterDefaultConstructible<Dummy>,
             class      = EnableIfPointerConvertible<Pp>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(Pp p, size_t size) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(Pp p, size_t size) noexcept
       : m_ptr(p)
       , m_deleter(size)
   {}
@@ -871,7 +841,7 @@ class unique_ptr<T[], D>
             class      = EnableIfDeleterDefaultConstructible<Dummy>,
             class      = EnableIfPointerConvertible<device_ptr<T>>,
             class      = EnableIfDeleterDefaultDelete<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit unique_ptr(Pp* raw_p, size_t size) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(Pp* raw_p, size_t size) noexcept
       : m_ptr(device_pointer_cast(raw_p))
       , m_deleter(size)
   {}
@@ -885,7 +855,7 @@ class unique_ptr<T[], D>
             bool Dummy = true,
             class      = EnableIfDeleterConstructible<LValRefType<Dummy>>,
             class      = EnableIfPointerConvertible<Pp>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(Pp p, LValRefType<Dummy> deleter) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(Pp p, LValRefType<Dummy> deleter) noexcept
       : m_ptr(p)
       , m_deleter(deleter)
   {}
@@ -895,7 +865,7 @@ class unique_ptr<T[], D>
    *  \param deleter The deleter to store.
    */
   template <bool Dummy = true, class = EnableIfDeleterConstructible<LValRefType<Dummy>>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(std::nullptr_t, LValRefType<Dummy> deleter) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(std::nullptr_t, LValRefType<Dummy> deleter) noexcept
       : m_ptr(nullptr)
       , m_deleter(deleter)
   {}
@@ -909,7 +879,7 @@ class unique_ptr<T[], D>
             bool Dummy = true,
             class      = EnableIfDeleterConstructible<GoodRValRefType<Dummy>>,
             class      = EnableIfPointerConvertible<Pp>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(Pp p, GoodRValRefType<Dummy> deleter) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(Pp p, GoodRValRefType<Dummy> deleter) noexcept
       : m_ptr(p)
       , m_deleter(std::move(deleter))
   {
@@ -921,7 +891,7 @@ class unique_ptr<T[], D>
    *  \param deleter The deleter to store (moved).
    */
   template <bool Dummy = true, class = EnableIfDeleterConstructible<GoodRValRefType<Dummy>>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(std::nullptr_t, GoodRValRefType<Dummy> deleter) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(std::nullptr_t, GoodRValRefType<Dummy> deleter) noexcept
       : m_ptr(nullptr)
       , m_deleter(std::move(deleter))
   {
@@ -938,7 +908,7 @@ class unique_ptr<T[], D>
    *
    *  \param u The \p unique_ptr to move from.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(unique_ptr&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& u) noexcept
       : m_ptr(u.release())
       , m_deleter(std::forward<deleter_type>(u.get_deleter()))
   {}
@@ -956,7 +926,7 @@ class unique_ptr<T[], D>
             class Ep,
             class = EnableIfMoveConvertible<unique_ptr<Up, Ep>, Up>,
             class = EnableIfDeleterConvertible<Ep>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr(unique_ptr<Up, Ep>&& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr<Up, Ep>&& u) noexcept
       : m_ptr(u.release())
       , m_deleter(std::forward<Ep>(u.get_deleter()))
   {}
@@ -972,7 +942,7 @@ class unique_ptr<T[], D>
    *  \param p The \p unique_ptr to move from.
    *  \return `*this`
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(unique_ptr&& p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& p) noexcept
   {
     reset(p.release());
     m_deleter = std::forward<deleter_type>(p.get_deleter());
@@ -987,7 +957,7 @@ class unique_ptr<T[], D>
             class Ep,
             class = EnableIfMoveConvertible<unique_ptr<Up, Ep>, Up>,
             class = EnableIfDeleterAssignable<Ep>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(unique_ptr<Up, Ep>&& p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr<Up, Ep>&& p) noexcept
   {
     reset(p.release());
     m_deleter = std::forward<Ep>(p.get_deleter());
@@ -997,7 +967,7 @@ class unique_ptr<T[], D>
   /*! \brief Assigns a null pointer, deallocating the managed object. Effectively the same as calling reset().
    *  \return `*this`
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr& operator=(std::nullptr_t) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(std::nullptr_t) noexcept
   {
     reset();
     return *this;
@@ -1008,7 +978,7 @@ class unique_ptr<T[], D>
   //==========================================================================
   /*! \brief Destroys the \p unique_ptr, the managed array is destroyed via `get_deleter()(get())`. If get() == nullptr there are no effects.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 ~unique_ptr()
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 ~unique_ptr()
   {
     reset();
   }
@@ -1027,7 +997,7 @@ class unique_ptr<T[], D>
    *  \param i The index of the element to access.
    *  \return A reference to (or copy of) the element at index \p i.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 auto operator[](size_t i) const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 auto operator[](size_t i) const noexcept
   {
     return m_ptr[i];
   }
@@ -1036,7 +1006,7 @@ class unique_ptr<T[], D>
    *  
    *  \return Pointer to the managed array.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 pointer get() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 pointer get() const noexcept
   {
     return m_ptr;
   }
@@ -1046,7 +1016,7 @@ class unique_ptr<T[], D>
    *  \return Pointer to the managed array.
    */
   template <bool Dummy = true, class = EnableIfDeleterDefaultDelete<Dummy>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 T* get_raw() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 T* get_raw() const noexcept
   {
     return raw_pointer_cast(m_ptr);
   }
@@ -1054,7 +1024,7 @@ class unique_ptr<T[], D>
   /*! \brief Returns a reference to the deleter object which would be used for destruction of the managed array.
    *  \return A reference to the stored deleter.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 deleter_type& get_deleter() noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 deleter_type& get_deleter() noexcept
   {
     return m_deleter;
   }
@@ -1062,7 +1032,7 @@ class unique_ptr<T[], D>
   /*! \brief Returns a const reference to the deleter object which would be used for destruction of the managed array.
    *  \return A const reference to the stored deleter.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 const deleter_type& get_deleter() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 const deleter_type& get_deleter() const noexcept
   {
     return m_deleter;
   }
@@ -1070,7 +1040,7 @@ class unique_ptr<T[], D>
   /*! \brief Checks if the \p unique_ptr owns an array.
    *  \return `true` if an array is owned, `false` otherwise.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 explicit operator bool() const noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 explicit operator bool() const noexcept
   {
     return m_ptr != nullptr;
   }
@@ -1081,7 +1051,7 @@ class unique_ptr<T[], D>
   /*! \brief Releases ownership of the managed array, if any.
    *  \return A pointer to the released array.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 pointer release() noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 pointer release() noexcept
   {
     pointer temp = m_ptr;
     m_ptr        = pointer();
@@ -1092,7 +1062,7 @@ class unique_ptr<T[], D>
    *  \param p The new array to manage.
    */
   template <class Pp, class = EnableIfPointerConvertible<Pp>>
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 void reset(Pp p) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 void reset(Pp p) noexcept
   {
     pointer temp = m_ptr;
     m_ptr        = p;
@@ -1106,7 +1076,7 @@ class unique_ptr<T[], D>
    *
    *  Destroys the currently managed array (if any) and resets to empty state.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 void reset(std::nullptr_t = nullptr) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 void reset(std::nullptr_t = nullptr) noexcept
   {
     pointer temp = m_ptr;
     m_ptr        = nullptr;
@@ -1119,7 +1089,7 @@ class unique_ptr<T[], D>
   /*! \brief Swaps the managed array and deleter with another array \p unique_ptr.
    *  \param u The \p unique_ptr to swap with.
    */
-  THRUST_HOST THRUST_CONSTEXPR_CXX23 void swap(unique_ptr& u) noexcept
+  THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 void swap(unique_ptr& u) noexcept
   {
     using std::swap;
     swap(m_ptr, u.m_ptr);
@@ -1135,7 +1105,7 @@ class unique_ptr<T[], D>
  *  \param y The second \p unique_ptr.
  */
 template <class T, class D, std::enable_if_t<std::is_swappable_v<D>, void>>
-inline THRUST_CONSTEXPR_CXX23 void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept
+inline THRUST_CONSTEXPR_SINCE_CXX23 void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept
 {
   x.swap(y);
 }
@@ -1153,12 +1123,12 @@ inline THRUST_CONSTEXPR_CXX23 void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y
  *  \return `true` if the pointers are equal, `false` otherwise.
  */
 template <class T1, class D1, class T2, class D2>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   return x.get() == y.get();
 }
 
-#if THRUST_STD_VER <= 2017
+#if THRUST_STD_VER <= 17
 template <class T1, class D1, class T2, class D2>
 /*! \brief Compares two \p unique_ptr objects for inequality (C++17 and earlier).
  *
@@ -1166,7 +1136,7 @@ template <class T1, class D1, class T2, class D2>
  *  \param y The second \p unique_ptr to compare.
  *  \return `true` if the pointers are not equal, `false` otherwise.
  */
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   return !(x == y);
 }
@@ -1181,7 +1151,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(const unique_ptr<T1, D
  *  \note Operators `>`, `<=`, and `>=` are also provided and defined in terms of this operator.
  */
 template <class T1, class D1, class T2, class D2>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   using P1 = typename unique_ptr<T1, D1>::element_type*;
   using P2 = typename unique_ptr<T2, D2>::element_type*;
@@ -1196,7 +1166,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(const unique_ptr<T1, D1
  *  \return `true` if \p x is greater than \p y, `false` otherwise.
  */
 template <class T1, class D1, class T2, class D2>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   return y < x;
 }
@@ -1208,7 +1178,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(const unique_ptr<T1, D1
  *  \return `true` if \p x is less than or equal to \p y, `false` otherwise.
  */
 template <class T1, class D1, class T2, class D2>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   return !(y < x);
 }
@@ -1220,12 +1190,12 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(const unique_ptr<T1, D
  *  \return `true` if \p x is greater than or equal to \p y, `false` otherwise.
  */
 template <class T1, class D1, class T2, class D2>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
   return !(x < y);
 }
 
-#if THRUST_STD_VER >= 2020
+#if THRUST_STD_VER >= 20
 template <class T1, class D1, class T2, class D2>
   THRUST_HOST inline auto operator<=> (const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y)
 {
@@ -1240,19 +1210,19 @@ template <class T1, class D1, class T2, class D2>
  *  \return `true` if \p x is empty, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator==(const unique_ptr<T, D>& x, std::nullptr_t) noexcept
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator==(const unique_ptr<T, D>& x, std::nullptr_t) noexcept
 {
   return !x;
 }
 
-#if THRUST_STD_VER <= 2017
+#if THRUST_STD_VER <= 17
 /*! \brief Compares nullptr with a \p unique_ptr for equality (C++17 and earlier).
  *
  *  \param y The \p unique_ptr to compare.
  *  \return `true` if \p y is empty, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator==(std::nullptr_t, const unique_ptr<T, D>& y) noexcept
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator==(std::nullptr_t, const unique_ptr<T, D>& y) noexcept
 {
   return !y;
 }
@@ -1263,7 +1233,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator==(std::nullptr_t, const
  *  \return `true` if \p x is not empty, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(const unique_ptr<T, D>& x, std::nullptr_t) noexcept
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator!=(const unique_ptr<T, D>& x, std::nullptr_t) noexcept
 {
   return static_cast<bool>(x);
 }
@@ -1274,7 +1244,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(const unique_ptr<T, D>
  *  \return `true` if \p y is not empty, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(std::nullptr_t, const unique_ptr<T, D>& y) noexcept
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator!=(std::nullptr_t, const unique_ptr<T, D>& y) noexcept
 {
   return static_cast<bool>(y);
 }
@@ -1286,7 +1256,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator!=(std::nullptr_t, const
  *  \return `true` if the pointer in \p x is less than nullptr, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(const unique_ptr<T, D>& x, std::nullptr_t)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<(const unique_ptr<T, D>& x, std::nullptr_t)
 {
   return std::less<typename unique_ptr<T, D>::pointer>()(x.get(), nullptr); // x.get() < nullptr;
 }
@@ -1297,7 +1267,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(const unique_ptr<T, D>&
  *  \return `true` if nullptr is less than the pointer in \p y, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(std::nullptr_t, const unique_ptr<T, D>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<(std::nullptr_t, const unique_ptr<T, D>& y)
 {
   return std::less<typename unique_ptr<T, D>::pointer>()(nullptr, y.get()); // nullptr < y.get();
 }
@@ -1308,7 +1278,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<(std::nullptr_t, const u
  *  \return `true` if the pointer in \p x is greater than nullptr, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(const unique_ptr<T, D>& x, std::nullptr_t)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>(const unique_ptr<T, D>& x, std::nullptr_t)
 {
   return nullptr < x;
 }
@@ -1319,7 +1289,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(const unique_ptr<T, D>&
  *  \return `true` if nullptr is greater than the pointer in \p y, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(std::nullptr_t, const unique_ptr<T, D>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>(std::nullptr_t, const unique_ptr<T, D>& y)
 {
   return y < nullptr;
 }
@@ -1330,7 +1300,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>(std::nullptr_t, const u
  *  \return `true` if the pointer in \p x is less than or equal to nullptr, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(const unique_ptr<T, D>& x, std::nullptr_t)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<=(const unique_ptr<T, D>& x, std::nullptr_t)
 {
   return !(nullptr < x);
 }
@@ -1341,7 +1311,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(const unique_ptr<T, D>
  *  \return `true` if nullptr is less than or equal to the pointer in \p y, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(std::nullptr_t, const unique_ptr<T, D>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator<=(std::nullptr_t, const unique_ptr<T, D>& y)
 {
   return !(y < nullptr);
 }
@@ -1352,7 +1322,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator<=(std::nullptr_t, const
  *  \return `true` if the pointer in \p x is greater than or equal to nullptr, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>=(const unique_ptr<T, D>& x, std::nullptr_t)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>=(const unique_ptr<T, D>& x, std::nullptr_t)
 {
   return !(x < nullptr);
 }
@@ -1363,12 +1333,12 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>=(const unique_ptr<T, D>
  *  \return `true` if nullptr is greater than or equal to the pointer in \p y, `false` otherwise.
  */
 template <class T, class D>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 bool operator>=(std::nullptr_t, const unique_ptr<T, D>& y)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 bool operator>=(std::nullptr_t, const unique_ptr<T, D>& y)
 {
   return !(y < nullptr);
 }
 
-#if THRUST_STD_VER >= 2020
+#if THRUST_STD_VER >= 20
 template <class T, class D>
   THRUST_HOST inline auto operator<=> (const unique_ptr<T, D>& x, std::nullptr_t)
 {
@@ -1394,7 +1364,7 @@ template <class T, class D>
  *  \return A \p unique_ptr<T> managing the newly created object.
  */
 template <class T, class... Args, class = std::enable_if_t<!std::is_array_v<T>>>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique(Args&&... args)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr<T> make_unique(Args&&... args)
 {
   thrust::device_ptr<T> p = thrust::device_malloc<T>(1);
   return unique_ptr<T>(thrust::device_new<T>(p, T(std::forward<Args>(args)...), 1));
@@ -1413,7 +1383,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique(Args&&... ar
  *  \return A \p unique_ptr<T> managing the newly created array.
  */
 template <class T, class = std::enable_if_t<thrust::detail::is_unbounded_array<T>::value>>
-THRUST_HOST inline THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique(size_t n)
+THRUST_HOST inline THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr<T> make_unique(size_t n)
 {
   using U = typename std::remove_extent<T>::type;
   return unique_ptr<T>(thrust::device_new<U>(n), n);
@@ -1422,7 +1392,7 @@ THRUST_HOST inline THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique(size_t n)
 template <class T, class... Args, class = std::enable_if_t<thrust::detail::is_bounded_array<T>::value>>
 THRUST_HOST void make_unique(Args&&...) = delete;
 
-#if THRUST_STD_VER >= 2020
+#if THRUST_STD_VER >= 20
 
 /*! \brief Constructs an object of type \p T in device memory without initialization (C++20).
  *
@@ -1436,7 +1406,7 @@ THRUST_HOST void make_unique(Args&&...) = delete;
  *  \return A \p unique_ptr<T> managing the uninitialized memory.
  */
 template <class T, class = std::enable_if_t<!std::is_array_v<T>>>
-THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique_for_overwrite()
+THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr<T> make_unique_for_overwrite()
 {
   return unique_ptr<T>(thrust::device_malloc<T>(1));
 }
@@ -1455,7 +1425,7 @@ THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique_for_overwrite()
  *  \return A \p unique_ptr<T> managing the uninitialized array.
  */
 template <class T, class = std::enable_if_t<thrust::detail::is_unbounded_array<T>::value>>
-THRUST_HOST THRUST_CONSTEXPR_CXX23 unique_ptr<T> make_unique_for_overwrite(size_t n)
+THRUST_HOST THRUST_CONSTEXPR_SINCE_CXX23 unique_ptr<T> make_unique_for_overwrite(size_t n)
 {
   using U = typename std::remove_extent<T>::type;
 
diff --git a/projects/rocthrust/thrust/universal_allocator.h b/projects/rocthrust/thrust/universal_allocator.h
index b66f6dd4af69..3b1a592911b4 100644
--- a/projects/rocthrust/thrust/universal_allocator.h
+++ b/projects/rocthrust/thrust/universal_allocator.h
@@ -23,25 +23,22 @@
 
 #include <thrust/detail/config.h>
 
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
+/*! \cond
+ *  skip overloaded implementation
+ */
 
-#ifndef THRUST_DOXYGEN_INVOKED
 // #include the device system's vector header
-#  define __THRUST_DEVICE_SYSTEM_MEMORY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/memory.h>
-#  include __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
-#  undef __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
-#endif
+#define __THRUST_DEVICE_SYSTEM_MEMORY_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/memory.h>
+#include __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
+#undef __THRUST_DEVICE_SYSTEM_MEMORY_HEADER
+
+/*! \endcond
+ */
 
 THRUST_NAMESPACE_BEGIN
 
 /** \addtogroup memory_resources Memory Resources
- *  \ingroup memory_management_classes
+ *  \ingroup memory_management
  *  \{
  */
 
@@ -52,13 +49,6 @@ THRUST_NAMESPACE_BEGIN
  */
 using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_allocator;
 
-/*! \brief An allocator which creates new elements in memory accessible by both hosts and devices. Uses pinned memory
- *         when the system supports it.
- *
- *  \see https://en.cppreference.com/w/cpp/named_req/Allocator
- */
-using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_host_pinned_allocator;
-
 /*! \p universal_ptr stores a pointer to an object allocated in memory accessible
  *  to both hosts and devices.
  *
diff --git a/projects/rocthrust/thrust/universal_ptr.h b/projects/rocthrust/thrust/universal_ptr.h
index 7b02b6e2f899..6bc1dc7a5ed4 100644
--- a/projects/rocthrust/thrust/universal_ptr.h
+++ b/projects/rocthrust/thrust/universal_ptr.h
@@ -21,14 +21,4 @@
 
 #pragma once
 
-#include <thrust/detail/config.h>
-
-#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
-#  pragma GCC system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
-#  pragma clang system_header
-#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
-#  pragma system_header
-#endif // no system header
-
 #include <thrust/universal_allocator.h>
diff --git a/projects/rocthrust/thrust/universal_vector.h b/projects/rocthrust/thrust/universal_vector.h
index 4eab4716ac98..615b57c65581 100644
--- a/projects/rocthrust/thrust/universal_vector.h
+++ b/projects/rocthrust/thrust/universal_vector.h
@@ -32,12 +32,17 @@
 #endif // no system header
 #include <thrust/universal_allocator.h>
 
-#ifndef THRUST_DOXYGEN_INVOKED
+/*! \cond
+ *  skip overloaded implementation
+ */
+
 // #include the device system's vector header
-#  define __THRUST_DEVICE_SYSTEM_VECTOR_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/vector.h>
-#  include __THRUST_DEVICE_SYSTEM_VECTOR_HEADER
-#  undef __THRUST_DEVICE_SYSTEM_VECTOR_HEADER
-#endif
+#define __THRUST_DEVICE_SYSTEM_VECTOR_HEADER <__THRUST_DEVICE_SYSTEM_ROOT/vector.h>
+#include __THRUST_DEVICE_SYSTEM_VECTOR_HEADER
+#undef __THRUST_DEVICE_SYSTEM_VECTOR_HEADER
+
+/*! \endcond
+ */
 
 THRUST_NAMESPACE_BEGIN
 
@@ -58,14 +63,12 @@ THRUST_NAMESPACE_BEGIN
  *  \see device_vector
  *  \see universal_host_pinned_vector
  */
-template <typename T, typename Allocator = universal_allocator<T>>
-using universal_vector = thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_vector<T, Allocator>;
+using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_vector;
 
 //! Like \ref universal_vector but uses pinned memory when the system supports it.
 //! \see device_vector
 //! \see universal_vector
-template <typename T>
-using universal_host_pinned_vector = thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_host_pinned_vector<T>;
+using thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::universal_host_pinned_vector;
 
 /*! \} // containers
  */
diff --git a/projects/rocthrust/thrust/version.h b/projects/rocthrust/thrust/version.h
index 857e70b9e51c..6e1becfa717b 100644
--- a/projects/rocthrust/thrust/version.h
+++ b/projects/rocthrust/thrust/version.h
@@ -63,7 +63,7 @@
  *         <tt>THRUST_VERSION / 100 % 1000</tt> is the minor version.
  *         <tt>THRUST_VERSION / 100000</tt> is the major version.
  */
-#define THRUST_VERSION 300003 // macro expansion with ## requires this to be a single value
+#define THRUST_VERSION 200805 // macro expansion with ## requires this to be a single value
 
 /*! \def THRUST_MAJOR_VERSION
  *  \brief The preprocessor macro \p THRUST_MAJOR_VERSION encodes the
@@ -92,10 +92,6 @@
 
 #if _THRUST_HAS_DEVICE_SYSTEM_STD
 static_assert(THRUST_MAJOR_VERSION == CCCL_MAJOR_VERSION, "");
-#  if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_HIP // for libhipcxx
-static_assert(THRUST_MINOR_VERSION <= CCCL_MINOR_VERSION, "");
-#  else // CUDA
 static_assert(THRUST_MINOR_VERSION == CCCL_MINOR_VERSION, "");
-static_assert(THRUST_SUBMINOR_VERSION <= CCCL_PATCH_VERSION, "");
-#  endif
+static_assert(THRUST_SUBMINOR_VERSION == CCCL_PATCH_VERSION, "");
 #endif
diff --git a/projects/rocthrust/thrust/zip_function.h b/projects/rocthrust/thrust/zip_function.h
index 6f5b9f513ef8..376fcb67dccd 100644
--- a/projects/rocthrust/thrust/zip_function.h
+++ b/projects/rocthrust/thrust/zip_function.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2020-2025 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -35,16 +35,13 @@
 #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
 #  pragma system_header
 #endif // no system header
+#include <thrust/detail/modern_gcc_required.h>
+#if !defined(THRUST_LEGACY_GCC)
 
-#include <thrust/detail/type_deduction.h>
-#include <thrust/tuple.h>
-#include <thrust/type_traits/integer_sequence.h>
-
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
-#  include _THRUST_LIBCXX_INCLUDE(functional)
-#else
-#  include <thrust/detail/libcxx_wrapper/__functional/address_stability.h>
-#endif
+#  include <thrust/detail/functional/address_stability.h>
+#  include <thrust/detail/type_deduction.h>
+#  include <thrust/tuple.h>
+#  include <thrust/type_traits/integer_sequence.h>
 
 THRUST_NAMESPACE_BEGIN
 
@@ -63,6 +60,8 @@ namespace zip_detail
 {
 
 // Add workaround for decltype(auto) on C++11-only compilers:
+#  if THRUST_CPP_DIALECT >= 2017
+
 THRUST_EXEC_CHECK_DISABLE
 template <typename Function, typename Tuple, std::size_t... Is>
 THRUST_HOST_DEVICE decltype(auto) apply_impl(Function&& func, Tuple&& args, index_sequence<Is...>)
@@ -77,6 +76,21 @@ THRUST_HOST_DEVICE decltype(auto) apply(Function&& func, Tuple&& args)
   return apply_impl(THRUST_FWD(func), THRUST_FWD(args), make_index_sequence<tuple_size>{});
 }
 
+#  else // THRUST_CPP_DIALECT
+
+THRUST_EXEC_CHECK_DISABLE
+template <typename Function, typename Tuple, std::size_t... Is>
+THRUST_HOST_DEVICE auto apply_impl(Function&& func, Tuple&& args, index_sequence<Is...>)
+  THRUST_DECLTYPE_RETURNS(func(thrust::get<Is>(THRUST_FWD(args))...))
+
+    template <typename Function, typename Tuple>
+    THRUST_HOST_DEVICE auto apply(Function&& func, Tuple&& args) THRUST_DECLTYPE_RETURNS(apply_impl(
+      THRUST_FWD(func),
+      THRUST_FWD(args),
+      make_index_sequence<thrust::tuple_size<typename std::decay<Tuple>::type>::value>{}))
+
+#  endif // THRUST_CPP_DIALECT
+
 } // namespace zip_detail
 } // namespace detail
 
@@ -154,7 +168,8 @@ class zip_function
   {}
 
   /*! Applies the N-ary function object to elements of the tuple \p args. */
-  // Add workaround for decltype(auto) on C++11-only compilers:
+// Add workaround for decltype(auto) on C++11-only compilers:
+#  if THRUST_CPP_DIALECT >= 2017
 
   template <typename Tuple>
   THRUST_HOST_DEVICE decltype(auto) operator()(Tuple&& args) const
@@ -162,6 +177,20 @@ class zip_function
     return detail::zip_detail::apply(func, THRUST_FWD(args));
   }
 
+#  else // THRUST_CPP_DIALECT
+
+  // Can't just use THRUST_DECLTYPE_RETURNS here since we need to use
+  // std::declval for the signature components:
+  template <typename Tuple>
+  THRUST_HOST_DEVICE auto operator()(Tuple&& args) const
+    noexcept(noexcept(detail::zip_detail::apply(std::declval<Function>(), THRUST_FWD(args))))
+      -> decltype(detail::zip_detail::apply(std::declval<Function>(), THRUST_FWD(args)))
+  {
+    return detail::zip_detail::apply(func, THRUST_FWD(args));
+  }
+
+#  endif // THRUST_CPP_DIALECT
+
   //! Returns a reference to the underlying function.
   THRUST_HOST_DEVICE Function& underlying_function() const
   {
@@ -194,17 +223,21 @@ THRUST_HOST_DEVICE zip_function<typename std::decay<Function>::type> make_zip_fu
 
 THRUST_NAMESPACE_END
 
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  if _THRUST_HAS_DEVICE_SYSTEM_STD
 _LIBCUDACXX_BEGIN_NAMESPACE_CUDA
-#else
-namespace internal
+#  else
+THRUST_NAMESPACE_BEGIN
+namespace detail
 {
-#endif
+#  endif
 template <typename F>
 struct proclaims_copyable_arguments<THRUST_NS_QUALIFIER::zip_function<F>> : proclaims_copyable_arguments<F>
 {};
-#if _THRUST_HAS_DEVICE_SYSTEM_STD
+#  if _THRUST_HAS_DEVICE_SYSTEM_STD
 _LIBCUDACXX_END_NAMESPACE_CUDA
-#else
-} // namespace internal
+#  else
+}
+THRUST_NAMESPACE_END
+#  endif
+
 #endif