diff --git a/sycl/include/sycl/detail/array.hpp b/sycl/include/sycl/detail/array.hpp
index 30dc6311b2105..2b723a2ebf73e 100644
--- a/sycl/include/sycl/detail/array.hpp
+++ b/sycl/include/sycl/detail/array.hpp
@@ -9,7 +9,10 @@
 #pragma once
 
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL_ALWAYS_INLINE
+
+#ifndef __SYCL_DEVICE_ONLY__
 #include <sycl/exception.hpp>
+#endif
 
 #include <stddef.h>    // for size_t
 #include <type_traits> // for enable_if_t
diff --git a/sycl/include/sycl/info/info_desc.hpp b/sycl/include/sycl/info/info_desc.hpp
index 3b2765be4f667..3f4fd7e34045f 100644
--- a/sycl/include/sycl/info/info_desc.hpp
+++ b/sycl/include/sycl/info/info_desc.hpp
@@ -29,6 +29,7 @@
 namespace sycl {
 inline namespace _V1 {
 
+class context;
 class device;
 class platform;
 class kernel_id;
diff --git a/sycl/include/syclcompat/dims.hpp b/sycl/include/syclcompat/dims.hpp
index 0497cc7f6ebb4..3af6c15f96d2a 100644
--- a/sycl/include/syclcompat/dims.hpp
+++ b/sycl/include/syclcompat/dims.hpp
@@ -22,6 +22,7 @@
 
 #pragma once
 
+#include <stdexcept>
 #include <tuple>
 
 #include <sycl/range.hpp>
diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp
index 668cbc647daef..693c03073c321 100644
--- a/sycl/test/include_deps/sycl_accessor.hpp.cpp
+++ b/sycl/test/include_deps/sycl_accessor.hpp.cpp
@@ -11,10 +11,10 @@
 // CHECK-NEXT: backend_types.hpp
 // CHECK-NEXT: stl_wrappers/cstdlib
 // CHECK-NEXT: detail/array.hpp
+// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: exception.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: detail/string.hpp
-// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: stl_wrappers/cassert
 // CHECK-NEXT: stl_wrappers/assert.h
 // CHECK-NEXT: __spirv/spirv_vars.hpp
diff --git a/sycl/test/include_deps/sycl_buffer.hpp.cpp b/sycl/test/include_deps/sycl_buffer.hpp.cpp
index ced2f150c320e..d7bba03c556fe 100644
--- a/sycl/test/include_deps/sycl_buffer.hpp.cpp
+++ b/sycl/test/include_deps/sycl_buffer.hpp.cpp
@@ -10,10 +10,10 @@
 // CHECK-NEXT: backend_types.hpp
 // CHECK-NEXT: stl_wrappers/cstdlib
 // CHECK-NEXT: detail/array.hpp
+// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: exception.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: detail/string.hpp
-// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: stl_wrappers/cassert
 // CHECK-NEXT: stl_wrappers/assert.h
 // CHECK-NEXT: __spirv/spirv_vars.hpp
diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
index 9a0791c5e9133..ecd570eaba235 100644
--- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp
+++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -12,10 +12,10 @@
 // CHECK-NEXT: backend_types.hpp
 // CHECK-NEXT: stl_wrappers/cstdlib
 // CHECK-NEXT: detail/array.hpp
+// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: exception.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: detail/string.hpp
-// CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: stl_wrappers/cassert
 // CHECK-NEXT: stl_wrappers/assert.h
 // CHECK-NEXT: __spirv/spirv_vars.hpp