diff --git a/level_zero/core/source/kernel/kernel_mutable_state.h b/level_zero/core/source/kernel/kernel_mutable_state.h
index e8ad54a5f7..1e7052341f 100644
--- a/level_zero/core/source/kernel/kernel_mutable_state.h
+++ b/level_zero/core/source/kernel/kernel_mutable_state.h
@@ -13,9 +13,13 @@
 
 #include "level_zero/ze_api.h"
 
+#include <limits>
+#include <vector>
+
 namespace NEO {
+class GraphicsAllocation;
 struct ImplicitArgs;
-}
+} // namespace NEO
 
 namespace L0 {
 
diff --git a/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h b/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
index e94643dfd0..9364217e23 100644
--- a/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
+++ b/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 #include "level_zero/sysman/source/api/events/sysman_os_events.h"
-#include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.cpp b/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.cpp
index 7ce36d3439..0ca2f45e9b 100644
--- a/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.cpp
+++ b/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.cpp
@@ -7,9 +7,10 @@
 
 #include "level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.h"
 
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/os_time.h"
+
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
+#include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.cpp b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.cpp
index 36d8a4eadf..bc16e240eb 100644
--- a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.cpp
+++ b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.cpp
@@ -18,6 +18,8 @@
 #include "level_zero/sysman/source/shared/linux/sysman_fs_access_interface.h"
 #include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
 
+#include <sstream>
+
 namespace L0 {
 namespace Sysman {
 
diff --git a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.cpp b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.cpp
index fae1f8d187..fdbc83eeb6 100644
--- a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.cpp
+++ b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.cpp
@@ -12,8 +12,6 @@
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
 #include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
 
-#include <Windows.h>
-
 namespace L0 {
 namespace Sysman {
 
diff --git a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
index 623b425039..2a753e22b9 100644
--- a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
+++ b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 #include "level_zero/sysman/source/api/memory/sysman_os_memory.h"
 #include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
diff --git a/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.cpp b/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.cpp
index 77d4a35072..082671e1db 100644
--- a/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.cpp
+++ b/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.cpp
@@ -7,6 +7,7 @@
 
 #include "level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.h"
 
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
 #include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
 
diff --git a/level_zero/sysman/source/api/performance/windows/sysman_os_performance_imp.cpp b/level_zero/sysman/source/api/performance/windows/sysman_os_performance_imp.cpp
index 94bb6e799b..bef65f4ff7 100644
--- a/level_zero/sysman/source/api/performance/windows/sysman_os_performance_imp.cpp
+++ b/level_zero/sysman/source/api/performance/windows/sysman_os_performance_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "level_zero/sysman/source/api/performance/windows/sysman_os_performance_imp.h"
 
+#include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
+
 namespace L0 {
 namespace Sysman {
 
diff --git a/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.cpp b/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.cpp
index bb42a8ef15..85bd6de3f2 100644
--- a/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.cpp
+++ b/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.cpp
@@ -7,10 +7,11 @@
 
 #include "level_zero/sysman/source/api/power/windows/sysman_os_power_imp.h"
 
+#include "shared/source/debug_settings/debug_settings_manager.h"
+
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
 #include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
 #include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
-#include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/shared/linux/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp b/level_zero/sysman/source/shared/linux/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp
index ff64008cb6..eb900873ef 100644
--- a/level_zero/sysman/source/shared/linux/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp
+++ b/level_zero/sysman/source/shared/linux/product_helper/xe2_hpg_core/bmg/sysman_product_helper_bmg.cpp
@@ -11,6 +11,8 @@
 #include "level_zero/sysman/source/shared/linux/product_helper/sysman_product_helper_hw.h"
 #include "level_zero/sysman/source/shared/linux/product_helper/sysman_product_helper_hw.inl"
 
+#include <sstream>
+
 namespace L0 {
 namespace Sysman {
 constexpr static auto gfxProduct = IGFX_BMG;
diff --git a/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h b/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h
index d624e1c8d0..7275633739 100644
--- a/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h
+++ b/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h
@@ -7,13 +7,15 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/shared/windows/sysman_kmd_sys.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
 #include "neo_igfxfmid.h"
 
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace NEO {
@@ -24,6 +26,7 @@ namespace L0 {
 namespace Sysman {
 
 class SysmanProductHelper;
+class WddmSysmanImp;
 
 using SysmanProductHelperCreateFunctionType = std::unique_ptr<SysmanProductHelper> (*)();
 extern SysmanProductHelperCreateFunctionType sysmanProductHelperFactory[IGFX_MAX_PRODUCT];
diff --git a/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.inl b/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.inl
index fdad613bba..8d1ea9cbd4 100644
--- a/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.inl
+++ b/level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.inl
@@ -5,8 +5,11 @@
  *
  */
 
+#include "level_zero/sysman/source/device/sysman_device.h"
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.h"
+#include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
+#include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.cpp b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.cpp
index 93a8b912a7..993a2f89a5 100644
--- a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.cpp
+++ b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.cpp
@@ -8,10 +8,12 @@
 #include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
 
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 #include "level_zero/core/source/driver/driver.h"
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/shared/firmware_util/sysman_firmware_util.h"
 #include "level_zero/sysman/source/shared/windows/pmt/sysman_pmt.h"
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
@@ -65,6 +67,12 @@ SysmanDeviceImp *WddmSysmanImp::getSysmanDeviceImp() {
     return pParentSysmanDeviceImp;
 }
 
+const NEO::HardwareInfo &WddmSysmanImp::getHardwareInfo() const {
+    return pParentSysmanDeviceImp->getHardwareInfo();
+}
+
+PRODUCT_FAMILY WddmSysmanImp::getProductFamily() const { return pParentSysmanDeviceImp->getProductFamily(); }
+
 SysmanProductHelper *WddmSysmanImp::getSysmanProductHelper() {
     UNRECOVERABLE_IF(nullptr == pSysmanProductHelper);
     return pSysmanProductHelper.get();
diff --git a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
index e29395f534..1a68e88296 100644
--- a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
+++ b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
@@ -6,24 +6,29 @@
  */
 
 #pragma once
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/product_helper.h"
 
 #include "level_zero/sysman/source/device/os_sysman.h"
-#include "level_zero/sysman/source/device/sysman_device.h"
-#include "level_zero/sysman/source/device/sysman_device_imp.h"
-#include "level_zero/sysman/source/shared/firmware_util/sysman_firmware_util.h"
-#include "level_zero/sysman/source/shared/windows/sysman_kmd_sys_manager.h"
+
+#include "neo_igfxfmid.h"
+
+#include <array>
+#include <cstdint>
 
 namespace NEO {
 class Wddm;
-}
+struct HardwareInfo;
+} // namespace NEO
 namespace L0 {
 namespace Sysman {
+class FirmwareUtil;
+class KmdSysManager;
 class SysmanProductHelper;
 class PlatformMonitoringTech;
+struct SysmanDevice;
+struct SysmanDeviceImp;
 
 class WddmSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
   public:
@@ -40,8 +45,8 @@ class WddmSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
     uint32_t getSubDeviceCount() override;
     void getDeviceUuids(std::vector<std::string> &deviceUuids) override;
     SysmanDeviceImp *getSysmanDeviceImp();
-    const NEO::HardwareInfo &getHardwareInfo() const override { return pParentSysmanDeviceImp->getHardwareInfo(); }
-    PRODUCT_FAMILY getProductFamily() const { return pParentSysmanDeviceImp->getProductFamily(); }
+    const NEO::HardwareInfo &getHardwareInfo() const override;
+    PRODUCT_FAMILY getProductFamily() const;
     SysmanProductHelper *getSysmanProductHelper();
     PlatformMonitoringTech *getSysmanPmt();
     bool getUuid(std::array<uint8_t, NEO::ProductHelper::uuidSize> &uuid);
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
index 21eff5b54b..a06ec1f2d2 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
@@ -9,6 +9,7 @@
 
 #include "shared/test/common/helpers/default_hw_info.h"
 
+#include "level_zero/sysman/source/device/sysman_device_imp.h"
 #include "level_zero/sysman/source/driver/sysman_driver.h"
 #include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h"
diff --git a/level_zero/tools/source/metrics/metric.h b/level_zero/tools/source/metrics/metric.h
index 08578567a3..f4f8438a2a 100644
--- a/level_zero/tools/source/metrics/metric.h
+++ b/level_zero/tools/source/metrics/metric.h
@@ -6,13 +6,17 @@
  */
 
 #pragma once
+#include "shared/source/debug_settings/debug_settings_manager.h"
+
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/helpers/api_handle_helper.h"
 #include "level_zero/tools/source/metrics/os_interface_metric.h"
 #include "level_zero/zet_intel_gpu_metric.h"
 
+#include <cstring>
 #include <map>
 #include <vector>
+
 namespace L0 {
 struct Device;
 } // namespace L0
diff --git a/level_zero/tools/source/metrics/metric_oa_export_data.cpp b/level_zero/tools/source/metrics/metric_oa_export_data.cpp
index 5d459becd9..5accbbf36a 100644
--- a/level_zero/tools/source/metrics/metric_oa_export_data.cpp
+++ b/level_zero/tools/source/metrics/metric_oa_export_data.cpp
@@ -7,7 +7,8 @@
 
 #include "level_zero/tools/source/metrics/metric_oa_export_data.h"
 
-#include "shared/source/helpers/string.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
 
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
diff --git a/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp_prelim.cpp b/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp_prelim.cpp
index 9e1134b318..33b857bae9 100644
--- a/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp_prelim.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
diff --git a/opencl/source/kernel/kernel_objects_for_aux_translation.h b/opencl/source/kernel/kernel_objects_for_aux_translation.h
index e726274d3a..abe91b150c 100644
--- a/opencl/source/kernel/kernel_objects_for_aux_translation.h
+++ b/opencl/source/kernel/kernel_objects_for_aux_translation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <unordered_set>
 
 namespace NEO {
diff --git a/shared/source/dll/linux/debugger_l0_dll_linux.cpp b/shared/source/dll/linux/debugger_l0_dll_linux.cpp
index 0c1c75859f..bf42702835 100644
--- a/shared/source/dll/linux/debugger_l0_dll_linux.cpp
+++ b/shared/source/dll/linux/debugger_l0_dll_linux.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/utilities/io_functions.h"
 
 namespace NEO {
 std::unique_ptr<NEO::Debugger> DebuggerL0::create(NEO::Device *device) {
diff --git a/shared/source/gen12lp/hw_cmds_base.h b/shared/source/gen12lp/hw_cmds_base.h
index b2a26d1f1d..fa42f36381 100644
--- a/shared/source/gen12lp/hw_cmds_base.h
+++ b/shared/source/gen12lp/hw_cmds_base.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 
 #include <cstring>
 #include <igfxfmid.h>
diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index 10c10cb944..4fe0a1ef79 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -101,6 +101,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_walk_order.h
     ${CMAKE_CURRENT_SOURCE_DIR}/in_order_cmd_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/in_order_cmd_helpers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/is_pod_v.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp
diff --git a/shared/source/helpers/common_types.h b/shared/source/helpers/common_types.h
index d1b411d71e..801bfea651 100644
--- a/shared/source/helpers/common_types.h
+++ b/shared/source/helpers/common_types.h
@@ -139,11 +139,6 @@ namespace InterruptId {
 static constexpr uint32_t notUsed = std::numeric_limits<uint32_t>::max();
 }
 
-namespace TypeTraits {
-template <typename T>
-constexpr bool isPodV = std::is_standard_layout_v<T> && std::is_trivial_v<T> && std::is_trivially_copyable_v<T>;
-} // namespace TypeTraits
-
 struct BcsSplitSettings {
     BcsInfoMask allEngines = {};
     BcsInfoMask h2dEngines = {};
diff --git a/shared/source/helpers/is_pod_v.h b/shared/source/helpers/is_pod_v.h
new file mode 100644
index 0000000000..78b7f78288
--- /dev/null
+++ b/shared/source/helpers/is_pod_v.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2025 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include <type_traits>
+
+namespace NEO {
+namespace TypeTraits {
+
+template <typename T>
+constexpr bool isPodV = std::is_standard_layout_v<T> && std::is_trivial_v<T> && std::is_trivially_copyable_v<T>;
+
+} // namespace TypeTraits
+} // namespace NEO
diff --git a/shared/source/helpers/ptr_math.h b/shared/source/helpers/ptr_math.h
index 0a236fd4da..31c2e0c20e 100644
--- a/shared/source/helpers/ptr_math.h
+++ b/shared/source/helpers/ptr_math.h
@@ -9,6 +9,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <limits>
 
diff --git a/shared/source/helpers/vec.h b/shared/source/helpers/vec.h
index 9593aaa282..629c7964b9 100644
--- a/shared/source/helpers/vec.h
+++ b/shared/source/helpers/vec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,12 +7,11 @@
 
 #pragma once
 
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 
 #include <cstddef>
 #include <cstdint>
-#include <type_traits>
 
 template <typename T>
 struct Vec3 {
diff --git a/shared/source/os_interface/linux/ioctl_helper_i915.cpp b/shared/source/os_interface/linux/ioctl_helper_i915.cpp
index 8d30fb0a48..f7586155f4 100644
--- a/shared/source/os_interface/linux/ioctl_helper_i915.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper_i915.cpp
@@ -16,7 +16,6 @@
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/linux/engine_info.h"
-#include "shared/source/os_interface/linux/file_descriptor.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/memory_info.h"
@@ -25,9 +24,10 @@
 #include "shared/source/os_interface/os_time.h"
 #include "shared/source/os_interface/product_helper.h"
 #include "shared/source/utilities/directory.h"
+#include "shared/source/utilities/logger.h"
 
-#include <fcntl.h>
-#include <span>
+#include <ios>
+#include <ostream>
 #include <sstream>
 
 namespace NEO {
diff --git a/shared/source/xe2_hpg_core/hw_cmds_base.h b/shared/source/xe2_hpg_core/hw_cmds_base.h
index 927631c619..e9c3020f18 100644
--- a/shared/source/xe2_hpg_core/hw_cmds_base.h
+++ b/shared/source/xe2_hpg_core/hw_cmds_base.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 
 #include <cstring>
 #include <igfxfmid.h>
diff --git a/shared/source/xe3_core/hw_cmds_base.h b/shared/source/xe3_core/hw_cmds_base.h
index 76f8ee0eef..1798eda65f 100644
--- a/shared/source/xe3_core/hw_cmds_base.h
+++ b/shared/source/xe3_core/hw_cmds_base.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 
 #include <cstdint>
 #include <cstring>
diff --git a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
index e79b83d210..d5218c415b 100644
--- a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
+++ b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 #include "shared/source/xe_hpc_core/hw_info.h"
 
 #include "neo_igfxfmid.h"
diff --git a/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h b/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h
index be3ec1d582..ebc8fff9c2 100644
--- a/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h
+++ b/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/is_pod_v.h"
 #include "shared/source/xe_hpg_core/hw_info.h"
 
 #include "neo_igfxfmid.h"
diff --git a/shared/test/common/mocks/mock_sip.cpp b/shared/test/common/mocks/mock_sip.cpp
index 5754fe58c4..4cd91e2d6f 100644
--- a/shared/test/common/mocks/mock_sip.cpp
+++ b/shared/test/common/mocks/mock_sip.cpp
@@ -7,14 +7,11 @@
 
 #include "shared/test/common/mocks/mock_sip.h"
 
+#include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/memory_allocation.h"
-#include "shared/test/common/helpers/test_files.h"
 
 #include "common/StateSaveAreaHeader.h"
 
-#include <fstream>
-#include <map>
-
 namespace NEO {
 
 static constexpr SIP::StateSaveAreaHeaderV3 mockSipStateSaveAreaHeaderV3 = {
diff --git a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
index f11b0b4ddb..7ca27d1445 100644
--- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"