From 13feb8713829843459c41de48d69913b1990a07e Mon Sep 17 00:00:00 2001
From: Vyas Ramasubramani <vyasr@nvidia.com>
Date: Sat, 13 Jun 2026 00:21:23 +0000
Subject: [PATCH] Add cudf_streaming to clang-format IncludeCategories

Add cudf_streaming to the 'other libcudf includes' regex in
.clang-format so that cudf_streaming/ headers are sorted into the
correct include category (priority 5) instead of falling through to
the generic system includes bucket.

Follow-up from https://github.com/rapidsai/cudf/pull/22747#discussion_r3351661351
---
 .clang-format                                            | 2 +-
 cpp/libcudf_streaming/benchmarks/bench_partition.cpp     | 3 ++-
 cpp/libcudf_streaming/benchmarks/bench_shuffle.cpp       | 1 +
 .../benchmarks/streaming/bench_streaming_shuffle.cpp     | 1 +
 .../benchmarks/streaming/data_generator.hpp              | 1 +
 .../benchmarks/streaming/ndsh/bench_read.cpp             | 3 ++-
 .../benchmarks/streaming/ndsh/concatenate.cpp            | 1 +
 .../benchmarks/streaming/ndsh/groupby.cpp                | 1 +
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/join.cpp | 5 +++--
 .../benchmarks/streaming/ndsh/parquet_writer.cpp         | 1 +
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/q01.cpp  | 5 +++--
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/q03.cpp  | 9 +++++----
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/q04.cpp  | 7 ++++---
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/q09.cpp  | 5 +++--
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/q21.cpp  | 7 ++++---
 cpp/libcudf_streaming/benchmarks/streaming/ndsh/sort.cpp | 1 +
 .../benchmarks/streaming/ndsh/utils.cpp                  | 3 ++-
 .../benchmarks/streaming/ndsh/utils.hpp                  | 5 +++--
 cpp/libcudf_streaming/examples/example_shuffle.cpp       | 1 +
 .../cudf_streaming/streaming/channel_metadata.hpp        | 3 ++-
 cpp/libcudf_streaming/src/integrations/bloom_filter.cu   | 3 ++-
 cpp/libcudf_streaming/src/integrations/partition.cpp     | 5 +++--
 cpp/libcudf_streaming/src/integrations/utils.cpp         | 1 +
 cpp/libcudf_streaming/src/streaming/bloom_filter.cpp     | 5 +++--
 cpp/libcudf_streaming/src/streaming/channel_metadata.cpp | 1 +
 cpp/libcudf_streaming/src/streaming/parquet.cpp          | 5 +++--
 cpp/libcudf_streaming/src/streaming/partition.cpp        | 1 +
 cpp/libcudf_streaming/src/streaming/table_chunk.cpp      | 3 ++-
 cpp/libcudf_streaming/tests/streaming/test_allgather.cpp | 3 ++-
 .../tests/streaming/test_channel_metadata.cpp            | 5 +++--
 .../tests/streaming/test_leaf_actor.cpp                  | 1 +
 cpp/libcudf_streaming/tests/streaming/test_partition.cpp | 1 +
 .../tests/streaming/test_read_parquet.cpp                | 7 ++++---
 cpp/libcudf_streaming/tests/streaming/test_shuffler.cpp  | 1 +
 .../tests/streaming/test_table_chunk.cpp                 | 3 ++-
 cpp/libcudf_streaming/tests/test_partition.cpp           | 1 +
 cpp/libcudf_streaming/tests/test_shuffler.cpp            | 1 +
 .../tests/test_shuffler_many_streams.cpp                 | 3 ++-
 38 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/.clang-format b/.clang-format
index 6e69a175a7f7..2e15249f6d47 100644
--- a/.clang-format
+++ b/.clang-format
@@ -81,7 +81,7 @@ IncludeCategories:
     Priority:        3
   - Regex:           '^<cudf/' # cuDF includes
     Priority:        4
-  - Regex:           '^<(nvtext|cudf_kafka)' # other libcudf includes
+  - Regex:           '^<(nvtext|cudf_kafka|cudf_streaming)' # other libcudf includes
     Priority:        5
   - Regex:           '^<(cugraph|cuml|raft|kvikio)' # Other RAPIDS includes
     Priority:        6
