From 079de7583fbfd4e62c6c0db157997fbaacca2704 Mon Sep 17 00:00:00 2001
From: Mark Harris <mharris@nvidia.com>
Date: Tue, 27 Feb 2024 04:05:36 +0000
Subject: [PATCH] Regroup headers using clang-format

---
 .../distance/hausdorff_benchmark.cpp          |  6 ++---
 .../distance/pairwise_linestring_distance.cu  |  5 ++--
 .../pairwise_linestring_polygon_distance.cu   |  5 ++--
 .../pairwise_point_polygon_distance.cu        |  5 ++--
 cpp/benchmarks/indexing/quadtree_on_points.cu | 11 ++++----
 .../point_in_polygon/point_in_polygon.cu      |  5 ++--
 .../points_in_range/points_in_range.cu        |  6 ++---
 .../synchronization/synchronization.hpp       | 26 +++++++------------
 .../utility/floating_point_equality.cu        |  7 ++---
 .../synchronization/synchronization.hpp       | 26 +++++++------------
 cpp/cuproj/benchmarks/wgs_to_utm_bench.cu     | 10 +++----
 cpp/cuproj/tests/wgs_to_utm_test.cu           |  8 +++---
 .../detail/algorithm/is_point_in_polygon.cuh  |  7 +++--
 .../cuspatial/detail/bounding_boxes.cuh       |  3 ++-
 .../cuspatial/detail/distance/hausdorff.cuh   |  7 +++--
 .../detail/find/find_and_combine_segment.cuh  |  6 ++---
 .../detail/find/find_duplicate_points.cuh     |  6 ++---
 .../detail/geometry/linestring_ref.cuh        |  6 ++---
 .../cuspatial/detail/geometry/polygon_ref.cuh |  6 ++---
 .../detail/index/construction/phase_1.cuh     |  5 ++--
 .../intersection/linestring_intersection.cuh  |  5 ++--
 .../linestring_intersection_count.cuh         |  6 ++---
 ...inestring_intersection_with_duplicates.cuh |  6 ++---
 .../detail/join/quadtree_bbox_filtering.cuh   |  5 ++--
 .../quadtree_point_to_nearest_linestring.cuh  |  5 ++--
 .../detail/kernel/pairwise_distance.cuh       |  6 ++---
 .../pairwise_multipoint_equals_count.cuh      |  6 ++---
 .../cuspatial/detail/point_in_polygon.cuh     |  3 +--
 .../point_linestring_nearest_points.cuh       |  6 ++---
 .../cuspatial/detail/point_quadtree.cuh       |  5 ++--
 .../detail/range/multipoint_range.cuh         | 12 ++++-----
 .../detail/trajectory/derive_trajectories.cuh |  5 ++--
 .../trajectory_distances_and_speeds.cuh       |  5 ++--
 .../detail/utility/device_atomics.cuh         |  5 ++--
 .../pairwise_multipoint_equals_count.hpp      |  6 ++---
 cpp/include/cuspatial_test/base_fixture.hpp   |  6 ++---
 .../cuspatial_test/column_factories.hpp       |  6 ++---
 .../cuspatial_test/geometry_fixtures.hpp      |  6 ++---
 .../cuspatial_test/geometry_generator.cuh     |  6 ++---
 cpp/include/cuspatial_test/random.cuh         |  5 ++--
 .../cuspatial_test/vector_equality.hpp        |  6 ++---
 .../bounding_boxes/polygon_bounding_boxes.cu  |  5 ++--
 .../distance/linestring_polygon_distance.cu   | 18 ++++++-------
 cpp/src/distance/point_polygon_distance.cu    | 18 ++++++-------
 cpp/src/distance/polygon_distance.cu          | 16 ++++++------
 cpp/src/join/quadtree_bbox_filtering.cu       |  6 ++---
 cpp/src/join/quadtree_point_in_polygon.cu     |  7 +++--
 .../linestring_bounding_boxes_test.cpp        |  3 +--
 .../polygon_bounding_boxes_test.cpp           |  3 +--
 cpp/tests/distance/hausdorff_test.cpp         |  3 +--
 cpp/tests/distance/hausdorff_test.cu          |  5 ++--
 .../distance/linestring_distance_test.cu      |  3 ++-
 .../linestring_polygon_distance_test.cpp      |  5 ++--
 .../distance/point_polygon_distance_test.cpp  |  8 +++---
 cpp/tests/distance/polygon_distance_test.cpp  |  5 ++--
 .../pairwise_multipoint_equals_count_test.cpp |  5 ++--
 cpp/tests/find/find_duplicate_points_test.cu  |  8 +++---
 .../find/find_points_on_segments_test.cu      |  8 +++---
 cpp/tests/index/point_quadtree_test.cpp       |  3 +--
 .../linestring_intersection_count_test.cu     |  6 ++---
 .../linestring_intersection_test.cpp          |  6 ++---
 ...tring_intersection_with_duplicates_test.cu |  5 ++--
 .../join_quadtree_and_bounding_boxes_test.cpp |  3 +--
 .../join/quadtree_point_in_polygon_test.cpp   |  6 ++---
 .../quadtree_point_in_polygon_test_large.cu   |  4 +--
 .../quadtree_point_in_polygon_test_small.cu   |  3 ++-
 ...dtree_point_to_nearest_linestring_test.cpp |  6 ++---
 .../points_in_range/points_in_range_test.cpp  |  3 +--
 .../points_in_range/points_in_range_test.cu   |  8 +++---
 .../projection/sinusoidal_projection_test.cu  |  9 ++++---
 cpp/tests/range/multilinestring_range_test.cu |  5 ++--
 .../trajectory_distances_and_speeds_test.cu   |  5 ++--
 .../trajectory/trajectory_test_utils.cuh      |  9 +++----
 .../utility_test/test_float_equivalent.cu     |  8 +++---
 .../utility_test/test_geometry_generators.cu  |  3 ++-
 75 files changed, 235 insertions(+), 270 deletions(-)

diff --git a/cpp/benchmarks/distance/hausdorff_benchmark.cpp b/cpp/benchmarks/distance/hausdorff_benchmark.cpp
index 10ffced0e..8d39b7167 100644
--- a/cpp/benchmarks/distance/hausdorff_benchmark.cpp
+++ b/cpp/benchmarks/distance/hausdorff_benchmark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <cuspatial/distance.hpp>
-
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
+#include <cuspatial/distance.hpp>
+
 #include <cudf/detail/iterator.cuh>
 #include <cudf_test/column_wrapper.hpp>
 
