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
diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
index d9b8807ee5eb6..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/includes/work_item_queries.hpp>
 #include <sycl/khr/static_addrspace_cast.hpp>
-#include <sycl/khr/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.