diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index 72f54f150ecfe..485753e2af549 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -9,8 +9,6 @@
 #pragma once
 
 #include <sycl/access/access.hpp>                     // for target, mode
-#include <sycl/aliases.hpp>                           // for float4, int4
-#include <sycl/aspects.hpp>                           // for aspect
 #include <sycl/atomic.hpp>                            // for atomic
 #include <sycl/buffer.hpp>                            // for range
 #include <sycl/detail/accessor_iterator.hpp>          // for accessor_iterator
@@ -36,20 +34,13 @@
 #include <sycl/properties/buffer_properties.hpp>      // for buffer, buffer...
 #include <sycl/property_list.hpp>                     // for property_list
 #include <sycl/range.hpp>                             // for range
-#include <sycl/sampler.hpp>                           // for addressing_mode
-#include <ur_api.h>                                   // for UR_RESULT_ERRO...
 
 #include <cstddef>     // for size_t
 #include <functional>  // for hash
 #include <iterator>    // for reverse_iterator
 #include <limits>      // for numeric_limits
 #include <memory>      // for shared_ptr
-#include <optional>    // for nullopt, optional
-#include <stdint.h>    // for uint32_t
-#include <tuple>       // for _Swallow_assign
 #include <type_traits> // for enable_if_t
-#include <typeinfo>    // for type_info
-#include <variant>     // for hash
 
 /// \file accessor.hpp
 /// The file contains implementations of accessor class.
diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp
index fd2628dfb6e1c..5e51278562b34 100644
--- a/sycl/test/include_deps/sycl_accessor.hpp.cpp
+++ b/sycl/test/include_deps/sycl_accessor.hpp.cpp
@@ -11,6 +11,12 @@
 // CHECK-NEXT: CL/__spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
 // CHECK-NEXT: detail/export.hpp
+// CHECK-NEXT: atomic.hpp
+// CHECK-NEXT: detail/helpers.hpp
+// CHECK-NEXT: memory_enums.hpp
+// CHECK-NEXT: ur_api.h
+// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
+// CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: bit_cast.hpp
@@ -18,12 +24,6 @@
 // CHECK-NEXT: aspects.hpp
 // CHECK-NEXT: info/aspects.def
 // CHECK-NEXT: info/aspects_deprecated.def
-// CHECK-NEXT: atomic.hpp
-// CHECK-NEXT: detail/helpers.hpp
-// CHECK-NEXT: memory_enums.hpp
-// CHECK-NEXT: ur_api.h
-// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
-// CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: detail/type_traits.hpp
 // CHECK-NEXT: detail/generic_type_lists.hpp
 // CHECK-NEXT: detail/type_list.hpp
@@ -116,5 +116,4 @@
 // CHECK-NEXT: detail/string_view.hpp
 // CHECK-NEXT: detail/util.hpp
 // CHECK-NEXT: device_selector.hpp
-// CHECK-NEXT: sampler.hpp
 // CHECK-EMPTY:
diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
index 33dc01b8a4e74..ad97f74c140c2 100644
--- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp
+++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -12,6 +12,12 @@
 // CHECK-NEXT: CL/__spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
 // CHECK-NEXT: detail/export.hpp
+// CHECK-NEXT: atomic.hpp
+// CHECK-NEXT: detail/helpers.hpp
+// CHECK-NEXT: memory_enums.hpp
+// CHECK-NEXT: ur_api.h
+// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
+// CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: bit_cast.hpp
@@ -19,12 +25,6 @@
 // CHECK-NEXT: aspects.hpp
 // CHECK-NEXT: info/aspects.def
 // CHECK-NEXT: info/aspects_deprecated.def
-// CHECK-NEXT: atomic.hpp
-// CHECK-NEXT: detail/helpers.hpp
-// CHECK-NEXT: memory_enums.hpp
-// CHECK-NEXT: ur_api.h
-// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
-// CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: detail/type_traits.hpp
 // CHECK-NEXT: detail/generic_type_lists.hpp
 // CHECK-NEXT: detail/type_list.hpp
@@ -117,7 +117,6 @@
 // CHECK-NEXT: detail/string_view.hpp
 // CHECK-NEXT: detail/util.hpp
 // CHECK-NEXT: device_selector.hpp
-// CHECK-NEXT: sampler.hpp
 // CHECK-NEXT: queue.hpp
 // CHECK-NEXT: detail/assert_happened.hpp
 // CHECK-NEXT: detail/cg_types.hpp
@@ -159,5 +158,6 @@
 // CHECK-NEXT: kernel.hpp
 // CHECK-NEXT: kernel_bundle.hpp
 // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp
+// CHECK-NEXT: sampler.hpp
 // CHECK-NEXT: feature_test.hpp
 // CHECK-EMPTY: