diff --git a/src/spatial/ArborX_LinearBVH.hpp b/src/spatial/ArborX_LinearBVH.hpp
index 22171c94c..b58b889f2 100644
--- a/src/spatial/ArborX_LinearBVH.hpp
+++ b/src/spatial/ArborX_LinearBVH.hpp
@@ -15,7 +15,6 @@
 #include <ArborX_Box.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
 #include <ArborX_SortUtils.hpp>
-#include <ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_AttachIndices.hpp>
 #include <details/ArborX_BatchedQueries.hpp>
@@ -26,6 +25,7 @@
 #include <details/ArborX_PairValueIndex.hpp>
 #include <details/ArborX_PermutedData.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
+#include <details/ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_TraversalPolicy.hpp>
 #include <details/ArborX_TreeConstruction.hpp>
 #include <details/ArborX_TreeTraversal.hpp>
diff --git a/src/spatial/details/ArborX_BatchedQueries.hpp b/src/spatial/details/ArborX_BatchedQueries.hpp
index 2238d735f..9114b4ca8 100644
--- a/src/spatial/details/ArborX_BatchedQueries.hpp
+++ b/src/spatial/details/ArborX_BatchedQueries.hpp
@@ -13,9 +13,9 @@
 #define ARBORX_DETAILS_BATCHED_QUERIES_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_SortUtils.hpp> // sortObjects
-#include <ArborX_SpaceFillingCurves.hpp>
+#include <ArborX_SortUtils.hpp>          // sortObjects
 #include <details/ArborX_Algorithms.hpp> // returnCentroid, translateAndScale
+#include <details/ArborX_SpaceFillingCurves.hpp>
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/misc/ArborX_MortonCode.hpp b/src/spatial/details/ArborX_MortonCode.hpp
similarity index 100%
rename from src/misc/ArborX_MortonCode.hpp
rename to src/spatial/details/ArborX_MortonCode.hpp
diff --git a/src/misc/ArborX_SpaceFillingCurves.hpp b/src/spatial/details/ArborX_SpaceFillingCurves.hpp
similarity index 98%
rename from src/misc/ArborX_SpaceFillingCurves.hpp
rename to src/spatial/details/ArborX_SpaceFillingCurves.hpp
index b598d5b2a..a3caa65be 100644
--- a/src/misc/ArborX_SpaceFillingCurves.hpp
+++ b/src/spatial/details/ArborX_SpaceFillingCurves.hpp
@@ -13,9 +13,9 @@
 #define ARBORX_SPACE_FILLING_CURVES_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_MortonCode.hpp>
 #include <ArborX_Point.hpp>
 #include <details/ArborX_Algorithms.hpp>
+#include <details/ArborX_MortonCode.hpp>
 
 #include <Kokkos_DetectionIdiom.hpp>
 #include <Kokkos_Macros.hpp>
diff --git a/src/spatial/details/ArborX_TreeConstruction.hpp b/src/spatial/details/ArborX_TreeConstruction.hpp
index 856d7b8b8..2daf9ded5 100644
--- a/src/spatial/details/ArborX_TreeConstruction.hpp
+++ b/src/spatial/details/ArborX_TreeConstruction.hpp
@@ -12,9 +12,9 @@
 #ifndef ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
 #define ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
 
-#include <ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_Algorithms.hpp> // expand
 #include <details/ArborX_Node.hpp>       // makeLeafNode
+#include <details/ArborX_SpaceFillingCurves.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
diff --git a/test/tstDetailsMortonCodes.cpp b/test/tstDetailsMortonCodes.cpp
index bc0422dcf..ac4f0e86a 100644
--- a/test/tstDetailsMortonCodes.cpp
+++ b/test/tstDetailsMortonCodes.cpp
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_MortonCode.hpp>
+#include <details/ArborX_MortonCode.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/tstDetailsTreeConstruction.cpp b/test/tstDetailsTreeConstruction.cpp
index 67e7a25b2..17cb5d9f2 100644
--- a/test/tstDetailsTreeConstruction.cpp
+++ b/test/tstDetailsTreeConstruction.cpp
@@ -11,11 +11,11 @@
 #include "ArborXTest_LegacyTree.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_MortonCode.hpp> // expandBits, morton32
-#include <ArborX_SortUtils.hpp>  // sortObjects
+#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_MortonCode.hpp> // expandBits, morton32
+#include <details/ArborX_Node.hpp>       // ROPE SENTINEL
 #include <details/ArborX_TreeConstruction.hpp>
 #include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>