diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp
index 6af249b911..715a00a22e 100644
--- a/opencl/source/api/api.cpp
+++ b/opencl/source/api/api.cpp
@@ -8,7 +8,6 @@
 #include "api.h"
 
 #include "shared/source/aub/aub_center.h"
-#include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
@@ -19,8 +18,6 @@
 #include "shared/source/os_interface/debug_env_reader.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/utilities/buffer_pool_allocator.inl"
-#include "shared/source/utilities/heap_allocator.h"
-#include "shared/source/utilities/staging_buffer_manager.h"
 
 #include "opencl/source/api/additional_extensions.h"
 #include "opencl/source/api/api_enter.h"
diff --git a/opencl/source/built_ins/builtins_dispatch_builder.h b/opencl/source/built_ins/builtins_dispatch_builder.h
index 48b3b34bea..9cdd65dbfa 100644
--- a/opencl/source/built_ins/builtins_dispatch_builder.h
+++ b/opencl/source/built_ins/builtins_dispatch_builder.h
@@ -21,6 +21,11 @@
 
 namespace NEO {
 struct BuiltinCode;
+class BuiltIns;
+class GraphicsAllocation;
+class Kernel;
+struct KernelInfo;
+
 typedef std::vector<char> BuiltinResourceT;
 
 class ClDeviceVector;
diff --git a/opencl/source/cl_device/cl_device.h b/opencl/source/cl_device/cl_device.h
index af50ef1542..d9b00d57d6 100644
--- a/opencl/source/cl_device/cl_device.h
+++ b/opencl/source/cl_device/cl_device.h
@@ -43,6 +43,8 @@ struct SelectorCopyEngine;
 class GfxCoreHelper;
 class ProductHelper;
 class GTPinGfxCoreHelper;
+class CompilerProductHelper;
+enum class EngineGroupType : uint32_t;
 
 template <>
 struct OpenCLObjectMapper<_cl_device_id> {
diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index 05c34ca18b..0517e41a69 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -21,7 +21,6 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/gtpin/gtpin_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
diff --git a/opencl/source/cl_device/cl_device_info.cpp b/opencl/source/cl_device/cl_device_info.cpp
index 668d7ce7d8..a94fec5e8a 100644
--- a/opencl/source/cl_device/cl_device_info.cpp
+++ b/opencl/source/cl_device/cl_device_info.cpp
@@ -12,17 +12,13 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/get_info.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_time.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/cl_device/cl_device_get_cap.inl"
 #include "opencl/source/cl_device/cl_device_info_map.h"
-#include "opencl/source/cl_device/cl_device_vector.h"
 #include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
-#include "opencl/source/platform/platform.h"
 
 namespace NEO {
 
diff --git a/opencl/source/command_queue/cl_local_work_size.cpp b/opencl/source/command_queue/cl_local_work_size.cpp
index 0ece9b98f2..7f193b996c 100644
--- a/opencl/source/command_queue/cl_local_work_size.cpp
+++ b/opencl/source/command_queue/cl_local_work_size.cpp
@@ -7,9 +7,6 @@
 
 #include "opencl/source/command_queue/cl_local_work_size.h"
 
-#include "shared/source/device/device.h"
-#include "shared/source/helpers/basic_math.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/local_work_size.h"
 #include "shared/source/utilities/logger.h"
 
diff --git a/opencl/source/command_queue/command_queue.h b/opencl/source/command_queue/command_queue.h
index ca3c5ff24a..38f6d058fc 100644
--- a/opencl/source/command_queue/command_queue.h
+++ b/opencl/source/command_queue/command_queue.h
@@ -26,6 +26,10 @@
 #include <optional>
 #include <span>
 
+namespace aub_stream {
+enum EngineType : uint32_t;
+} // namespace aub_stream
+
 namespace NEO {
 class BarrierCommand;
 class Buffer;
@@ -46,6 +50,13 @@ struct CsrSelectionArgs;
 struct MultiDispatchInfo;
 struct TimestampPacketDependencies;
 struct StagingTransferStatus;
+class CommandStreamReceiver;
+class CsrDependencies;
+class Device;
+class MemObj;
+class TagNodeBase;
+enum class MapOperationType;
+struct EngineControl;
 
 enum class QueuePriority {
     low,
diff --git a/opencl/source/command_queue/hardware_interface.h b/opencl/source/command_queue/hardware_interface.h
index 73c46a7eca..84e15aea9e 100644
--- a/opencl/source/command_queue/hardware_interface.h
+++ b/opencl/source/command_queue/hardware_interface.h
@@ -11,6 +11,9 @@
 
 #include <cstdint>
 
+template <typename T>
+struct Vec3;
+
 namespace NEO {
 
 class CommandQueue;
@@ -30,9 +33,9 @@ struct TimestampPacketDependencies;
 struct KernelInfo;
 struct EncodeWalkerArgs;
 struct HardwareInfo;
-
 template <class T>
 class TagNode;
+enum class DebugPauseState : uint32_t;
 
 struct HardwareInterfaceWalkerArgs {
     size_t globalWorkSizes[3] = {};
diff --git a/opencl/source/command_queue/resource_barrier.h b/opencl/source/command_queue/resource_barrier.h
index c494cde7a1..eac608edf2 100644
--- a/opencl/source/command_queue/resource_barrier.h
+++ b/opencl/source/command_queue/resource_barrier.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/utilities/stackvec.h"
 
@@ -14,6 +15,8 @@
 
 namespace NEO {
 class CommandQueue;
+class Surface;
+
 class BarrierCommand : NEO::NonCopyableAndNonMovableClass {
   public:
     BarrierCommand(CommandQueue *commandQueue, const cl_resource_barrier_descriptor_intel *descriptors, uint32_t numDescriptors);
diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp
index d4a4ea6f84..a80b79e5af 100644
--- a/opencl/source/context/context.cpp
+++ b/opencl/source/context/context.cpp
@@ -8,9 +8,7 @@
 #include "opencl/source/context/context.h"
 
 #include "shared/source/ail/ail_configuration.h"
-#include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/sub_device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
@@ -39,8 +37,6 @@
 #include "opencl/source/sharings/sharing.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
-#include "d3d_sharing_functions.h"
-
 #include <algorithm>
 #include <memory>
 
diff --git a/opencl/source/context/context.h b/opencl/source/context/context.h
index fba14abf97..d2bb50ab71 100644
--- a/opencl/source/context/context.h
+++ b/opencl/source/context/context.h
@@ -29,7 +29,6 @@ enum class InternalMemoryType : uint32_t;
 namespace NEO {
 struct MemoryProperties;
 class HeapAllocator;
-
 class AsyncEventsHandler;
 class CommandQueue;
 class Device;
@@ -42,6 +41,7 @@ class Program;
 class Platform;
 class TagAllocatorBase;
 class StagingBufferManager;
+class ClDevice;
 
 template <>
 struct OpenCLObjectMapper<_cl_context> {
diff --git a/opencl/source/event/async_events_handler.cpp b/opencl/source/event/async_events_handler.cpp
index 52bcdc31a6..af75d6f02f 100644
--- a/opencl/source/event/async_events_handler.cpp
+++ b/opencl/source/event/async_events_handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "opencl/source/event/async_events_handler.h"
 
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/os_interface/os_thread.h"
 
 #include "opencl/source/event/event.h"
diff --git a/opencl/source/event/event_builder.cpp b/opencl/source/event/event_builder.cpp
index d3c9f1da5e..f41bfb48fa 100644
--- a/opencl/source/event/event_builder.cpp
+++ b/opencl/source/event/event_builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,7 @@
 #include "opencl/source/event/event_builder.h"
 
 #include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/helpers/timestamp_packet.h"
 
-#include "opencl/source/api/cl_types.h"
 #include "opencl/source/event/user_event.h"
 
 namespace NEO {
diff --git a/opencl/source/event/event_builder.h b/opencl/source/event/event_builder.h
index c80c17a3fb..21199bc6b7 100644
--- a/opencl/source/event/event_builder.h
+++ b/opencl/source/event/event_builder.h
@@ -14,6 +14,9 @@
 
 #include <type_traits>
 
+template <typename DataType>
+class ArrayRef;
+
 namespace NEO {
 
 class Event;
diff --git a/opencl/source/event/user_event.cpp b/opencl/source/event/user_event.cpp
index 4f6d5058c6..0290f0586a 100644
--- a/opencl/source/event/user_event.cpp
+++ b/opencl/source/event/user_event.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,10 +9,8 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/device/device.h"
 
 #include "opencl/source/command_queue/command_queue.h"
-#include "opencl/source/context/context.h"
 
 namespace NEO {
 
diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
index 3a844e63e5..e89130098c 100644
--- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
+++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
@@ -1,21 +1,15 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/gen12lp/hw_cmds.h"
-#include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
-#include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/mem_obj/image.h"
-#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/helpers/enable_family_full_ocl.h"
 
 namespace NEO {
-
 using Family = Gen12LpFamily;
 
 struct EnableOCLGen12LP {
diff --git a/opencl/source/gtpin/gtpin_helpers.cpp b/opencl/source/gtpin/gtpin_helpers.cpp
index 4ba29ce4c8..6693dd6464 100644
--- a/opencl/source/gtpin/gtpin_helpers.cpp
+++ b/opencl/source/gtpin/gtpin_helpers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "gtpin_helpers.h"
 
 #include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/validators.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
@@ -17,7 +16,6 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/gtpin/gtpin_gfx_core_helper.h"
-#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/buffer.h"
 
 #include "CL/cl.h"
diff --git a/opencl/source/helpers/CMakeLists.txt b/opencl/source/helpers/CMakeLists.txt
index 7e819e44ea..6686d3cb19 100644
--- a/opencl/source/helpers/CMakeLists.txt
+++ b/opencl/source/helpers/CMakeLists.txt
@@ -26,6 +26,7 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_ocl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/get_info_status_mapper.h
diff --git a/opencl/source/helpers/api_specific_config_ocl.cpp b/opencl/source/helpers/api_specific_config_ocl.cpp
index 6b4f8f9c1d..915a0d4639 100644
--- a/opencl/source/helpers/api_specific_config_ocl.cpp
+++ b/opencl/source/helpers/api_specific_config_ocl.cpp
@@ -9,14 +9,13 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/compiler_product_helper.h"
-#include "shared/source/release_helper/release_helper.h"
 
 #include "opencl/source/os_interface/ocl_reg_path.h"
 
 #include <string>
-#include <vector>
 
 namespace NEO {
+
 StackVec<const char *, 4> validClPrefixes;
 StackVec<NEO::DebugVarPrefix, 4> validClPrefixTypes;
 bool ApiSpecificConfig::isStatelessCompressionSupported() {
diff --git a/opencl/source/helpers/base_object.h b/opencl/source/helpers/base_object.h
index 68e32bebec..94b0c1d88d 100644
--- a/opencl/source/helpers/base_object.h
+++ b/opencl/source/helpers/base_object.h
@@ -18,6 +18,8 @@
 #include <condition_variable>
 #include <thread>
 
+struct _cl_mem;
+
 namespace NEO {
 
 #if defined(__clang__)
diff --git a/opencl/source/helpers/cl_gfx_core_helper.h b/opencl/source/helpers/cl_gfx_core_helper.h
index c086593ebc..48b5ed5ac0 100644
--- a/opencl/source/helpers/cl_gfx_core_helper.h
+++ b/opencl/source/helpers/cl_gfx_core_helper.h
@@ -27,8 +27,9 @@ struct HardwareInfo;
 struct KernelInfo;
 struct MultiDispatchInfo;
 struct RootDeviceEnvironment;
-
 class ClGfxCoreHelper;
+enum class EngineGroupType : uint32_t;
+
 using createClGfxCoreHelperFunctionType = std::unique_ptr<ClGfxCoreHelper> (*)();
 
 class ClGfxCoreHelper : public ApiGfxCoreHelper {
diff --git a/opencl/source/helpers/dispatch_info.h b/opencl/source/helpers/dispatch_info.h
index 2ccfff205f..958f4ef5be 100644
--- a/opencl/source/helpers/dispatch_info.h
+++ b/opencl/source/helpers/dispatch_info.h
@@ -19,10 +19,10 @@
 
 namespace NEO {
 class LinearStream;
-
 class Kernel;
 class ClDevice;
 struct TimestampPacketDependencies;
+class MemObj;
 
 class DispatchInfo {
 
diff --git a/opencl/source/helpers/enable_family_full_ocl.h b/opencl/source/helpers/enable_family_full_ocl.h
new file mode 100644
index 0000000000..ce90062ae0
--- /dev/null
+++ b/opencl/source/helpers/enable_family_full_ocl.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/helpers/populate_factory.h"
+
+namespace NEO {
+
+template <typename GfxFamily>
+class BufferHw;
+
+template <typename GfxFamily>
+class ClGfxCoreHelperHw;
+
+template <typename GfxFamily>
+class CommandQueueHw;
+
+template <typename GfxFamily>
+class ImageHw;
+
+template <typename GfxFamily>
+struct SamplerHw;
+
+} // namespace NEO
\ No newline at end of file
diff --git a/opencl/source/helpers/properties_helper.cpp b/opencl/source/helpers/properties_helper.cpp
index 4f2327f8e9..33e5cd03bb 100644
--- a/opencl/source/helpers/properties_helper.cpp
+++ b/opencl/source/helpers/properties_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,6 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/device.h"
-#include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_context.h"
 
diff --git a/opencl/source/helpers/properties_helper.h b/opencl/source/helpers/properties_helper.h
index 38f3b85ed8..e9045c5568 100644
--- a/opencl/source/helpers/properties_helper.h
+++ b/opencl/source/helpers/properties_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,6 +17,7 @@ namespace NEO {
 class MemObj;
 class Buffer;
 class GraphicsAllocation;
+class CommandStreamReceiver;
 
 struct EventsRequest {
     EventsRequest() = delete;
diff --git a/opencl/source/helpers/surface_formats.cpp b/opencl/source/helpers/surface_formats.cpp
index c10239b7b7..2dc7b1ffdb 100644
--- a/opencl/source/helpers/surface_formats.cpp
+++ b/opencl/source/helpers/surface_formats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,6 @@
 
 #include "surface_formats.h"
 
-#include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/array_count.h"
-
-#include "opencl/source/api/cl_types.h"
 #include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/mem_obj/image.h"
 
diff --git a/opencl/source/helpers/task_information.h b/opencl/source/helpers/task_information.h
index 5b2ed58a06..8c0f57c943 100644
--- a/opencl/source/helpers/task_information.h
+++ b/opencl/source/helpers/task_information.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -32,8 +32,10 @@ class HwTimeStamps;
 class TimestampPacketContainer;
 template <class T>
 class TagNode;
-
 enum PreemptionMode : uint32_t;
+class TagNodeBase;
+enum class MapOperationType;
+struct TimestampPacketDependencies;
 
 struct KernelOperation {
   protected:
diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp
index 6876e4c1a7..3846e313fe 100644
--- a/opencl/source/kernel/kernel.cpp
+++ b/opencl/source/kernel/kernel.cpp
@@ -7,7 +7,6 @@
 
 #include "opencl/source/kernel/kernel.h"
 
-#include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
@@ -34,19 +33,16 @@
 #include "shared/source/memory_manager/compression_selector.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/product_helper.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/utilities/lookup_array.h"
-#include "shared/source/utilities/tag_allocator.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/cl_local_work_size.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/event/event.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_validators.h"
@@ -63,14 +59,12 @@
 #include "patch_list.h"
 
 #include <algorithm>
-#include <cstdint>
 #include <ranges>
 #include <vector>
 
 using namespace iOpenCL;
 
 namespace NEO {
-class Surface;
 
 uint32_t Kernel::dummyPatchLocation = 0xbaddf00d;
 
diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h
index 20d9036714..aa6ef2c5fd 100644
--- a/opencl/source/kernel/kernel.h
+++ b/opencl/source/kernel/kernel.h
@@ -42,6 +42,9 @@ class Surface;
 class PrintfHandler;
 class MultiDeviceKernel;
 class LocalIdsCache;
+class ExecutionEnvironment;
+class GfxCoreHelper;
+struct HardwareInfo;
 
 class Kernel : public ReferenceTrackedObject<Kernel>, NEO::NonCopyableAndNonMovableClass {
   public:
diff --git a/opencl/source/kernel/multi_device_kernel.h b/opencl/source/kernel/multi_device_kernel.h
index f9524df30c..1baeab1e9d 100644
--- a/opencl/source/kernel/multi_device_kernel.h
+++ b/opencl/source/kernel/multi_device_kernel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,6 +15,8 @@
 namespace NEO {
 class ClDeviceVector;
 class MultiGraphicsAllocation;
+class Context;
+class MultiDeviceKernel;
 
 template <>
 struct OpenCLObjectMapper<_cl_kernel> {
diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp
index 3736e8393e..aafb56aea4 100644
--- a/opencl/source/mem_obj/buffer.cpp
+++ b/opencl/source/mem_obj/buffer.cpp
@@ -12,7 +12,6 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/blit_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
@@ -24,7 +23,6 @@
 #include "shared/source/memory_manager/memory_operations_handler.h"
 #include "shared/source/memory_manager/migration_sync_data.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/utilities/cpuintrinsics.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
diff --git a/opencl/source/mem_obj/buffer.h b/opencl/source/mem_obj/buffer.h
index 21023a1b43..7a5f0a463d 100644
--- a/opencl/source/mem_obj/buffer.h
+++ b/opencl/source/mem_obj/buffer.h
@@ -23,6 +23,8 @@ class ClDevice;
 class Device;
 class MemoryManager;
 struct EncodeSurfaceStateArgs;
+class GraphicsAllocation;
+class SharingHandler;
 
 using BufferCreateFunc = Buffer *(*)(Context *context,
                                      const MemoryProperties &memoryProperties,
diff --git a/opencl/source/mem_obj/image.h b/opencl/source/mem_obj/image.h
index cd4432b4ae..7ba0919d1c 100644
--- a/opencl/source/mem_obj/image.h
+++ b/opencl/source/mem_obj/image.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/memory_manager/graphics_allocation.h"
 
 #include "opencl/source/helpers/surface_formats.h"
@@ -21,6 +22,8 @@ struct HardwareInfo;
 struct KernelInfo;
 struct SurfaceFormatInfo;
 struct UnifiedSharingMemoryDescription;
+class MemoryManager;
+class SharingHandler;
 
 using ImageCreateFunc = Image *(*)(Context *context,
                                    const MemoryProperties &memoryProperties,
diff --git a/opencl/source/mem_obj/map_operations_handler.h b/opencl/source/mem_obj/map_operations_handler.h
index df09cd2118..ba66c4da79 100644
--- a/opencl/source/mem_obj/map_operations_handler.h
+++ b/opencl/source/mem_obj/map_operations_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,7 @@
 #include <vector>
 
 namespace NEO {
+class GraphicsAllocation;
 
 class MapOperationsHandler {
   public:
diff --git a/opencl/source/mem_obj/mem_obj.h b/opencl/source/mem_obj/mem_obj.h
index 1a12219fa9..f582883e93 100644
--- a/opencl/source/mem_obj/mem_obj.h
+++ b/opencl/source/mem_obj/mem_obj.h
@@ -29,6 +29,7 @@ class GraphicsAllocation;
 struct KernelInfo;
 class MemoryManager;
 class Context;
+class MemObj;
 
 template <>
 struct OpenCLObjectMapper<_cl_mem> {
diff --git a/opencl/source/mem_obj/mem_obj_helper.cpp b/opencl/source/mem_obj/mem_obj_helper.cpp
index 339ba45d73..655f47a7c0 100644
--- a/opencl/source/mem_obj/mem_obj_helper.cpp
+++ b/opencl/source/mem_obj/mem_obj_helper.cpp
@@ -8,13 +8,11 @@
 #include "opencl/source/mem_obj/mem_obj_helper.h"
 
 #include "shared/source/device/device.h"
-#include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 
 namespace NEO {
diff --git a/opencl/source/mem_obj/mem_obj_helper.h b/opencl/source/mem_obj/mem_obj_helper.h
index b8f8ddff2e..43819a0505 100644
--- a/opencl/source/mem_obj/mem_obj_helper.h
+++ b/opencl/source/mem_obj/mem_obj_helper.h
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+
 #include "shared/source/helpers/bit_helpers.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
@@ -18,6 +19,9 @@
 namespace NEO {
 
 class Context;
+struct HardwareInfo;
+struct ImageInfo;
+struct MemoryProperties;
 
 class MemObjHelper {
   public:
diff --git a/opencl/source/memory_manager/compression_selector_ocl.cpp b/opencl/source/memory_manager/compression_selector_ocl.cpp
index 23ff85da0d..657fb56640 100644
--- a/opencl/source/memory_manager/compression_selector_ocl.cpp
+++ b/opencl/source/memory_manager/compression_selector_ocl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/compression_selector.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/os_interface/product_helper.h"
 
 namespace NEO {
 bool CompressionSelector::preferCompressedAllocation(const AllocationProperties &properties) {
diff --git a/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp b/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp
index 96a7e83a50..b308bb9e48 100644
--- a/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp
+++ b/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp
@@ -9,7 +9,6 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/os_interface/os_interface.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 
 #include "opencl/source/command_queue/command_queue.h"
diff --git a/opencl/source/platform/platform.h b/opencl/source/platform/platform.h
index 5662dcacd6..df54c1ba6a 100644
--- a/opencl/source/platform/platform.h
+++ b/opencl/source/platform/platform.h
@@ -24,6 +24,7 @@ class GmmHelper;
 class GmmClientContext;
 struct PlatformInfo;
 struct HardwareInfo;
+class ClDevice;
 
 template <>
 struct OpenCLObjectMapper<_cl_platform_id> {
diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp
index 9ee3b0fbef..2242c33c16 100644
--- a/opencl/source/program/build.cpp
+++ b/opencl/source/program/build.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,10 +9,7 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/compiler_warnings/compiler_warnings.h"
-#include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/device/device.h"
-#include "shared/source/device_binary_format/device_binary_formats.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/addressing_mode_helper.h"
 #include "shared/source/helpers/compiler_options_parser.h"
@@ -22,14 +19,8 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/cl_validators.h"
-#include "opencl/source/platform/platform.h"
 #include "opencl/source/program/program.h"
 
-#include <cstring>
-#include <iterator>
-#include <sstream>
-
 namespace NEO {
 
 cl_int Program::build(
diff --git a/opencl/source/program/compile.cpp b/opencl/source/program/compile.cpp
index 32d4244b46..abcb7b946b 100644
--- a/opencl/source/program/compile.cpp
+++ b/opencl/source/program/compile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,19 +8,14 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/compiler_warnings/compiler_warnings.h"
-#include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/compiler_interface/linker.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/device_binary_format/elf/elf.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/compiler_options_parser.h"
 
 #include "opencl/source/cl_device/cl_device.h"
-#include "opencl/source/helpers/cl_validators.h"
-#include "opencl/source/platform/platform.h"
 
 #include "program.h"
 
diff --git a/opencl/source/program/create.cpp b/opencl/source/program/create.cpp
index 6521c8c97a..a6b2f201c8 100644
--- a/opencl/source/program/create.cpp
+++ b/opencl/source/program/create.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "opencl/source/program/create.inl"
 
-#include "shared/source/compiler_interface/external_functions.h"
-
 #include "opencl/source/program/program.h"
 
 namespace NEO {
diff --git a/opencl/source/program/get_info.cpp b/opencl/source/program/get_info.cpp
index f01ac665df..c5bcef1912 100644
--- a/opencl/source/program/get_info.cpp
+++ b/opencl/source/program/get_info.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,15 +7,12 @@
 
 #include "shared/source/helpers/get_info.h"
 
-#include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/device/device.h"
 #include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/program/kernel_info.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/base_object.h"
-#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
 
 #include "program.h"
diff --git a/opencl/source/program/link.cpp b/opencl/source/program/link.cpp
index 38604ad03f..3158765e21 100644
--- a/opencl/source/program/link.cpp
+++ b/opencl/source/program/link.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,18 +7,13 @@
 
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/compiler_options.h"
-#include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/compiler_interface/linker.h"
 #include "shared/source/device/device.h"
-#include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/device_binary_format/elf/elf.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
-#include "shared/source/program/kernel_info.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/program/program.h"
 
 namespace NEO {
diff --git a/opencl/source/program/printf_handler.cpp b/opencl/source/program/printf_handler.cpp
index 8378750f8e..4f2f62966e 100644
--- a/opencl/source/program/printf_handler.cpp
+++ b/opencl/source/program/printf_handler.cpp
@@ -9,11 +9,8 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/device.h"
-#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/blit_properties.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/ptr_math.h"
-#include "shared/source/kernel/implicit_args_helper.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/compression_selector.h"
 #include "shared/source/memory_manager/memory_manager.h"
diff --git a/opencl/source/program/process_intermediate_binary.cpp b/opencl/source/program/process_intermediate_binary.cpp
index fc0f29851d..af0f01f66f 100644
--- a/opencl/source/program/process_intermediate_binary.cpp
+++ b/opencl/source/program/process_intermediate_binary.cpp
@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/compiler_interface/linker.h"
 #include "shared/source/helpers/string.h"
 
 #include "program.h"
diff --git a/opencl/source/program/program.h b/opencl/source/program/program.h
index 347f891c8e..db1f54d6ae 100644
--- a/opencl/source/program/program.h
+++ b/opencl/source/program/program.h
@@ -35,6 +35,9 @@ class ExecutionEnvironment;
 class Program;
 struct MetadataGeneration;
 struct KernelInfo;
+enum class DecodeError : uint8_t;
+struct ExternalFunctionInfo;
+
 template <>
 struct OpenCLObjectMapper<_cl_program> {
     typedef class Program DerivedType;
diff --git a/opencl/source/sharings/gl/cl_gl_api.cpp b/opencl/source/sharings/gl/cl_gl_api.cpp
index 14dc0c4ff3..399e51fcd1 100644
--- a/opencl/source/sharings/gl/cl_gl_api.cpp
+++ b/opencl/source/sharings/gl/cl_gl_api.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/utilities/api_intercept.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/api/api_enter.h"
diff --git a/opencl/source/sharings/gl/gl_cl_image_format.cpp b/opencl/source/sharings/gl/gl_cl_image_format.cpp
index 44863b1b28..de7d343779 100644
--- a/opencl/source/sharings/gl/gl_cl_image_format.cpp
+++ b/opencl/source/sharings/gl/gl_cl_image_format.cpp
@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "opencl/extensions/public/cl_gl_private_intel.h"
 #include "opencl/source/sharings/gl/gl_sharing.h"
 #include "opencl/source/sharings/gl/gl_texture.h"
 
diff --git a/opencl/source/sharings/gl/linux/gl_arb_sync_event_linux.cpp b/opencl/source/sharings/gl/linux/gl_arb_sync_event_linux.cpp
index be492f2d6b..e9869d23b2 100644
--- a/opencl/source/sharings/gl/linux/gl_arb_sync_event_linux.cpp
+++ b/opencl/source/sharings/gl/linux/gl_arb_sync_event_linux.cpp
@@ -1,15 +1,12 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/device/device.h"
-#include "shared/source/os_interface/os_interface.h"
 
-#include "opencl/extensions/public/cl_gl_private_intel.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/base_object.h"
diff --git a/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp b/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp
index 0e2f9b29d7..85e407bb35 100644
--- a/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp
+++ b/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "opencl/extensions/public/cl_gl_private_intel.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/mem_obj/buffer.h"
diff --git a/opencl/source/sharings/gl/linux/gl_texture_linux.cpp b/opencl/source/sharings/gl/linux/gl_texture_linux.cpp
index ecd911c131..d150e2b4f7 100644
--- a/opencl/source/sharings/gl/linux/gl_texture_linux.cpp
+++ b/opencl/source/sharings/gl/linux/gl_texture_linux.cpp
@@ -7,17 +7,14 @@
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/get_info.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/product_helper.h"
 
-#include "opencl/extensions/public/cl_gl_private_intel.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/gmm_types_converter.h"
diff --git a/opencl/source/sharings/sharing.cpp b/opencl/source/sharings/sharing.cpp
index ce4d32e327..532a614493 100644
--- a/opencl/source/sharings/sharing.cpp
+++ b/opencl/source/sharings/sharing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 
 #include "CL/cl.h"
 
-#include <memory>
-
 namespace NEO {
 
 int SharingHandler::acquire(MemObj *memObj, uint32_t rootDeviceIndex) {
diff --git a/opencl/source/sharings/unified/enable_unified.cpp b/opencl/source/sharings/unified/enable_unified.cpp
index e0a7cfeaa5..877d4bd6f4 100644
--- a/opencl/source/sharings/unified/enable_unified.cpp
+++ b/opencl/source/sharings/unified/enable_unified.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "opencl/source/sharings/unified/enable_unified.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
-
 #include "opencl/source/context/context.h"
 #include "opencl/source/context/context.inl"
 #include "opencl/source/sharings/sharing_factory.h"
diff --git a/opencl/source/sharings/unified/unified_buffer.h b/opencl/source/sharings/unified/unified_buffer.h
index 31c1e9138d..6031e67d9a 100644
--- a/opencl/source/sharings/unified/unified_buffer.h
+++ b/opencl/source/sharings/unified/unified_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,8 @@
 namespace NEO {
 class Buffer;
 class Context;
+enum class UnifiedSharingHandleType;
+struct UnifiedSharingMemoryDescription;
 
 class UnifiedBuffer : public UnifiedSharing {
     using UnifiedSharing::UnifiedSharing;
diff --git a/opencl/source/sharings/unified/unified_image.cpp b/opencl/source/sharings/unified/unified_image.cpp
index 27078bd8a2..bd968f7bb2 100644
--- a/opencl/source/sharings/unified/unified_image.cpp
+++ b/opencl/source/sharings/unified/unified_image.cpp
@@ -8,7 +8,6 @@
 #include "unified_image.h"
 
 #include "shared/source/gmm_helper/gmm.h"
-#include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
diff --git a/opencl/source/sharings/unified/unified_image.h b/opencl/source/sharings/unified/unified_image.h
index 4ccec1252c..b1b891d59e 100644
--- a/opencl/source/sharings/unified/unified_image.h
+++ b/opencl/source/sharings/unified/unified_image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,10 @@
 namespace NEO {
 class Image;
 class Context;
+class GraphicsAllocation;
+enum class UnifiedSharingHandleType;
+struct ImageInfo;
+struct UnifiedSharingMemoryDescription;
 
 class UnifiedImage : public UnifiedSharing {
     using UnifiedSharing::UnifiedSharing;
diff --git a/opencl/source/sharings/unified/unified_sharing.h b/opencl/source/sharings/unified/unified_sharing.h
index fc6a4f036a..cb2c090084 100644
--- a/opencl/source/sharings/unified/unified_sharing.h
+++ b/opencl/source/sharings/unified/unified_sharing.h
@@ -15,6 +15,10 @@
 namespace NEO {
 struct ImageInfo;
 class MultiGraphicsAllocation;
+class Context;
+enum class AllocationType;
+enum class UnifiedSharingHandleType;
+struct UnifiedSharingMemoryDescription;
 
 class UnifiedSharingFunctions : public SharingFunctions {
   public:
diff --git a/opencl/source/sharings/va/cl_va_api.cpp b/opencl/source/sharings/va/cl_va_api.cpp
index d5ac1aaeb0..c849c276ef 100644
--- a/opencl/source/sharings/va/cl_va_api.cpp
+++ b/opencl/source/sharings/va/cl_va_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,7 @@
 #include "opencl/source/sharings/va/cl_va_api.h"
 
 #include "shared/source/helpers/get_info.h"
-#include "shared/source/utilities/api_intercept.h"
 
-#include "opencl/source/api/api.h"
 #include "opencl/source/api/api_enter.h"
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
@@ -18,14 +16,11 @@
 #include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/sharings/va/va_device.h"
-#include "opencl/source/sharings/va/va_sharing.h"
 #include "opencl/source/sharings/va/va_surface.h"
 #include "opencl/source/utilities/cl_logger.h"
 
 #include "CL/cl.h"
 
-#include <cstring>
-
 using namespace NEO;
 
 cl_mem CL_API_CALL
diff --git a/opencl/source/sharings/va/va_device_shared.cpp b/opencl/source/sharings/va/va_device_shared.cpp
index a24c809c75..7a10f32891 100644
--- a/opencl/source/sharings/va/va_device_shared.cpp
+++ b/opencl/source/sharings/va/va_device_shared.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,9 +15,6 @@
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/sharings/va/va_device.h"
 
-#include <sys/stat.h>
-#include <system_error>
-#include <unistd.h>
 #include <va/va_backend.h>
 
 namespace NEO {
diff --git a/opencl/source/sharings/va/va_surface.cpp b/opencl/source/sharings/va/va_surface.cpp
index bf36d12a98..b4b9deb065 100644
--- a/opencl/source/sharings/va/va_surface.cpp
+++ b/opencl/source/sharings/va/va_surface.cpp
@@ -11,7 +11,6 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
-#include "shared/source/os_interface/linux/i915.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
diff --git a/opencl/source/utilities/cl_logger.h b/opencl/source/utilities/cl_logger.h
index ca129a8c0f..988f6f1f8a 100644
--- a/opencl/source/utilities/cl_logger.h
+++ b/opencl/source/utilities/cl_logger.h
@@ -15,6 +15,8 @@
 
 namespace NEO {
 struct MultiDispatchInfo;
+template <DebugFunctionalityLevel debugLevel>
+class FileLogger;
 
 template <DebugFunctionalityLevel debugLevel>
 class ClFileLogger : public NonCopyableAndNonMovableClass {
diff --git a/opencl/source/xe2_hpg_core/enable_family_full_ocl_xe2_hpg_core.cpp b/opencl/source/xe2_hpg_core/enable_family_full_ocl_xe2_hpg_core.cpp
index 0b1c6310fb..a966a5c76c 100644
--- a/opencl/source/xe2_hpg_core/enable_family_full_ocl_xe2_hpg_core.cpp
+++ b/opencl/source/xe2_hpg_core/enable_family_full_ocl_xe2_hpg_core.cpp
@@ -1,21 +1,15 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe2_hpg_core/hw_cmds.h"
 
-#include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
-#include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/mem_obj/image.h"
-#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/helpers/enable_family_full_ocl.h"
 
 namespace NEO {
-
 using Family = Xe2HpgCoreFamily;
 
 struct EnableOCLXe2HpgCore {
diff --git a/opencl/source/xe3_core/enable_family_full_ocl_xe3_core.cpp b/opencl/source/xe3_core/enable_family_full_ocl_xe3_core.cpp
index 18d43f3d8f..ac8f8542e4 100644
--- a/opencl/source/xe3_core/enable_family_full_ocl_xe3_core.cpp
+++ b/opencl/source/xe3_core/enable_family_full_ocl_xe3_core.cpp
@@ -5,17 +5,11 @@
  *
  */
 
-#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe3_core/hw_cmds_base.h"
 
-#include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
-#include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/mem_obj/image.h"
-#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/helpers/enable_family_full_ocl.h"
 
 namespace NEO {
-
 using Family = Xe3CoreFamily;
 
 struct EnableOCLXe3Core {
diff --git a/opencl/source/xe3_core/gpgpu_walker_xe3_core.cpp b/opencl/source/xe3_core/gpgpu_walker_xe3_core.cpp
index d576a319f9..4b27e7c803 100644
--- a/opencl/source/xe3_core/gpgpu_walker_xe3_core.cpp
+++ b/opencl/source/xe3_core/gpgpu_walker_xe3_core.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/command_container/encode_surface_state.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/xe3_core/hw_cmds_base.h"
 
 #include "opencl/source/command_queue/gpgpu_walker_xehp_and_later.inl"
diff --git a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
index bcaf01f32f..1a9883cd3a 100644
--- a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
@@ -1,21 +1,15 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
-#include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
-#include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/mem_obj/image.h"
-#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/helpers/enable_family_full_ocl.h"
 
 namespace NEO {
-
 using Family = XeHpcCoreFamily;
 
 struct EnableOCLXeHpcCore {
diff --git a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
index 41f0a253c3..a741eb9830 100644
--- a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
@@ -1,21 +1,15 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
-#include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_gfx_core_helper.h"
-#include "opencl/source/mem_obj/buffer.h"
-#include "opencl/source/mem_obj/image.h"
-#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/helpers/enable_family_full_ocl.h"
 
 namespace NEO {
-
 using Family = XeHpgCoreFamily;
 
 struct EnableOCLXeHpgCore {