diff --git a/cudax/include/cuda/experimental/__event/event.cuh b/cudax/include/cuda/experimental/__event/event.cuh
index 0b6b7802b22..df72d7fd5a1 100644
--- a/cudax/include/cuda/experimental/__event/event.cuh
+++ b/cudax/include/cuda/experimental/__event/event.cuh
@@ -24,13 +24,12 @@
 #  pragma system_header
 #endif // no system header
 
+#include <cuda/experimental/__detail/utility.cuh>
+#include <cuda/experimental/__event/event_ref.cuh>
 #include <cuda/std/__cuda/api_wrapper.h>
 #include <cuda/std/cstddef>
 #include <cuda/std/utility>
 
-#include <cuda/experimental/__detail/utility.cuh>
-#include <cuda/experimental/__event/event_ref.cuh>
-
 namespace cuda::experimental
 {
 class timed_event;
diff --git a/cudax/include/cuda/experimental/__event/timed_event.cuh b/cudax/include/cuda/experimental/__event/timed_event.cuh
index debcbcd26e5..ffc95d293fe 100644
--- a/cudax/include/cuda/experimental/__event/timed_event.cuh
+++ b/cudax/include/cuda/experimental/__event/timed_event.cuh
@@ -24,13 +24,12 @@
 #  pragma system_header
 #endif // no system header
 
+#include <cuda/experimental/__detail/utility.cuh>
+#include <cuda/experimental/__event/event.cuh>
 #include <cuda/std/__cuda/api_wrapper.h>
 #include <cuda/std/chrono>
 #include <cuda/std/cstddef>
 
-#include <cuda/experimental/__detail/utility.cuh>
-#include <cuda/experimental/__event/event.cuh>
-
 namespace cuda::experimental
 {
 //! @brief An owning wrapper for a `cudaEvent_t` with timing enabled.
diff --git a/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
index e7ec1e3c3fc..947c1390d0d 100644
--- a/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
+++ b/cudax/include/cuda/experimental/__hierarchy/hierarchy_dimensions.cuh
@@ -11,11 +11,10 @@
 #ifndef _CUDAX__HIERARCHY_HIERARCHY_DIMENSIONS
 #define _CUDAX__HIERARCHY_HIERARCHY_DIMENSIONS
 
+#include <cuda/experimental/__hierarchy/level_dimensions.cuh>
 #include <cuda/std/__utility/declval.h>
 #include <cuda/std/tuple>
 
-#include <cuda/experimental/__hierarchy/level_dimensions.cuh>
-
 #include <nv/target>
 
 #if _CCCL_STD_VER >= 2017
diff --git a/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh b/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
index cf6503d07bd..8d42fba499d 100644
--- a/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
+++ b/cudax/include/cuda/experimental/__hierarchy/level_dimensions.cuh
@@ -11,9 +11,8 @@
 #ifndef _CUDAX__HIERARCHY_LEVEL_DIMENSIONS
 #define _CUDAX__HIERARCHY_LEVEL_DIMENSIONS
 
-#include <cuda/std/type_traits>
-
 #include <cuda/experimental/__hierarchy/hierarchy_levels.cuh>
+#include <cuda/std/type_traits>
 
 #if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
diff --git a/cudax/include/cuda/experimental/__launch/configuration.cuh b/cudax/include/cuda/experimental/__launch/configuration.cuh
index 8680582ac5f..54b18c90e5c 100644
--- a/cudax/include/cuda/experimental/__launch/configuration.cuh
+++ b/cudax/include/cuda/experimental/__launch/configuration.cuh
@@ -11,11 +11,10 @@
 #ifndef _CUDAX__LAUNCH_CONFIGURATION
 #define _CUDAX__LAUNCH_CONFIGURATION
 
+#include <cuda/experimental/hierarchy.cuh>
 #include <cuda/std/span>
 #include <cuda/std/tuple>
 
-#include <cuda/experimental/hierarchy.cuh>
-
 #if _CCCL_STD_VER >= 2017
 namespace cuda::experimental
 {
diff --git a/cudax/test/launch/launch_smoke.cu b/cudax/test/launch/launch_smoke.cu
index 4662ff6f307..2409905c78b 100644
--- a/cudax/test/launch/launch_smoke.cu
+++ b/cudax/test/launch/launch_smoke.cu
@@ -9,7 +9,6 @@
 //===----------------------------------------------------------------------===//
 #define LIBCUDACXX_ENABLE_EXCEPTIONS
 #include <cuda/atomic>
-
 #include <cuda/experimental/launch.cuh>
 
 #include "../hierarchy/testing_common.cuh"