From 29744df2ac95aae58bdb236ffb7711b5d657c471 Mon Sep 17 00:00:00 2001
From: Andrey Prokopenko <prokopenkoav@ornl.gov>
Date: Wed, 2 Oct 2024 11:12:17 -0400
Subject: [PATCH] Include KokkosExt through kokkos_ext/header

---
 CMakeLists.txt                                              | 1 -
 benchmarks/dbscan/ArborX_DBSCANVerification.hpp             | 2 +-
 benchmarks/dbscan/dbscan_timpl.hpp                          | 4 ++--
 benchmarks/union_find/union_find.cpp                        | 4 ++--
 examples/viz/tree_visualization.cpp                         | 2 +-
 src/ArborX_Version.hpp.in                                   | 2 +-
 src/cluster/ArborX_DBSCAN.hpp                               | 4 ++--
 src/cluster/ArborX_Dendrogram.hpp                           | 4 ++--
 src/cluster/ArborX_MinimumSpanningTree.hpp                  | 4 ++--
 src/cluster/details/ArborX_Dendrogram.hpp                   | 2 +-
 src/cluster/details/ArborX_FDBSCANDenseBox.hpp              | 4 ++--
 src/cluster/details/ArborX_MinimumSpanningTree.hpp          | 2 +-
 src/distributed/ArborX_DistributedTree.hpp                  | 2 +-
 src/distributed/details/ArborX_DistributedTreeNearest.hpp   | 6 +++---
 src/distributed/details/ArborX_DistributedTreeUtils.hpp     | 6 +++---
 src/distributed/details/ArborX_Distributor.hpp              | 4 ++--
 src/geometry/ArborX_Box.hpp                                 | 2 +-
 src/geometry/ArborX_KDOP.hpp                                | 2 +-
 src/geometry/ArborX_Ray.hpp                                 | 2 +-
 src/geometry/details/ArborX_Algorithms.hpp                  | 2 +-
 .../ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp  | 2 +-
 .../ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp       | 2 +-
 src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp             | 2 +-
 src/kokkos_ext/ArborX_KokkosExtSort.hpp                     | 2 +-
 src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp            | 2 +-
 src/misc/ArborX_SortUtils.hpp                               | 6 +++---
 src/misc/ArborX_Utils.hpp                                   | 4 ++--
 src/spatial/ArborX_BruteForce.hpp                           | 2 +-
 src/spatial/ArborX_LinearBVH.hpp                            | 2 +-
 src/spatial/details/ArborX_BruteForceImpl.hpp               | 4 ++--
 src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp          | 4 ++--
 src/spatial/details/ArborX_ExpandHalfToFull.hpp             | 4 ++--
 src/spatial/details/ArborX_NearestBufferProvider.hpp        | 4 ++--
 src/spatial/details/ArborX_NeighborList.hpp                 | 4 ++--
 src/spatial/details/ArborX_TreeConstruction.hpp             | 2 +-
 src/spatial/details/ArborX_TreeTraversal.hpp                | 6 +++---
 src/spatial/details/ArborX_TreeVisualization.hpp            | 2 +-
 test/ArborX_BoostRTreeHelpers.hpp                           | 6 +++---
 test/ArborX_BoostRangeAdapters.hpp                          | 2 +-
 test/ArborX_EnableViewComparison.hpp                        | 2 +-
 test/tstDendrogram.cpp                                      | 2 +-
 test/tstDetailsAlgorithms.cpp                               | 2 +-
 test/tstDetailsCrsGraphWrapperImpl.cpp                      | 4 ++--
 test/tstDetailsDistributedTreeImpl.cpp                      | 2 +-
 test/tstDetailsDistributor.cpp                              | 2 +-
 test/tstDetailsKokkosExtKernelStdAlgorithms.cpp             | 4 ++--
 test/tstDetailsKokkosExtMinMaxReduce.cpp                    | 4 ++--
 test/tstDetailsKokkosExtStdAlgorithms.cpp                   | 2 +-
 test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp   | 2 +-
 test/tstDetailsKokkosExtViewHelpers.cpp                     | 2 +-
 test/tstDetailsMutualReachabilityDistance.cpp               | 2 +-
 test/tstDetailsTreeConstruction.cpp                         | 2 +-
 test/tstQueryTreeTraversalPolicy.cpp                        | 6 +++---
 test/tstUnionFind.cpp                                       | 2 +-
 54 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 524d5cc67..ccc385288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,6 @@ cmake_dependent_option(ARBORX_ENABLE_GPU_AWARE_MPI
 target_include_directories(ArborX INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/geometry>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos_ext>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cluster>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/interpolation>
diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
index 4b682ece9..78fa1eff9 100644
--- a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
+++ b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILSDBSCANVERIFICATION_HPP
 #define ARBORX_DETAILSDBSCANVERIFICATION_HPP
 
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/benchmarks/dbscan/dbscan_timpl.hpp b/benchmarks/dbscan/dbscan_timpl.hpp
index 77e331886..0850cf123 100644
--- a/benchmarks/dbscan/dbscan_timpl.hpp
+++ b/benchmarks/dbscan/dbscan_timpl.hpp
@@ -12,9 +12,9 @@
 #include <ArborX_DBSCAN.hpp>
 #include <ArborX_DBSCANVerification.hpp>
 #include <ArborX_HDBSCAN.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/benchmarks/union_find/union_find.cpp b/benchmarks/union_find/union_find.cpp
index 680b7c3d4..2189d9e38 100644
--- a/benchmarks/union_find/union_find.cpp
+++ b/benchmarks/union_find/union_find.cpp
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtVersion.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_Utils.hpp>
 #include <ArborX_Version.hpp>
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Random.hpp>
diff --git a/examples/viz/tree_visualization.cpp b/examples/viz/tree_visualization.cpp
index 56a44bb3f..29287eb34 100644
--- a/examples/viz/tree_visualization.cpp
+++ b/examples/viz/tree_visualization.cpp
@@ -9,9 +9,9 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_TreeVisualization.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/ArborX_Version.hpp.in b/src/ArborX_Version.hpp.in
index 59e82bcbf..04367b53e 100644
--- a/src/ArborX_Version.hpp.in
+++ b/src/ArborX_Version.hpp.in
@@ -14,7 +14,7 @@
 
 #include <ArborX_Config.hpp>
 
-#include <ArborX_KokkosExtVersion.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
 
 #include <string>
 
diff --git a/src/cluster/ArborX_DBSCAN.hpp b/src/cluster/ArborX_DBSCAN.hpp
index 8187dcd57..cac65b0f0 100644
--- a/src/cluster/ArborX_DBSCAN.hpp
+++ b/src/cluster/ArborX_DBSCAN.hpp
@@ -13,8 +13,6 @@
 #define ARBORX_DBSCAN_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_Sphere.hpp>
@@ -25,6 +23,8 @@
 #include <details/ArborX_FDBSCANDenseBox.hpp>
 #include <details/ArborX_HalfTraversal.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 namespace ArborX
 {
diff --git a/src/cluster/ArborX_Dendrogram.hpp b/src/cluster/ArborX_Dendrogram.hpp
index 4581daa9b..1148112fc 100644
--- a/src/cluster/ArborX_Dendrogram.hpp
+++ b/src/cluster/ArborX_Dendrogram.hpp
@@ -11,10 +11,10 @@
 #ifndef ARBORX_DENDROGRAM_HPP
 #define ARBORX_DENDROGRAM_HPP
 
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_Dendrogram.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/cluster/ArborX_MinimumSpanningTree.hpp b/src/cluster/ArborX_MinimumSpanningTree.hpp
index 7bd9f168f..fa8fb247d 100644
--- a/src/cluster/ArborX_MinimumSpanningTree.hpp
+++ b/src/cluster/ArborX_MinimumSpanningTree.hpp
@@ -12,8 +12,6 @@
 #ifndef ARBORX_MINIMUM_SPANNING_TREE_HPP
 #define ARBORX_MINIMUM_SPANNING_TREE_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_MinimumSpanningTree.hpp>
@@ -21,6 +19,8 @@
 #include <details/ArborX_PredicateHelpers.hpp>
 #include <details/ArborX_TreeNodeLabeling.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/cluster/details/ArborX_Dendrogram.hpp b/src/cluster/details/ArborX_Dendrogram.hpp
index 3c4249722..3706e77fb 100644
--- a/src/cluster/details/ArborX_Dendrogram.hpp
+++ b/src/cluster/details/ArborX_Dendrogram.hpp
@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILS_DENDROGRAM_HPP
 #define ARBORX_DETAILS_DENDROGRAM_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // iota
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/cluster/details/ArborX_FDBSCANDenseBox.hpp b/src/cluster/details/ArborX_FDBSCANDenseBox.hpp
index 184c71ffa..f99db9013 100644
--- a/src/cluster/details/ArborX_FDBSCANDenseBox.hpp
+++ b/src/cluster/details/ArborX_FDBSCANDenseBox.hpp
@@ -12,12 +12,12 @@
 #ifndef ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 #define ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_Callbacks.hpp>
 #include <details/ArborX_CartesianGrid.hpp>
 #include <details/ArborX_Predicates.hpp>
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/cluster/details/ArborX_MinimumSpanningTree.hpp b/src/cluster/details/ArborX_MinimumSpanningTree.hpp
index 538ead13e..b6dde8d4e 100644
--- a/src/cluster/details/ArborX_MinimumSpanningTree.hpp
+++ b/src/cluster/details/ArborX_MinimumSpanningTree.hpp
@@ -12,11 +12,11 @@
 #ifndef ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
 #define ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
 
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Utils.hpp>
 #include <details/ArborX_Algorithms.hpp>
 #include <details/ArborX_HappyTreeFriends.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/distributed/ArborX_DistributedTree.hpp b/src/distributed/ArborX_DistributedTree.hpp
index 900e46125..e057f0e5c 100644
--- a/src/distributed/ArborX_DistributedTree.hpp
+++ b/src/distributed/ArborX_DistributedTree.hpp
@@ -13,12 +13,12 @@
 #define ARBORX_DISTRIBUTED_TREE_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_DistributedTreeNearest.hpp>
 #include <details/ArborX_DistributedTreeSpatial.hpp>
 #include <details/ArborX_PairValueIndex.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/distributed/details/ArborX_DistributedTreeNearest.hpp b/src/distributed/details/ArborX_DistributedTreeNearest.hpp
index 061b05608..7f36c265d 100644
--- a/src/distributed/details/ArborX_DistributedTreeNearest.hpp
+++ b/src/distributed/details/ArborX_DistributedTreeNearest.hpp
@@ -11,13 +11,13 @@
 #ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
 #define ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
 
-#include <ArborX_KokkosExtKernelStdAlgorithms.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_DistributedTreeImpl.hpp>
 #include <details/ArborX_DistributedTreeNearestHelpers.hpp>
 #include <details/ArborX_DistributedTreeUtils.hpp>
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/distributed/details/ArborX_DistributedTreeUtils.hpp b/src/distributed/details/ArborX_DistributedTreeUtils.hpp
index 591f387e8..e949ff2a1 100644
--- a/src/distributed/details/ArborX_DistributedTreeUtils.hpp
+++ b/src/distributed/details/ArborX_DistributedTreeUtils.hpp
@@ -14,11 +14,11 @@
 #include <ArborX_Config.hpp>
 
 #include <ArborX_Containers.hpp>
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_PriorityQueue.hpp>
 #include <details/ArborX_Distributor.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/distributed/details/ArborX_Distributor.hpp b/src/distributed/details/ArborX_Distributor.hpp
index c629050b3..0e1819246 100644
--- a/src/distributed/details/ArborX_Distributor.hpp
+++ b/src/distributed/details/ArborX_Distributor.hpp
@@ -14,9 +14,9 @@
 #include <ArborX_Config.hpp>
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_SortUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/geometry/ArborX_Box.hpp b/src/geometry/ArborX_Box.hpp
index dd24c9f34..076d6d149 100644
--- a/src/geometry/ArborX_Box.hpp
+++ b/src/geometry/ArborX_Box.hpp
@@ -13,8 +13,8 @@
 #define ARBORX_BOX_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_ReductionIdentity.hpp>
diff --git a/src/geometry/ArborX_KDOP.hpp b/src/geometry/ArborX_KDOP.hpp
index 9d3b96a30..29a83fbdd 100644
--- a/src/geometry/ArborX_KDOP.hpp
+++ b/src/geometry/ArborX_KDOP.hpp
@@ -14,10 +14,10 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Vector.hpp>
 #include <details/ArborX_Algorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Array.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/geometry/ArborX_Ray.hpp b/src/geometry/ArborX_Ray.hpp
index bb1417a35..9048c2cb7 100644
--- a/src/geometry/ArborX_Ray.hpp
+++ b/src/geometry/ArborX_Ray.hpp
@@ -12,12 +12,12 @@
 #define ARBORX_RAY_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Triangle.hpp>
 #include <ArborX_Vector.hpp>
 #include <details/ArborX_Algorithms.hpp> // equal
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>
diff --git a/src/geometry/details/ArborX_Algorithms.hpp b/src/geometry/details/ArborX_Algorithms.hpp
index 492f68e96..7575bbea2 100644
--- a/src/geometry/details/ArborX_Algorithms.hpp
+++ b/src/geometry/details/ArborX_Algorithms.hpp
@@ -13,8 +13,8 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Vector.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // isfinite
diff --git a/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp b/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
index 0fca16d43..1e37f5d4d 100644
--- a/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
+++ b/src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp
@@ -13,12 +13,12 @@
 #define ARBORX_INTERP_DETAILS_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
 #include <details/ArborX_InterpDetailsPolynomialBasis.hpp>
 #include <details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp b/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
index 17df873ab..344438eaf 100644
--- a/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
+++ b/src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp
@@ -13,7 +13,7 @@
 #define ARBORX_INTERP_DETAILS_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp b/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
index 8ae556bc2..2140b543e 100644
--- a/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp
@@ -13,7 +13,7 @@
 #define ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/kokkos_ext/ArborX_KokkosExtSort.hpp b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
index 5bccb54db..9953ae630 100644
--- a/src/kokkos_ext/ArborX_KokkosExtSort.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtSort.hpp
@@ -14,7 +14,7 @@
 
 #include <ArborX_Config.hpp> // ARBORX_ENABLE_ROCTHRUST
 
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
 
 #include <Kokkos_Profiling_ScopedRegion.hpp>
 #include <Kokkos_Sort.hpp>
diff --git a/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp b/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
index efa78f0d1..2c7218d19 100644
--- a/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
+++ b/src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp
@@ -12,7 +12,7 @@
 #ifndef ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
 #define ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_StdAlgorithms.hpp>
diff --git a/src/misc/ArborX_SortUtils.hpp b/src/misc/ArborX_SortUtils.hpp
index 16e364f22..d0a03481d 100644
--- a/src/misc/ArborX_SortUtils.hpp
+++ b/src/misc/ArborX_SortUtils.hpp
@@ -13,9 +13,9 @@
 #define ARBORX_DETAILS_SORT_UTILS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // iota
-#include <ArborX_KokkosExtViewHelpers.hpp>   // clone
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>   // clone
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/misc/ArborX_Utils.hpp b/src/misc/ArborX_Utils.hpp
index 9f8c02c69..cda8ba0ab 100644
--- a/src/misc/ArborX_Utils.hpp
+++ b/src/misc/ArborX_Utils.hpp
@@ -13,8 +13,8 @@
 #define ARBORX_DETAILS_UTILS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/spatial/ArborX_BruteForce.hpp b/src/spatial/ArborX_BruteForce.hpp
index fc1d34b03..aeb886e7a 100644
--- a/src/spatial/ArborX_BruteForce.hpp
+++ b/src/spatial/ArborX_BruteForce.hpp
@@ -14,7 +14,6 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_AttachIndices.hpp>
 #include <details/ArborX_BruteForceImpl.hpp>
@@ -23,6 +22,7 @@
 #include <details/ArborX_IndexableGetter.hpp>
 #include <details/ArborX_PairValueIndex.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/spatial/ArborX_LinearBVH.hpp b/src/spatial/ArborX_LinearBVH.hpp
index ed9f87c3c..22171c94c 100644
--- a/src/spatial/ArborX_LinearBVH.hpp
+++ b/src/spatial/ArborX_LinearBVH.hpp
@@ -14,7 +14,6 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_AccessTraits.hpp>
@@ -30,6 +29,7 @@
 #include <details/ArborX_TraversalPolicy.hpp>
 #include <details/ArborX_TreeConstruction.hpp>
 #include <details/ArborX_TreeTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/spatial/details/ArborX_BruteForceImpl.hpp b/src/spatial/details/ArborX_BruteForceImpl.hpp
index 05066de9a..710261040 100644
--- a/src/spatial/details/ArborX_BruteForceImpl.hpp
+++ b/src/spatial/details/ArborX_BruteForceImpl.hpp
@@ -13,12 +13,12 @@
 #define ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_PriorityQueue.hpp>
 #include <details/ArborX_Algorithms.hpp> // expand
 #include <details/ArborX_NearestBufferProvider.hpp>
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>
diff --git a/src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp b/src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp
index 3f0c7e853..39d6b312e 100644
--- a/src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp
+++ b/src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp
@@ -13,13 +13,13 @@
 #define ARBORX_DETAIL_CRS_GRAPH_WRAPPER_IMPL_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_BatchedQueries.hpp>
 #include <details/ArborX_Callbacks.hpp>
 #include <details/ArborX_PermutedData.hpp>
 #include <details/ArborX_Predicates.hpp>
 #include <details/ArborX_TraversalPolicy.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 namespace ArborX
 {
diff --git a/src/spatial/details/ArborX_ExpandHalfToFull.hpp b/src/spatial/details/ArborX_ExpandHalfToFull.hpp
index 9550d3394..ca22a5933 100644
--- a/src/spatial/details/ArborX_ExpandHalfToFull.hpp
+++ b/src/spatial/details/ArborX_ExpandHalfToFull.hpp
@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILS_EXPAND_HALF_TO_FULL_HPP
 #define ARBORX_DETAILS_EXPAND_HALF_TO_FULL_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/spatial/details/ArborX_NearestBufferProvider.hpp b/src/spatial/details/ArborX_NearestBufferProvider.hpp
index c09f28a2a..e7b98269f 100644
--- a/src/spatial/details/ArborX_NearestBufferProvider.hpp
+++ b/src/spatial/details/ArborX_NearestBufferProvider.hpp
@@ -11,8 +11,8 @@
 #ifndef ARBORX_DETAILS_NEAREST_BUFFER_PROVIDER_HPP
 #define ARBORX_DETAILS_NEAREST_BUFFER_PROVIDER_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/spatial/details/ArborX_NeighborList.hpp b/src/spatial/details/ArborX_NeighborList.hpp
index 440cc0b6e..e534e86c7 100644
--- a/src/spatial/details/ArborX_NeighborList.hpp
+++ b/src/spatial/details/ArborX_NeighborList.hpp
@@ -13,11 +13,11 @@
 #define ARBORX_NEIGHBOR_LIST_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp> // reallocWithoutInitializing
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_Sphere.hpp>
 #include <details/ArborX_HalfTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp> // reallocWithoutInitializing
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/spatial/details/ArborX_TreeConstruction.hpp b/src/spatial/details/ArborX_TreeConstruction.hpp
index d228c98c0..856d7b8b8 100644
--- a/src/spatial/details/ArborX_TreeConstruction.hpp
+++ b/src/spatial/details/ArborX_TreeConstruction.hpp
@@ -12,10 +12,10 @@
 #ifndef ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
 #define ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
 
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_Algorithms.hpp> // expand
 #include <details/ArborX_Node.hpp>       // makeLeafNode
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/spatial/details/ArborX_TreeTraversal.hpp b/src/spatial/details/ArborX_TreeTraversal.hpp
index 8523504da..d88aabcd0 100644
--- a/src/spatial/details/ArborX_TreeTraversal.hpp
+++ b/src/spatial/details/ArborX_TreeTraversal.hpp
@@ -12,9 +12,6 @@
 #define ARBORX_DETAILS_TREE_TRAVERSAL_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_PriorityQueue.hpp>
 #include <ArborX_Stack.hpp>
 #include <details/ArborX_Algorithms.hpp>
@@ -22,6 +19,9 @@
 #include <details/ArborX_NearestBufferProvider.hpp>
 #include <details/ArborX_Node.hpp> // ROPE_SENTINEL
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 namespace ArborX
 {
diff --git a/src/spatial/details/ArborX_TreeVisualization.hpp b/src/spatial/details/ArborX_TreeVisualization.hpp
index 33b6c0004..7725291ea 100644
--- a/src/spatial/details/ArborX_TreeVisualization.hpp
+++ b/src/spatial/details/ArborX_TreeVisualization.hpp
@@ -11,10 +11,10 @@
 #ifndef ARBORX_DETAILS_TREE_VISUALIZATION_HPP
 #define ARBORX_DETAILS_TREE_VISUALIZATION_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <details/ArborX_HappyTreeFriends.hpp>
 #include <details/ArborX_TreeTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/ArborX_BoostRTreeHelpers.hpp b/test/ArborX_BoostRTreeHelpers.hpp
index 0f438bcbb..67d02bee5 100644
--- a/test/ArborX_BoostRTreeHelpers.hpp
+++ b/test/ArborX_BoostRTreeHelpers.hpp
@@ -17,12 +17,12 @@
 #include "ArborX_BoostGeometryAdapters.hpp"
 #include "ArborX_BoostRangeAdapters.hpp"
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
-#include <ArborX_KokkosExtStdAlgorithms.hpp>       // exclusive_scan
-#include <ArborX_KokkosExtViewHelpers.hpp>         // lastElement
 #include <ArborX_Sphere.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // exclusive_scan
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>   // lastElement
 #ifdef ARBORX_ENABLE_MPI
 #include "ArborXTest_PairIndexRank.hpp"
 #endif
diff --git a/test/ArborX_BoostRangeAdapters.hpp b/test/ArborX_BoostRangeAdapters.hpp
index c99337eaf..c0f888895 100644
--- a/test/ArborX_BoostRangeAdapters.hpp
+++ b/test/ArborX_BoostRangeAdapters.hpp
@@ -13,7 +13,7 @@
 #define ARBORX_BOOST_RANGE_ADAPTERS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/ArborX_EnableViewComparison.hpp b/test/ArborX_EnableViewComparison.hpp
index 1bfcf28d8..f391299ec 100644
--- a/test/ArborX_EnableViewComparison.hpp
+++ b/test/ArborX_EnableViewComparison.hpp
@@ -12,7 +12,7 @@
 #ifndef ARBORX_ENABLE_VIEW_COMPARISON_HPP
 #define ARBORX_ENABLE_VIEW_COMPARISON_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDendrogram.cpp b/test/tstDendrogram.cpp
index 1dec7b290..339ecf4bc 100644
--- a/test/tstDendrogram.cpp
+++ b/test/tstDendrogram.cpp
@@ -14,10 +14,10 @@
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Dendrogram.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include "boost_ext/TupleComparison.hpp"
diff --git a/test/tstDetailsAlgorithms.cpp b/test/tstDetailsAlgorithms.cpp
index 0f935457d..a41fc2a88 100644
--- a/test/tstDetailsAlgorithms.cpp
+++ b/test/tstDetailsAlgorithms.cpp
@@ -10,13 +10,13 @@
  ****************************************************************************/
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Segment.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Tetrahedron.hpp>
 #include <ArborX_Triangle.hpp>
 #include <details/ArborX_Algorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <boost/mpl/list.hpp>
 
diff --git a/test/tstDetailsCrsGraphWrapperImpl.cpp b/test/tstDetailsCrsGraphWrapperImpl.cpp
index e52ace97a..1411c8071 100644
--- a/test/tstDetailsCrsGraphWrapperImpl.cpp
+++ b/test/tstDetailsCrsGraphWrapperImpl.cpp
@@ -11,11 +11,11 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // exclusive_scan
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_CrsGraphWrapperImpl.hpp>
 #include <details/ArborX_Predicates.hpp>
 #include <details/ArborX_TraversalPolicy.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // exclusive_scan
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsDistributedTreeImpl.cpp b/test/tstDetailsDistributedTreeImpl.cpp
index d7603a197..bbdc6653a 100644
--- a/test/tstDetailsDistributedTreeImpl.cpp
+++ b/test/tstDetailsDistributedTreeImpl.cpp
@@ -11,8 +11,8 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <details/ArborX_DistributedTreeUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsDistributor.cpp b/test/tstDetailsDistributor.cpp
index c7d211068..e2293cbf2 100644
--- a/test/tstDetailsDistributor.cpp
+++ b/test/tstDetailsDistributor.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <details/ArborX_DistributedTreeUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp b/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
index 8a7974537..9a1d9024a 100644
--- a/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtKernelStdAlgorithms.cpp
@@ -12,8 +12,8 @@
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtKernelStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtMinMaxReduce.cpp b/test/tstDetailsKokkosExtMinMaxReduce.cpp
index 0952bb49d..3fc972399 100644
--- a/test/tstDetailsKokkosExtMinMaxReduce.cpp
+++ b/test/tstDetailsKokkosExtMinMaxReduce.cpp
@@ -12,8 +12,8 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtStdAlgorithms.cpp b/test/tstDetailsKokkosExtStdAlgorithms.cpp
index 5ddf17967..06458209e 100644
--- a/test/tstDetailsKokkosExtStdAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtStdAlgorithms.cpp
@@ -12,7 +12,7 @@
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp b/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
index 806326f05..6339f2483 100644
--- a/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
+++ b/test/tstDetailsKokkosExtUninitializedMemoryAlgorithms.cpp
@@ -11,7 +11,7 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtUninitializedMemoryAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsKokkosExtViewHelpers.cpp b/test/tstDetailsKokkosExtViewHelpers.cpp
index 748d0bec2..493e864ca 100644
--- a/test/tstDetailsKokkosExtViewHelpers.cpp
+++ b/test/tstDetailsKokkosExtViewHelpers.cpp
@@ -11,7 +11,7 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/test/tstDetailsMutualReachabilityDistance.cpp b/test/tstDetailsMutualReachabilityDistance.cpp
index 8e23e667b..a7452372c 100644
--- a/test/tstDetailsMutualReachabilityDistance.cpp
+++ b/test/tstDetailsMutualReachabilityDistance.cpp
@@ -12,9 +12,9 @@
 #include "ArborXTest_StdVectorToKokkosView.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_MutualReachabilityDistance.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/test/tstDetailsTreeConstruction.cpp b/test/tstDetailsTreeConstruction.cpp
index c23a05e5b..67e7a25b2 100644
--- a/test/tstDetailsTreeConstruction.cpp
+++ b/test/tstDetailsTreeConstruction.cpp
@@ -11,13 +11,13 @@
 #include "ArborXTest_LegacyTree.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <ArborX_MortonCode.hpp> // expandBits, morton32
 #include <ArborX_SortUtils.hpp>  // sortObjects
 #include <details/ArborX_Algorithms.hpp>
 #include <details/ArborX_IndexableGetter.hpp>
 #include <details/ArborX_Node.hpp> // ROPE SENTINEL
 #include <details/ArborX_TreeConstruction.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstQueryTreeTraversalPolicy.cpp b/test/tstQueryTreeTraversalPolicy.cpp
index 5b5f3e981..67d760461 100644
--- a/test/tstQueryTreeTraversalPolicy.cpp
+++ b/test/tstQueryTreeTraversalPolicy.cpp
@@ -11,10 +11,10 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborXTest_LegacyTree.hpp>
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstUnionFind.cpp b/test/tstUnionFind.cpp
index 853e579ea..068d05ada 100644
--- a/test/tstUnionFind.cpp
+++ b/test/tstUnionFind.cpp
@@ -10,8 +10,8 @@
  ****************************************************************************/
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // iota
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>