diff --git a/sycl/include/sycl/atomic_ref.hpp b/sycl/include/sycl/atomic_ref.hpp
index 28ad83df95b36..abfcd5765451d 100644
--- a/sycl/include/sycl/atomic_ref.hpp
+++ b/sycl/include/sycl/atomic_ref.hpp
@@ -9,7 +9,8 @@
 #pragma once
 
 #include <sycl/access/access.hpp> // for address_space
-#include <sycl/bit_cast.hpp>      // for bit_cast
+#include <sycl/aspects.hpp>
+#include <sycl/bit_cast.hpp>
 #include <sycl/ext/oneapi/experimental/address_cast.hpp>
 #include <sycl/memory_enums.hpp> // for getStdMemoryOrder, memory_order
 
diff --git a/sycl/include/sycl/multi_ptr.hpp b/sycl/include/sycl/multi_ptr.hpp
index a4112edfee485..5733a51835ff5 100644
--- a/sycl/include/sycl/multi_ptr.hpp
+++ b/sycl/include/sycl/multi_ptr.hpp
@@ -8,18 +8,18 @@
 
 #pragma once
 
-#include <sycl/access/access.hpp> // for address_space, decorated
-#include <sycl/aliases.hpp>       // for half
+#include <sycl/access/access.hpp>
 #include <sycl/detail/address_space_cast.hpp>
-#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
+#include <sycl/detail/defines_elementary.hpp>
 #include <sycl/detail/fwd/accessor.hpp>
+#include <sycl/detail/fwd/half.hpp>
 #include <sycl/detail/fwd/multi_ptr.hpp>
-#include <sycl/detail/type_traits.hpp> // for const_if_const_AS
-#include <sycl/half_type.hpp>          // for BIsRepresentationT
+#include <sycl/detail/type_traits.hpp>
 
-#include <cstddef>     // for nullptr_t, ptrdiff_t, size_t
-#include <iterator>    // for random_access_iterator_tag
-#include <type_traits> // for enable_if_t, add_pointer_t
+#include <cstddef>
+// Compile-time "heavy", but necessary for `for random_access_iterator_tag`:
+#include <iterator>
+#include <type_traits>
 
 namespace sycl {
 inline namespace _V1 {
diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp
index d29a575a728e7..59474a58c5fd7 100644
--- a/sycl/test/include_deps/sycl_accessor.hpp.cpp
+++ b/sycl/test/include_deps/sycl_accessor.hpp.cpp
@@ -51,10 +51,6 @@
 // CHECK-NEXT: detail/handler_proxy.hpp
 // CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: detail/address_space_cast.hpp
-// CHECK-NEXT: half_type.hpp
-// CHECK-NEXT: aspects.hpp
-// CHECK-NEXT: info/aspects.def
-// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: pointers.hpp
 // CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/runtime_accessor_properties.def
@@ -62,12 +58,16 @@
 // CHECK-NEXT: context.hpp
 // CHECK-NEXT: async_handler.hpp
 // CHECK-NEXT: detail/info_desc_helpers.hpp
+// CHECK-NEXT: aspects.hpp
+// CHECK-NEXT: info/aspects.def
+// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: info/info_desc.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.def
 // CHECK-NEXT: ext/oneapi/experimental/forward_progress.hpp
 // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp
 // CHECK-NEXT: ext/oneapi/bfloat16.hpp
+// CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp
 // CHECK-NEXT: info/platform_traits.def
 // CHECK-NEXT: info/context_traits.def
diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
index f3a91fe6199d4..75c96a1adbceb 100644
--- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp
+++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -52,10 +52,6 @@
 // CHECK-NEXT: detail/handler_proxy.hpp
 // CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: detail/address_space_cast.hpp
-// CHECK-NEXT: half_type.hpp
-// CHECK-NEXT: aspects.hpp
-// CHECK-NEXT: info/aspects.def
-// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: pointers.hpp
 // CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/runtime_accessor_properties.def
@@ -63,12 +59,16 @@
 // CHECK-NEXT: context.hpp
 // CHECK-NEXT: async_handler.hpp
 // CHECK-NEXT: detail/info_desc_helpers.hpp
+// CHECK-NEXT: aspects.hpp
+// CHECK-NEXT: info/aspects.def
+// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: info/info_desc.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.def
 // CHECK-NEXT: ext/oneapi/experimental/forward_progress.hpp
 // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp
 // CHECK-NEXT: ext/oneapi/bfloat16.hpp
+// CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp
 // CHECK-NEXT: info/platform_traits.def
 // CHECK-NEXT: info/context_traits.def