diff --git a/src/spatial/detail/ArborX_Callbacks.hpp b/src/spatial/detail/ArborX_Callbacks.hpp
index 27d9624ff..cc86f4976 100644
--- a/src/spatial/detail/ArborX_Callbacks.hpp
+++ b/src/spatial/detail/ArborX_Callbacks.hpp
@@ -12,7 +12,6 @@
 #define ARBORX_CALLBACKS_HPP
 
 #include <detail/ArborX_AccessTraits.hpp>
-#include <detail/ArborX_PairValueIndex.hpp>
 #include <detail/ArborX_Predicates.hpp> // is_valid_predicate_tag
 
 #include <Kokkos_DetectionIdiom.hpp>
diff --git a/src/spatial/detail/ArborX_PairValueIndex.hpp b/src/spatial/detail/ArborX_PairValueIndex.hpp
index 6ce3a4ec8..22ab2899c 100644
--- a/src/spatial/detail/ArborX_PairValueIndex.hpp
+++ b/src/spatial/detail/ArborX_PairValueIndex.hpp
@@ -12,10 +12,10 @@
 #ifndef ARBORX_PAIR_VALUE_INDEX_HPP
 #define ARBORX_PAIR_VALUE_INDEX_HPP
 
-#include <detail/ArborX_AccessTraits.hpp>
-
 #include <Kokkos_Macros.hpp>
 
+#include <type_traits>
+
 namespace ArborX
 {