diff --git a/cpp/benchmarks/distance/pairwise_linestring_distance.cu b/cpp/benchmarks/distance/pairwise_linestring_distance.cu
index c17c59b0d..539f8992a 100644
--- a/cpp/benchmarks/distance/pairwise_linestring_distance.cu
+++ b/cpp/benchmarks/distance/pairwise_linestring_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -23,6 +22,8 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>
diff --git a/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu b/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu
index 0d4fdf574..703cdc5e5 100644
--- a/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu
+++ b/cpp/benchmarks/distance/pairwise_linestring_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * 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 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -23,6 +22,8 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>
diff --git a/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu b/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu
index c3f84da70..3bb08dd11 100644
--- a/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu
+++ b/cpp/benchmarks/distance/pairwise_point_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * 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 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -25,6 +24,8 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 using namespace cuspatial::test;
 
diff --git a/cpp/benchmarks/indexing/quadtree_on_points.cu b/cpp/benchmarks/indexing/quadtree_on_points.cu
index 4984834f7..8f6448505 100644
--- a/cpp/benchmarks/indexing/quadtree_on_points.cu
+++ b/cpp/benchmarks/indexing/quadtree_on_points.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
+#include <benchmarks/fixture/rmm_pool_raii.hpp>
+
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/point_quadtree.cuh>
 
-#include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
-
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_vector.hpp>
-
 #include <rmm/exec_policy.hpp>
+
 #include <thrust/host_vector.h>
 
+#include <nvbench/nvbench.cuh>
+
 using namespace cuspatial;
 
 template <typename T>
diff --git a/cpp/benchmarks/point_in_polygon/point_in_polygon.cu b/cpp/benchmarks/point_in_polygon/point_in_polygon.cu
index 7f41dd371..71e089cd8 100644
--- a/cpp/benchmarks/point_in_polygon/point_in_polygon.cu
+++ b/cpp/benchmarks/point_in_polygon/point_in_polygon.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
-#include <nvbench/nvbench.cuh>
 
 #include <cuspatial_test/geometry_generator.cuh>
 
@@ -27,6 +26,8 @@
 
 #include <thrust/iterator/counting_iterator.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 #include <numeric>
 
diff --git a/cpp/benchmarks/points_in_range/points_in_range.cu b/cpp/benchmarks/points_in_range/points_in_range.cu
index b9bced1be..181f48429 100644
--- a/cpp/benchmarks/points_in_range/points_in_range.cu
+++ b/cpp/benchmarks/points_in_range/points_in_range.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <nvbench/nvbench.cuh>
-
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/random/linear_congruential_engine.h>
 #include <thrust/random/normal_distribution.h>
 #include <thrust/random/uniform_int_distribution.h>
 #include <thrust/tabulate.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 
 using cuspatial::vec_2d;
diff --git a/cpp/benchmarks/synchronization/synchronization.hpp b/cpp/benchmarks/synchronization/synchronization.hpp
index 5e84e9fb9..631b34405 100644
--- a/cpp/benchmarks/synchronization/synchronization.hpp
+++ b/cpp/benchmarks/synchronization/synchronization.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include <rmm/cuda_stream_view.hpp>
+
+#include <driver_types.h>
+
+#include <benchmark/benchmark.h>
+
 /**
  * @file synchronization.hpp
  * @brief This is the header file for `cuda_event_timer`.
@@ -52,22 +60,8 @@
     // Register the function as a benchmark. You will need to set the `UseManualTime()`
     // flag in order to use the timer embedded in this class.
     BENCHMARK(sample_cuda_benchmark)->UseManualTime();
-
-
  **/
 
