From d23bcb475273d6874bf797b4e77a90d0c478f9ef Mon Sep 17 00:00:00 2001
From: Conor Hoekstra <36027403+codereport@users.noreply.github.com>
Date: Sun, 12 Dec 2021 17:31:26 -0500
Subject: [PATCH] Remove `IncludeCategories` from `.clang-format` (#9876)

It was recently noticed that the `IncludeCategories`:
```
IncludeCategories:
  - Regex:           '^<ext/.*\.h>'
    Priority:        2
  - Regex:           '^<.*\.h>'
    Priority:        1
  - Regex:           '^<.*'
    Priority:        2
  - Regex:           '.*'
    Priority:        3
```
In the `.clang-format` are not really necessary as `ext` has no meaning in RAPIDS. This PR removes these.

Depends on https://github.com/rapidsai/cudf/pull/9870.

Authors:
  - Conor Hoekstra (https://github.com/codereport)

Approvers:
  - Nghia Truong (https://github.com/ttnghia)
  - Bradley Dice (https://github.com/bdice)
  - MithunR (https://github.com/mythrocks)
  - Ram (Ramakrishna Prabhu) (https://github.com/rgsl888prabhu)

URL: https://github.com/rapidsai/cudf/pull/9876
---
 cpp/.clang-format                                       | 9 ---------
 cpp/benchmarks/transpose/transpose_benchmark.cu         | 2 +-
 cpp/include/cudf/detail/reduction_operators.cuh         | 2 +-
 cpp/include/cudf/strings/string.cuh                     | 2 +-
 cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp | 2 +-
 cpp/libcudf_kafka/src/kafka_consumer.cpp                | 2 +-
 cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp        | 2 +-
 cpp/src/dictionary/set_keys.cu                          | 2 +-
 cpp/src/groupby/hash/groupby_kernels.cuh                | 2 +-
 cpp/src/groupby/hash/multi_pass_kernels.cuh             | 4 +++-
 cpp/src/groupby/sort/group_nth_element.cu               | 2 +-
 cpp/src/groupby/sort/group_quantiles.cu                 | 2 +-
 cpp/src/io/avro/avro.h                                  | 4 ++--
 cpp/src/io/avro/avro_common.h                           | 2 +-
 cpp/src/io/comp/cpu_unbz2.cpp                           | 4 ++--
 cpp/src/io/functions.cpp                                | 2 +-
 cpp/src/io/orc/orc.h                                    | 6 +++---
 cpp/src/io/orc/orc_field_reader.hpp                     | 2 +-
 cpp/src/io/orc/orc_field_writer.hpp                     | 2 +-
 cpp/src/io/orc/orc_gpu.h                                | 6 +++---
 cpp/src/io/orc/timezone.cuh                             | 2 +-
 cpp/src/io/orc/writer_impl.hpp                          | 2 +-
 cpp/src/io/parquet/compact_protocol_writer.hpp          | 2 +-
 cpp/src/io/parquet/page_data.cu                         | 2 +-
 cpp/src/io/parquet/page_enc.cu                          | 6 +++---
 cpp/src/io/parquet/page_hdr.cu                          | 4 ++--
 cpp/src/io/parquet/parquet.hpp                          | 2 +-
 cpp/src/io/parquet/writer_impl.cu                       | 4 ++--
 cpp/src/io/utilities/data_sink.cpp                      | 2 +-
 cpp/src/io/utilities/file_io_utilities.hpp              | 2 +-
 cpp/src/join/hash_join.cu                               | 2 +-
 cpp/src/lists/contains.cu                               | 4 ++--
 cpp/src/merge/merge.cu                                  | 2 +-
 cpp/src/rolling/range_window_bounds.cpp                 | 2 +-
 cpp/src/rolling/rolling.cu                              | 2 +-
 cpp/src/strings/case.cu                                 | 4 ++--
 cpp/src/strings/regex/regcomp.cpp                       | 2 +-
 cpp/src/structs/structs_column_view.cpp                 | 2 +-
 cpp/src/text/subword/load_hash_file.cu                  | 2 +-
 cpp/src/transform/mask_to_bools.cu                      | 4 ++--
 cpp/tests/binaryop/assert-binops.h                      | 2 +-
 cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp  | 2 +-
 cpp/tests/binaryop/binop-compiled-test.cpp              | 2 +-
 cpp/tests/binaryop/binop-generic-ptx-test.cpp           | 2 +-
 cpp/tests/bitmask/bitmask_tests.cpp                     | 4 ++--
 cpp/tests/column/column_test.cu                         | 2 +-
 cpp/tests/copying/gather_str_tests.cpp                  | 2 +-
 cpp/tests/hash_map/map_test.cu                          | 2 +-
 cpp/tests/iterator/value_iterator_test.cuh              | 2 +-
 cpp/tests/iterator/value_iterator_test_strings.cu       | 2 +-
 cpp/tests/lists/extract_tests.cpp                       | 2 +-
 cpp/tests/partitioning/hash_partition_test.cpp          | 2 +-
 cpp/tests/replace/replace_tests.cpp                     | 4 ++--
 cpp/tests/reshape/interleave_columns_tests.cpp          | 2 +-
 cpp/tests/reshape/tile_tests.cpp                        | 2 +-
 cpp/tests/scalar/scalar_device_view_test.cu             | 4 ++--
 cpp/tests/strings/booleans_tests.cpp                    | 2 +-
 cpp/tests/strings/case_tests.cpp                        | 2 +-
 cpp/tests/strings/combine/concatenate_tests.cpp         | 2 +-
 cpp/tests/strings/combine/join_strings_tests.cpp        | 2 +-
 cpp/tests/strings/concatenate_tests.cpp                 | 2 +-
 cpp/tests/strings/contains_tests.cpp                    | 2 +-
 cpp/tests/strings/datetime_tests.cpp                    | 2 +-
 cpp/tests/strings/durations_tests.cpp                   | 2 +-
 cpp/tests/strings/extract_tests.cpp                     | 2 +-
 cpp/tests/strings/factories_test.cu                     | 2 +-
 cpp/tests/strings/fill_tests.cpp                        | 2 +-
 cpp/tests/strings/findall_tests.cpp                     | 2 +-
 cpp/tests/strings/floats_tests.cpp                      | 2 +-
 cpp/tests/strings/integers_tests.cpp                    | 2 +-
 cpp/tests/strings/ipv4_tests.cpp                        | 2 +-
 cpp/tests/strings/pad_tests.cpp                         | 2 +-
 cpp/tests/strings/replace_regex_tests.cpp               | 2 +-
 cpp/tests/strings/replace_tests.cpp                     | 2 +-
 cpp/tests/strings/split_tests.cpp                       | 2 +-
 cpp/tests/strings/strip_tests.cpp                       | 2 +-
 cpp/tests/strings/substring_tests.cpp                   | 4 ++--
 cpp/tests/strings/translate_tests.cpp                   | 2 +-
 cpp/tests/strings/urls_tests.cpp                        | 2 +-
 cpp/tests/text/ngrams_tests.cpp                         | 2 +-
 80 files changed, 98 insertions(+), 105 deletions(-)

diff --git a/cpp/.clang-format b/cpp/.clang-format
index 0c05436e922..6019a6f3d5c 100644
--- a/cpp/.clang-format
+++ b/cpp/.clang-format
@@ -72,15 +72,6 @@ ForEachMacros:
   - Q_FOREACH
   - BOOST_FOREACH
 IncludeBlocks: Preserve
-IncludeCategories:
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
 IndentPPDirectives: None
diff --git a/cpp/benchmarks/transpose/transpose_benchmark.cu b/cpp/benchmarks/transpose/transpose_benchmark.cu
index 49ea361fe36..31861c12ebe 100644
--- a/cpp/benchmarks/transpose/transpose_benchmark.cu
+++ b/cpp/benchmarks/transpose/transpose_benchmark.cu
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <thrust/transform.h>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 #include <cudf/transpose.hpp>
 #include <cudf/types.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <memory>
+#include <thrust/transform.h>
 
 using cudf::test::fixed_width_column_wrapper;
 
diff --git a/cpp/include/cudf/detail/reduction_operators.cuh b/cpp/include/cudf/detail/reduction_operators.cuh
index 3a3b0338035..866e26cd655 100644
--- a/cpp/include/cudf/detail/reduction_operators.cuh
+++ b/cpp/include/cudf/detail/reduction_operators.cuh
@@ -21,8 +21,8 @@
 #include <cudf/detail/utilities/transform_unary_functions.cuh>
 #include <cudf/types.hpp>  //for CUDA_HOST_DEVICE_CALLABLE
 
-#include <thrust/functional.h>
 #include <cmath>
+#include <thrust/functional.h>
 
 namespace cudf {
 namespace reduction {
diff --git a/cpp/include/cudf/strings/string.cuh b/cpp/include/cudf/strings/string.cuh
index d85d19d7f10..a215a3f36c0 100644
--- a/cpp/include/cudf/strings/string.cuh
+++ b/cpp/include/cudf/strings/string.cuh
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <thrust/logical.h>
 #include <cudf/strings/string_view.cuh>
+#include <thrust/logical.h>
 
 namespace cudf {
 namespace strings {
diff --git a/cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp b/cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp
index d752acbceaf..464d1cd71b1 100644
--- a/cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp
+++ b/cpp/libcudf_kafka/include/cudf_kafka/kafka_consumer.hpp
@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#include <librdkafka/rdkafkacpp.h>
 #include <algorithm>
 #include <chrono>
 #include <cudf/io/datasource.hpp>
+#include <librdkafka/rdkafkacpp.h>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/cpp/libcudf_kafka/src/kafka_consumer.cpp b/cpp/libcudf_kafka/src/kafka_consumer.cpp
index a76d6b0a985..4f7cdba632e 100644
--- a/cpp/libcudf_kafka/src/kafka_consumer.cpp
+++ b/cpp/libcudf_kafka/src/kafka_consumer.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "cudf_kafka/kafka_consumer.hpp"
-#include <librdkafka/rdkafkacpp.h>
 #include <chrono>
+#include <librdkafka/rdkafkacpp.h>
 #include <memory>
 
 namespace cudf {
diff --git a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp
index fa3d7d887aa..ca4b70531db 100644
--- a/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp
+++ b/cpp/libcudf_kafka/tests/kafka_consumer_tests.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include "cudf_kafka/kafka_consumer.hpp"
 #include <gtest/gtest.h>
 #include <map>
 #include <memory>
 #include <string>
-#include "cudf_kafka/kafka_consumer.hpp"
 
 #include <cudf/io/csv.hpp>
 #include <cudf/io/datasource.hpp>
diff --git a/cpp/src/dictionary/set_keys.cu b/cpp/src/dictionary/set_keys.cu
index 2baf336bb9e..72f6e034479 100644
--- a/cpp/src/dictionary/set_keys.cu
+++ b/cpp/src/dictionary/set_keys.cu
@@ -31,9 +31,9 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <thrust/binary_search.h>
 #include <algorithm>
 #include <iterator>
+#include <thrust/binary_search.h>
 
 namespace cudf {
 namespace dictionary {
diff --git a/cpp/src/groupby/hash/groupby_kernels.cuh b/cpp/src/groupby/hash/groupby_kernels.cuh
index b6ed7f3ae93..7238186b7d9 100644
--- a/cpp/src/groupby/hash/groupby_kernels.cuh
+++ b/cpp/src/groupby/hash/groupby_kernels.cuh
@@ -16,11 +16,11 @@
 
 #pragma once
 
+#include "multi_pass_kernels.cuh"
 #include <cudf/detail/aggregation/aggregation.cuh>
 #include <cudf/detail/aggregation/aggregation.hpp>
 #include <cudf/groupby.hpp>
 #include <cudf/utilities/bit.hpp>
-#include "multi_pass_kernels.cuh"
 
 namespace cudf {
 namespace groupby {
diff --git a/cpp/src/groupby/hash/multi_pass_kernels.cuh b/cpp/src/groupby/hash/multi_pass_kernels.cuh
index 24de22705a9..02977bb4ece 100644
--- a/cpp/src/groupby/hash/multi_pass_kernels.cuh
+++ b/cpp/src/groupby/hash/multi_pass_kernels.cuh
@@ -16,15 +16,17 @@
 
 #pragma once
 
-#include <cmath>
 #include <cudf/aggregation.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/detail/aggregation/aggregation.hpp>
 #include <cudf/detail/utilities/assert.cuh>
 #include <cudf/detail/utilities/device_atomics.cuh>
+#include <cudf/dictionary/dictionary_column_view.hpp>
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/utilities/type_dispatcher.hpp>
 
+#include <cmath>
+
 namespace cudf {
 namespace detail {
 
diff --git a/cpp/src/groupby/sort/group_nth_element.cu b/cpp/src/groupby/sort/group_nth_element.cu
index c1fc58beb80..7e9bd4539ba 100644
--- a/cpp/src/groupby/sort/group_nth_element.cu
+++ b/cpp/src/groupby/sort/group_nth_element.cu
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <thrust/iterator/discard_iterator.h>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_view.hpp>
@@ -24,6 +23,7 @@
 #include <cudf/detail/iterator.cuh>
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
+#include <thrust/iterator/discard_iterator.h>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
diff --git a/cpp/src/groupby/sort/group_quantiles.cu b/cpp/src/groupby/sort/group_quantiles.cu
index e4ae3cf5915..b910c96731c 100644
--- a/cpp/src/groupby/sort/group_quantiles.cu
+++ b/cpp/src/groupby/sort/group_quantiles.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <quantiles/quantiles_util.hpp>
 #include "group_reductions.hpp"
+#include <quantiles/quantiles_util.hpp>
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
diff --git a/cpp/src/io/avro/avro.h b/cpp/src/io/avro/avro.h
index 1f2389eab84..f84693fdba3 100644
--- a/cpp/src/io/avro/avro.h
+++ b/cpp/src/io/avro/avro.h
@@ -18,12 +18,12 @@
 
 #include "avro_common.h"
 
+#include <algorithm>
+#include <map>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <algorithm>
-#include <map>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/io/avro/avro_common.h b/cpp/src/io/avro/avro_common.h
index 3ef36863cd2..17f12da3165 100644
--- a/cpp/src/io/avro/avro_common.h
+++ b/cpp/src/io/avro/avro_common.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <io/utilities/column_buffer.hpp>
 #include <stdint.h>
 #include <stdio.h>
-#include <io/utilities/column_buffer.hpp>
 
 namespace cudf {
 namespace io {
diff --git a/cpp/src/io/comp/cpu_unbz2.cpp b/cpp/src/io/comp/cpu_unbz2.cpp
index f4cb6edd41f..7f37b62e9c2 100644
--- a/cpp/src/io/comp/cpu_unbz2.cpp
+++ b/cpp/src/io/comp/cpu_unbz2.cpp
@@ -79,11 +79,11 @@ Jon L. Bentley
 For more information on these sources, see the manual.
 --*/
 
+#include "io_uncomp.h"
+#include "unbz2.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <vector>
-#include "io_uncomp.h"
-#include "unbz2.h"
 
 namespace cudf {
 namespace io {
diff --git a/cpp/src/io/functions.cpp b/cpp/src/io/functions.cpp
index 613ccf203cb..768d6b25690 100644
--- a/cpp/src/io/functions.cpp
+++ b/cpp/src/io/functions.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <io/orc/orc.h>
 #include <algorithm>
 #include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/io/avro.hpp>
@@ -32,6 +31,7 @@
 #include <cudf/io/parquet.hpp>
 #include <cudf/table/table.hpp>
 #include <cudf/utilities/error.hpp>
+#include <io/orc/orc.h>
 
 namespace cudf {
 namespace io {
diff --git a/cpp/src/io/orc/orc.h b/cpp/src/io/orc/orc.h
index d75b76a0341..277c5d99f8f 100644
--- a/cpp/src/io/orc/orc.h
+++ b/cpp/src/io/orc/orc.h
@@ -18,17 +18,17 @@
 
 #include "orc_common.h"
 
-#include <io/comp/io_uncomp.h>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/io/datasource.hpp>
 #include <cudf/io/orc_metadata.hpp>
 #include <cudf/utilities/error.hpp>
+#include <io/comp/io_uncomp.h>
 
-#include <stddef.h>
-#include <stdint.h>
 #include <algorithm>
 #include <memory>
 #include <optional>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/io/orc/orc_field_reader.hpp b/cpp/src/io/orc/orc_field_reader.hpp
index 45d2cbe3bf2..da1c8ec2b2f 100644
--- a/cpp/src/io/orc/orc_field_reader.hpp
+++ b/cpp/src/io/orc/orc_field_reader.hpp
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <string>
 #include "orc.h"
+#include <string>
 
 /**
  * @file orc_field_reader.hpp
diff --git a/cpp/src/io/orc/orc_field_writer.hpp b/cpp/src/io/orc/orc_field_writer.hpp
index 7882810b50d..afcd99a2cd6 100644
--- a/cpp/src/io/orc/orc_field_writer.hpp
+++ b/cpp/src/io/orc/orc_field_writer.hpp
@@ -15,9 +15,9 @@
  */
 #pragma once
 
+#include "orc.h"
 #include <numeric>
 #include <string>
-#include "orc.h"
 
 /**
  * @file orc_field_writer.hpp
diff --git a/cpp/src/io/orc/orc_gpu.h b/cpp/src/io/orc/orc_gpu.h
index ad4450bc6a7..d94aa00c7b9 100644
--- a/cpp/src/io/orc/orc_gpu.h
+++ b/cpp/src/io/orc/orc_gpu.h
@@ -18,14 +18,14 @@
 
 #include "timezone.cuh"
 
-#include <io/comp/gpuinflate.h>
+#include "orc.h"
+#include "orc_common.h"
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/types.hpp>
 #include <cudf/utilities/span.hpp>
+#include <io/comp/gpuinflate.h>
 #include <io/statistics/statistics.cuh>
 #include <io/utilities/column_buffer.hpp>
-#include "orc.h"
-#include "orc_common.h"
 
 #include <rmm/cuda_stream_view.hpp>
 
diff --git a/cpp/src/io/orc/timezone.cuh b/cpp/src/io/orc/timezone.cuh
index 11db05cf28c..77c2bd4ffa0 100644
--- a/cpp/src/io/orc/timezone.cuh
+++ b/cpp/src/io/orc/timezone.cuh
@@ -20,9 +20,9 @@
 #include <cudf/utilities/span.hpp>
 #include <io/utilities/time_utils.cuh>
 
+#include <rmm/device_uvector.hpp>
 #include <thrust/binary_search.h>
 #include <thrust/execution_policy.h>
-#include <rmm/device_uvector.hpp>
 
 #include <stdint.h>
 #include <string>
diff --git a/cpp/src/io/orc/writer_impl.hpp b/cpp/src/io/orc/writer_impl.hpp
index 89b8c305424..68622d17b28 100644
--- a/cpp/src/io/orc/writer_impl.hpp
+++ b/cpp/src/io/orc/writer_impl.hpp
@@ -29,9 +29,9 @@
 #include <cudf/table/table_device_view.cuh>
 #include <cudf/utilities/error.hpp>
 
-#include <thrust/iterator/counting_iterator.h>
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/iterator/counting_iterator.h>
 
 #include <memory>
 #include <string>
diff --git a/cpp/src/io/parquet/compact_protocol_writer.hpp b/cpp/src/io/parquet/compact_protocol_writer.hpp
index 633bbdf1e19..71452bd7809 100644
--- a/cpp/src/io/parquet/compact_protocol_writer.hpp
+++ b/cpp/src/io/parquet/compact_protocol_writer.hpp
@@ -19,9 +19,9 @@
 #include "parquet.hpp"
 #include "parquet_common.hpp"
 
+#include <algorithm>
 #include <stddef.h>
 #include <stdint.h>
-#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/io/parquet/page_data.cu b/cpp/src/io/parquet/page_data.cu
index b31888b6ac2..751d6b62319 100644
--- a/cpp/src/io/parquet/page_data.cu
+++ b/cpp/src/io/parquet/page_data.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "parquet_gpu.hpp"
 #include <io/utilities/block_utils.cuh>
 #include <io/utilities/column_buffer.hpp>
-#include "parquet_gpu.hpp"
 
 #include <cudf/detail/utilities/assert.cuh>
 #include <cudf/utilities/bit.hpp>
diff --git a/cpp/src/io/parquet/page_enc.cu b/cpp/src/io/parquet/page_enc.cu
index 4728a8001f2..33647ff626c 100644
--- a/cpp/src/io/parquet/page_enc.cu
+++ b/cpp/src/io/parquet/page_enc.cu
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <io/utilities/block_utils.cuh>
 #include "parquet_gpu.hpp"
+#include <io/utilities/block_utils.cuh>
 
 #include <cudf/detail/iterator.cuh>
 #include <cudf/detail/utilities/cuda.cuh>
@@ -25,10 +25,10 @@
 
 #include <cub/cub.cuh>
 
-#include <thrust/gather.h>
-#include <thrust/iterator/discard_iterator.h>
 #include <cub/cub.cuh>
 #include <cuda/std/chrono>
+#include <thrust/gather.h>
+#include <thrust/iterator/discard_iterator.h>
 
 namespace cudf {
 namespace io {
diff --git a/cpp/src/io/parquet/page_hdr.cu b/cpp/src/io/parquet/page_hdr.cu
index a5536775116..7c0775076f0 100644
--- a/cpp/src/io/parquet/page_hdr.cu
+++ b/cpp/src/io/parquet/page_hdr.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <thrust/tuple.h>
-#include <io/utilities/block_utils.cuh>
 #include "parquet_gpu.hpp"
+#include <io/utilities/block_utils.cuh>
+#include <thrust/tuple.h>
 
 #include <rmm/cuda_stream_view.hpp>
 
diff --git a/cpp/src/io/parquet/parquet.hpp b/cpp/src/io/parquet/parquet.hpp
index cd57414d98b..21610638843 100644
--- a/cpp/src/io/parquet/parquet.hpp
+++ b/cpp/src/io/parquet/parquet.hpp
@@ -18,9 +18,9 @@
 
 #include "parquet_common.hpp"
 
+#include <algorithm>
 #include <stddef.h>
 #include <stdint.h>
-#include <algorithm>
 #include <string>
 #include <tuple>
 #include <vector>
diff --git a/cpp/src/io/parquet/writer_impl.cu b/cpp/src/io/parquet/writer_impl.cu
index 1a5fc1a3c64..e04c8371df8 100644
--- a/cpp/src/io/parquet/writer_impl.cu
+++ b/cpp/src/io/parquet/writer_impl.cu
@@ -19,12 +19,12 @@
  * @brief cuDF-IO parquet writer class implementation
  */
 
-#include <io/statistics/column_statistics.cuh>
 #include "writer_impl.hpp"
+#include <io/statistics/column_statistics.cuh>
 
+#include "compact_protocol_writer.hpp"
 #include <io/utilities/column_utils.cuh>
 #include <io/utilities/config_utils.hpp>
-#include "compact_protocol_writer.hpp"
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/detail/utilities/vector_factories.hpp>
diff --git a/cpp/src/io/utilities/data_sink.cpp b/cpp/src/io/utilities/data_sink.cpp
index a0ed54b96ef..642f3518edd 100644
--- a/cpp/src/io/utilities/data_sink.cpp
+++ b/cpp/src/io/utilities/data_sink.cpp
@@ -16,9 +16,9 @@
 
 #include <fstream>
 
+#include "file_io_utilities.hpp"
 #include <cudf/io/data_sink.hpp>
 #include <cudf/utilities/error.hpp>
-#include "file_io_utilities.hpp"
 
 #include <rmm/cuda_stream_view.hpp>
 
diff --git a/cpp/src/io/utilities/file_io_utilities.hpp b/cpp/src/io/utilities/file_io_utilities.hpp
index ede0eb6f925..7178418bbbf 100644
--- a/cpp/src/io/utilities/file_io_utilities.hpp
+++ b/cpp/src/io/utilities/file_io_utilities.hpp
@@ -19,8 +19,8 @@
 #ifdef CUFILE_FOUND
 #include "thread_pool.hpp"
 
-#include <cufile.h>
 #include <cudf_test/file_utilities.hpp>
+#include <cufile.h>
 #endif
 
 #include <rmm/cuda_stream_view.hpp>
diff --git a/cpp/src/join/hash_join.cu b/cpp/src/join/hash_join.cu
index 57303ed7795..ee62008b90f 100644
--- a/cpp/src/join/hash_join.cu
+++ b/cpp/src/join/hash_join.cu
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <join/hash_join.cuh>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/uninitialized_fill.h>
-#include <join/hash_join.cuh>
 
 #include <cudf/copying.hpp>
 #include <cudf/detail/concatenate.cuh>
diff --git a/cpp/src/lists/contains.cu b/cpp/src/lists/contains.cu
index b48982d205a..3d135992dea 100644
--- a/cpp/src/lists/contains.cu
+++ b/cpp/src/lists/contains.cu
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/logical.h>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/detail/iterator.cuh>
 #include <cudf/detail/valid_if.cuh>
@@ -28,6 +26,8 @@
 #include <cudf/table/row_operators.cuh>
 #include <cudf/utilities/type_dispatcher.hpp>
 #include <rmm/exec_policy.hpp>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/logical.h>
 #include <type_traits>
 
 namespace cudf {
diff --git a/cpp/src/merge/merge.cu b/cpp/src/merge/merge.cu
index 05bd195e764..f7e9b114f7b 100644
--- a/cpp/src/merge/merge.cu
+++ b/cpp/src/merge/merge.cu
@@ -36,9 +36,9 @@
 #include <thrust/merge.h>
 #include <thrust/pair.h>
 
+#include "cudf/utilities/traits.hpp"
 #include <queue>
 #include <vector>
-#include "cudf/utilities/traits.hpp"
 
 namespace cudf {
 namespace detail {
diff --git a/cpp/src/rolling/range_window_bounds.cpp b/cpp/src/rolling/range_window_bounds.cpp
index 9c3bc0edf92..dd147c99614 100644
--- a/cpp/src/rolling/range_window_bounds.cpp
+++ b/cpp/src/rolling/range_window_bounds.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include "range_window_bounds_detail.hpp"
 #include <cudf/rolling/range_window_bounds.hpp>
 #include <cudf/scalar/scalar_factories.hpp>
 #include <cudf/types.hpp>
 #include <cudf/wrappers/durations.hpp>
-#include "range_window_bounds_detail.hpp"
 
 namespace cudf {
 namespace {
diff --git a/cpp/src/rolling/rolling.cu b/cpp/src/rolling/rolling.cu
index ab0f78bcf5d..fdb9f09a812 100644
--- a/cpp/src/rolling/rolling.cu
+++ b/cpp/src/rolling/rolling.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <cudf/detail/aggregation/aggregation.hpp>
 #include "rolling_detail.cuh"
+#include <cudf/detail/aggregation/aggregation.hpp>
 
 namespace cudf {
 namespace detail {
diff --git a/cpp/src/strings/case.cu b/cpp/src/strings/case.cu
index 2b4d832e85e..e09367d72a4 100644
--- a/cpp/src/strings/case.cu
+++ b/cpp/src/strings/case.cu
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <strings/char_types/char_cases.h>
-#include <strings/char_types/is_flags.h>
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/column/column_factories.hpp>
@@ -27,6 +25,8 @@
 #include <cudf/strings/string_view.cuh>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/utilities/error.hpp>
+#include <strings/char_types/char_cases.h>
+#include <strings/char_types/is_flags.h>
 
 #include <strings/utf8.cuh>
 #include <strings/utilities.hpp>
diff --git a/cpp/src/strings/regex/regcomp.cpp b/cpp/src/strings/regex/regcomp.cpp
index 0e3dcb93826..7da4915d668 100644
--- a/cpp/src/strings/regex/regcomp.cpp
+++ b/cpp/src/strings/regex/regcomp.cpp
@@ -18,9 +18,9 @@
 
 #include <cudf/utilities/error.hpp>
 
-#include <string.h>
 #include <algorithm>
 #include <array>
+#include <string.h>
 
 namespace cudf {
 namespace strings {
diff --git a/cpp/src/structs/structs_column_view.cpp b/cpp/src/structs/structs_column_view.cpp
index dba31ecc21e..db9496f18be 100644
--- a/cpp/src/structs/structs_column_view.cpp
+++ b/cpp/src/structs/structs_column_view.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "cudf/utilities/error.hpp"
 #include <cudf/column/column.hpp>
 #include <cudf/structs/structs_column_view.hpp>
-#include "cudf/utilities/error.hpp"
 
 namespace cudf {
 
diff --git a/cpp/src/text/subword/load_hash_file.cu b/cpp/src/text/subword/load_hash_file.cu
index b2230f95842..0af34eb8092 100644
--- a/cpp/src/text/subword/load_hash_file.cu
+++ b/cpp/src/text/subword/load_hash_file.cu
@@ -28,10 +28,10 @@
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 
-#include <stdint.h>
 #include <algorithm>
 #include <fstream>
 #include <iostream>
+#include <stdint.h>
 #include <vector>
 
 namespace nvtext {
diff --git a/cpp/src/transform/mask_to_bools.cu b/cpp/src/transform/mask_to_bools.cu
index f2a6c65cb48..f4bdb2f50b2 100644
--- a/cpp/src/transform/mask_to_bools.cu
+++ b/cpp/src/transform/mask_to_bools.cu
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/transform.h>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_view.hpp>
 #include <cudf/detail/nvtx/ranges.hpp>
 #include <cudf/transform.hpp>
 #include <cudf/types.hpp>
 #include <cudf/utilities/bit.hpp>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/transform.h>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/exec_policy.hpp>
diff --git a/cpp/tests/binaryop/assert-binops.h b/cpp/tests/binaryop/assert-binops.h
index 65859251e42..b257ca21dd7 100644
--- a/cpp/tests/binaryop/assert-binops.h
+++ b/cpp/tests/binaryop/assert-binops.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <tests/binaryop/util/operation.h>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/cudf_gtest.hpp>
+#include <tests/binaryop/util/operation.h>
 
 #include <cudf/scalar/scalar.hpp>
 #include <cudf/utilities/traits.hpp>
diff --git a/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp b/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp
index 5020fbf898b..29905171907 100644
--- a/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp
+++ b/cpp/tests/binaryop/binop-compiled-fixed_point-test.cpp
@@ -26,9 +26,9 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/type_lists.hpp>
 
+#include "cudf/utilities/error.hpp"
 #include <tests/binaryop/assert-binops.h>
 #include <tests/binaryop/binop-fixture.hpp>
-#include "cudf/utilities/error.hpp"
 
 namespace cudf::test::binop {
 
diff --git a/cpp/tests/binaryop/binop-compiled-test.cpp b/cpp/tests/binaryop/binop-compiled-test.cpp
index 37212c30d80..0339d52dda9 100644
--- a/cpp/tests/binaryop/binop-compiled-test.cpp
+++ b/cpp/tests/binaryop/binop-compiled-test.cpp
@@ -26,9 +26,9 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/type_lists.hpp>
 
+#include <cudf/utilities/error.hpp>
 #include <tests/binaryop/assert-binops.h>
 #include <tests/binaryop/binop-fixture.hpp>
-#include "cudf/utilities/error.hpp"
 
 #include <type_traits>
 
diff --git a/cpp/tests/binaryop/binop-generic-ptx-test.cpp b/cpp/tests/binaryop/binop-generic-ptx-test.cpp
index f4407834786..0b6cfdab498 100644
--- a/cpp/tests/binaryop/binop-generic-ptx-test.cpp
+++ b/cpp/tests/binaryop/binop-generic-ptx-test.cpp
@@ -20,8 +20,8 @@
 #include <cudf/binaryop.hpp>
 
 #include <tests/binaryop/assert-binops.h>
-#include <tests/binaryop/util/runtime_support.h>
 #include <tests/binaryop/binop-fixture.hpp>
+#include <tests/binaryop/util/runtime_support.h>
 
 namespace cudf {
 namespace test {
diff --git a/cpp/tests/bitmask/bitmask_tests.cpp b/cpp/tests/bitmask/bitmask_tests.cpp
index 19a0da21cb9..3a479f0860b 100644
--- a/cpp/tests/bitmask/bitmask_tests.cpp
+++ b/cpp/tests/bitmask/bitmask_tests.cpp
@@ -25,9 +25,9 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/cudf_gtest.hpp>
 
+#include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_buffer.hpp>
-#include "rmm/cuda_stream_view.hpp"
-#include "rmm/device_uvector.hpp"
+#include <rmm/device_uvector.hpp>
 
 struct BitmaskUtilitiesTest : public cudf::test::BaseFixture {
 };
diff --git a/cpp/tests/column/column_test.cu b/cpp/tests/column/column_test.cu
index 5d7d570b321..48de5c2e5c6 100644
--- a/cpp/tests/column/column_test.cu
+++ b/cpp/tests/column/column_test.cu
@@ -30,8 +30,8 @@
 #include <cudf_test/type_list_utilities.hpp>
 #include <cudf_test/type_lists.hpp>
 
-#include <thrust/sequence.h>
 #include <random>
+#include <thrust/sequence.h>
 
 template <typename T>
 struct TypedColumnTest : public cudf::test::BaseFixture {
diff --git a/cpp/tests/copying/gather_str_tests.cpp b/cpp/tests/copying/gather_str_tests.cpp
index 3083631f7a1..a9a9a4f9342 100644
--- a/cpp/tests/copying/gather_str_tests.cpp
+++ b/cpp/tests/copying/gather_str_tests.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <tests/strings/utilities.h>
 #include <cudf/column/column_view.hpp>
 #include <cudf/copying.hpp>
 #include <cudf/detail/gather.hpp>
@@ -24,6 +23,7 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/cudf_gtest.hpp>
 #include <cudf_test/table_utilities.hpp>
+#include <tests/strings/utilities.h>
 
 class GatherTestStr : public cudf::test::BaseFixture {
 };
diff --git a/cpp/tests/hash_map/map_test.cu b/cpp/tests/hash_map/map_test.cu
index 94648ef00b1..54f7a97fb2b 100644
--- a/cpp/tests/hash_map/map_test.cu
+++ b/cpp/tests/hash_map/map_test.cu
@@ -26,13 +26,13 @@
 
 #include <thrust/logical.h>
 
+#include "rmm/exec_policy.hpp"
 #include <cstdlib>
 #include <iostream>
 #include <limits>
 #include <random>
 #include <unordered_map>
 #include <vector>
-#include "rmm/exec_policy.hpp"
 
 template <typename K, typename V>
 struct key_value_types {
diff --git a/cpp/tests/iterator/value_iterator_test.cuh b/cpp/tests/iterator/value_iterator_test.cuh
index 3a7ef075a41..8e542af643d 100644
--- a/cpp/tests/iterator/value_iterator_test.cuh
+++ b/cpp/tests/iterator/value_iterator_test.cuh
@@ -12,8 +12,8 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-#include <tests/iterator/iterator_tests.cuh>
 #include "cudf/detail/utilities/vector_factories.hpp"
+#include <tests/iterator/iterator_tests.cuh>
 
 // tests for non-null iterator (pointer of device array)
 template <typename T>
diff --git a/cpp/tests/iterator/value_iterator_test_strings.cu b/cpp/tests/iterator/value_iterator_test_strings.cu
index f28067649fd..c0ed9fa7480 100644
--- a/cpp/tests/iterator/value_iterator_test_strings.cu
+++ b/cpp/tests/iterator/value_iterator_test_strings.cu
@@ -12,10 +12,10 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-#include <tests/iterator/iterator_tests.cuh>
 #include "cudf/detail/utilities/vector_factories.hpp"
 #include "rmm/cuda_stream_view.hpp"
 #include "rmm/device_uvector.hpp"
+#include <tests/iterator/iterator_tests.cuh>
 
 auto strings_to_string_views(std::vector<std::string>& input_strings)
 {
diff --git a/cpp/tests/lists/extract_tests.cpp b/cpp/tests/lists/extract_tests.cpp
index d6ee62a7731..c7e8ba7e5de 100644
--- a/cpp/tests/lists/extract_tests.cpp
+++ b/cpp/tests/lists/extract_tests.cpp
@@ -18,12 +18,12 @@
 #include <cudf/detail/null_mask.hpp>
 #include <cudf/lists/extract.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/iterator_utilities.hpp>
 #include <cudf_test/type_lists.hpp>
+#include <tests/strings/utilities.h>
 
 #include <rmm/cuda_stream_view.hpp>
 
diff --git a/cpp/tests/partitioning/hash_partition_test.cpp b/cpp/tests/partitioning/hash_partition_test.cpp
index 9eb9814373e..ab8a394ab37 100644
--- a/cpp/tests/partitioning/hash_partition_test.cpp
+++ b/cpp/tests/partitioning/hash_partition_test.cpp
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <cudf/detail/utilities/vector_factories.hpp>
 #include <cudf/hashing.hpp>
 #include <cudf/partitioning.hpp>
 #include <cudf/sorting.hpp>
@@ -22,7 +23,6 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
 #include <cudf_test/type_lists.hpp>
-#include "cudf/detail/utilities/vector_factories.hpp"
 
 using cudf::test::fixed_width_column_wrapper;
 using cudf::test::strings_column_wrapper;
diff --git a/cpp/tests/replace/replace_tests.cpp b/cpp/tests/replace/replace_tests.cpp
index 92ccbbfbfd8..fe65fe0474a 100644
--- a/cpp/tests/replace/replace_tests.cpp
+++ b/cpp/tests/replace/replace_tests.cpp
@@ -31,11 +31,11 @@
 
 #include <thrust/iterator/transform_iterator.h>
 
-#include <gtest/gtest.h>
 #include <cstdlib>
+#include <cudf/types.hpp>
+#include <gtest/gtest.h>
 #include <iostream>
 #include <vector>
-#include "cudf/types.hpp"
 
 struct ReplaceErrorTest : public cudf::test::BaseFixture {
 };
diff --git a/cpp/tests/reshape/interleave_columns_tests.cpp b/cpp/tests/reshape/interleave_columns_tests.cpp
index fb8e5bdd01a..c682e4ab29f 100644
--- a/cpp/tests/reshape/interleave_columns_tests.cpp
+++ b/cpp/tests/reshape/interleave_columns_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/column/column_factories.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/iterator_utilities.hpp>
 #include <cudf_test/type_lists.hpp>
+#include <tests/strings/utilities.h>
 
 #include <cudf/reshape.hpp>
 
diff --git a/cpp/tests/reshape/tile_tests.cpp b/cpp/tests/reshape/tile_tests.cpp
index 48eb8919d23..e605fd7a84b 100644
--- a/cpp/tests/reshape/tile_tests.cpp
+++ b/cpp/tests/reshape/tile_tests.cpp
@@ -22,7 +22,7 @@
 
 #include <cudf/reshape.hpp>
 #include <cudf/table/table.hpp>
-#include "cudf/utilities/error.hpp"
+#include <cudf/utilities/error.hpp>
 
 using namespace cudf::test;
 
diff --git a/cpp/tests/scalar/scalar_device_view_test.cu b/cpp/tests/scalar/scalar_device_view_test.cu
index 984e591d19f..ee4c878726f 100644
--- a/cpp/tests/scalar/scalar_device_view_test.cu
+++ b/cpp/tests/scalar/scalar_device_view_test.cu
@@ -25,9 +25,9 @@
 #include <cudf_test/type_list_utilities.hpp>
 #include <cudf_test/type_lists.hpp>
 
-#include <thrust/sequence.h>
 #include <random>
-#include "rmm/cuda_stream_view.hpp"
+#include <rmm/cuda_stream_view.hpp>
+#include <thrust/sequence.h>
 
 template <typename T>
 struct TypedScalarDeviceViewTest : public cudf::test::BaseFixture {
diff --git a/cpp/tests/strings/booleans_tests.cpp b/cpp/tests/strings/booleans_tests.cpp
index 17b163a8690..cc637bf55a0 100644
--- a/cpp/tests/strings/booleans_tests.cpp
+++ b/cpp/tests/strings/booleans_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/convert/convert_booleans.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <thrust/iterator/transform_iterator.h>
 
diff --git a/cpp/tests/strings/case_tests.cpp b/cpp/tests/strings/case_tests.cpp
index a9d4c9c76b5..c399c640bb6 100644
--- a/cpp/tests/strings/case_tests.cpp
+++ b/cpp/tests/strings/case_tests.cpp
@@ -19,10 +19,10 @@
 #include <cudf/strings/case.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <thrust/iterator/transform_iterator.h>
 
diff --git a/cpp/tests/strings/combine/concatenate_tests.cpp b/cpp/tests/strings/combine/concatenate_tests.cpp
index be1dacd0b5d..569767531bc 100644
--- a/cpp/tests/strings/combine/concatenate_tests.cpp
+++ b/cpp/tests/strings/combine/concatenate_tests.cpp
@@ -21,10 +21,10 @@
 #include <cudf/table/table.hpp>
 #include <cudf/types.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <thrust/iterator/transform_iterator.h>
 
diff --git a/cpp/tests/strings/combine/join_strings_tests.cpp b/cpp/tests/strings/combine/join_strings_tests.cpp
index 552cd5b0f95..e018540e84c 100644
--- a/cpp/tests/strings/combine/join_strings_tests.cpp
+++ b/cpp/tests/strings/combine/join_strings_tests.cpp
@@ -20,10 +20,10 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/types.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <thrust/iterator/transform_iterator.h>
 
diff --git a/cpp/tests/strings/concatenate_tests.cpp b/cpp/tests/strings/concatenate_tests.cpp
index 74ec5b8bc08..0318fc3edb9 100644
--- a/cpp/tests/strings/concatenate_tests.cpp
+++ b/cpp/tests/strings/concatenate_tests.cpp
@@ -18,10 +18,10 @@
 #include <cudf/strings/detail/concatenate.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/contains_tests.cpp b/cpp/tests/strings/contains_tests.cpp
index 6f3896d7292..f95b282171f 100644
--- a/cpp/tests/strings/contains_tests.cpp
+++ b/cpp/tests/strings/contains_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/contains.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <algorithm>
 #include <vector>
diff --git a/cpp/tests/strings/datetime_tests.cpp b/cpp/tests/strings/datetime_tests.cpp
index 9a01d5dd041..9375a29a078 100644
--- a/cpp/tests/strings/datetime_tests.cpp
+++ b/cpp/tests/strings/datetime_tests.cpp
@@ -21,10 +21,10 @@
 #include <cudf/wrappers/durations.hpp>
 #include <cudf/wrappers/timestamps.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/durations_tests.cpp b/cpp/tests/strings/durations_tests.cpp
index 5dc30472471..523c64159f4 100644
--- a/cpp/tests/strings/durations_tests.cpp
+++ b/cpp/tests/strings/durations_tests.cpp
@@ -18,10 +18,10 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/wrappers/durations.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <thrust/iterator/transform_iterator.h>
 #include <vector>
diff --git a/cpp/tests/strings/extract_tests.cpp b/cpp/tests/strings/extract_tests.cpp
index bca5014a46c..824bf7deb34 100644
--- a/cpp/tests/strings/extract_tests.cpp
+++ b/cpp/tests/strings/extract_tests.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/extract.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/table/table_view.hpp>
@@ -22,6 +21,7 @@
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/factories_test.cu b/cpp/tests/strings/factories_test.cu
index 1d1a6074b08..38f905078a7 100644
--- a/cpp/tests/strings/factories_test.cu
+++ b/cpp/tests/strings/factories_test.cu
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/copying.hpp>
 #include <cudf/detail/utilities/vector_factories.hpp>
@@ -27,6 +26,7 @@
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
diff --git a/cpp/tests/strings/fill_tests.cpp b/cpp/tests/strings/fill_tests.cpp
index d35cc0e1acd..3952f02d5f3 100644
--- a/cpp/tests/strings/fill_tests.cpp
+++ b/cpp/tests/strings/fill_tests.cpp
@@ -19,10 +19,10 @@
 #include <cudf/strings/detail/fill.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/findall_tests.cpp b/cpp/tests/strings/findall_tests.cpp
index 561efa67d51..d7bf162d36f 100644
--- a/cpp/tests/strings/findall_tests.cpp
+++ b/cpp/tests/strings/findall_tests.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/findall.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/floats_tests.cpp b/cpp/tests/strings/floats_tests.cpp
index e6f4f6bb8d9..01dd19bf308 100644
--- a/cpp/tests/strings/floats_tests.cpp
+++ b/cpp/tests/strings/floats_tests.cpp
@@ -17,10 +17,10 @@
 #include <cudf/strings/convert/convert_floats.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/integers_tests.cpp b/cpp/tests/strings/integers_tests.cpp
index a9f9eacede4..81e45f2808e 100644
--- a/cpp/tests/strings/integers_tests.cpp
+++ b/cpp/tests/strings/integers_tests.cpp
@@ -17,12 +17,12 @@
 #include <cudf/strings/convert/convert_integers.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf/detail/utilities/vector_factories.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/type_lists.hpp>
+#include <tests/strings/utilities.h>
 
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
diff --git a/cpp/tests/strings/ipv4_tests.cpp b/cpp/tests/strings/ipv4_tests.cpp
index 30fa533725a..6abe9a55da1 100644
--- a/cpp/tests/strings/ipv4_tests.cpp
+++ b/cpp/tests/strings/ipv4_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/convert/convert_ipv4.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/pad_tests.cpp b/cpp/tests/strings/pad_tests.cpp
index f344b5432a2..a07f298b3af 100644
--- a/cpp/tests/strings/pad_tests.cpp
+++ b/cpp/tests/strings/pad_tests.cpp
@@ -21,10 +21,10 @@
 #include <cudf/strings/wrap.hpp>
 #include <cudf/utilities/error.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/replace_regex_tests.cpp b/cpp/tests/strings/replace_regex_tests.cpp
index fc1c20d8719..16308265a9b 100644
--- a/cpp/tests/strings/replace_regex_tests.cpp
+++ b/cpp/tests/strings/replace_regex_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/replace_re.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/replace_tests.cpp b/cpp/tests/strings/replace_tests.cpp
index 536cfc8daab..63a65e178c7 100644
--- a/cpp/tests/strings/replace_tests.cpp
+++ b/cpp/tests/strings/replace_tests.cpp
@@ -19,10 +19,10 @@
 #include <cudf/strings/replace.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
+#include "./utilities.h"
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
-#include "./utilities.h"
 
 #include <vector>
 
diff --git a/cpp/tests/strings/split_tests.cpp b/cpp/tests/strings/split_tests.cpp
index 53912faab69..de4e48fd70a 100644
--- a/cpp/tests/strings/split_tests.cpp
+++ b/cpp/tests/strings/split_tests.cpp
@@ -21,11 +21,11 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/table/table.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/table_utilities.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/strip_tests.cpp b/cpp/tests/strings/strip_tests.cpp
index 6297db6c87c..661444ff515 100644
--- a/cpp/tests/strings/strip_tests.cpp
+++ b/cpp/tests/strings/strip_tests.cpp
@@ -18,10 +18,10 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/strings/strip.hpp>
 
+#include "./utilities.h"
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
-#include "./utilities.h"
 
 #include <vector>
 
diff --git a/cpp/tests/strings/substring_tests.cpp b/cpp/tests/strings/substring_tests.cpp
index 448b61300fd..4fa4686e887 100644
--- a/cpp/tests/strings/substring_tests.cpp
+++ b/cpp/tests/strings/substring_tests.cpp
@@ -19,13 +19,13 @@
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf/strings/substring.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
-#include <thrust/sequence.h>
 #include <string>
+#include <thrust/sequence.h>
 #include <vector>
 
 struct StringsSubstringsTest : public cudf::test::BaseFixture {
diff --git a/cpp/tests/strings/translate_tests.cpp b/cpp/tests/strings/translate_tests.cpp
index 92daee46a7a..c516383b8a1 100644
--- a/cpp/tests/strings/translate_tests.cpp
+++ b/cpp/tests/strings/translate_tests.cpp
@@ -20,10 +20,10 @@
 #include <cudf/strings/translate.hpp>
 #include <cudf/utilities/error.hpp>
 
-#include <tests/strings/utilities.h>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <vector>
 
diff --git a/cpp/tests/strings/urls_tests.cpp b/cpp/tests/strings/urls_tests.cpp
index 6ac3e08b1e9..86c94a85025 100644
--- a/cpp/tests/strings/urls_tests.cpp
+++ b/cpp/tests/strings/urls_tests.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/strings/convert/convert_urls.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <random>
 #include <vector>
diff --git a/cpp/tests/text/ngrams_tests.cpp b/cpp/tests/text/ngrams_tests.cpp
index a9b631cb6ad..5c1e27eea3d 100644
--- a/cpp/tests/text/ngrams_tests.cpp
+++ b/cpp/tests/text/ngrams_tests.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <tests/strings/utilities.h>
 #include <cudf/column/column.hpp>
 #include <cudf/scalar/scalar.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 #include <cudf_test/base_fixture.hpp>
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/column_wrapper.hpp>
+#include <tests/strings/utilities.h>
 
 #include <nvtext/generate_ngrams.hpp>