diff --git a/cpp/libcudf_streaming/benchmarks/bench_partition.cpp b/cpp/libcudf_streaming/benchmarks/bench_partition.cpp
index 42e4a129ac29..ae814c94907e 100644
--- a/cpp/libcudf_streaming/benchmarks/bench_partition.cpp
+++ b/cpp/libcudf_streaming/benchmarks/bench_partition.cpp
@@ -9,13 +9,14 @@
 #include <cudf/types.hpp>
 #include <cudf/utilities/error.hpp>
 
+#include <cudf_streaming/integrations/partition.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_buffer.hpp>
 #include <rmm/mr/cuda_memory_resource.hpp>
 #include <rmm/mr/pool_memory_resource.hpp>
 
 #include <benchmark/benchmark.h>
-#include <cudf_streaming/integrations/partition.hpp>
 #include <rapidsmpf/utils/misc.hpp>
 
 #include <memory>
diff --git a/cpp/libcudf_streaming/benchmarks/bench_shuffle.cpp b/cpp/libcudf_streaming/benchmarks/bench_shuffle.cpp
index dd99c4696b5a..50ac39d44b63 100644
--- a/cpp/libcudf_streaming/benchmarks/bench_shuffle.cpp
+++ b/cpp/libcudf_streaming/benchmarks/bench_shuffle.cpp
@@ -4,6 +4,7 @@
  */
 
 #include <cudf_streaming/integrations/partition.hpp>
+
 #include <rapidsmpf/bootstrap/bootstrap.hpp>
 #include <rapidsmpf/bootstrap/utils.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/bench_streaming_shuffle.cpp b/cpp/libcudf_streaming/benchmarks/streaming/bench_streaming_shuffle.cpp
index c93c348d90f5..577588621544 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/bench_streaming_shuffle.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/bench_streaming_shuffle.cpp
@@ -11,6 +11,7 @@
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/partition.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/bootstrap/bootstrap.hpp>
 #include <rapidsmpf/bootstrap/utils.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/data_generator.hpp b/cpp/libcudf_streaming/benchmarks/streaming/data_generator.hpp
index bde729bb931b..43dd85d9c8d6 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/data_generator.hpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/data_generator.hpp
@@ -11,6 +11,7 @@
 #include <cudf/types.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/streaming/core/actor.hpp>
 #include <rapidsmpf/streaming/core/channel.hpp>
 #include <rapidsmpf/streaming/core/context.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/bench_read.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/bench_read.cpp
index 84af904faa3d..8f2ab0fe0b2e 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/bench_read.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/bench_read.cpp
@@ -9,13 +9,14 @@
 #include <cudf/io/types.hpp>
 #include <cudf/types.hpp>
 
+#include <cudf_streaming/streaming/parquet.hpp>
+
 #include <rmm/detail/format.hpp>
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 
 #include <coro/when_all.hpp>
-#include <cudf_streaming/streaming/parquet.hpp>
 #include <getopt.h>
 #include <rapidsmpf/memory/memory_type.hpp>
 #include <rapidsmpf/nvtx.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/concatenate.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/concatenate.cpp
index 036eb81a581c..656688da201d 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/concatenate.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/concatenate.cpp
@@ -10,6 +10,7 @@
 #include <cudf/table/table_view.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/cuda_event.hpp>
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/streaming/core/channel.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/groupby.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/groupby.cpp
index 71eedc24e0fb..4f65d39e90d2 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/groupby.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/groupby.cpp
@@ -10,6 +10,7 @@
 #include <cudf/types.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/streaming/core/channel.hpp>
 #include <rapidsmpf/streaming/core/context.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/join.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/join.cpp
index 9434a744b5c8..9cf846de7b97 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/join.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/join.cpp
@@ -16,10 +16,11 @@
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
 
-#include <rmm/cuda_stream_view.hpp>
-
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
+#include <rmm/cuda_stream_view.hpp>
+
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/cuda_event.hpp>
 #include <rapidsmpf/cuda_stream.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/parquet_writer.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/parquet_writer.cpp
index 8ddf81aa20a0..9cbc3f0df2ab 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/parquet_writer.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/parquet_writer.cpp
@@ -9,6 +9,7 @@
 #include <cudf/io/types.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/streaming/core/channel.hpp>
 #include <rapidsmpf/streaming/core/context.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q01.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q01.cpp
