From 45aa9b9bf29ecd47eda8b4ba178a24794b0647c4 Mon Sep 17 00:00:00 2001
From: y <konstantinos.parasyris@intel.com>
Date: Fri, 24 Apr 2026 17:59:39 -0700
Subject: [PATCH 1/3] [SYCL] Move work_item_queries under includes for
 consistency

---
 sycl/include/sycl/khr/{ => includes}/work_item_queries.hpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sycl/include/sycl/khr/{ => includes}/work_item_queries.hpp (100%)

diff --git a/sycl/include/sycl/khr/work_item_queries.hpp b/sycl/include/sycl/khr/includes/work_item_queries.hpp
similarity index 100%
rename from sycl/include/sycl/khr/work_item_queries.hpp
rename to sycl/include/sycl/khr/includes/work_item_queries.hpp

From 4cd831180d80593d1f885dfbb29564bec4ed4856 Mon Sep 17 00:00:00 2001
From: y <konstantinos.parasyris@intel.com>
Date: Mon, 27 Apr 2026 07:25:14 -0700
Subject: [PATCH 2/3] Fix tests etc

---
 sycl/include/sycl/sycl.hpp                                  | 2 +-
 sycl/test-e2e/Basic/work_item_queries/work_item_queries.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
index d9b8807ee5eb6..ef4e8070cea25 100644
--- a/sycl/include/sycl/sycl.hpp
+++ b/sycl/include/sycl/sycl.hpp
@@ -152,4 +152,4 @@ can be disabled by setting SYCL_DISABLE_FSYCL_SYCLHPP_WARNING macro.")
 #include <sycl/khr/free_function_commands.hpp>
 #include <sycl/khr/group_interface.hpp>
 #include <sycl/khr/static_addrspace_cast.hpp>
-#include <sycl/khr/work_item_queries.hpp>
+#include <sycl/khr/includes/work_item_queries.hpp>
diff --git a/sycl/test-e2e/Basic/work_item_queries/work_item_queries.cpp b/sycl/test-e2e/Basic/work_item_queries/work_item_queries.cpp
index 04ef15b00b3f9..6cf01756e1b8a 100644
--- a/sycl/test-e2e/Basic/work_item_queries/work_item_queries.cpp
+++ b/sycl/test-e2e/Basic/work_item_queries/work_item_queries.cpp
@@ -12,7 +12,7 @@
 #include <cassert>
 #include <iostream>
 #include <sycl/detail/core.hpp>
-#include <sycl/khr/work_item_queries.hpp>
+#include <sycl/khr/includes/work_item_queries.hpp>
 
 template <size_t... Dims> static int check_this_nd_item_api() {
   // Define the kernel ranges.

From 0a56e6f594a511a21d024c0ec400f4503df5682e Mon Sep 17 00:00:00 2001
From: y <konstantinos.parasyris@intel.com>
Date: Mon, 27 Apr 2026 07:30:01 -0700
Subject: [PATCH 3/3] Fix formatting

---
 sycl/include/sycl/sycl.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
index ef4e8070cea25..7c3ac1b98e098 100644
--- a/sycl/include/sycl/sycl.hpp
+++ b/sycl/include/sycl/sycl.hpp
@@ -151,5 +151,5 @@ can be disabled by setting SYCL_DISABLE_FSYCL_SYCLHPP_WARNING macro.")
 #include <sycl/khr/dynamic_addrspace_cast.hpp>
 #include <sycl/khr/free_function_commands.hpp>
 #include <sycl/khr/group_interface.hpp>
-#include <sycl/khr/static_addrspace_cast.hpp>
 #include <sycl/khr/includes/work_item_queries.hpp>
+#include <sycl/khr/static_addrspace_cast.hpp>