diff --git a/sycl/include/sycl/detail/get_kernel_info_impl.hpp b/sycl/include/sycl/detail/get_kernel_info_impl.hpp
index 9774d479218b..b564e803a316 100644
--- a/sycl/include/sycl/detail/get_kernel_info_impl.hpp
+++ b/sycl/include/sycl/detail/get_kernel_info_impl.hpp
@@ -21,7 +21,7 @@ class DeviceKernelInfo;
 // Fetches the cached kernel via the program manager and dispatches to
 // get_kernel_device_specific_info. Validation that kernel_impl::get_info
 // performs is replicated in the library-side definition (see
-// validateDeviceSpecificQuery in source/detail/get_device_kernel_info.cpp).
+// validateDeviceSpecificQuery in source/detail/get_kernel_info_impl.cpp).
 // Explicit instantiations for every kernel_device_specific descriptor form
 // the ABI boundary; user code reaches these through the public entry points
 // in ext/oneapi/get_kernel_info.hpp.
diff --git a/sycl/source/detail/get_kernel_info_impl.cpp b/sycl/source/detail/get_kernel_info_impl.cpp
index 1b3396b16216..402167777601 100644
--- a/sycl/source/detail/get_kernel_info_impl.cpp
+++ b/sycl/source/detail/get_kernel_info_impl.cpp
@@ -11,7 +11,6 @@
 
 #include <detail/context_impl.hpp>
 #include <detail/device_impl.hpp>
-#include <detail/global_handler.hpp>
 #include <detail/kernel_info.hpp>
 #include <detail/program_manager/program_manager.hpp>
 
diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
index 66d0e647f813..985715d0cdb5 100644
--- a/sycl/source/detail/kernel_impl.hpp
+++ b/sycl/source/detail/kernel_impl.hpp
@@ -334,7 +334,7 @@ inline context kernel_impl::get_info<info::kernel::context>() const {
 }
 
 // NOTE: the global_work_size and spill_memory_size pre-query checks below are
-// mirrored in validateDeviceSpecificQuery (get_device_kernel_info.cpp), which
+// mirrored in validateDeviceSpecificQuery (get_kernel_info_impl.cpp), which
 // serves the ext::oneapi::get_kernel_info<KernelName, Param> fast path that
 // does not go through kernel_impl. Keep both in sync.
 template <typename Param>