index 4d08ef30a704..2f0a24db7857 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q01.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q01.cpp
@@ -21,12 +21,13 @@
 #include <cudf/types.hpp>
 #include <cudf/wrappers/timestamps.hpp>
 
+#include <cudf_streaming/streaming/parquet.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 
-#include <cudf_streaming/streaming/parquet.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/nvtx.hpp>
 #include <rapidsmpf/streaming/coll/allgather.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q03.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q03.cpp
index d33072f88103..9e3f62811c84 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q03.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q03.cpp
@@ -25,14 +25,15 @@
 #include <cudf/types.hpp>
 #include <cudf/wrappers/timestamps.hpp>
 
-#include <rmm/mr/cuda_async_memory_resource.hpp>
-
-#include <cuda_runtime_api.h>
-
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/bloom_filter.hpp>
 #include <cudf_streaming/streaming/parquet.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
+#include <rmm/mr/cuda_async_memory_resource.hpp>
+
+#include <cuda_runtime_api.h>
+
 #include <driver_types.h>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/cuda_event.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q04.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q04.cpp
index 61283dddc691..124050741c24 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q04.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q04.cpp
@@ -24,14 +24,15 @@
 #include <cudf/types.hpp>
 #include <cudf/wrappers/timestamps.hpp>
 
+#include <cudf_streaming/streaming/bloom_filter.hpp>
+#include <cudf_streaming/streaming/parquet.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 
 #include <cuda/std/chrono>
 #include <cuda_runtime_api.h>
 
-#include <cudf_streaming/streaming/bloom_filter.hpp>
-#include <cudf_streaming/streaming/parquet.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/nvtx.hpp>
 #include <rapidsmpf/streaming/coll/allgather.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q09.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q09.cpp
index cbc1429c3cf0..3bf8357432e2 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q09.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q09.cpp
@@ -25,12 +25,13 @@
 #include <cudf/transform.hpp>
 #include <cudf/types.hpp>
 
+#include <cudf_streaming/streaming/parquet.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 
-#include <cudf_streaming/streaming/parquet.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/nvtx.hpp>
 #include <rapidsmpf/streaming/coll/allgather.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q21.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q21.cpp
index 283ce5fc5291..1db735a06ab3 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q21.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/q21.cpp
@@ -22,14 +22,15 @@
 #include <cudf/table/table.hpp>
 #include <cudf/types.hpp>
 
+#include <cudf_streaming/streaming/bloom_filter.hpp>
+#include <cudf_streaming/streaming/parquet.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 
 #include <cuda_runtime_api.h>
 
 #include <coro/when_all.hpp>
-#include <cudf_streaming/streaming/bloom_filter.hpp>
-#include <cudf_streaming/streaming/parquet.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/nvtx.hpp>
 #include <rapidsmpf/rmm_resource_adaptor.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/sort.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/sort.cpp
index a1b3caad8126..79e1dcc01d53 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/sort.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/sort.cpp
@@ -9,6 +9,7 @@
 #include <cudf/types.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/streaming/core/channel.hpp>
 #include <rapidsmpf/streaming/core/context.hpp>
 
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.cpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.cpp
index f8c60599db79..061aeac6db5d 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.cpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.cpp
@@ -8,11 +8,12 @@
 #include <cudf/io/parquet.hpp>
 #include <cudf/io/parquet_metadata.hpp>
 
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/aligned.hpp>
 #include <rmm/cuda_device.hpp>
 #include <rmm/mr/per_device_resource.hpp>
 
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <getopt.h>
 #include <rapidsmpf/bootstrap/bootstrap.hpp>
 #include <rapidsmpf/bootstrap/utils.hpp>
diff --git a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.hpp b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.hpp
index 886ae9e04f56..8291cedabff7 100644
--- a/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.hpp
+++ b/cpp/libcudf_streaming/benchmarks/streaming/ndsh/utils.hpp
@@ -10,12 +10,13 @@
 #include <cudf/utilities/error.hpp>
 #include <cudf/wrappers/timestamps.hpp>
 
+#include <cudf_streaming/streaming/parquet.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 
 #include <cuda/memory_resource>
 
-#include <cudf_streaming/streaming/parquet.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/communicator/communicator.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
 #include <rapidsmpf/owning_wrapper.hpp>
