diff --git a/libcudacxx/include/cuda/__warp/warp_shuffle.h b/libcudacxx/include/cuda/__warp/warp_shuffle.h
index 80f51651402..925da691502 100644
--- a/libcudacxx/include/cuda/__warp/warp_shuffle.h
+++ b/libcudacxx/include/cuda/__warp/warp_shuffle.h
@@ -28,15 +28,11 @@
 #    include <cuda/__cmath/pow2.h>
 #    include <cuda/__ptx/instructions/get_sreg.h>
 #    include <cuda/__ptx/instructions/shfl_sync.h>
-#    include <cuda/std/__concepts/concept_macros.h>
 #    include <cuda/std/__memory/addressof.h>
 #    include <cuda/std/__type_traits/enable_if.h>
 #    include <cuda/std/__type_traits/integral_constant.h>
 #    include <cuda/std/__type_traits/is_default_constructible.h>
 #    include <cuda/std/__type_traits/is_pointer.h>
-#    include <cuda/std/__type_traits/is_trivially_copyable.h>
-#    include <cuda/std/__type_traits/is_void.h>
-#    include <cuda/std/__type_traits/remove_cvref.h>
 #    include <cuda/std/cstdint>
 
 #    include <cuda/std/__cccl/prologue.h>
@@ -61,8 +57,6 @@ template <int _Width = 32, typename _Tp, typename _Up = ::cuda::std::remove_cv_t
   const _Tp& __data, int __src_lane, uint32_t __lane_mask = 0xFFFFFFFF, ::cuda::std::integral_constant<int, _Width> = {})
 {
   static_assert(::cuda::std::is_default_constructible_v<_Tp>, "_Tp must be default constructible");
-  static_assert(::cuda::std::is_trivially_copyable_v<_Tp>, "_Tp must be trivially copyable");
-
   constexpr auto __warp_size   = 32u;
   constexpr bool __is_void_ptr = ::cuda::std::is_same_v<_Up, void*> || ::cuda::std::is_same_v<_Up, const void*>;
   static_assert(!::cuda::std::is_pointer_v<_Up> || __is_void_ptr,
@@ -108,8 +102,6 @@ template <int _Width = 32, typename _Tp, typename _Up = ::cuda::std::remove_cv_t
   const _Tp& __data, int __delta, uint32_t __lane_mask = 0xFFFFFFFF, ::cuda::std::integral_constant<int, _Width> = {})
 {
   static_assert(::cuda::std::is_default_constructible_v<_Tp>, "_Tp must be default constructible");
-  static_assert(::cuda::std::is_trivially_copyable_v<_Tp>, "_Tp must be trivially copyable");
-
   constexpr auto __warp_size   = 32u;
   constexpr bool __is_void_ptr = ::cuda::std::is_same_v<_Up, void*> || ::cuda::std::is_same_v<_Up, const void*>;
   static_assert(!::cuda::std::is_pointer_v<_Up> || __is_void_ptr,
@@ -159,8 +151,6 @@ template <int _Width = 32, typename _Tp, typename _Up = ::cuda::std::remove_cv_t
   const _Tp& __data, int __delta, uint32_t __lane_mask = 0xFFFFFFFF, ::cuda::std::integral_constant<int, _Width> = {})
 {
   static_assert(::cuda::std::is_default_constructible_v<_Tp>, "_Tp must be default constructible");
-  static_assert(::cuda::std::is_trivially_copyable_v<_Tp>, "_Tp must be trivially copyable");
-
   constexpr auto __warp_size   = 32u;
   constexpr bool __is_void_ptr = ::cuda::std::is_same_v<_Up, void*> || ::cuda::std::is_same_v<_Up, const void*>;
   static_assert(!::cuda::std::is_pointer_v<_Up> || __is_void_ptr,
@@ -210,8 +200,6 @@ template <int _Width = 32, typename _Tp, typename _Up = ::cuda::std::remove_cv_t
   const _Tp& __data, int __xor_mask, uint32_t __lane_mask = 0xFFFFFFFF, ::cuda::std::integral_constant<int, _Width> = {})
 {
   static_assert(::cuda::std::is_default_constructible_v<_Tp>, "_Tp must be default constructible");
-  static_assert(::cuda::std::is_trivially_copyable_v<_Tp>, "_Tp must be trivially copyable");
-
   constexpr auto __warp_size   = 32u;
   constexpr bool __is_void_ptr = ::cuda::std::is_same_v<_Up, void*> || ::cuda::std::is_same_v<_Up, const void*>;
   static_assert(!::cuda::std::is_pointer_v<_Up> || __is_void_ptr,