diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp
index 543012bbac..bcc9f83367 100644
--- a/level_zero/core/source/device/device_imp.cpp
+++ b/level_zero/core/source/device/device_imp.cpp
@@ -30,8 +30,6 @@
 #include "shared/source/utilities/debug_settings_reader_creator.h"
 
 #include "opencl/source/mem_obj/mem_obj.h"
-#include "opencl/source/os_interface/ocl_reg_path.h"
-#include "opencl/source/program/program.h"
 
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/cache/cache_reservation.h"
diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp
index 218fe0718c..b3469c0a8b 100644
--- a/opencl/source/kernel/kernel.cpp
+++ b/opencl/source/kernel/kernel.cpp
@@ -21,6 +21,7 @@
 #include "shared/source/helpers/kernel_helpers.h"
 #include "shared/source/helpers/per_thread_data.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/kernel/kernel_arg_descriptor_extended_device_side_enqueue.h"
 #include "shared/source/kernel/kernel_arg_descriptor_extended_vme.h"
 #include "shared/source/memory_manager/memory_manager.h"
@@ -42,7 +43,6 @@
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
 #include "opencl/source/helpers/sampler_helpers.h"
-#include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/kernel/image_transformer.h"
 #include "opencl/source/kernel/kernel.inl"
 #include "opencl/source/kernel/kernel_info_cl.h"
diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp
index 5c7d915ab1..95e468c1ba 100644
--- a/opencl/test/unit_test/kernel/kernel_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
@@ -24,7 +25,6 @@
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/helpers/memory_properties_helpers.h"
-#include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
@@ -3421,4 +3421,4 @@ TEST_F(KernelImplicitArgsTest, givenKernelWithoutImplicitArgsWhenSettingKernelPa
     kernel.setNumWorkGroupsValues(3, 2, 1);
 
     EXPECT_EQ(nullptr, kernel.getImplicitArgs());
-}
\ No newline at end of file
+}
diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h
index 17fe099598..0286de2a80 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h
+++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h
@@ -7,8 +7,7 @@
 
 #pragma once
 #include "shared/source/gmm_helper/resource_info.h"
-
-#include "opencl/source/helpers/surface_formats.h"
+#include "shared/source/helpers/surface_format_info.h"
 
 #include "gmock/gmock.h"
 
diff --git a/shared/source/helpers/blit_commands_helper_xehp_and_later.inl b/shared/source/helpers/blit_commands_helper_xehp_and_later.inl
index 2294d319ba..5e18da8973 100644
--- a/shared/source/helpers/blit_commands_helper_xehp_and_later.inl
+++ b/shared/source/helpers/blit_commands_helper_xehp_and_later.inl
@@ -12,8 +12,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/blit_commands_helper_base.inl"
 
-#include "opencl/source/helpers/hardware_commands_helper.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/helpers/cache_flush.inl b/shared/source/helpers/cache_flush.inl
index ec0c848cf8..05d42328c9 100644
--- a/shared/source/helpers/cache_flush.inl
+++ b/shared/source/helpers/cache_flush.inl
@@ -10,9 +10,6 @@
 #include "shared/source/helpers/l3_range.h"
 #include "shared/source/utilities/range.h"
 
-#include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/source/kernel/kernel.h"
-
 #include "hw_cmds.h"
 
 namespace NEO {
diff --git a/shared/source/os_interface/windows/page_table_manager_functions.cpp b/shared/source/os_interface/windows/page_table_manager_functions.cpp
index 1f30adafb8..aaf862bde9 100644
--- a/shared/source/os_interface/windows/page_table_manager_functions.cpp
+++ b/shared/source/os_interface/windows/page_table_manager_functions.cpp
@@ -9,8 +9,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 
-#include "opencl/source/platform/platform.h"
-
 namespace NEO {
 GmmPageTableMngr::GmmPageTableMngr(GmmClientContext *gmmClientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) : clientContext(gmmClientContext->getHandle()) {
     pageTableManager = clientContext->CreatePageTblMgrObject(translationTableCb, translationTableFlags);
diff --git a/shared/test/common/mocks/mock_memory_manager.cpp b/shared/test/common/mocks/mock_memory_manager.cpp
index 6df6f6258f..d3126f712f 100644
--- a/shared/test/common/mocks/mock_memory_manager.cpp
+++ b/shared/test/common/mocks/mock_memory_manager.cpp
@@ -9,9 +9,9 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/memory_manager/deferred_deleter.h"
 
-#include "opencl/source/helpers/surface_formats.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 
 #include <cstring>