diff --git a/sycl/include/sycl/khr/group_interface.hpp b/sycl/include/sycl/khr/group_interface.hpp
index e548be72c35f2..d7e19db1e3953 100644
--- a/sycl/include/sycl/khr/group_interface.hpp
+++ b/sycl/include/sycl/khr/group_interface.hpp
@@ -13,11 +13,9 @@
 
 #define SYCL_KHR_GROUP_INTERFACE 1
 
-#if __cplusplus >= 202302L && defined(__has_include)
-#if __has_include(<mdspan>)
+#if __cplusplus >= 202302L && __has_include(<mdspan>)
 #include <mdspan>
 #endif
-#endif
 
 namespace sycl {
 inline namespace _V1 {
diff --git a/sycl/source/detail/os_util.cpp b/sycl/source/detail/os_util.cpp
index 9069e1ca25ef0..437743c9af241 100644
--- a/sycl/source/detail/os_util.cpp
+++ b/sycl/source/detail/os_util.cpp
@@ -13,10 +13,10 @@
 #include <limits>
 
 // For GCC versions less than 8, use experimental/filesystem.
-#if defined(__has_include) && __has_include(<filesystem>)
+#if __has_include(<filesystem>)
 #include <filesystem>
 namespace fs = std::filesystem;
-#elif defined(__has_include) && __has_include(<experimental/filesystem>)
+#elif __has_include(<experimental/filesystem>)
 #include <experimental/filesystem>
 namespace fs = std::experimental::filesystem;
 #else