diff --git a/cpp/libcudf_streaming/examples/example_shuffle.cpp b/cpp/libcudf_streaming/examples/example_shuffle.cpp
index 824dc3545233..35d2c36afb03 100644
--- a/cpp/libcudf_streaming/examples/example_shuffle.cpp
+++ b/cpp/libcudf_streaming/examples/example_shuffle.cpp
@@ -6,6 +6,7 @@
 #include "../benchmarks/utils/random_data.hpp"
 
 #include <cudf_streaming/integrations/partition.hpp>
+
 #include <mpi.h>
 #include <rapidsmpf/communicator/mpi.hpp>
 #include <rapidsmpf/error.hpp>
diff --git a/cpp/libcudf_streaming/include/cudf_streaming/streaming/channel_metadata.hpp b/cpp/libcudf_streaming/include/cudf_streaming/streaming/channel_metadata.hpp
index aa22187b7ef4..6e85aa8e1926 100644
--- a/cpp/libcudf_streaming/include/cudf_streaming/streaming/channel_metadata.hpp
+++ b/cpp/libcudf_streaming/include/cudf_streaming/streaming/channel_metadata.hpp
@@ -7,9 +7,10 @@
 
 #include <cudf/types.hpp>
 
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <cuda_runtime_api.h>
 
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
 #include <rapidsmpf/memory/content_description.hpp>
 #include <rapidsmpf/streaming/core/message.hpp>
diff --git a/cpp/libcudf_streaming/src/integrations/bloom_filter.cu b/cpp/libcudf_streaming/src/integrations/bloom_filter.cu
index 3b2fb3195f4c..7f3584b3895d 100644
--- a/cpp/libcudf_streaming/src/integrations/bloom_filter.cu
+++ b/cpp/libcudf_streaming/src/integrations/bloom_filter.cu
@@ -32,13 +32,14 @@
 #include <cudf/table/table_view.hpp>
 #include <cudf/utilities/memory_resource.hpp>
 
+#include <cudf_streaming/integrations/bloom_filter.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/resource_ref.hpp>
 
 #include <cub/device/device_transform.cuh>
 #include <cuda/std/tuple>
 
-#include <cudf_streaming/integrations/bloom_filter.hpp>
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>
 #include <rapidsmpf/memory/buffer.hpp>
diff --git a/cpp/libcudf_streaming/src/integrations/partition.cpp b/cpp/libcudf_streaming/src/integrations/partition.cpp
index f258273672ad..4362810a456f 100644
--- a/cpp/libcudf_streaming/src/integrations/partition.cpp
+++ b/cpp/libcudf_streaming/src/integrations/partition.cpp
@@ -9,11 +9,12 @@
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
 
+#include <cudf_streaming/integrations/partition.hpp>
+#include <cudf_streaming/integrations/utils.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_buffer.hpp>
 
-#include <cudf_streaming/integrations/partition.hpp>
-#include <cudf_streaming/integrations/utils.hpp>
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>
 #include <rapidsmpf/memory/buffer.hpp>
diff --git a/cpp/libcudf_streaming/src/integrations/utils.cpp b/cpp/libcudf_streaming/src/integrations/utils.cpp
index 94c5ba60e424..633135634158 100644
--- a/cpp/libcudf_streaming/src/integrations/utils.cpp
+++ b/cpp/libcudf_streaming/src/integrations/utils.cpp
@@ -12,6 +12,7 @@
 #include <cudf/wrappers/dictionary.hpp>
 
 #include <cudf_streaming/integrations/utils.hpp>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>
 #include <rapidsmpf/memory/buffer.hpp>
diff --git a/cpp/libcudf_streaming/src/streaming/bloom_filter.cpp b/cpp/libcudf_streaming/src/streaming/bloom_filter.cpp
index be7da4202571..63676709b374 100644
--- a/cpp/libcudf_streaming/src/streaming/bloom_filter.cpp
+++ b/cpp/libcudf_streaming/src/streaming/bloom_filter.cpp
@@ -5,11 +5,12 @@
 
 #include <cudf/stream_compaction.hpp>
 
-#include <cuda_runtime_api.h>
-
 #include <cudf_streaming/integrations/bloom_filter.hpp>
 #include <cudf_streaming/streaming/bloom_filter.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