-#ifndef CUDF_BENCH_SYNCHRONIZATION_H
-#define CUDF_BENCH_SYNCHRONIZATION_H
-
-// Google Benchmark library
-#include <benchmark/benchmark.h>
-
-#include <cudf/types.hpp>
-
-#include <rmm/cuda_stream_view.hpp>
-
-#include <driver_types.h>
-
 class cuda_event_timer {
  public:
   /**
@@ -99,5 +93,3 @@ class cuda_event_timer {
   rmm::cuda_stream_view stream;
   benchmark::State* p_state;
 };
-
-#endif
diff --git a/cpp/benchmarks/utility/floating_point_equality.cu b/cpp/benchmarks/utility/floating_point_equality.cu
index f0f99c4d8..cd44b9a5a 100644
--- a/cpp/benchmarks/utility/floating_point_equality.cu
+++ b/cpp/benchmarks/utility/floating_point_equality.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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 @@
  */
 
 #include <benchmarks/fixture/rmm_pool_raii.hpp>
+
 #include <cuspatial_test/random.cuh>
 
 #include <cuspatial/detail/utility/floating_point.cuh>
@@ -23,10 +24,10 @@
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <nvbench/nvbench.cuh>
-
 #include <thrust/tabulate.h>
 
+#include <nvbench/nvbench.cuh>
+
 #include <memory>
 #include <type_traits>
 
diff --git a/cpp/cuproj/benchmarks/synchronization/synchronization.hpp b/cpp/cuproj/benchmarks/synchronization/synchronization.hpp
index 169450ead..631b34405 100644
--- a/cpp/cuproj/benchmarks/synchronization/synchronization.hpp
+++ b/cpp/cuproj/benchmarks/synchronization/synchronization.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include <rmm/cuda_stream_view.hpp>
+
+#include <driver_types.h>
+
+#include <benchmark/benchmark.h>
+
 /**
  * @file synchronization.hpp
  * @brief This is the header file for `cuda_event_timer`.
@@ -52,22 +60,8 @@
     // Register the function as a benchmark. You will need to set the `UseManualTime()`
     // flag in order to use the timer embedded in this class.
     BENCHMARK(sample_cuda_benchmark)->UseManualTime();
-
-
  **/
 
-#ifndef CUDF_BENCH_SYNCHRONIZATION_H
-#define CUDF_BENCH_SYNCHRONIZATION_H
-
-// Google Benchmark library
-#include <benchmark/benchmark.h>
-
-#include <cudf/types.hpp>
-
-#include <rmm/cuda_stream_view.hpp>
-
-#include <driver_types.h>
-
 class cuda_event_timer {
  public:
   /**
@@ -99,5 +93,3 @@ class cuda_event_timer {
   rmm::cuda_stream_view stream;
   benchmark::State* p_state;
 };
-
-#endif
diff --git a/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu b/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu
index 7fe4c04ac..0533a0d65 100644
--- a/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu
+++ b/cpp/cuproj/benchmarks/wgs_to_utm_bench.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <cuproj/projection_factories.cuh>
-#include <cuspatial/geometry/vec_2d.hpp>
+#include <benchmarks/fixture/benchmark_fixture.hpp>
+#include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cuproj_test/convert_coordinates.hpp>
 #include <cuproj_test/coordinate_generator.cuh>
 
-#include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/synchronization/synchronization.hpp>
+#include <cuproj/projection_factories.cuh>
+#include <cuspatial/geometry/vec_2d.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_vector.hpp>
diff --git a/cpp/cuproj/tests/wgs_to_utm_test.cu b/cpp/cuproj/tests/wgs_to_utm_test.cu
index a78756802..7a732c5da 100644
--- a/cpp/cuproj/tests/wgs_to_utm_test.cu
+++ b/cpp/cuproj/tests/wgs_to_utm_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
 
 #include <cuproj_test/convert_coordinates.hpp>
 #include <cuproj_test/coordinate_generator.cuh>
+#include <cuspatial_test/vector_equality.hpp>
 
 #include <cuproj/error.hpp>
 #include <cuproj/projection_factories.cuh>
 #include <cuproj/vec_2d.hpp>
 
-#include <cuspatial_test/vector_equality.hpp>
-
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
@@ -30,9 +29,8 @@
 #include <thrust/host_vector.h>
 #include <thrust/tabulate.h>
 
-#include <proj.h>
-
 #include <gtest/gtest.h>
+#include <proj.h>
 
 #include <cmath>
 #include <iostream>
diff --git a/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh b/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh
index 2bbd3839d..ef5496d1a 100644
--- a/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh
+++ b/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 
 #pragma once
 
+#include <cuspatial/detail/utility/floating_point.cuh>
+#include <cuspatial/geometry/polygon_ref.cuh>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/geometry/vec_3d.hpp>
 #include <cuspatial/geometry_collection/multipoint_ref.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <cuspatial/detail/utility/floating_point.cuh>
-#include <cuspatial/geometry/polygon_ref.cuh>
-
 #include <thrust/swap.h>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/bounding_boxes.cuh b/cpp/include/cuspatial/detail/bounding_boxes.cuh
index 2e2e3f6e5..22d749e9c 100644
--- a/cpp/include/cuspatial/detail/bounding_boxes.cuh
+++ b/cpp/include/cuspatial/detail/bounding_boxes.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/reduce.h>
+
 #include <type_traits>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/distance/hausdorff.cuh b/cpp/include/cuspatial/detail/distance/hausdorff.cuh
index 3b25014a4..aa955a7d6 100644
--- a/cpp/include/cuspatial/detail/distance/hausdorff.cuh
+++ b/cpp/include/cuspatial/detail/distance/hausdorff.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, 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,8 +24,7 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <ranger/ranger.hpp>
-
+#include <cuda/atomic>
 #include <thrust/advance.h>
 #include <thrust/binary_search.h>
 #include <thrust/distance.h>
@@ -33,7 +32,7 @@
 #include <thrust/fill.h>
 #include <thrust/memory.h>
 
-#include <cuda/atomic>
+#include <ranger/ranger.hpp>
 
 #include <type_traits>
 
diff --git a/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh b/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh
index 5694088ad..2cdbfd425 100644
--- a/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh
+++ b/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, 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,11 +24,11 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/sort.h>
 #include <thrust/uninitialized_fill.h>
 
+#include <ranger/ranger.hpp>
+
 namespace cuspatial {
 namespace detail {
 
diff --git a/cpp/include/cuspatial/detail/find/find_duplicate_points.cuh b/cpp/include/cuspatial/detail/find/find_duplicate_points.cuh
index 430a0bc5e..de18bb927 100644
--- a/cpp/include/cuspatial/detail/find/find_duplicate_points.cuh
+++ b/cpp/include/cuspatial/detail/find/find_duplicate_points.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/uninitialized_fill.h>
 
+#include <ranger/ranger.hpp>
+
 namespace cuspatial {
 namespace detail {
 
diff --git a/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh b/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh
index 2e0e7370f..4b0d9d484 100644
--- a/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh
+++ b/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 
 #include <cuspatial/cuda_utils.hpp>
 #include <cuspatial/geometry/segment.cuh>
+#include <cuspatial/geometry/vec_2d.hpp>
+#include <cuspatial/geometry/vec_3d.hpp>
 #include <cuspatial/iterator_factory.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <cuspatial/geometry/vec_2d.hpp>
-#include <cuspatial/geometry/vec_3d.hpp>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/tuple.h>
 
diff --git a/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh b/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh
index ffb3ea2bb..a7da32644 100644
--- a/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh
+++ b/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 
 #include <cuspatial/cuda_utils.hpp>
 #include <cuspatial/geometry/segment.cuh>
+#include <cuspatial/geometry/vec_2d.hpp>
+#include <cuspatial/geometry/vec_3d.hpp>
 #include <cuspatial/geometry_collection/multilinestring_ref.cuh>
 #include <cuspatial/iterator_factory.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <cuspatial/geometry/vec_2d.hpp>
-#include <cuspatial/geometry/vec_3d.hpp>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/tuple.h>
 
diff --git a/cpp/include/cuspatial/detail/index/construction/phase_1.cuh b/cpp/include/cuspatial/detail/index/construction/phase_1.cuh
index b06dbc6bb..3d06c93b1 100644
--- a/cpp/include/cuspatial/detail/index/construction/phase_1.cuh
+++ b/cpp/include/cuspatial/detail/index/construction/phase_1.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cuda/functional>
 #include <thrust/copy.h>
 #include <thrust/distance.h>
 #include <thrust/fill.h>
@@ -38,8 +39,6 @@
 #include <thrust/transform.h>
 #include <thrust/tuple.h>
 
-#include <cuda/functional>
-
 #include <memory>
 #include <tuple>
 #include <utility>
diff --git a/cpp/include/cuspatial/detail/intersection/linestring_intersection.cuh b/cpp/include/cuspatial/detail/intersection/linestring_intersection.cuh
index 2db5492ed..1d88e5e36 100644
--- a/cpp/include/cuspatial/detail/intersection/linestring_intersection.cuh
+++ b/cpp/include/cuspatial/detail/intersection/linestring_intersection.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
 #include <rmm/mr/device/device_memory_resource.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
+#include <cuda/atomic>
 #include <thrust/binary_search.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
@@ -49,8 +50,6 @@
 #include <thrust/uninitialized_fill.h>
 #include <thrust/unique.h>
 
-#include <cuda/atomic>
-
 #include <cstdint>
 #include <memory>
 
diff --git a/cpp/include/cuspatial/detail/intersection/linestring_intersection_count.cuh b/cpp/include/cuspatial/detail/intersection/linestring_intersection_count.cuh
index a0297b05b..b164fa729 100644
--- a/cpp/include/cuspatial/detail/intersection/linestring_intersection_count.cuh
+++ b/cpp/include/cuspatial/detail/intersection/linestring_intersection_count.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/tuple.h>
 
+#include <ranger/ranger.hpp>
+
 namespace cuspatial {
 namespace detail {
 
diff --git a/cpp/include/cuspatial/detail/intersection/linestring_intersection_with_duplicates.cuh b/cpp/include/cuspatial/detail/intersection/linestring_intersection_with_duplicates.cuh
index 3279df2f9..e513cf651 100644
--- a/cpp/include/cuspatial/detail/intersection/linestring_intersection_with_duplicates.cuh
+++ b/cpp/include/cuspatial/detail/intersection/linestring_intersection_with_duplicates.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,6 @@
 #include <rmm/exec_policy.hpp>
 #include <rmm/mr/device/device_memory_resource.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/binary_search.h>
 #include <thrust/distance.h>
 #include <thrust/iterator/counting_iterator.h>
@@ -42,6 +40,8 @@
 #include <thrust/tuple.h>
 #include <thrust/uninitialized_fill.h>
 
+#include <ranger/ranger.hpp>
+
 #include <type_traits>
 #include <utility>
 
diff --git a/cpp/include/cuspatial/detail/join/quadtree_bbox_filtering.cuh b/cpp/include/cuspatial/detail/join/quadtree_bbox_filtering.cuh
index c3009b1b2..43ff7b0f6 100644
--- a/cpp/include/cuspatial/detail/join/quadtree_bbox_filtering.cuh
+++ b/cpp/include/cuspatial/detail/join/quadtree_bbox_filtering.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,8 @@
 #include <cuspatial/point_quadtree.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <thrust/iterator/discard_iterator.h>
-
 #include <cuda/functional>
+#include <thrust/iterator/discard_iterator.h>
 
 #include <iterator>
 #include <utility>
diff --git a/cpp/include/cuspatial/detail/join/quadtree_point_to_nearest_linestring.cuh b/cpp/include/cuspatial/detail/join/quadtree_point_to_nearest_linestring.cuh
index f594f51a3..6335f133f 100644
--- a/cpp/include/cuspatial/detail/join/quadtree_point_to_nearest_linestring.cuh
+++ b/cpp/include/cuspatial/detail/join/quadtree_point_to_nearest_linestring.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,13 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cuda/functional>
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/iterator/permutation_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/scan.h>
 
-#include <cuda/functional>
-
 #include <cstdint>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/kernel/pairwise_distance.cuh b/cpp/include/cuspatial/detail/kernel/pairwise_distance.cuh
index 48c139e1e..9786681d9 100644
--- a/cpp/include/cuspatial/detail/kernel/pairwise_distance.cuh
+++ b/cpp/include/cuspatial/detail/kernel/pairwise_distance.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
 
 #include <rmm/device_uvector.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/optional.h>
 
+#include <ranger/ranger.hpp>
+
 #include <limits>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/pairwise_multipoint_equals_count.cuh b/cpp/include/cuspatial/detail/pairwise_multipoint_equals_count.cuh
index 614a3f2d4..141a85d61 100644
--- a/cpp/include/cuspatial/detail/pairwise_multipoint_equals_count.cuh
+++ b/cpp/include/cuspatial/detail/pairwise_multipoint_equals_count.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * 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 <cuspatial/range/range.cuh>
 #include <cuspatial/traits.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
@@ -35,6 +33,8 @@
 #include <thrust/sort.h>
 #include <thrust/transform.h>
 
+#include <ranger/ranger.hpp>
+
 #include <iterator>
 #include <type_traits>
 
diff --git a/cpp/include/cuspatial/detail/point_in_polygon.cuh b/cpp/include/cuspatial/detail/point_in_polygon.cuh
index bd7c0b805..119d48ecb 100644
--- a/cpp/include/cuspatial/detail/point_in_polygon.cuh
+++ b/cpp/include/cuspatial/detail/point_in_polygon.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, 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,7 +24,6 @@
 #include <cuspatial/traits.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
-
 #include <rmm/exec_policy.hpp>
 
 #include <thrust/logical.h>
diff --git a/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh b/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh
index c1c7bfc77..f085204eb 100644
--- a/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh
+++ b/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/binary_search.h>
 
+#include <ranger/ranger.hpp>
+
 #include <iterator>
 #include <limits>
 #include <memory>
diff --git a/cpp/include/cuspatial/detail/point_quadtree.cuh b/cpp/include/cuspatial/detail/point_quadtree.cuh
index ebe9b02e6..7e0d70dac 100644
--- a/cpp/include/cuspatial/detail/point_quadtree.cuh
+++ b/cpp/include/cuspatial/detail/point_quadtree.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,13 +25,12 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
+#include <cuda/functional>
 #include <thrust/distance.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/tuple.h>
 
-#include <cuda/functional>
-
 #include <tuple>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/range/multipoint_range.cuh b/cpp/include/cuspatial/detail/range/multipoint_range.cuh
index e69351608..e73e0e0d3 100644
--- a/cpp/include/cuspatial/detail/range/multipoint_range.cuh
+++ b/cpp/include/cuspatial/detail/range/multipoint_range.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 #pragma once
 
-#include <thrust/binary_search.h>
-#include <thrust/distance.h>
-#include <thrust/iterator/transform_iterator.h>
-#include <thrust/pair.h>
-
 #include <cuspatial/cuda_utils.hpp>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/geometry_collection/multipoint_ref.cuh>
 #include <cuspatial/iterator_factory.cuh>
 #include <cuspatial/traits.hpp>
 
+#include <thrust/binary_search.h>
+#include <thrust/distance.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/pair.h>
+
 namespace cuspatial {
 
 using namespace cuspatial::detail;
diff --git a/cpp/include/cuspatial/detail/trajectory/derive_trajectories.cuh b/cpp/include/cuspatial/detail/trajectory/derive_trajectories.cuh
index 6a1a1c0a7..6da914181 100644
--- a/cpp/include/cuspatial/detail/trajectory/derive_trajectories.cuh
+++ b/cpp/include/cuspatial/detail/trajectory/derive_trajectories.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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,7 @@
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cub/device/device_merge_sort.cuh>
 #include <thrust/gather.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
@@ -30,8 +31,6 @@
 #include <thrust/reduce.h>
 #include <thrust/sort.h>
 
-#include <cub/device/device_merge_sort.cuh>
-
 #include <cstdint>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/detail/trajectory/trajectory_distances_and_speeds.cuh b/cpp/include/cuspatial/detail/trajectory/trajectory_distances_and_speeds.cuh
index baede9b92..9ce7baef5 100644
--- a/cpp/include/cuspatial/detail/trajectory/trajectory_distances_and_speeds.cuh
+++ b/cpp/include/cuspatial/detail/trajectory/trajectory_distances_and_speeds.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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,7 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cuda/std/chrono>
 #include <thrust/adjacent_difference.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
@@ -31,8 +32,6 @@
 #include <thrust/reduce.h>
 #include <thrust/transform.h>
 
-#include <cuda/std/chrono>
-
 namespace cuspatial {
 
 template <typename IdInputIt,
diff --git a/cpp/include/cuspatial/detail/utility/device_atomics.cuh b/cpp/include/cuspatial/detail/utility/device_atomics.cuh
index 58863bcd0..d91fa9c29 100644
--- a/cpp/include/cuspatial/detail/utility/device_atomics.cuh
+++ b/cpp/include/cuspatial/detail/utility/device_atomics.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,11 @@
 
 #pragma once
 
+#include <cuda/atomic>
 #include <thrust/detail/raw_reference_cast.h>
 #include <thrust/device_ptr.h>
 #include <thrust/device_reference.h>
 
-#include <cuda/atomic>
-
 #include <type_traits>
 
 namespace cuspatial {
diff --git a/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp b/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp
index 8dca3185e..9bfb13700 100644
--- a/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp
+++ b/cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <cudf/types.hpp>
-
 #include <cuspatial/column/geometry_column_view.hpp>
 
+#include <cudf/types.hpp>
+
 #include <rmm/mr/device/per_device_resource.hpp>
 
 #include <memory>
diff --git a/cpp/include/cuspatial_test/base_fixture.hpp b/cpp/include/cuspatial_test/base_fixture.hpp
index 44a22d2bb..c9927b489 100644
--- a/cpp/include/cuspatial_test/base_fixture.hpp
+++ b/cpp/include/cuspatial_test/base_fixture.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 #pragma once
 
+#include <cudf_test/cudf_gtest.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
-#include <cudf_test/cudf_gtest.hpp>
-
 namespace cuspatial {
 namespace test {
 
diff --git a/cpp/include/cuspatial_test/column_factories.hpp b/cpp/include/cuspatial_test/column_factories.hpp
index 30f426cdc..14ac03bf3 100644
--- a/cpp/include/cuspatial_test/column_factories.hpp
+++ b/cpp/include/cuspatial_test/column_factories.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 #include <cudf/column/column_factories.hpp>
 #include <cudf/filling.hpp>
 #include <cudf/scalar/scalar_factories.hpp>
-
 #include <cudf_test/column_wrapper.hpp>
 
+#include <rmm/cuda_stream_view.hpp>
+
 #include <initializer_list>
 #include <memory>
-#include <rmm/cuda_stream_view.hpp>
 
 namespace cuspatial {
 namespace test {
diff --git a/cpp/include/cuspatial_test/geometry_fixtures.hpp b/cpp/include/cuspatial_test/geometry_fixtures.hpp
index d52775785..44d8410e2 100644
--- a/cpp/include/cuspatial_test/geometry_fixtures.hpp
+++ b/cpp/include/cuspatial_test/geometry_fixtures.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
 #include <cuspatial/column/geometry_column_view.hpp>
 #include <cuspatial/types.hpp>
 
+#include <cudf/utilities/default_stream.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
-#include <cudf/utilities/default_stream.hpp>
-
 namespace cuspatial {
 namespace test {
 
diff --git a/cpp/include/cuspatial_test/geometry_generator.cuh b/cpp/include/cuspatial_test/geometry_generator.cuh
index f966664fb..a3efa5812 100644
--- a/cpp/include/cuspatial_test/geometry_generator.cuh
+++ b/cpp/include/cuspatial_test/geometry_generator.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <ranger/ranger.hpp>
-
 #include <thrust/sequence.h>
 #include <thrust/tabulate.h>
 
+#include <ranger/ranger.hpp>
+
 namespace cuspatial {
 namespace test {
 
diff --git a/cpp/include/cuspatial_test/random.cuh b/cpp/include/cuspatial_test/random.cuh
index d2a65af3b..6fd63f79f 100644
--- a/cpp/include/cuspatial_test/random.cuh
+++ b/cpp/include/cuspatial_test/random.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,13 @@
 
 #include <rmm/device_uvector.hpp>
 
+#include <cuda/std/type_traits>
 #include <thrust/execution_policy.h>
 #include <thrust/random.h>
 #include <thrust/random/normal_distribution.h>
 #include <thrust/random/uniform_int_distribution.h>
 #include <thrust/tabulate.h>
 
-#include <cuda/std/type_traits>
-
 #include <algorithm>
 #include <memory>
 
diff --git a/cpp/include/cuspatial_test/vector_equality.hpp b/cpp/include/cuspatial_test/vector_equality.hpp
index a352b6a8f..a8278f2d0 100644
--- a/cpp/include/cuspatial_test/vector_equality.hpp
+++ b/cpp/include/cuspatial_test/vector_equality.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 #pragma once
 
+#include <cuspatial_test/test_util.cuh>
+
 #include <cuspatial/geometry/segment.cuh>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/traits.hpp>
 
-#include <cuspatial_test/test_util.cuh>
-
 #include <rmm/device_uvector.hpp>
 #include <rmm/device_vector.hpp>
 
diff --git a/cpp/src/bounding_boxes/polygon_bounding_boxes.cu b/cpp/src/bounding_boxes/polygon_bounding_boxes.cu
index 9fdca1bd5..e38e12dfd 100644
--- a/cpp/src/bounding_boxes/polygon_bounding_boxes.cu
+++ b/cpp/src/bounding_boxes/polygon_bounding_boxes.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include <cuspatial/error.hpp>
-
 #include <cuspatial/bounding_boxes.cuh>
+#include <cuspatial/error.hpp>
 #include <cuspatial/iterator_factory.cuh>
 
 #include <cudf/column/column_factories.hpp>
diff --git a/cpp/src/distance/linestring_polygon_distance.cu b/cpp/src/distance/linestring_polygon_distance.cu
index 347f998fa..b6d370b90 100644
--- a/cpp/src/distance/linestring_polygon_distance.cu
+++ b/cpp/src/distance/linestring_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
 
 #include "../utility/multi_geometry_dispatch.hpp"
 
+#include <cuspatial/column/geometry_column_view.hpp>
+#include <cuspatial/distance.cuh>
+#include <cuspatial/error.hpp>
+#include <cuspatial/iterator_factory.cuh>
+#include <cuspatial/range/multilinestring_range.cuh>
+#include <cuspatial/range/multipolygon_range.cuh>
+#include <cuspatial/types.hpp>
+
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
@@ -27,14 +35,6 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-#include <cuspatial/column/geometry_column_view.hpp>
-#include <cuspatial/distance.cuh>
-#include <cuspatial/error.hpp>
-#include <cuspatial/iterator_factory.cuh>
-#include <cuspatial/range/multilinestring_range.cuh>
-#include <cuspatial/range/multipolygon_range.cuh>
-#include <cuspatial/types.hpp>
-
 #include <thrust/iterator/counting_iterator.h>
 
 #include <memory>
diff --git a/cpp/src/distance/point_polygon_distance.cu b/cpp/src/distance/point_polygon_distance.cu
index ecd5e06aa..dd7364fbd 100644
--- a/cpp/src/distance/point_polygon_distance.cu
+++ b/cpp/src/distance/point_polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
 
 #include "../utility/multi_geometry_dispatch.hpp"
 
+#include <cuspatial/column/geometry_column_view.hpp>
+#include <cuspatial/distance.cuh>
+#include <cuspatial/error.hpp>
+#include <cuspatial/iterator_factory.cuh>
+#include <cuspatial/range/multipoint_range.cuh>
+#include <cuspatial/range/multipolygon_range.cuh>
+#include <cuspatial/types.hpp>
+
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
@@ -27,14 +35,6 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-#include <cuspatial/column/geometry_column_view.hpp>
-#include <cuspatial/distance.cuh>
-#include <cuspatial/error.hpp>
-#include <cuspatial/iterator_factory.cuh>
-#include <cuspatial/range/multipoint_range.cuh>
-#include <cuspatial/range/multipolygon_range.cuh>
-#include <cuspatial/types.hpp>
-
 #include <thrust/iterator/counting_iterator.h>
 
 #include <memory>
diff --git a/cpp/src/distance/polygon_distance.cu b/cpp/src/distance/polygon_distance.cu
index d31db9bb9..678aa3f56 100644
--- a/cpp/src/distance/polygon_distance.cu
+++ b/cpp/src/distance/polygon_distance.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,13 @@
 
 #include "../utility/multi_geometry_dispatch.hpp"
 
+#include <cuspatial/column/geometry_column_view.hpp>
+#include <cuspatial/distance.cuh>
+#include <cuspatial/error.hpp>
+#include <cuspatial/iterator_factory.cuh>
+#include <cuspatial/range/multipolygon_range.cuh>
+#include <cuspatial/types.hpp>
+
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_view.hpp>
@@ -26,13 +33,6 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-#include <cuspatial/column/geometry_column_view.hpp>
-#include <cuspatial/distance.cuh>
-#include <cuspatial/error.hpp>
-#include <cuspatial/iterator_factory.cuh>
-#include <cuspatial/range/multipolygon_range.cuh>
-#include <cuspatial/types.hpp>
-
 #include <thrust/iterator/counting_iterator.h>
 
 #include <memory>
diff --git a/cpp/src/join/quadtree_bbox_filtering.cu b/cpp/src/join/quadtree_bbox_filtering.cu
index 42b07c015..59bd369cd 100644
--- a/cpp/src/join/quadtree_bbox_filtering.cu
+++ b/cpp/src/join/quadtree_bbox_filtering.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-#include <cuspatial/iterator_factory.cuh>
-#include <cuspatial/spatial_join.cuh>
-
 #include <cuspatial/error.hpp>
 #include <cuspatial/iterator_factory.cuh>
+#include <cuspatial/spatial_join.cuh>
 #include <cuspatial/spatial_join.hpp>
 
 #include <cudf/column/column.hpp>
diff --git a/cpp/src/join/quadtree_point_in_polygon.cu b/cpp/src/join/quadtree_point_in_polygon.cu
index 2d94504af..75b723aa8 100644
--- a/cpp/src/join/quadtree_point_in_polygon.cu
+++ b/cpp/src/join/quadtree_point_in_polygon.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
+#include <cuspatial/detail/utility/validation.hpp>
+#include <cuspatial/error.hpp>
 #include <cuspatial/iterator_factory.cuh>
 #include <cuspatial/range/multipoint_range.cuh>
 #include <cuspatial/range/multipolygon_range.cuh>
 #include <cuspatial/spatial_join.cuh>
 
-#include <cuspatial/detail/utility/validation.hpp>
-#include <cuspatial/error.hpp>
-
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_view.hpp>
 #include <cudf/table/table.hpp>
diff --git a/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp b/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp
index d742b0cc7..fb4fab6db 100644
--- a/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp
+++ b/cpp/tests/bounding_boxes/linestring_bounding_boxes_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
-
 #include <cudf_test/column_wrapper.hpp>
 
 struct LinestringBoundingBoxErrorTest : public ::testing::Test {};
diff --git a/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp b/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp
index 07f6ac2f0..83be1f845 100644
--- a/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp
+++ b/cpp/tests/bounding_boxes/polygon_bounding_boxes_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * 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 <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
 #include <cudf/utilities/error.hpp>
-
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 
diff --git a/cpp/tests/distance/hausdorff_test.cpp b/cpp/tests/distance/hausdorff_test.cpp
index 2111e3330..10335c519 100644
--- a/cpp/tests/distance/hausdorff_test.cpp
+++ b/cpp/tests/distance/hausdorff_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, 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,7 +18,6 @@
 #include <cuspatial/error.hpp>
 
 #include <cudf/column/column_view.hpp>
-
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
diff --git a/cpp/tests/distance/hausdorff_test.cu b/cpp/tests/distance/hausdorff_test.cu
index 6ef18341f..7b923ec8c 100644
--- a/cpp/tests/distance/hausdorff_test.cu
+++ b/cpp/tests/distance/hausdorff_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 #include <rmm/device_vector.hpp>
 
+#include <cuda/functional>
 #include <thrust/host_vector.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
@@ -30,8 +31,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <cuda/functional>
-
 #include <iterator>
 
 template <typename T>
diff --git a/cpp/tests/distance/linestring_distance_test.cu b/cpp/tests/distance/linestring_distance_test.cu
index 0748d9c59..830512cc3 100644
--- a/cpp/tests/distance/linestring_distance_test.cu
+++ b/cpp/tests/distance/linestring_distance_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/iterator_factory.cuh>
 #include <cuspatial/range/multilinestring_range.cuh>
+
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>
 
diff --git a/cpp/tests/distance/linestring_polygon_distance_test.cpp b/cpp/tests/distance/linestring_polygon_distance_test.cpp
index 95beec0bd..4ce0c9e65 100644
--- a/cpp/tests/distance/linestring_polygon_distance_test.cpp
+++ b/cpp/tests/distance/linestring_polygon_distance_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, 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,11 +24,10 @@
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/types.hpp>
 
+#include <cudf/utilities/default_stream.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 
-#include <cudf/utilities/default_stream.hpp>
-
 #include <rmm/cuda_stream_view.hpp>
 
 #include <initializer_list>
diff --git a/cpp/tests/distance/point_polygon_distance_test.cpp b/cpp/tests/distance/point_polygon_distance_test.cpp
index dfb486b69..07a90667b 100644
--- a/cpp/tests/distance/point_polygon_distance_test.cpp
+++ b/cpp/tests/distance/point_polygon_distance_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+#include <cuspatial_test/column_factories.hpp>
+#include <cuspatial_test/vector_equality.hpp>
+
 #include <cuspatial/column/geometry_column_view.hpp>
 #include <cuspatial/distance.hpp>
 #include <cuspatial/error.hpp>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/types.hpp>
 
-#include <cuspatial_test/column_factories.hpp>
-#include <cuspatial_test/vector_equality.hpp>
-
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 
diff --git a/cpp/tests/distance/polygon_distance_test.cpp b/cpp/tests/distance/polygon_distance_test.cpp
index c1a2e8b4f..b6d345f56 100644
--- a/cpp/tests/distance/polygon_distance_test.cpp
+++ b/cpp/tests/distance/polygon_distance_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,10 @@
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/types.hpp>
 
+#include <cudf/utilities/default_stream.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 
-#include <cudf/utilities/default_stream.hpp>
-
 #include <rmm/cuda_stream_view.hpp>
 
 #include <initializer_list>
diff --git a/cpp/tests/equality/pairwise_multipoint_equals_count_test.cpp b/cpp/tests/equality/pairwise_multipoint_equals_count_test.cpp
index 1d2923e4b..b096abd69 100644
--- a/cpp/tests/equality/pairwise_multipoint_equals_count_test.cpp
+++ b/cpp/tests/equality/pairwise_multipoint_equals_count_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <cudf/utilities/default_stream.hpp>
 #include <cuspatial_test/column_factories.hpp>
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/pairwise_multipoint_equals_count.hpp>
 
+#include <cudf/utilities/default_stream.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
@@ -27,6 +27,7 @@
 #include <cudf_test/type_lists.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
+
 #include <type_traits>
 
 using namespace cuspatial;
diff --git a/cpp/tests/find/find_duplicate_points_test.cu b/cpp/tests/find/find_duplicate_points_test.cu
index 49bc86bb9..947ebd8eb 100644
--- a/cpp/tests/find/find_duplicate_points_test.cu
+++ b/cpp/tests/find/find_duplicate_points_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, 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,12 +18,12 @@
 #include <cuspatial_test/vector_equality.hpp>
 #include <cuspatial_test/vector_factories.cuh>
 
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/device_vector.hpp>
-
 #include <cuspatial/detail/find/find_duplicate_points.cuh>
 #include <cuspatial/geometry/vec_2d.hpp>
 
+#include <rmm/cuda_stream_view.hpp>
+#include <rmm/device_vector.hpp>
+
 using namespace cuspatial;
 using namespace cuspatial::detail;
 using namespace cuspatial::test;
diff --git a/cpp/tests/find/find_points_on_segments_test.cu b/cpp/tests/find/find_points_on_segments_test.cu
index 4296f6479..cd6a2e37f 100644
--- a/cpp/tests/find/find_points_on_segments_test.cu
+++ b/cpp/tests/find/find_points_on_segments_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, 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,13 +18,13 @@
 #include <cuspatial_test/vector_equality.hpp>
 #include <cuspatial_test/vector_factories.cuh>
 
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/device_vector.hpp>
-
 #include <cuspatial/detail/find/find_points_on_segments.cuh>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/range/range.cuh>
 
+#include <rmm/cuda_stream_view.hpp>
+#include <rmm/device_vector.hpp>
+
 #include <initializer_list>
 
 using namespace cuspatial;
diff --git a/cpp/tests/index/point_quadtree_test.cpp b/cpp/tests/index/point_quadtree_test.cpp
index 93978e093..1f6c11dba 100644
--- a/cpp/tests/index/point_quadtree_test.cpp
+++ b/cpp/tests/index/point_quadtree_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * 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 <cudf/column/column_view.hpp>
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
-
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
diff --git a/cpp/tests/intersection/linestring_intersection_count_test.cu b/cpp/tests/intersection/linestring_intersection_count_test.cu
index 24467462e..cec8be291 100644
--- a/cpp/tests/intersection/linestring_intersection_count_test.cu
+++ b/cpp/tests/intersection/linestring_intersection_count_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/device_vector.hpp>
-#include <thrust/uninitialized_fill.h>
-
 #include <rmm/exec_policy.hpp>
+
 #include <thrust/iterator/zip_iterator.h>
+#include <thrust/uninitialized_fill.h>
 
 #include <initializer_list>
 #include <type_traits>
diff --git a/cpp/tests/intersection/linestring_intersection_test.cpp b/cpp/tests/intersection/linestring_intersection_test.cpp
index b48d1b057..9b9318104 100644
--- a/cpp/tests/intersection/linestring_intersection_test.cpp
+++ b/cpp/tests/intersection/linestring_intersection_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <cudf_test/cudf_gtest.hpp>
-
 #include <cuspatial_test/base_fixture.hpp>
 #include <cuspatial_test/test_util.cuh>
 #include <cuspatial_test/vector_equality.hpp>
@@ -32,9 +30,9 @@
 #include <cudf/scalar/scalar_factories.hpp>
 #include <cudf/types.hpp>
 #include <cudf/utilities/default_stream.hpp>
-
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <cudf_test/cudf_gtest.hpp>
 #include <cudf_test/type_lists.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
diff --git a/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu b/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu
index 195968615..359b45700 100644
--- a/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu
+++ b/cpp/tests/intersection/linestring_intersection_with_duplicates_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,13 +32,12 @@
 #include <rmm/mr/device/device_memory_resource.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
+#include <cub/device/device_segmented_sort.cuh>
 #include <thrust/gather.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/sequence.h>
 #include <thrust/sort.h>
 
-#include <cub/device/device_segmented_sort.cuh>
-
 #include <initializer_list>
 #include <type_traits>
 
diff --git a/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cpp b/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cpp
index e7d6d5948..34a16208e 100644
--- a/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cpp
+++ b/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
-
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
diff --git a/cpp/tests/join/quadtree_point_in_polygon_test.cpp b/cpp/tests/join/quadtree_point_in_polygon_test.cpp
index c3d720c10..592e7a52e 100644
--- a/cpp/tests/join/quadtree_point_in_polygon_test.cpp
+++ b/cpp/tests/join/quadtree_point_in_polygon_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include <cudf/column/column.hpp>
 #include <cuspatial/bounding_boxes.hpp>
 #include <cuspatial/error.hpp>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/point_quadtree.hpp>
 #include <cuspatial/spatial_join.hpp>
 
+#include <cudf/column/column.hpp>
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
 #include <cudf/utilities/error.hpp>
-
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
+
 #include <memory>
 
 using T = float;
diff --git a/cpp/tests/join/quadtree_point_in_polygon_test_large.cu b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu
index 1be866afc..d80709486 100644
--- a/cpp/tests/join/quadtree_point_in_polygon_test_large.cu
+++ b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 #include <rmm/mr/device/device_memory_resource.hpp>
-
 #include <rmm/mr/device/per_device_resource.hpp>
+
 #include <thrust/gather.h>
 #include <thrust/sort.h>
 
diff --git a/cpp/tests/join/quadtree_point_in_polygon_test_small.cu b/cpp/tests/join/quadtree_point_in_polygon_test_small.cu
index 52792dd9b..2439347b1 100644
--- a/cpp/tests/join/quadtree_point_in_polygon_test_small.cu
+++ b/cpp/tests/join/quadtree_point_in_polygon_test_small.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 #include <cuspatial/spatial_join.cuh>
 
 #include <gtest/gtest.h>
+
 #include <initializer_list>
 
 /*
diff --git a/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp b/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp
index d78cda350..bfca5b024 100644
--- a/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp
+++ b/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#include <cudf/column/column.hpp>
 #include <cuspatial/bounding_boxes.hpp>
 #include <cuspatial/error.hpp>
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/point_quadtree.hpp>
 #include <cuspatial/spatial_join.hpp>
 
+#include <cudf/column/column.hpp>
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
 #include <cudf/utilities/error.hpp>
-
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
+
 #include <memory>
 
 using T = float;
diff --git a/cpp/tests/points_in_range/points_in_range_test.cpp b/cpp/tests/points_in_range/points_in_range_test.cpp
index 37f7b153d..449a1a5b3 100644
--- a/cpp/tests/points_in_range/points_in_range_test.cpp
+++ b/cpp/tests/points_in_range/points_in_range_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2024, 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,7 +18,6 @@
 #include <cuspatial/points_in_range.hpp>
 
 #include <cudf/table/table.hpp>
-
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
diff --git a/cpp/tests/points_in_range/points_in_range_test.cu b/cpp/tests/points_in_range/points_in_range_test.cu
index ca638fbdc..235cd476d 100644
--- a/cpp/tests/points_in_range/points_in_range_test.cu
+++ b/cpp/tests/points_in_range/points_in_range_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/points_in_range.cuh>
 
-#include <limits>
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/device_vector.hpp>
 
-#include <type_traits>
-
 #include <gtest/gtest.h>
 
+#include <limits>
+#include <type_traits>
+
 template <typename T>
 using Vec = cuspatial::vec_2d<T>;
 
diff --git a/cpp/tests/projection/sinusoidal_projection_test.cu b/cpp/tests/projection/sinusoidal_projection_test.cu
index 41c2202e1..031a15c73 100644
--- a/cpp/tests/projection/sinusoidal_projection_test.cu
+++ b/cpp/tests/projection/sinusoidal_projection_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
+#include <cuspatial_test/vector_equality.hpp>
+
 #include <cuspatial/constants.hpp>
 #include <cuspatial/error.hpp>
 #include <cuspatial/projection.cuh>
-#include <cuspatial_test/vector_equality.hpp>
 
 #include <rmm/device_vector.hpp>
 
-#include <gtest/gtest.h>
-
 #include <thrust/iterator/transform_iterator.h>
 
+#include <gtest/gtest.h>
+
 template <typename T>
 inline T midpoint(T a, T b)
 {
diff --git a/cpp/tests/range/multilinestring_range_test.cu b/cpp/tests/range/multilinestring_range_test.cu
index 11c17e5ac..4938e0df4 100644
--- a/cpp/tests/range/multilinestring_range_test.cu
+++ b/cpp/tests/range/multilinestring_range_test.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cuspatial_test/test_util.cuh>
-
 #include <cuspatial_test/base_fixture.hpp>
+#include <cuspatial_test/test_util.cuh>
 #include <cuspatial_test/vector_equality.hpp>
 #include <cuspatial_test/vector_factories.cuh>
 
diff --git a/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu b/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu
index 819dae901..bf084fcee 100644
--- a/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu
+++ b/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * 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,10 @@
 
 #include <rmm/exec_policy.hpp>
 
+#include <cuda/functional>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/reduce.h>
 
-#include <cuda/functional>
-
 #include <gtest/gtest.h>
 
 #include <limits>
diff --git a/cpp/tests/trajectory/trajectory_test_utils.cuh b/cpp/tests/trajectory/trajectory_test_utils.cuh
index 847748fc6..b150e7284 100644
--- a/cpp/tests/trajectory/trajectory_test_utils.cuh
+++ b/cpp/tests/trajectory/trajectory_test_utils.cuh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 
 #pragma once
 
+#include <cuspatial_test/test_util.cuh>
+
 #include <cuspatial/geometry/vec_2d.hpp>
 #include <cuspatial/iterator_factory.cuh>
 
-#include <cuspatial_test/test_util.cuh>
-
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cuda/std/chrono>
 #include <thrust/binary_search.h>
 #include <thrust/gather.h>
 #include <thrust/iterator/constant_iterator.h>
@@ -34,8 +35,6 @@
 #include <thrust/tabulate.h>
 #include <thrust/transform.h>
 
-#include <cuda/std/chrono>
-
 #include <cstdint>
 
 namespace cuspatial {
diff --git a/cpp/tests/utility_test/test_float_equivalent.cu b/cpp/tests/utility_test/test_float_equivalent.cu
index 8fe74c357..b459ae787 100644
--- a/cpp/tests/utility_test/test_float_equivalent.cu
+++ b/cpp/tests/utility_test/test_float_equivalent.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-#include <cuspatial/detail/utility/floating_point.cuh>
 #include <cuspatial_test/vector_factories.cuh>
 
-#include <limits>
+#include <cuspatial/detail/utility/floating_point.cuh>
+
 #include <rmm/device_vector.hpp>
 
 #include <gtest/gtest.h>
 
+#include <limits>
+
 using namespace cuspatial;
 using namespace cuspatial::test;
 
diff --git a/cpp/tests/utility_test/test_geometry_generators.cu b/cpp/tests/utility_test/test_geometry_generators.cu
index d0b35e9e4..70910d6aa 100644
--- a/cpp/tests/utility_test/test_geometry_generators.cu
+++ b/cpp/tests/utility_test/test_geometry_generators.cu
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2023-2024, NVIDIA CORPORATION.
  *
  * 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 <cuspatial/geometry/vec_2d.hpp>
 
 #include <gtest/gtest-param-test.h>
+
 #include <type_traits>
 
 using namespace cuspatial;