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/include/cugraph/detail/graph_utils.cuh b/cpp/include/cugraph/detail/graph_utils.cuh
index d9ca3dbe03e..2d9ee2b2547 100644
--- a/cpp/include/cugraph/detail/graph_utils.cuh
+++ b/cpp/include/cugraph/detail/graph_utils.cuh
@@ -24,10 +24,10 @@
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cuco/detail/hash_functions.cuh>
 #include <thrust/sort.h>
 #include <thrust/tabulate.h>
 #include <thrust/transform.h>
-#include <cuco/detail/hash_functions.cuh>
 
 #include <algorithm>
 #include <numeric>
diff --git a/cpp/include/cugraph/legacy/graph.hpp b/cpp/include/cugraph/legacy/graph.hpp
index 4345fd225c1..62f192fa5f3 100644
--- a/cpp/include/cugraph/legacy/graph.hpp
+++ b/cpp/include/cugraph/legacy/graph.hpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 #pragma once
-#include <unistd.h>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
 #include <memory>
 #include <raft/handle.hpp>
 #include <rmm/device_buffer.hpp>
+#include <unistd.h>
 
 namespace cugraph {
 namespace legacy {
diff --git a/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh b/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh
index a25b8e2ecde..6251c269697 100644
--- a/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh
+++ b/cpp/include/cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh
@@ -28,12 +28,12 @@
 #include <raft/handle.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cub/cub.cuh>
 #include <thrust/distance.h>
 #include <thrust/functional.h>
 #include <thrust/transform_reduce.h>
 #include <thrust/tuple.h>
 #include <thrust/type_traits/integer_sequence.h>
-#include <cub/cub.cuh>
 
 #include <type_traits>
 #include <utility>
diff --git a/cpp/include/cugraph/prims/property_op_utils.cuh b/cpp/include/cugraph/prims/property_op_utils.cuh
index bd34e9b5be7..f61df807cdd 100644
--- a/cpp/include/cugraph/prims/property_op_utils.cuh
+++ b/cpp/include/cugraph/prims/property_op_utils.cuh
@@ -21,10 +21,10 @@
 #include <raft/comms/comms.hpp>
 #include <raft/device_atomics.cuh>
 
+#include <cub/cub.cuh>
 #include <thrust/detail/type_traits/iterator/is_discard_iterator.h>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/tuple.h>
-#include <cub/cub.cuh>
 
 #include <array>
 #include <type_traits>
diff --git a/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh b/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh
index a1004a76c63..e6248190c2c 100644
--- a/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh
+++ b/cpp/include/cugraph/prims/update_frontier_v_push_if_out_nbr.cuh
@@ -33,6 +33,7 @@
 #include <rmm/device_scalar.hpp>
 #include <rmm/exec_policy.hpp>
 
+#include <cub/cub.cuh>
 #include <thrust/binary_search.h>
 #include <thrust/distance.h>
 #include <thrust/functional.h>
@@ -41,7 +42,6 @@
 #include <thrust/transform_reduce.h>
 #include <thrust/tuple.h>
 #include <thrust/type_traits/integer_sequence.h>
-#include <cub/cub.cuh>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh b/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh
index eb1a095bc90..7321fe12f9b 100644
--- a/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh
+++ b/cpp/include/cugraph/utilities/thrust_tuple_utils.cuh
@@ -19,9 +19,9 @@
 #include <raft/device_atomics.cuh>
 #include <rmm/device_uvector.hpp>
 
+#include <cub/cub.cuh>
 #include <thrust/iterator/discard_iterator.h>
 #include <thrust/tuple.h>
-#include <cub/cub.cuh>
 
 #include <array>
 #include <type_traits>
diff --git a/cpp/include/cugraph/visitors/cascaded_dispatch.hpp b/cpp/include/cugraph/visitors/cascaded_dispatch.hpp
old mode 100755
new mode 100644
index 4af2a4320fe..53d861e26c4
--- a/cpp/include/cugraph/visitors/cascaded_dispatch.hpp
+++ b/cpp/include/cugraph/visitors/cascaded_dispatch.hpp
@@ -31,8 +31,8 @@
 #include "enum_mapping.hpp"
 #include "graph_enum_mapping.hpp"
 
-#include <cugraph/utilities/graph_traits.hpp>
 #include "graph_factory.hpp"
+#include <cugraph/utilities/graph_traits.hpp>
 
 namespace cugraph {
 namespace visitors {
diff --git a/cpp/include/cugraph/visitors/graph_enum_mapping.hpp b/cpp/include/cugraph/visitors/graph_enum_mapping.hpp
old mode 100755
new mode 100644
index 74eec6c3840..7aaa0f9b856
--- a/cpp/include/cugraph/visitors/graph_enum_mapping.hpp
+++ b/cpp/include/cugraph/visitors/graph_enum_mapping.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <cugraph/graph.hpp>
 #include "graph_enum.hpp"
+#include <cugraph/graph.hpp>
 
 namespace cugraph {
 namespace visitors {
diff --git a/cpp/src/c_api/cugraph_api.cpp b/cpp/src/c_api/cugraph_api.cpp
index f93b3e23da6..dc81223f8fe 100644
--- a/cpp/src/c_api/cugraph_api.cpp
+++ b/cpp/src/c_api/cugraph_api.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <cugraph_c/cugraph_api.h>
 #include <cugraph/api_helpers.hpp>
+#include <cugraph_c/cugraph_api.h>
 
 #include <cugraph/visitors/rw_visitor.hpp>
 
diff --git a/cpp/src/c_api/error.cpp b/cpp/src/c_api/error.cpp
index b9545b1ae2e..21cd3344e14 100644
--- a/cpp/src/c_api/error.cpp
+++ b/cpp/src/c_api/error.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <cugraph_c/error.h>
 #include <c_api/error.hpp>
+#include <cugraph_c/error.h>
 
 extern "C" const char* cugraph_error_message(const cugraph_error_t* error)
 {
diff --git a/cpp/src/c_api/graph.hpp b/cpp/src/c_api/graph.hpp
index 8c20fa54a14..188f3bee727 100644
--- a/cpp/src/c_api/graph.hpp
+++ b/cpp/src/c_api/graph.hpp
@@ -15,9 +15,9 @@
  */
 #pragma once
 
-#include <cugraph_c/graph.h>
 #include <c_api/array.hpp>
 #include <c_api/error.hpp>
+#include <cugraph_c/graph.h>
 
 #include <cugraph/graph.hpp>
 
diff --git a/cpp/src/c_api/graph_sg.cpp b/cpp/src/c_api/graph_sg.cpp
index e32c0e6b94e..e51e94edeeb 100644
--- a/cpp/src/c_api/graph_sg.cpp
+++ b/cpp/src/c_api/graph_sg.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
+#include <cugraph/detail/utility_wrappers.hpp>
+#include <cugraph/graph_functions.hpp>
+#include <cugraph/visitors/generic_cascaded_dispatch.hpp>
 #include <cugraph_c/graph.h>
+
 #include <c_api/abstract_functor.hpp>
 #include <c_api/array.hpp>
 #include <c_api/error.hpp>
 #include <c_api/graph.hpp>
 
-#include <cugraph/detail/utility_wrappers.hpp>
-#include <cugraph/graph_functions.hpp>
-#include <cugraph/visitors/generic_cascaded_dispatch.hpp>
-
 #include <raft/handle.hpp>
 
 namespace cugraph {
diff --git a/cpp/src/centrality/betweenness_centrality.cu b/cpp/src/centrality/betweenness_centrality.cu
index 927850769cb..dd1a398ea01 100644
--- a/cpp/src/centrality/betweenness_centrality.cu
+++ b/cpp/src/centrality/betweenness_centrality.cu
@@ -27,9 +27,9 @@
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_vector.hpp>
 
-#include <raft/handle.hpp>
 #include "betweenness_centrality.cuh"
 #include "betweenness_centrality_kernels.cuh"
+#include <raft/handle.hpp>
 
 namespace cugraph {
 namespace detail {
diff --git a/cpp/src/community/legacy/ecg.cu b/cpp/src/community/legacy/ecg.cu
index 40a2ae27b5b..ad63720a0fc 100644
--- a/cpp/src/community/legacy/ecg.cu
+++ b/cpp/src/community/legacy/ecg.cu
@@ -20,8 +20,8 @@
 #include <cugraph/utilities/error.hpp>
 #include <utilities/graph_utils.cuh>
 
-#include <thrust/random.h>
 #include <rmm/exec_policy.hpp>
+#include <thrust/random.h>
 
 #include <ctime>
 
diff --git a/cpp/src/community/legacy/egonet.cu b/cpp/src/community/legacy/egonet.cu
index b4cfd51100d..9fde94bf272 100644
--- a/cpp/src/community/legacy/egonet.cu
+++ b/cpp/src/community/legacy/egonet.cu
@@ -25,8 +25,8 @@
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 
-#include <thrust/transform.h>
 #include <ctime>
+#include <thrust/transform.h>
 
 #include <cugraph/legacy/graph.hpp>
 
diff --git a/cpp/src/community/legacy/ktruss.cu b/cpp/src/community/legacy/ktruss.cu
index 2216278add8..74a871adb01 100644
--- a/cpp/src/community/legacy/ktruss.cu
+++ b/cpp/src/community/legacy/ktruss.cu
@@ -23,10 +23,10 @@
 
 #include <cugraph/utilities/error.hpp>
 
+#include "Static/KTruss/KTruss.cuh"
 #include <Hornet.hpp>
 #include <StandardAPI.hpp>
 #include <cugraph/algorithms.hpp>
-#include "Static/KTruss/KTruss.cuh"
 
 using namespace hornets_nest;
 
diff --git a/cpp/src/community/legacy/spectral_clustering.cu b/cpp/src/community/legacy/spectral_clustering.cu
index 8534665530b..631348f3826 100644
--- a/cpp/src/community/legacy/spectral_clustering.cu
+++ b/cpp/src/community/legacy/spectral_clustering.cu
@@ -22,10 +22,10 @@
 
 #include <cugraph/algorithms.hpp>
 
-#include <thrust/transform.h>
 #include <ctime>
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
+#include <thrust/transform.h>
 
 #include <cugraph/legacy/graph.hpp>
 #include <cugraph/utilities/error.hpp>
diff --git a/cpp/src/community/legacy/triangles_counting.cu b/cpp/src/community/legacy/triangles_counting.cu
index e4fe6f09a1b..aeb76c6e15a 100644
--- a/cpp/src/community/legacy/triangles_counting.cu
+++ b/cpp/src/community/legacy/triangles_counting.cu
@@ -16,10 +16,10 @@
 
 #include <cuda_runtime.h>
 
-#include <raft/cudart_utils.h>
 #include <cugraph/algorithms.hpp>
 #include <cugraph/legacy/graph.hpp>
 #include <cugraph/utilities/error.hpp>
+#include <raft/cudart_utils.h>
 #include <rmm/device_buffer.hpp>
 #include <rmm/device_vector.hpp>
 
diff --git a/cpp/src/components/utils.h b/cpp/src/components/utils.h
index 4e7dbe075da..964eb750f6d 100644
--- a/cpp/src/components/utils.h
+++ b/cpp/src/components/utils.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <cstdio>
 #include <cuda_runtime.h>
 #include <execinfo.h>
-#include <cstdio>
 #include <iostream>
 #include <memory>
 #include <sstream>
diff --git a/cpp/src/components/weak_cc.cuh b/cpp/src/components/weak_cc.cuh
index 6ae1e8d096c..0f459ac4531 100644
--- a/cpp/src/components/weak_cc.cuh
+++ b/cpp/src/components/weak_cc.cuh
@@ -28,8 +28,8 @@
 #include <raft/cudart_utils.h>
 #include <raft/device_atomics.cuh>
 
-#include <rmm/device_vector.hpp>
 #include "utils.h"
+#include <rmm/device_vector.hpp>
 
 namespace MLCommon {
 
diff --git a/cpp/src/converters/COOtoCSR.cu b/cpp/src/converters/COOtoCSR.cu
index 49986810539..904b2856c49 100644
--- a/cpp/src/converters/COOtoCSR.cu
+++ b/cpp/src/converters/COOtoCSR.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <cugraph/functions.hpp>
 #include "COOtoCSR.cuh"
+#include <cugraph/functions.hpp>
 
 namespace cugraph {
 
diff --git a/cpp/src/converters/COOtoCSR.cuh b/cpp/src/converters/COOtoCSR.cuh
index a790782be11..ec208dbf4f0 100644
--- a/cpp/src/converters/COOtoCSR.cuh
+++ b/cpp/src/converters/COOtoCSR.cuh
@@ -22,12 +22,12 @@
 
 #pragma once
 
+#include <algorithm>
 #include <thrust/extrema.h>
 #include <thrust/iterator/zip_iterator.h>
 #include <thrust/scan.h>
 #include <thrust/sort.h>
 #include <thrust/tuple.h>
-#include <algorithm>
 
 #include <cugraph/utilities/error.hpp>
 #include <rmm/exec_policy.hpp>
diff --git a/cpp/src/converters/permute_graph.cuh b/cpp/src/converters/permute_graph.cuh
index cbff8ad3f7c..77ce3caf056 100644
--- a/cpp/src/converters/permute_graph.cuh
+++ b/cpp/src/converters/permute_graph.cuh
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "converters/COOtoCSR.cuh"
 #include <cugraph/legacy/graph.hpp>
 #include <cugraph/utilities/error.hpp>
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
 #include <utilities/graph_utils.cuh>
-#include "converters/COOtoCSR.cuh"
 
 namespace cugraph {
 namespace detail {
diff --git a/cpp/src/detail/utility_wrappers.cu b/cpp/src/detail/utility_wrappers.cu
index 73c4bbaedc3..85ccbcad3bc 100644
--- a/cpp/src/detail/utility_wrappers.cu
+++ b/cpp/src/detail/utility_wrappers.cu
@@ -17,8 +17,8 @@
 
 #include <raft/random/rng.hpp>
 
-#include <thrust/sequence.h>
 #include <rmm/exec_policy.hpp>
+#include <thrust/sequence.h>
 
 namespace cugraph {
 namespace detail {
diff --git a/cpp/src/sampling/random_walks.cu b/cpp/src/sampling/random_walks.cu
index 7526f1b7674..8136e3b6185 100644
--- a/cpp/src/sampling/random_walks.cu
+++ b/cpp/src/sampling/random_walks.cu
@@ -16,8 +16,8 @@
 
 // Andrei Schaffer, aschaffer@nvidia.com
 //
-#include <cugraph/algorithms.hpp>
 #include "random_walks.cuh"
+#include <cugraph/algorithms.hpp>
 
 namespace cugraph {
 // template explicit instantiation directives (EIDir's):
diff --git a/cpp/src/traversal/legacy/bfs.cu b/cpp/src/traversal/legacy/bfs.cu
index 74a94ba0670..8ded72e68f4 100644
--- a/cpp/src/traversal/legacy/bfs.cu
+++ b/cpp/src/traversal/legacy/bfs.cu
@@ -9,19 +9,19 @@
  *
  */
 
+#include "bfs.cuh"
 #include <algorithm>
 #include <iomanip>
 #include <limits>
-#include "bfs.cuh"
 
 #include <cugraph/legacy/graph.hpp>
 
-#include <cugraph/utilities/error.hpp>
-#include <utilities/graph_utils.cuh>
 #include "bfs_kernels.cuh"
 #include "mg/bfs.cuh"
 #include "mg/common_utils.cuh"
 #include "traversal_common.cuh"
+#include <cugraph/utilities/error.hpp>
+#include <utilities/graph_utils.cuh>
 
 namespace cugraph {
 namespace detail {
diff --git a/cpp/src/traversal/legacy/bfs_kernels.cuh b/cpp/src/traversal/legacy/bfs_kernels.cuh
index 4e482b446ba..de04be3ff86 100644
--- a/cpp/src/traversal/legacy/bfs_kernels.cuh
+++ b/cpp/src/traversal/legacy/bfs_kernels.cuh
@@ -15,11 +15,11 @@
  */
 #include <iostream>
 
-#include <raft/cudart_utils.h>
 #include <cub/cub.cuh>
+#include <raft/cudart_utils.h>
 
-#include <cugraph/legacy/graph.hpp>
 #include "traversal_common.cuh"
+#include <cugraph/legacy/graph.hpp>
 
 namespace cugraph {
 namespace detail {
diff --git a/cpp/src/traversal/legacy/mg/bfs.cuh b/cpp/src/traversal/legacy/mg/bfs.cuh
index 5e53ea78e04..300916c5d55 100644
--- a/cpp/src/traversal/legacy/mg/bfs.cuh
+++ b/cpp/src/traversal/legacy/mg/bfs.cuh
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include <raft/handle.hpp>
-#include <rmm/device_vector.hpp>
 #include "../traversal_common.cuh"
 #include "common_utils.cuh"
 #include "frontier_expand.cuh"
+#include <raft/handle.hpp>
+#include <rmm/device_vector.hpp>
 
 namespace cugraph {
 
diff --git a/cpp/src/traversal/legacy/mg/common_utils.cuh b/cpp/src/traversal/legacy/mg/common_utils.cuh
index ad3c6b71659..2b159703dba 100644
--- a/cpp/src/traversal/legacy/mg/common_utils.cuh
+++ b/cpp/src/traversal/legacy/mg/common_utils.cuh
@@ -18,14 +18,14 @@
 
 #include "../traversal_common.cuh"
 
-#include <thrust/host_vector.h>
 #include <cub/cub.cuh>
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
+#include <thrust/host_vector.h>
 
 #include <raft/cudart_utils.h>
-#include <raft/integer_utils.h>
 #include <raft/handle.hpp>
+#include <raft/integer_utils.h>
 
 namespace cugraph {
 
diff --git a/cpp/src/traversal/legacy/mg/frontier_expand.cuh b/cpp/src/traversal/legacy/mg/frontier_expand.cuh
index 8390dbaf5e3..22cecf22549 100644
--- a/cpp/src/traversal/legacy/mg/frontier_expand.cuh
+++ b/cpp/src/traversal/legacy/mg/frontier_expand.cuh
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <cugraph/legacy/graph.hpp>
-#include <rmm/device_vector.hpp>
 #include "frontier_expand_kernels.cuh"
 #include "vertex_binning.cuh"
+#include <cugraph/legacy/graph.hpp>
+#include <rmm/device_vector.hpp>
 
 namespace cugraph {
 
diff --git a/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh b/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh
index 32b9310f02f..f451b980dee 100644
--- a/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh
+++ b/cpp/src/traversal/legacy/mg/frontier_expand_kernels.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <cugraph/legacy/graph.hpp>
 #include "vertex_binning.cuh"
+#include <cugraph/legacy/graph.hpp>
 
 namespace cugraph {
 
diff --git a/cpp/src/traversal/legacy/mg/vertex_binning.cuh b/cpp/src/traversal/legacy/mg/vertex_binning.cuh
index 22973f6d1a9..7c8384c5810 100644
--- a/cpp/src/traversal/legacy/mg/vertex_binning.cuh
+++ b/cpp/src/traversal/legacy/mg/vertex_binning.cuh
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <rmm/device_vector.hpp>
 #include "common_utils.cuh"
 #include "vertex_binning_kernels.cuh"
+#include <rmm/device_vector.hpp>
 
 #include <thrust/host_vector.h>
 
diff --git a/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh b/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh
index 6af2df61f14..534e23d83a4 100644
--- a/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh
+++ b/cpp/src/traversal/legacy/mg/vertex_binning_kernels.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <rmm/device_vector.hpp>
 #include "../traversal_common.cuh"
+#include <rmm/device_vector.hpp>
 
 namespace cugraph {
 
diff --git a/cpp/src/traversal/legacy/sssp_kernels.cuh b/cpp/src/traversal/legacy/sssp_kernels.cuh
index d1cf9980773..38c88e04c0b 100644
--- a/cpp/src/traversal/legacy/sssp_kernels.cuh
+++ b/cpp/src/traversal/legacy/sssp_kernels.cuh
@@ -18,9 +18,9 @@
 
 #include <iostream>
 
+#include "traversal_common.cuh"
 #include <cub/cub.cuh>
 #include <cugraph/utilities/error.hpp>
-#include "traversal_common.cuh"
 namespace cugraph {
 namespace detail {
 namespace sssp_kernels {
diff --git a/cpp/src/traversal/two_hop_neighbors.cu b/cpp/src/traversal/two_hop_neighbors.cu
index c6ef012b1d3..c7050536247 100644
--- a/cpp/src/traversal/two_hop_neighbors.cu
+++ b/cpp/src/traversal/two_hop_neighbors.cu
@@ -19,12 +19,12 @@
  * @file two_hop_neighbors.cu
  * ---------------------------------------------------------------------------**/
 
+#include "two_hop_neighbors.cuh"
 #include <cugraph/algorithms.hpp>
 #include <cugraph/legacy/graph.hpp>
 #include <cugraph/utilities/error.hpp>
 #include <rmm/device_vector.hpp>
 #include <rmm/exec_policy.hpp>
-#include "two_hop_neighbors.cuh"
 
 #include <thrust/scan.h>
 #include <thrust/transform.h>
diff --git a/cpp/src/tree/mst.cu b/cpp/src/tree/mst.cu
index e1c22fb87da..8a4f1c7dc1e 100644
--- a/cpp/src/tree/mst.cu
+++ b/cpp/src/tree/mst.cu
@@ -24,9 +24,9 @@
 #include <memory>
 #include <utility>
 
-#include <thrust/transform.h>
 #include <ctime>
 #include <rmm/exec_policy.hpp>
+#include <thrust/transform.h>
 
 #include <cugraph/legacy/graph.hpp>
 #include <cugraph/utilities/error.hpp>
diff --git a/cpp/src/utilities/spmv_1D.cu b/cpp/src/utilities/spmv_1D.cu
index b4db219fb89..0309100950f 100644
--- a/cpp/src/utilities/spmv_1D.cu
+++ b/cpp/src/utilities/spmv_1D.cu
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <raft/spectral/matrix_wrappers.hpp>
 #include "spmv_1D.cuh"
+#include <raft/spectral/matrix_wrappers.hpp>
 
 namespace cugraph {
 namespace mg {
diff --git a/cpp/tests/bcast/mg_graph_bcast.cpp b/cpp/tests/bcast/mg_graph_bcast.cpp
index e952eb31848..0eadedf808b 100644
--- a/cpp/tests/bcast/mg_graph_bcast.cpp
+++ b/cpp/tests/bcast/mg_graph_bcast.cpp
@@ -23,9 +23,9 @@
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/partition_manager.hpp>
 
-#include <raft/cudart_utils.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
 
 #include <gtest/gtest.h>
diff --git a/cpp/tests/centrality/katz_centrality_test.cpp b/cpp/tests/centrality/katz_centrality_test.cpp
index 826fc3cd473..2f85d1da43d 100644
--- a/cpp/tests/centrality/katz_centrality_test.cpp
+++ b/cpp/tests/centrality/katz_centrality_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/centrality/legacy/katz_centrality_test.cu b/cpp/tests/centrality/legacy/katz_centrality_test.cu
index e9d3f8d7a69..e66eaef193d 100644
--- a/cpp/tests/centrality/legacy/katz_centrality_test.cu
+++ b/cpp/tests/centrality/legacy/katz_centrality_test.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <converters/COOtoCSR.cuh>
diff --git a/cpp/tests/centrality/mg_katz_centrality_test.cpp b/cpp/tests/centrality/mg_katz_centrality_test.cpp
index d78544a1805..bf6c2e2c17b 100644
--- a/cpp/tests/centrality/mg_katz_centrality_test.cpp
+++ b/cpp/tests/centrality/mg_katz_centrality_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/community/egonet_test.cu b/cpp/tests/community/egonet_test.cu
index c9aba9f640b..c0f1ec38dc5 100644
--- a/cpp/tests/community/egonet_test.cu
+++ b/cpp/tests/community/egonet_test.cu
@@ -29,8 +29,8 @@
 
 #include <gtest/gtest.h>
 
-#include <raft/cudart_utils.h>
 #include <algorithm>
+#include <raft/cudart_utils.h>
 #include <rmm/exec_policy.hpp>
 #include <tuple>
 #include <vector>
diff --git a/cpp/tests/community/mg_louvain_test.cpp b/cpp/tests/community/mg_louvain_test.cpp
index 1c7e0b1de84..9acca9a88ae 100644
--- a/cpp/tests/community/mg_louvain_test.cpp
+++ b/cpp/tests/community/mg_louvain_test.cpp
@@ -24,9 +24,9 @@
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/partition_manager.hpp>
 
-#include <raft/cudart_utils.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
+#include <raft/cudart_utils.h>
 #include <raft/handle.hpp>
 
 #include <thrust/execution_policy.h>
diff --git a/cpp/tests/components/con_comp_test.cu b/cpp/tests/components/con_comp_test.cu
index 97758058adc..9cbb8e63775 100644
--- a/cpp/tests/components/con_comp_test.cu
+++ b/cpp/tests/components/con_comp_test.cu
@@ -12,8 +12,8 @@
 // connected components tests
 // Author: Andrei Schaffer aschaffer@nvidia.com
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cuda_profiler_api.h>
diff --git a/cpp/tests/components/mg_weakly_connected_components_test.cpp b/cpp/tests/components/mg_weakly_connected_components_test.cpp
index 7187477cf7d..d02b8dcbd9c 100644
--- a/cpp/tests/components/mg_weakly_connected_components_test.cpp
+++ b/cpp/tests/components/mg_weakly_connected_components_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/thrust_wrapper.hpp>
 
diff --git a/cpp/tests/components/scc_test.cu b/cpp/tests/components/scc_test.cu
index 1a0d22cdb26..beb78b21ba7 100644
--- a/cpp/tests/components/scc_test.cu
+++ b/cpp/tests/components/scc_test.cu
@@ -12,8 +12,8 @@
 // strongly connected components tests
 // Author: Andrei Schaffer aschaffer@nvidia.com
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <rmm/device_vector.hpp>
diff --git a/cpp/tests/components/weakly_connected_components_test.cpp b/cpp/tests/components/weakly_connected_components_test.cpp
index 9022c913ff3..53290084101 100644
--- a/cpp/tests/components/weakly_connected_components_test.cpp
+++ b/cpp/tests/components/weakly_connected_components_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/thrust_wrapper.hpp>
 
diff --git a/cpp/tests/cores/core_number_test.cpp b/cpp/tests/cores/core_number_test.cpp
index dd1d2c5c908..75fa7188944 100644
--- a/cpp/tests/cores/core_number_test.cpp
+++ b/cpp/tests/cores/core_number_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/cores/mg_core_number_test.cpp b/cpp/tests/cores/mg_core_number_test.cpp
index 675d4deea39..dfd4c692295 100644
--- a/cpp/tests/cores/mg_core_number_test.cpp
+++ b/cpp/tests/cores/mg_core_number_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/layout/force_atlas2_test.cu b/cpp/tests/layout/force_atlas2_test.cu
index 6f02a5dace9..2d9da885661 100644
--- a/cpp/tests/layout/force_atlas2_test.cu
+++ b/cpp/tests/layout/force_atlas2_test.cu
@@ -12,13 +12,13 @@
 // Force_Atlas2 tests
 // Author: Hugo Linsenmaier hlinsenmaier@nvidia.com
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
-#include <layout/trust_worthiness.h>
 #include <cugraph/algorithms.hpp>
 #include <cugraph/legacy/graph.hpp>
+#include <layout/trust_worthiness.h>
 
 #include <raft/error.hpp>
 #include <rmm/exec_policy.hpp>
diff --git a/cpp/tests/link_analysis/hits_test.cpp b/cpp/tests/link_analysis/hits_test.cpp
index b5c2159fdb4..9b446183383 100644
--- a/cpp/tests/link_analysis/hits_test.cpp
+++ b/cpp/tests/link_analysis/hits_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -32,15 +32,15 @@
 
 #include <gtest/gtest.h>
 
-#include <thrust/execution_policy.h>
-#include <thrust/host_vector.h>
-#include <thrust/iterator/constant_iterator.h>
-#include <thrust/sort.h>
 #include <algorithm>
 #include <iterator>
 #include <limits>
 #include <numeric>
 #include <random>
+#include <thrust/execution_policy.h>
+#include <thrust/host_vector.h>
+#include <thrust/iterator/constant_iterator.h>
+#include <thrust/sort.h>
 #include <vector>
 
 template <typename result_t, typename vertex_t, typename edge_t>
diff --git a/cpp/tests/link_analysis/mg_hits_test.cpp b/cpp/tests/link_analysis/mg_hits_test.cpp
index 7499a75f9ce..0f0aeb5fc4d 100644
--- a/cpp/tests/link_analysis/mg_hits_test.cpp
+++ b/cpp/tests/link_analysis/mg_hits_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/link_analysis/mg_pagerank_test.cpp b/cpp/tests/link_analysis/mg_pagerank_test.cpp
index d3ecde31c7b..7f6b3aedfc7 100644
--- a/cpp/tests/link_analysis/mg_pagerank_test.cpp
+++ b/cpp/tests/link_analysis/mg_pagerank_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/link_analysis/pagerank_test.cpp b/cpp/tests/link_analysis/pagerank_test.cpp
index ed610fdc795..3aa44cd5bed 100644
--- a/cpp/tests/link_analysis/pagerank_test.cpp
+++ b/cpp/tests/link_analysis/pagerank_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu b/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu
index 739ace26734..e560f4ca524 100644
--- a/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu
+++ b/cpp/tests/prims/mg_copy_v_transform_reduce_inout_nbr.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -32,14 +32,14 @@
 #include <cugraph/prims/copy_v_transform_reduce_in_out_nbr.cuh>
 #include <cugraph/prims/row_col_properties.cuh>
 
-#include <thrust/count.h>
-#include <thrust/equal.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 #include <sstream>
+#include <thrust/count.h>
+#include <thrust/equal.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_count_if_e.cu b/cpp/tests/prims/mg_count_if_e.cu
index 202352bfc9d..66791c51e56 100644
--- a/cpp/tests/prims/mg_count_if_e.cu
+++ b/cpp/tests/prims/mg_count_if_e.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -32,12 +32,12 @@
 #include <cugraph/prims/count_if_e.cuh>
 #include <cugraph/prims/row_col_properties.cuh>
 
-#include <thrust/count.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/count.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_count_if_v.cu b/cpp/tests/prims/mg_count_if_v.cu
index dc68de0810c..c685af7a455 100644
--- a/cpp/tests/prims/mg_count_if_v.cu
+++ b/cpp/tests/prims/mg_count_if_v.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -28,12 +28,12 @@
 #include <cugraph/graph_view.hpp>
 #include <cugraph/prims/count_if_v.cuh>
 
-#include <thrust/count.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/count.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_extract_if_e.cu b/cpp/tests/prims/mg_extract_if_e.cu
index 5cacfeee4ca..ed4c83c798f 100644
--- a/cpp/tests/prims/mg_extract_if_e.cu
+++ b/cpp/tests/prims/mg_extract_if_e.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -30,13 +30,13 @@
 #include <cugraph/prims/extract_if_e.cuh>
 #include <cugraph/prims/property_op_utils.cuh>
 
-#include <thrust/equal.h>
-#include <thrust/reduce.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/equal.h>
+#include <thrust/reduce.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_reduce_v.cu b/cpp/tests/prims/mg_reduce_v.cu
index 1bdc8fb1366..58ef5450b5c 100644
--- a/cpp/tests/prims/mg_reduce_v.cu
+++ b/cpp/tests/prims/mg_reduce_v.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -29,12 +29,12 @@
 #include <cugraph/prims/property_op_utils.cuh>
 #include <cugraph/prims/reduce_v.cuh>
 
-#include <thrust/reduce.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/reduce.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_transform_reduce_e.cu b/cpp/tests/prims/mg_transform_reduce_e.cu
index 8382cc0fece..e25f006ada9 100644
--- a/cpp/tests/prims/mg_transform_reduce_e.cu
+++ b/cpp/tests/prims/mg_transform_reduce_e.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -32,12 +32,12 @@
 #include <cugraph/prims/row_col_properties.cuh>
 #include <cugraph/prims/transform_reduce_e.cuh>
 
-#include <thrust/count.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/count.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_transform_reduce_v.cu b/cpp/tests/prims/mg_transform_reduce_v.cu
index f33fc97ee09..99fbc920ce3 100644
--- a/cpp/tests/prims/mg_transform_reduce_v.cu
+++ b/cpp/tests/prims/mg_transform_reduce_v.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -28,12 +28,12 @@
 #include <cugraph/graph_view.hpp>
 #include <cugraph/prims/transform_reduce_v.cuh>
 
-#include <thrust/count.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/count.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu b/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu
index 0fb2880bae6..610e793eb61 100644
--- a/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu
+++ b/cpp/tests/prims/mg_update_frontier_v_push_if_out_nbr.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
@@ -33,16 +33,16 @@
 #include <cugraph/prims/update_frontier_v_push_if_out_nbr.cuh>
 #include <cugraph/prims/vertex_frontier.cuh>
 
-#include <thrust/copy.h>
-#include <thrust/count.h>
-#include <thrust/equal.h>
-#include <thrust/iterator/permutation_iterator.h>
 #include <raft/comms/comms.hpp>
 #include <raft/comms/mpi_comms.hpp>
 #include <raft/handle.hpp>
 #include <rmm/device_scalar.hpp>
 #include <rmm/device_uvector.hpp>
 #include <sstream>
+#include <thrust/copy.h>
+#include <thrust/count.h>
+#include <thrust/equal.h>
+#include <thrust/iterator/permutation_iterator.h>
 
 #include <gtest/gtest.h>
 
diff --git a/cpp/tests/sampling/random_walks_test.cu b/cpp/tests/sampling/random_walks_test.cu
index 9dcec44be40..33fd67cfc44 100644
--- a/cpp/tests/sampling/random_walks_test.cu
+++ b/cpp/tests/sampling/random_walks_test.cu
@@ -20,8 +20,8 @@
 #include <utilities/base_fixture.hpp>
 #include <utilities/test_utilities.hpp>
 
-#include <thrust/random.h>
 #include <rmm/exec_policy.hpp>
+#include <thrust/random.h>
 
 #include <cugraph/algorithms.hpp>
 #include <sampling/random_walks.cuh>
diff --git a/cpp/tests/sampling/rw_low_level_test.cu b/cpp/tests/sampling/rw_low_level_test.cu
index 717a03a38e0..a0a7b2b1d79 100644
--- a/cpp/tests/sampling/rw_low_level_test.cu
+++ b/cpp/tests/sampling/rw_low_level_test.cu
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
 #include "cuda_profiler_api.h"
+#include <gtest/gtest.h>
 
 #include <topology/topology.cuh>
 #include <utilities/base_fixture.hpp>
 #include <utilities/test_utilities.hpp>
 
-#include <thrust/random.h>
 #include <rmm/exec_policy.hpp>
+#include <thrust/random.h>
 
 #include <cugraph/algorithms.hpp>
 #include <sampling/random_walks.cuh>
diff --git a/cpp/tests/serialization/un_serialize_test.cpp b/cpp/tests/serialization/un_serialize_test.cpp
index d1a08818978..6b4ca95d135 100644
--- a/cpp/tests/serialization/un_serialize_test.cpp
+++ b/cpp/tests/serialization/un_serialize_test.cpp
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gtest/gtest.h>
 #include "cuda_profiler_api.h"
+#include <gtest/gtest.h>
 
 #include <utilities/base_fixture.hpp>
 #include <utilities/test_utilities.hpp>
diff --git a/cpp/tests/structure/coarsen_graph_test.cpp b/cpp/tests/structure/coarsen_graph_test.cpp
index 08fc7815b1f..22bb1df3c83 100644
--- a/cpp/tests/structure/coarsen_graph_test.cpp
+++ b/cpp/tests/structure/coarsen_graph_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cugraph/algorithms.hpp>
diff --git a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp
index 60aac430a06..dec645a9e51 100644
--- a/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp
+++ b/cpp/tests/structure/count_self_loops_and_multi_edges_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp
index adea1e01acc..289ec69e9ac 100644
--- a/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp
+++ b/cpp/tests/structure/mg_count_self_loops_and_multi_edges_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/mg_symmetrize_test.cpp b/cpp/tests/structure/mg_symmetrize_test.cpp
index ccf38af4705..0c595d14cf3 100644
--- a/cpp/tests/structure/mg_symmetrize_test.cpp
+++ b/cpp/tests/structure/mg_symmetrize_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/mg_transpose_storage_test.cpp b/cpp/tests/structure/mg_transpose_storage_test.cpp
index c2a66269423..1bee1ca2bfc 100644
--- a/cpp/tests/structure/mg_transpose_storage_test.cpp
+++ b/cpp/tests/structure/mg_transpose_storage_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/mg_transpose_test.cpp b/cpp/tests/structure/mg_transpose_test.cpp
index f32a2770b38..bd3adc92189 100644
--- a/cpp/tests/structure/mg_transpose_test.cpp
+++ b/cpp/tests/structure/mg_transpose_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/renumbering_test.cpp b/cpp/tests/structure/renumbering_test.cpp
index a42a99f83e2..76503208d79 100644
--- a/cpp/tests/structure/renumbering_test.cpp
+++ b/cpp/tests/structure/renumbering_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/structure/streams.cu b/cpp/tests/structure/streams.cu
index 3390daa6575..9f9510abb78 100644
--- a/cpp/tests/structure/streams.cu
+++ b/cpp/tests/structure/streams.cu
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include "gtest/gtest.h"
 #include <raft/cudart_utils.h>
-#include <thrust/transform.h>
 #include <raft/handle.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>
 #include <rmm/mr/device/cuda_memory_resource.hpp>
-#include "gtest/gtest.h"
+#include <thrust/transform.h>
 struct StreamTest : public ::testing::Test {
 };
 TEST_F(StreamTest, basic_test)
diff --git a/cpp/tests/structure/symmetrize_test.cpp b/cpp/tests/structure/symmetrize_test.cpp
index f89bec6ad34..f5bff02ceaa 100644
--- a/cpp/tests/structure/symmetrize_test.cpp
+++ b/cpp/tests/structure/symmetrize_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cugraph/graph.hpp>
diff --git a/cpp/tests/structure/transpose_storage_test.cpp b/cpp/tests/structure/transpose_storage_test.cpp
index ad56fe095b8..024f4e1e1f6 100644
--- a/cpp/tests/structure/transpose_storage_test.cpp
+++ b/cpp/tests/structure/transpose_storage_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cugraph/graph.hpp>
diff --git a/cpp/tests/structure/transpose_test.cpp b/cpp/tests/structure/transpose_test.cpp
index 5ba8faf2c77..7983e85e9a8 100644
--- a/cpp/tests/structure/transpose_test.cpp
+++ b/cpp/tests/structure/transpose_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cugraph/graph.hpp>
diff --git a/cpp/tests/traversal/bfs_test.cpp b/cpp/tests/traversal/bfs_test.cpp
index 7914cc61548..e15fc0d735b 100644
--- a/cpp/tests/traversal/bfs_test.cpp
+++ b/cpp/tests/traversal/bfs_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/traversal/extract_bfs_paths_test.cu b/cpp/tests/traversal/extract_bfs_paths_test.cu
index 93a47822910..ee9b8ea5d27 100644
--- a/cpp/tests/traversal/extract_bfs_paths_test.cu
+++ b/cpp/tests/traversal/extract_bfs_paths_test.cu
@@ -15,8 +15,8 @@
  */
 #include "randomly_select_destinations.cuh"
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/traversal/legacy/sssp_test.cu b/cpp/tests/traversal/legacy/sssp_test.cu
index ffa04f6d649..e7a698099a3 100644
--- a/cpp/tests/traversal/legacy/sssp_test.cu
+++ b/cpp/tests/traversal/legacy/sssp_test.cu
@@ -9,8 +9,8 @@
  *
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <rmm/device_vector.hpp>
diff --git a/cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/traversal/mg_bfs_test.cpp
index 849258e9dca..a0ee8fe13ce 100644
--- a/cpp/tests/traversal/mg_bfs_test.cpp
+++ b/cpp/tests/traversal/mg_bfs_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu
index f4824e581b8..3c7b1c6deb5 100644
--- a/cpp/tests/traversal/mg_extract_bfs_paths_test.cu
+++ b/cpp/tests/traversal/mg_extract_bfs_paths_test.cu
@@ -15,8 +15,8 @@
  */
 #include "randomly_select_destinations.cuh"
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/traversal/mg_sssp_test.cpp b/cpp/tests/traversal/mg_sssp_test.cpp
index 2e2cd78de86..3996a153b57 100644
--- a/cpp/tests/traversal/mg_sssp_test.cpp
+++ b/cpp/tests/traversal/mg_sssp_test.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
 #include <utilities/device_comm_wrapper.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/traversal/sssp_test.cpp b/cpp/tests/traversal/sssp_test.cpp
index f2bcbd4161a..e1c6916cfbc 100644
--- a/cpp/tests/traversal/sssp_test.cpp
+++ b/cpp/tests/traversal/sssp_test.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_graphs.hpp>
 #include <utilities/test_utilities.hpp>
 #include <utilities/thrust_wrapper.hpp>
diff --git a/cpp/tests/tree/mst_test.cu b/cpp/tests/tree/mst_test.cu
index ffbddd96eb0..336f36587ce 100644
--- a/cpp/tests/tree/mst_test.cu
+++ b/cpp/tests/tree/mst_test.cu
@@ -17,8 +17,8 @@
 // Mst solver tests
 // Author: Alex Fender afender@nvidia.com
 
-#include <utilities/high_res_clock.h>
 #include <utilities/base_fixture.hpp>
+#include <utilities/high_res_clock.h>
 #include <utilities/test_utilities.hpp>
 
 #include <cugraph/algorithms.hpp>
@@ -31,9 +31,9 @@
 
 #include <cmath>
 
+#include "../src/converters/COOtoCSR.cuh"
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/reduce.h>
-#include "../src/converters/COOtoCSR.cuh"
 
 typedef struct Mst_Usecase_t {
   std::string matrix_file;
diff --git a/cpp/tests/utilities/high_res_clock.h b/cpp/tests/utilities/high_res_clock.h
index e52e7c9a522..88a86709591 100644
--- a/cpp/tests/utilities/high_res_clock.h
+++ b/cpp/tests/utilities/high_res_clock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2021, 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,9 +17,9 @@
 // Michael A. Frumkin (mfrumkin@nvidia.com)
 #pragma once
 
-#include <time.h>
 #include <iostream>
 #include <string>
+#include <time.h>
 
 class HighResClock {
  public:
diff --git a/cpp/tests/utilities/test_utilities.hpp b/cpp/tests/utilities/test_utilities.hpp
index be21c7b2b0d..62c32e6a667 100644
--- a/cpp/tests/utilities/test_utilities.hpp
+++ b/cpp/tests/utilities/test_utilities.hpp
@@ -19,10 +19,10 @@
 #include <cugraph/graph_functions.hpp>
 #include <cugraph/legacy/graph.hpp>
 
-#include <thrust/iterator/zip_iterator.h>
-#include <thrust/tuple.h>
 #include <raft/handle.hpp>
 #include <rmm/device_uvector.hpp>
+#include <thrust/iterator/zip_iterator.h>
+#include <thrust/tuple.h>
 
 #include <numeric>
 #include <optional>