+#include <cuda_runtime_api.h>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
diff --git a/cpp/libcudf_streaming/src/streaming/channel_metadata.cpp b/cpp/libcudf_streaming/src/streaming/channel_metadata.cpp
index 6e90a03ee97a..6d91d32d33f0 100644
--- a/cpp/libcudf_streaming/src/streaming/channel_metadata.cpp
+++ b/cpp/libcudf_streaming/src/streaming/channel_metadata.cpp
@@ -9,6 +9,7 @@
 #include <cudf/scalar/scalar.hpp>
 
 #include <cudf_streaming/streaming/channel_metadata.hpp>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>
 #include <rapidsmpf/memory/memory_reservation.hpp>
diff --git a/cpp/libcudf_streaming/src/streaming/parquet.cpp b/cpp/libcudf_streaming/src/streaming/parquet.cpp
index 7c639b283434..54955dfa536e 100644
--- a/cpp/libcudf_streaming/src/streaming/parquet.cpp
+++ b/cpp/libcudf_streaming/src/streaming/parquet.cpp
@@ -9,10 +9,11 @@
 #include <cudf/io/parquet_metadata.hpp>
 #include <cudf/io/types.hpp>
 
-#include <rmm/cuda_stream_view.hpp>
-
 #include <cudf_streaming/streaming/parquet.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
+#include <rmm/cuda_stream_view.hpp>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/memory/memory_type.hpp>
 #include <rapidsmpf/statistics.hpp>
diff --git a/cpp/libcudf_streaming/src/streaming/partition.cpp b/cpp/libcudf_streaming/src/streaming/partition.cpp
index 7ef41cbc1804..55e04cf6236e 100644
--- a/cpp/libcudf_streaming/src/streaming/partition.cpp
+++ b/cpp/libcudf_streaming/src/streaming/partition.cpp
@@ -7,6 +7,7 @@
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/partition.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/memory/spill.hpp>
 #include <rapidsmpf/streaming/chunks/partition.hpp>
diff --git a/cpp/libcudf_streaming/src/streaming/table_chunk.cpp b/cpp/libcudf_streaming/src/streaming/table_chunk.cpp
index 779fd9098344..b7f4a2c9de7d 100644
--- a/cpp/libcudf_streaming/src/streaming/table_chunk.cpp
+++ b/cpp/libcudf_streaming/src/streaming/table_chunk.cpp
@@ -5,9 +5,10 @@
 
 #include <cudf/contiguous_split.hpp>
 
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/mr/per_device_resource.hpp>
 
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/memory/buffer.hpp>
 #include <rapidsmpf/statistics.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_allgather.cpp b/cpp/libcudf_streaming/tests/streaming/test_allgather.cpp
index a0be10aaced8..7617ce156eaa 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_allgather.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_allgather.cpp
@@ -5,10 +5,11 @@
 
 #include "base_streaming_fixture.hpp"
 
+#include <cudf_streaming/integrations/partition.hpp>
+
 #include <cuda_runtime_api.h>
 
 #include <coro/latch.hpp>
-#include <cudf_streaming/integrations/partition.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <rapidsmpf/communicator/single.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_channel_metadata.cpp b/cpp/libcudf_streaming/tests/streaming/test_channel_metadata.cpp
index 95dec084ee1b..d9d25620791e 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_channel_metadata.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_channel_metadata.cpp
@@ -9,11 +9,12 @@
 #include <cudf/table/table.hpp>
 #include <cudf/utilities/default_stream.hpp>
 
+#include <cudf_streaming/streaming/channel_metadata.hpp>
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_buffer.hpp>
 
-#include <cudf_streaming/streaming/channel_metadata.hpp>
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
 
 #include <memory>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_leaf_actor.cpp b/cpp/libcudf_streaming/tests/streaming/test_leaf_actor.cpp
index 648fc02e3593..4423ef1e863e 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_leaf_actor.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_leaf_actor.cpp
@@ -9,6 +9,7 @@
 #include <cudf_test/table_utilities.hpp>
 
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <rapidsmpf/communicator/single.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_partition.cpp b/cpp/libcudf_streaming/tests/streaming/test_partition.cpp
index 7217f639e3c5..945bb0364488 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_partition.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_partition.cpp
@@ -11,6 +11,7 @@
 
 #include <cudf_streaming/streaming/partition.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <gmock/gmock.h>
 #include <rapidsmpf/communicator/single.hpp>
 #include <rapidsmpf/memory/buffer.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_read_parquet.cpp b/cpp/libcudf_streaming/tests/streaming/test_read_parquet.cpp
