diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h
index 2980a514df..2fa883f771 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw.h
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/vec.h"
 #include "shared/source/kernel/kernel_arg_descriptor.h"
@@ -17,8 +18,6 @@
 
 #include "igfxfmid.h"
 
-#include <memory>
-
 namespace NEO {
 enum class ImageType;
 class LogicalStateHelper;
diff --git a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
index e05e06586f..7799101607 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp
@@ -13,6 +13,7 @@
 #include "gtest/gtest.h"
 #include "mock/mock_encoder.h"
 
+#include <array>
 #include <cstdint>
 #include <fstream>
 #include <sstream>
diff --git a/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
index e31cac714a..92a637ffa3 100644
--- a/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/zebin_manipulator_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/source/device_binary_format/elf/elf.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
+#include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/test.h"
 
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_validator_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_validator_tests.cpp
index bbb01a68b5..3218dd8694 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_validator_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_validator_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/offline_compiler/source/ocloc_validator.h"
 #include "shared/source/device_binary_format/device_binary_formats.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 
 #include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp
index 62d911d338..1690eb1f9a 100644
--- a/opencl/test/unit_test/program/program_tests.cpp
+++ b/opencl/test/unit_test/program/program_tests.cpp
@@ -37,6 +37,7 @@
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/hw_test.h"
diff --git a/shared/offline_compiler/source/ocloc_arg_helper.h b/shared/offline_compiler/source/ocloc_arg_helper.h
index de30a835d9..78471ba7db 100644
--- a/shared/offline_compiler/source/ocloc_arg_helper.h
+++ b/shared/offline_compiler/source/ocloc_arg_helper.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/offline_compiler/source/decoder/helper.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/const_stringref.h"
 
diff --git a/shared/offline_compiler/source/ocloc_interface.cpp b/shared/offline_compiler/source/ocloc_interface.cpp
index 648b5aca0d..f88264d3bd 100644
--- a/shared/offline_compiler/source/ocloc_interface.cpp
+++ b/shared/offline_compiler/source/ocloc_interface.cpp
@@ -14,14 +14,11 @@
 #include "shared/offline_compiler/source/ocloc_concat.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
-#include "shared/offline_compiler/source/ocloc_interface.h"
 #include "shared/offline_compiler/source/ocloc_validator.h"
 #include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/offline_compiler/source/offline_linker.h"
 #include "shared/offline_compiler/source/utilities/safety_caller.h"
-#include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
-#include "shared/source/device_binary_format/elf/zebin_elf.h"
 
 #include <memory>
 
diff --git a/shared/offline_compiler/source/offline_compiler_helper.cpp b/shared/offline_compiler/source/offline_compiler_helper.cpp
index eb2020a456..15ee2ec24d 100644
--- a/shared/offline_compiler/source/offline_compiler_helper.cpp
+++ b/shared/offline_compiler/source/offline_compiler_helper.cpp
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/utilities/debug_settings_reader_creator.h"
 
 namespace NEO {
diff --git a/shared/offline_compiler/source/offline_linker.cpp b/shared/offline_compiler/source/offline_linker.cpp
index 75a6d3e5ab..4cc619c2ac 100644
--- a/shared/offline_compiler/source/offline_linker.cpp
+++ b/shared/offline_compiler/source/offline_linker.cpp
@@ -14,8 +14,6 @@
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/os_interface/os_inc_base.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/import/library_api.h"
diff --git a/shared/source/aub/aub_helper.h b/shared/source/aub/aub_helper.h
index 7042085af9..c4ad9cbf3a 100644
--- a/shared/source/aub/aub_helper.h
+++ b/shared/source/aub/aub_helper.h
@@ -7,12 +7,13 @@
 
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
 namespace NEO {
 
+struct HardwareInfo;
+
 class AubHelper : public NonCopyableOrMovableClass {
   public:
     static bool isOneTimeAubWritableAllocationType(const AllocationType &type) {
diff --git a/shared/source/aub_mem_dump/aub_data.h b/shared/source/aub_mem_dump/aub_data.h
index d5e15b42e9..a00a3db5b2 100644
--- a/shared/source/aub_mem_dump/aub_data.h
+++ b/shared/source/aub_mem_dump/aub_data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <cstdint>
-
 struct AubGTTData {
     bool present;
     bool localMemory;
diff --git a/shared/source/command_container/walker_partition_xehp_and_later.h b/shared/source/command_container/walker_partition_xehp_and_later.h
index 52843d72c9..5a28af787e 100644
--- a/shared/source/command_container/walker_partition_xehp_and_later.h
+++ b/shared/source/command_container/walker_partition_xehp_and_later.h
@@ -13,7 +13,6 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h
index 7450f95959..62f8ac89b9 100644
--- a/shared/source/command_stream/command_stream_receiver.h
+++ b/shared/source/command_stream/command_stream_receiver.h
@@ -49,6 +49,7 @@ class HwTimeStamps;
 class GmmHelper;
 class TagAllocatorBase;
 class LogicalStateHelper;
+class KmdNotifyHelper;
 
 template <typename TSize>
 class TimestampPackets;
diff --git a/shared/source/command_stream/command_stream_receiver_hw.h b/shared/source/command_stream/command_stream_receiver_hw.h
index b8f00e8542..c11b5eed5e 100644
--- a/shared/source/command_stream/command_stream_receiver_hw.h
+++ b/shared/source/command_stream/command_stream_receiver_hw.h
@@ -12,7 +12,6 @@
 #include "shared/source/direct_submission/direct_submission_hw.h"
 #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/dirty_state_helpers.h"
 #include "shared/source/helpers/hw_info.h"
 
diff --git a/shared/source/command_stream/create_command_stream_impl.cpp b/shared/source/command_stream/create_command_stream_impl.cpp
index 45d3fd2b57..151f8b1967 100644
--- a/shared/source/command_stream/create_command_stream_impl.cpp
+++ b/shared/source/command_stream/create_command_stream_impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/device_factory.h"
 
 namespace NEO {
diff --git a/shared/source/command_stream/definitions/stream_properties.inl b/shared/source/command_stream/definitions/stream_properties.inl
index 92fa8c8e8f..c916f12822 100644
--- a/shared/source/command_stream/definitions/stream_properties.inl
+++ b/shared/source/command_stream/definitions/stream_properties.inl
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/stream_property.h"
+#include "shared/source/helpers/hw_info.h"
 
 namespace NEO {
 
diff --git a/shared/source/command_stream/experimental_command_buffer.inl b/shared/source/command_stream/experimental_command_buffer.inl
index b415337ebf..ba9cd5e8ba 100644
--- a/shared/source/command_stream/experimental_command_buffer.inl
+++ b/shared/source/command_stream/experimental_command_buffer.inl
@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/experimental_command_buffer.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
diff --git a/shared/source/command_stream/preemption.h b/shared/source/command_stream/preemption.h
index ef2806185b..99a52dca2f 100644
--- a/shared/source/command_stream/preemption.h
+++ b/shared/source/command_stream/preemption.h
@@ -9,7 +9,6 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption_mode.h"
-#include "shared/source/helpers/hw_info.h"
 
 #include "sku_info.h"
 
@@ -18,6 +17,7 @@ class Device;
 class GraphicsAllocation;
 struct KernelDescriptor;
 class LogicalStateHelper;
+struct RuntimeCapabilityTable;
 
 struct PreemptionFlags {
     PreemptionFlags() {
diff --git a/shared/source/command_stream/stream_properties.cpp b/shared/source/command_stream/stream_properties.cpp
index b89704ae8b..f58d87b85e 100644
--- a/shared/source/command_stream/stream_properties.cpp
+++ b/shared/source/command_stream/stream_properties.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
diff --git a/shared/source/command_stream/stream_properties.h b/shared/source/command_stream/stream_properties.h
index 1ac782f89c..6d6071322b 100644
--- a/shared/source/command_stream/stream_properties.h
+++ b/shared/source/command_stream/stream_properties.h
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
-
 #include "stream_properties.inl"
 
 namespace NEO {
diff --git a/shared/source/device/device.h b/shared/source/device/device.h
index 7ae2f5e03e..c8dd0c43a1 100644
--- a/shared/source/device/device.h
+++ b/shared/source/device/device.h
@@ -15,7 +15,6 @@
 #include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/performance_counters.h"
diff --git a/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp b/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp
index c6652b8097..cb419b6e4f 100644
--- a/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp
+++ b/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gen11/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp
index 493034dd33..011c46c0dc 100644
--- a/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp
+++ b/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gen12lp/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp b/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp
index f6403c0911..d9bb8735f2 100644
--- a/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp
+++ b/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gen8/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp b/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp
index 7f62c30797..44bea1f538 100644
--- a/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp
+++ b/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gen9/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/helpers/product_config_helper.cpp b/shared/source/helpers/product_config_helper.cpp
index 0a0ec7eae1..fba013c4a8 100644
--- a/shared/source/helpers/product_config_helper.cpp
+++ b/shared/source/helpers/product_config_helper.cpp
@@ -7,8 +7,6 @@
 
 #include "shared/source/helpers/product_config_helper.h"
 
-#include "shared/source/helpers/hw_info.h"
-
 #include "device_ids_configs.h"
 #include "hw_cmds.h"
 #include "platforms.h"
diff --git a/shared/source/os_interface/windows/wddm/wddm_interface.h b/shared/source/os_interface/windows/wddm/wddm_interface.h
index 312eda268b..9653769004 100644
--- a/shared/source/os_interface/windows/wddm/wddm_interface.h
+++ b/shared/source/os_interface/windows/wddm/wddm_interface.h
@@ -1,15 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
-#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 #include <cstdint>
 
diff --git a/shared/source/program/kernel_info.h b/shared/source/program/kernel_info.h
index f88f01967a..abdfddabce 100644
--- a/shared/source/program/kernel_info.h
+++ b/shared/source/program/kernel_info.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/program/heap_info.h"
 #include "shared/source/utilities/arrayref.h"
diff --git a/shared/source/xe_hp_core/create_device_command_stream_receiver_xe_hp_core.cpp b/shared/source/xe_hp_core/create_device_command_stream_receiver_xe_hp_core.cpp
index 836674c1c7..6db3d56a7c 100644
--- a/shared/source/xe_hp_core/create_device_command_stream_receiver_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/create_device_command_stream_receiver_xe_hp_core.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
index 8c0d50b5fb..6daaa6d56a 100644
--- a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
+++ b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "engine_node.h"
diff --git a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp
index 919ee0972c..3545fb2c95 100644
--- a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp
+++ b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/kernel/kernel_properties.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
diff --git a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp
index 0511f3e3ed..548103715c 100644
--- a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp
index b243a21c2e..e979feae96 100644
--- a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "create_command_stream_receiver.inl"
diff --git a/shared/test/common/libult/create_command_stream.cpp b/shared/test/common/libult/create_command_stream.cpp
index 6d3f3f8585..9c1ee0d017 100644
--- a/shared/test/common/libult/create_command_stream.cpp
+++ b/shared/test/common/libult/create_command_stream.cpp
@@ -10,12 +10,11 @@
 #include "shared/source/command_stream/create_command_stream_impl.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include <cassert>
-
 namespace NEO {
 
 extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
diff --git a/shared/test/common/mocks/mock_modules_zebin.cpp b/shared/test/common/mocks/mock_modules_zebin.cpp
index 9cbfa17cd6..526a9b07e9 100644
--- a/shared/test/common/mocks/mock_modules_zebin.cpp
+++ b/shared/test/common/mocks/mock_modules_zebin.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
+#include "shared/test/common/mocks/mock_elf.h"
 
 namespace ZebinTestData {
 using ELF_IDENTIFIER_CLASS = NEO::Elf::ELF_IDENTIFIER_CLASS;
diff --git a/shared/test/common/mocks/mock_modules_zebin.h b/shared/test/common/mocks/mock_modules_zebin.h
index d6f36e7a56..876753fe3d 100644
--- a/shared/test/common/mocks/mock_modules_zebin.h
+++ b/shared/test/common/mocks/mock_modules_zebin.h
@@ -10,9 +10,9 @@
 #include "shared/source/device_binary_format/elf/zebin_elf.h"
 #include "shared/source/device_binary_format/zebin_decoder.h"
 #include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/utilities/const_stringref.h"
-#include "shared/test/common/mocks/mock_elf.h"
 
 #include "igfxfmid.h"
 
diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
index 0e58499c0d..2ed5aadf78 100644
--- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
@@ -9,12 +9,14 @@
 #include "shared/source/device_binary_format/elf/zebin_elf.h"
 #include "shared/source/device_binary_format/elf/zeinfo_enum_lookup.h"
 #include "shared/source/device_binary_format/zebin_decoder.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/kernel/kernel_arg_descriptor_extended_vme.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/program/program_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/test.h"