From a6b00e18e10b8bf616911636c2daec78a751138c Mon Sep 17 00:00:00 2001
From: Andrei Elovikov <andrei.elovikov@intel.com>
Date: Mon, 15 Sep 2025 13:03:42 -0700
Subject: [PATCH] [NFC][SYCL] Reduce dependencies of `<sycl/group.hpp>`

---
 sycl/include/sycl/detail/fwd/multi_ptr.hpp    |  4 +++
 sycl/include/sycl/group.hpp                   | 26 ++++++++++---------
 .../include_deps/sycl_detail_core.hpp.cpp     |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/sycl/include/sycl/detail/fwd/multi_ptr.hpp b/sycl/include/sycl/detail/fwd/multi_ptr.hpp
index 934646f8181ef..c3718463dc070 100644
--- a/sycl/include/sycl/detail/fwd/multi_ptr.hpp
+++ b/sycl/include/sycl/detail/fwd/multi_ptr.hpp
@@ -16,5 +16,9 @@ inline namespace _V1 {
 template <typename ElementType, access::address_space Space,
           access::decorated DecorateAddress>
 class multi_ptr;
+template <access::address_space Space, access::decorated DecorateAddress,
+          typename ElementType>
+multi_ptr<ElementType, Space, DecorateAddress>
+address_space_cast(ElementType *pointer);
 } // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/group.hpp b/sycl/include/sycl/group.hpp
index 86693ac4137d2..0ad23a6c9ceaa 100644
--- a/sycl/include/sycl/group.hpp
+++ b/sycl/include/sycl/group.hpp
@@ -8,35 +8,37 @@
 
 #pragma once
 
-#include <sycl/__spirv/spirv_types.hpp>        // for Scope, __ocl_event_t
-#include <sycl/access/access.hpp>              // for decorated, mode, addr...
-#include <sycl/detail/common.hpp>              // for NDLoop, __SYCL_ASSERT
-#include <sycl/detail/defines.hpp>             // for __SYCL_TYPE
-#include <sycl/detail/defines_elementary.hpp>  // for __SYCL2020_DEPRECATED
+#include <sycl/__spirv/spirv_types.hpp>       // for Scope, __ocl_event_t
+#include <sycl/access/access.hpp>             // for decorated, mode, addr...
+#include <sycl/detail/common.hpp>             // for NDLoop
+#include <sycl/detail/defines.hpp>            // for __SYCL_TYPE
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
+#include <sycl/detail/fwd/multi_ptr.hpp>
 #include <sycl/detail/generic_type_traits.hpp> // for convertToOpenCLType
 #include <sycl/detail/helpers.hpp>             // for Builder, getSPIRVMemo...
-#include <sycl/detail/item_base.hpp>           // for id, range
 #include <sycl/detail/type_traits.hpp>         // for is_bool, change_base_...
 #include <sycl/device_event.hpp>               // for device_event
-#include <sycl/exception.hpp>                  // for make_error_code, errc
-#include <sycl/h_item.hpp>                     // for h_item
 #include <sycl/id.hpp>                         // for id
 #include <sycl/item.hpp>                       // for item
 #include <sycl/memory_enums.hpp>               // for memory_scope
-#include <sycl/multi_ptr.hpp>                  // for multi_ptr, address_sp...
 #include <sycl/pointers.hpp>                   // for decorated_global_ptr
 #include <sycl/range.hpp>                      // for range
 
-#include <memory>      // for unique_ptr
+#ifndef __SYCL_DEVICE_ONLY__
+#include <sycl/exception.hpp>
+
+#include <memory> // for unique_ptr
+#endif
+
 #include <stddef.h>    // for size_t
 #include <stdint.h>    // for uint8_t, uint32_t
 #include <type_traits> // for enable_if_t, remove_c...
 
 namespace sycl {
 inline namespace _V1 {
-namespace detail {
-class Builder;
+template <int Dimensions> class h_item;
 
+namespace detail {
 // Implements a barrier accross work items within a work group.
 inline void workGroupBarrier() {
 #ifdef __SYCL_DEVICE_ONLY__
diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
index 72eea7f16317c..f4c33d1ed938f 100644
--- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp
+++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -95,8 +95,8 @@
 // CHECK-NEXT: detail/kernel_desc.hpp
 // CHECK-NEXT: group.hpp
 // CHECK-NEXT: device_event.hpp
-// CHECK-NEXT: h_item.hpp
 // CHECK-NEXT: item.hpp
+// CHECK-NEXT: h_item.hpp
 // CHECK-NEXT: kernel_handler.hpp
 // CHECK-NEXT: nd_item.hpp
 // CHECK-NEXT: nd_range.hpp