index b0b4205b54b7..2f8d85d27662 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_read_parquet.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_read_parquet.cpp
@@ -20,12 +20,13 @@
 #include <cudf/table/table_view.hpp>
 #include <cudf/types.hpp>
 
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/mr/per_device_resource.hpp>
-
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/parquet.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
+#include <rmm/cuda_stream_view.hpp>
+#include <rmm/mr/per_device_resource.hpp>
+
 #include <rapidsmpf/coll/allgather.hpp>
 #include <rapidsmpf/memory/packed_data.hpp>
 #include <rapidsmpf/owning_wrapper.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_shuffler.cpp b/cpp/libcudf_streaming/tests/streaming/test_shuffler.cpp
index 711ea46b1377..af2e87f61d00 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_shuffler.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_shuffler.cpp
@@ -13,6 +13,7 @@
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/streaming/partition.hpp>
 #include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <rapidsmpf/communicator/single.hpp>
diff --git a/cpp/libcudf_streaming/tests/streaming/test_table_chunk.cpp b/cpp/libcudf_streaming/tests/streaming/test_table_chunk.cpp
index 75c681889ef1..9af12dc93cc5 100644
--- a/cpp/libcudf_streaming/tests/streaming/test_table_chunk.cpp
+++ b/cpp/libcudf_streaming/tests/streaming/test_table_chunk.cpp
@@ -14,10 +14,11 @@
 #include <cudf/table/table.hpp>
 #include <cudf/table/table_view.hpp>
 
+#include <cudf_streaming/streaming/table_chunk.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/mr/per_device_resource.hpp>
 
-#include <cudf_streaming/streaming/table_chunk.hpp>
 #include <rapidsmpf/owning_wrapper.hpp>
 #include <rapidsmpf/streaming/core/channel.hpp>
 
diff --git a/cpp/libcudf_streaming/tests/test_partition.cpp b/cpp/libcudf_streaming/tests/test_partition.cpp
index d261968a27bd..ae88478f6933 100644
--- a/cpp/libcudf_streaming/tests/test_partition.cpp
+++ b/cpp/libcudf_streaming/tests/test_partition.cpp
@@ -16,6 +16,7 @@
 
 #include <cudf_streaming/integrations/partition.hpp>
 #include <cudf_streaming/integrations/utils.hpp>
+
 #include <rapidsmpf/memory/buffer.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
 #include <rapidsmpf/memory/packed_data.hpp>
diff --git a/cpp/libcudf_streaming/tests/test_shuffler.cpp b/cpp/libcudf_streaming/tests/test_shuffler.cpp
index bcec7282f64d..d74c734f8800 100644
--- a/cpp/libcudf_streaming/tests/test_shuffler.cpp
+++ b/cpp/libcudf_streaming/tests/test_shuffler.cpp
@@ -12,6 +12,7 @@
 #include <cudf_test/table_utilities.hpp>
 
 #include <cudf_streaming/integrations/partition.hpp>
+
 #include <gtest/gtest.h>
 #include <rapidsmpf/memory/buffer.hpp>
 #include <rapidsmpf/memory/buffer_resource.hpp>
diff --git a/cpp/libcudf_streaming/tests/test_shuffler_many_streams.cpp b/cpp/libcudf_streaming/tests/test_shuffler_many_streams.cpp
index 277826cd7c64..ffd8ecdd6b2e 100644
--- a/cpp/libcudf_streaming/tests/test_shuffler_many_streams.cpp
+++ b/cpp/libcudf_streaming/tests/test_shuffler_many_streams.cpp
@@ -8,9 +8,10 @@
 
 #include <cudf/utilities/memory_resource.hpp>
 
+#include <cudf_streaming/integrations/partition.hpp>
+
 #include <rmm/cuda_stream_view.hpp>
 
-#include <cudf_streaming/integrations/partition.hpp>
 #include <gtest/gtest.h>
 #include <rapidsmpf/cuda_stream.hpp>
 #include <rapidsmpf/error.hpp>