refactor: cleanup header includes in level_zero/tools 1/2

Related-To: NEO-15383
Signed-off-by: Naklicki, Mateusz <mateusz.naklicki@intel.com>

level_zero/tools/source/debug/debug_session.h

@@ -15,6 +15,10 @@
 
 #include <memory>
 
+namespace NEO {
+struct HardwareInfo;
+} // namespace NEO
+
 struct _zet_debug_session_handle_t : BaseHandle {};
 static_assert(IsCompliantWithDdiHandlesExt<_zet_debug_session_handle_t>);
 

level_zero/tools/source/debug/debug_session_imp.h

@@ -20,7 +20,10 @@
 #include <condition_variable>
 #include <mutex>
 #include <queue>
-#include <unordered_set>
+
+namespace NEO {
+struct StateSaveAreaHeader;
+} // namespace NEO
 
 namespace SIP {
 struct StateSaveAreaHeader;
@@ -30,6 +33,7 @@ struct sip_command;
 } // namespace SIP
 
 namespace L0 {
+struct Device;
 
 struct DebugSessionImp : DebugSession {
 

level_zero/tools/source/debug/linux/debug_session.cpp

@@ -13,8 +13,6 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/sleep.h"
-#include "shared/source/memory_manager/memory_manager.h"
-#include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 

level_zero/tools/source/debug/linux/debug_session.h

@@ -7,15 +7,14 @@
 
 #pragma once
 
-#include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/debug/debug_session.h"
 #include "level_zero/tools/source/debug/debug_session_imp.h"
 
 #include <set>
+#include <unordered_set>
 
 namespace L0 {
 struct DebugSessionLinux : DebugSessionImp {

level_zero/tools/source/debug/linux/prelim/debug_session.cpp

@@ -7,32 +7,23 @@
 
 #include "level_zero/tools/source/debug/linux/prelim/debug_session.h"
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/helpers/sleep.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
-#include "shared/source/os_interface/linux/ioctl_helper.h"
-#include "shared/source/os_interface/os_interface.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/os_thread.h"
 
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/tools/source/debug/linux/debug_session_factory.h"
 #include "level_zero/tools/source/debug/linux/drm_helper.h"
-#include "level_zero/zet_intel_gpu_debug.h"
 #include <level_zero/ze_api.h>
 
-#include "common/StateSaveAreaHeader.h"
-
 #include <algorithm>
-#include <fcntl.h>
 
 namespace L0 {
 

level_zero/tools/source/debug/linux/prelim/debug_session.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -30,6 +30,8 @@ struct EngineClassInstance;
 
 namespace L0 {
 struct TileDebugSessionLinuxi915;
+struct DebugSession;
+struct DebugSessionImp;
 
 struct DebugSessionLinuxi915 : DebugSessionLinux {
 

level_zero/tools/source/debug/linux/prelim/debug_session_linux_helper.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/tools/source/debug/linux/prelim/debug_session.h"
-#include <level_zero/ze_api.h>
+
 namespace L0 {
 
 DebugSession *createDebugSessionHelper(const zet_debug_config_t &config, Device *device, int debugFd, void *params) {

level_zero/tools/source/debug/linux/xe/debug_session.cpp

@@ -11,13 +11,9 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/memory_manager/memory_manager.h"
-#include "shared/source/os_interface/linux/drm_debug.h"
-#include "shared/source/os_interface/linux/sys_calls.h"
-#include "shared/source/os_interface/linux/xe/ioctl_helper_xe.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/tools/source/debug/debug_session.h"
 #include "level_zero/tools/source/debug/linux/drm_helper.h"
 
 namespace L0 {

level_zero/tools/source/debug/linux/xe/debug_session.h

@@ -16,6 +16,8 @@
 #include "level_zero/tools/source/debug/linux/debug_session_factory.h"
 
 namespace L0 {
+struct DebugSession;
+struct Device;
 
 struct DebugSessionLinuxXe : DebugSessionLinux {
 

level_zero/tools/source/debug/linux/xe/debug_session_xe_helper.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/tools/source/debug/linux/xe/debug_session.h"
-#include <level_zero/ze_api.h>
+
 namespace L0 {
 
 DebugSession *createDebugSessionHelperXe(const zet_debug_config_t &config, Device *device, int debugFd, void *params) {

level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp

@@ -5,8 +5,6 @@
  *
  */
 
-#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/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/engine_info.h"

level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp

@@ -7,7 +7,6 @@
 
 #include "level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/os_interface/os_interface.h"
@@ -15,7 +14,6 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
-#include "level_zero/tools/source/metrics/os_interface_metric.h"
 
 #include <sys/stat.h>
 #include <sys/sysmacros.h>

level_zero/tools/source/metrics/linux/os_metric_oa_query_imp_linux.cpp

@@ -10,7 +10,6 @@
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
-#include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 using namespace MetricsLibraryApi;
 

level_zero/tools/source/metrics/metric.h

@@ -6,19 +6,19 @@
  */
 
 #pragma once
-#include "shared/source/helpers/constants.h"
-
 #include "level_zero/core/source/device/device_imp.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 "metrics_discovery_api.h"
-
 #include <map>
 #include <vector>
 
+namespace L0 {
+struct Device;
+} // namespace L0
+
 struct _zet_metric_group_handle_t : BaseHandle {};
 static_assert(IsCompliantWithDdiHandlesExt<_zet_metric_group_handle_t>);
 

level_zero/tools/source/metrics/metric_ip_sampling_source.cpp

@@ -7,7 +7,6 @@
 
 #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"

level_zero/tools/source/metrics/metric_multidevice_programmable.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,6 @@
 
 #include "level_zero/tools/source/metrics/metric_multidevice_programmable.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
-
-#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/metrics/metric_multidevice_programmable.inl"
 

level_zero/tools/source/metrics/metric_oa_enumeration_imp.cpp

@@ -7,7 +7,6 @@
 
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"

level_zero/tools/source/metrics/metric_oa_enumeration_imp.h

@@ -12,9 +12,12 @@
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 
+#include "metrics_discovery_api.h"
+
 #include <vector>
 
 namespace L0 {
+struct Device;
 
 static constexpr std::string_view globalSymbolOaMaxBufferSize = "OABufferMaxSize";
 static constexpr std::string_view globalSymbolOaMaxTimestamp = "MaxTimestamp";

level_zero/tools/source/metrics/metric_oa_export_data.cpp

@@ -7,13 +7,11 @@
 
 #include "level_zero/tools/source/metrics/metric_oa_export_data.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 
-#include <algorithm>
 #include <map>
 
 namespace L0 {

level_zero/tools/source/metrics/metric_oa_programmable_imp.cpp

@@ -7,8 +7,6 @@
 
 #include "level_zero/tools/source/metrics/metric_oa_programmable_imp.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
-
 #include "level_zero/tools/source/metrics/metric.h"
 #include "level_zero/tools/source/metrics/metric_oa_enumeration_imp.h"
 

level_zero/tools/source/metrics/metric_oa_programmable_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,7 @@
 #include <vector>
 
 namespace L0 {
+class OaMetricSourceImp;
 
 struct OaMetricProgrammableImp : public MetricProgrammable {
     OaMetricProgrammableImp() = default;

level_zero/tools/source/metrics/metric_oa_query_imp.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/tools/source/metrics/metric_oa_query_imp.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/engine_node_helper.h"

level_zero/tools/source/metrics/metric_oa_source.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 #include "level_zero/core/source/device/device_imp.h"
@@ -23,7 +22,6 @@
 #include "level_zero/zet_intel_gpu_metric.h"
 
 namespace L0 {
-
 std::unique_ptr<OaMetricSourceImp> OaMetricSourceImp::create(const MetricDeviceContext &metricDeviceContext) {
     return std::unique_ptr<OaMetricSourceImp>(new (std::nothrow) OaMetricSourceImp(metricDeviceContext));
 }

level_zero/tools/source/metrics/metric_oa_source.h

@@ -13,6 +13,7 @@ namespace L0 {
 struct MetricEnumeration;
 struct MetricsLibrary;
 struct MetricsStreamer;
+struct Device;
 
 class OaMetricSourceImp : public MetricSource {
 

level_zero/tools/source/sysman/diagnostics/diagnostics.cpp

@@ -1,16 +1,13 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h"
 
 namespace L0 {
-class OsDiagnostics;
 DiagnosticsHandleContext::~DiagnosticsHandleContext() {
     releaseDiagnosticsHandles();
 }

level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h

@@ -16,6 +16,7 @@
 namespace L0 {
 
 class OsDiagnostics;
+struct OsSysman;
 
 class DiagnosticsImp : public Diagnostics, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h"
@@ -14,6 +15,10 @@
 
 namespace L0 {
 class FirmwareUtil;
+class FsAccess;
+class LinuxSysmanImp;
+class SysfsAccess;
+struct OsSysman;
 
 class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/engine/engine.cpp

@@ -7,12 +7,10 @@
 
 #include "level_zero/tools/source/sysman/engine/engine.h"
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/engine/engine_imp.h"
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
-class OsEngine;
+
 namespace L0 {
 
 EngineHandleContext::EngineHandleContext(OsSysman *pOsSysman) {

level_zero/tools/source/sysman/engine/engine_imp.h

@@ -12,7 +12,9 @@
 #include "level_zero/tools/source/sysman/engine/engine.h"
 #include "level_zero/tools/source/sysman/engine/os_engine.h"
 #include <level_zero/zes_api.h>
+
 namespace L0 {
+struct OsSysman;
 
 class EngineImp : public Engine, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/engine/linux/os_engine_common.cpp

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/os_interface/linux/engine_info.h"
 
 #include "level_zero/tools/source/sysman/engine/linux/os_engine_imp.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"

level_zero/tools/source/sysman/engine/linux/os_engine_imp.h

@@ -11,13 +11,20 @@
 
 #include "level_zero/tools/source/sysman/engine/os_engine.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
-#include "level_zero/tools/source/sysman/sysman_const.h"
 
 #include <unistd.h>
 
+namespace NEO {
+class Drm;
+struct EngineInfo;
+} // namespace NEO
+
 namespace L0 {
 class PmuInterface;
 struct Device;
+class SysfsAccess;
+struct OsSysman;
+
 class LinuxEngineImp : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;

level_zero/tools/source/sysman/events/events_imp.h

@@ -14,6 +14,8 @@
 #include <mutex>
 
 namespace L0 {
+class OsEvents;
+struct OsSysman;
 
 class EventsImp : public Events, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/events/linux/os_events_imp.cpp

@@ -8,17 +8,12 @@
 #include "level_zero/tools/source/sysman/events/linux/os_events_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/utilities/directory.h"
 
-#include "level_zero/tools/source/sysman/events/events_imp.h"
+#include "level_zero/tools/source/sysman/global_operations/global_operations.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
-#include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
-
-#include <sys/stat.h>
 
 namespace L0 {
-
 const std::string LinuxEventsUtil::add("add");
 const std::string LinuxEventsUtil::remove("remove");
 const std::string LinuxEventsUtil::change("change");

level_zero/tools/source/sysman/events/linux/os_events_imp.h

@@ -6,11 +6,17 @@
  */
 
 #pragma once
+
 #include "level_zero/tools/source/sysman/events/os_events.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/udev/udev_lib.h"
 
 namespace L0 {
+class LinuxSysmanImp;
+class Ras;
+class UdevLib;
+struct OsSysman;
+struct SysmanDeviceImp;
 
 class LinuxEventsImp : public OsEvents, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/fabric_port/fabric_port.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "level_zero/tools/source/sysman/fabric_port/fabric_port.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
 
 #include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h"

level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h

@@ -14,6 +14,9 @@
 #include <level_zero/zes_api.h>
 
 namespace L0 {
+class OsFabricDevice;
+class OsFabricPort;
+struct OsSysman;
 
 class FabricDeviceImp : public FabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.cpp

@@ -11,8 +11,6 @@
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
-#include <limits>
-
 namespace L0 {
 
 void FabricDeviceAccessNl::readIafPortStatus(zes_fabric_port_state_t &state, const IafPortState &iafPortState) {

level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h

@@ -13,6 +13,8 @@
 #include "fabric_device_access.h"
 
 namespace L0 {
+class LinuxSysmanImp;
+struct OsSysman;
 
 struct Port {
     bool onSubdevice;

level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h

@@ -17,6 +17,9 @@
 
 namespace L0 {
 class LinuxSysmanImp;
+class FabricDeviceAccess;
+struct OsSysman;
+
 class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;

level_zero/tools/source/sysman/fan/fan.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 "level_zero/tools/source/sysman/fan/fan.h"
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/fan/fan_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/fan/fan_imp.h

@@ -13,6 +13,9 @@
 #include "level_zero/tools/source/sysman/fan/os_fan.h"
 
 namespace L0 {
+class OsFan;
+struct OsSysman;
+
 class FanImp : public Fan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t fanGetProperties(zes_fan_properties_t *pProperties) override;

level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,6 @@
 
 #include "level_zero/tools/source/sysman/fan/linux/os_fan_imp.h"
 
-#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
-#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
-
 namespace L0 {
 
 ze_result_t LinuxFanImp::getProperties(zes_fan_properties_t *pProperties) {

level_zero/tools/source/sysman/fan/linux/os_fan_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/fan/os_fan.h"
@@ -13,6 +14,7 @@
 namespace L0 {
 
 class SysfsAccess;
+struct OsSysman;
 
 class LinuxFanImp : public OsFan, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/firmware/firmware.cpp

@@ -1,16 +1,13 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/firmware/firmware_imp.h"
 
 namespace L0 {
-class OsFirmware;
 FirmwareHandleContext::~FirmwareHandleContext() {
     releaseFwHandles();
 }

level_zero/tools/source/sysman/firmware/firmware_imp.cpp

@@ -8,6 +8,7 @@
 #include "firmware_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/string.h"
 
 #include "os_firmware.h"
 

level_zero/tools/source/sysman/firmware/firmware_imp.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
-#include "shared/source/helpers/string.h"
 
 #include "level_zero/tools/source/sysman/firmware/firmware.h"
 #include "level_zero/tools/source/sysman/firmware/os_firmware.h"
@@ -16,6 +15,7 @@
 namespace L0 {
 
 class OsFirmware;
+struct OsSysman;
 
 class FirmwareImp : public Firmware, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/firmware/firmware_imp.h"
@@ -14,6 +15,8 @@
 
 namespace L0 {
 class FirmwareUtil;
+class SysfsAccess;
+struct OsSysman;
 
 class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/firmware_util/firmware_util_imp.cpp

@@ -9,7 +9,6 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/utilities/directory.h"
 
 namespace L0 {
 const std::string fwDeviceInitByDevice = "igsc_device_init_by_device_info";

level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h

@@ -10,13 +10,14 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
 #include <mutex>
 #include <string>
 #include <vector>
 
+struct igsc_device_iterator;
+
 namespace L0 {
 typedef int (*pIgscDeviceInitByDevice)(struct igsc_device_handle *handle,
                                        const char *devicePath);

level_zero/tools/source/sysman/frequency/frequency.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 "level_zero/tools/source/sysman/frequency/frequency.h"
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/frequency/frequency_imp.h"
 #include "level_zero/tools/source/sysman/frequency/os_frequency.h"
 #include "level_zero/tools/source/sysman/os_sysman.h"

level_zero/tools/source/sysman/frequency/frequency_imp.h

@@ -14,6 +14,8 @@
 #include <level_zero/zes_api.h>
 
 namespace L0 {
+class OsFrequency;
+struct OsSysman;
 
 class FrequencyImp : public Frequency, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp

@@ -13,8 +13,6 @@
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
-#include "neo_igfxfmid.h"
-
 #include <cmath>
 
 namespace L0 {

level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/frequency/frequency_imp.h"
@@ -13,6 +14,9 @@
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 
 namespace L0 {
+class SysfsAccess;
+struct Device;
+struct OsSysman;
 
 class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/global_operations/global_operations_imp.h

@@ -14,6 +14,8 @@
 #include <mutex>
 
 namespace L0 {
+class OsGlobalOperations;
+struct OsSysman;
 
 class GlobalOperationsImp : public GlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,18 +9,15 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/pci_path.h"
+#include "shared/source/os_interface/linux/pmt_util.h"
 
 #include "level_zero/core/source/device/device_imp.h"
-#include "level_zero/tools/source/sysman/global_operations/global_operations_imp.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
-#include <level_zero/zet_api.h>
 
 #include <chrono>
 #include <cstring>

level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h

@@ -6,14 +6,21 @@
  */
 
 #pragma once
-#include "shared/source/os_interface/linux/pmt_util.h"
 
 #include "level_zero/tools/source/sysman/global_operations/os_global_operations.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
+namespace NEO {
+class ExecutionEnvironment;
+} // namespace NEO
+
 namespace L0 {
 class SysfsAccess;
 struct Device;
+class FsAccess;
+class LinuxSysmanImp;
+class ProcfsAccess;
+struct OsSysman;
 
 class LinuxGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/linux/fs_access.cpp

@@ -9,7 +9,6 @@
 
 #include <climits>
 
-#include <array>
 #include <cerrno>
 #include <csignal>
 #include <cstdio>

level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,9 +14,6 @@
 #include <fcntl.h>
 #include <limits>
 #include <netlink/attr.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/genl/family.h>
-#include <sys/socket.h>
 
 namespace L0 {
 

level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,6 +19,7 @@
 #include <vector>
 
 namespace L0 {
+class NlApi;
 
 const std::string iafPath = "device/";
 const std::string iafDirectoryLegacy = "iaf.";

level_zero/tools/source/sysman/linux/os_sysman_driver_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,12 +7,8 @@
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h"
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
-
 #include "level_zero/tools/source/sysman/events/linux/os_events_imp.h"
 
-#include <sys/stat.h>
-
 namespace L0 {
 
 ze_result_t LinuxSysmanDriverImp::eventsListen(uint64_t timeout, uint32_t count, zes_device_handle_t *phDevices, uint32_t *pNumDeviceEvents, zes_event_type_flags_t *pEvents) {

level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/linux/udev/udev_lib.h"
@@ -15,6 +16,7 @@ namespace L0 {
 
 class LinuxEventsUtil;
 struct SysmanDeviceImp;
+class UdevLib;
 
 class LinuxSysmanDriverImp : public OsSysmanDriver, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/linux/os_sysman_imp.h

@@ -15,17 +15,26 @@
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
-#include "level_zero/tools/source/sysman/linux/udev/udev_lib.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
 #include <map>
 #include <mutex>
 
+namespace NEO {
+class Drm;
+} // namespace NEO
+
 namespace L0 {
 
 class PmuInterface;
 class FirmwareUtil;
+class FsAccess;
+class PlatformMonitoringTech;
+class ProcfsAccess;
+class SysfsAccess;
+struct Device;
+struct SysmanDeviceImp;
 
 class ExecutionEnvironmentRefCountRestore : public NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/linux/pmt/pmt.cpp

@@ -14,9 +14,7 @@
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
 #include <algorithm>
-#include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 
 namespace L0 {
 const std::string PlatformMonitoringTech::baseTelemSysFS("/sys/class/intel_pmt");

level_zero/tools/source/sysman/linux/pmt/pmt.h

@@ -9,15 +9,17 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 
+#include "neo_igfxfmid.h"
+
 #include <fcntl.h>
 #include <map>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 namespace L0 {
+class FsAccess;
 
 class PlatformMonitoringTech : NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/linux/pmu/pmu_imp.h

@@ -14,6 +14,10 @@
 #include <sys/sysinfo.h>
 
 namespace L0 {
+class FsAccess;
+class LinuxSysmanImp;
+class SysfsAccess;
+struct Device;
 
 class PmuInterfaceImp : public PmuInterface, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/memory/linux/os_memory_imp.cpp

@@ -22,8 +22,6 @@
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "neo_igfxfmid.h"
-
 #include <unordered_set>
 
 namespace L0 {

level_zero/tools/source/sysman/memory/linux/os_memory_imp.h

@@ -11,14 +11,14 @@
 
 #include "level_zero/tools/source/sysman/memory/os_memory.h"
 
-#include <map>
-
 namespace L0 {
 
 class SysfsAccess;
 struct Device;
 class PlatformMonitoringTech;
 class LinuxSysmanImp;
+struct OsSysman;
+
 class LinuxMemoryImp : public OsMemory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_mem_properties_t *pProperties) override;

level_zero/tools/source/sysman/memory/memory.cpp

@@ -1,14 +1,10 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/basic_math.h"
-#include "shared/source/memory_manager/memory_manager.h"
-
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/memory/memory_imp.h"
 #include "level_zero/tools/source/sysman/os_sysman.h"
 

level_zero/tools/source/sysman/memory/memory_imp.h

@@ -13,6 +13,8 @@
 #include <level_zero/zes_api.h>
 
 namespace L0 {
+class OsMemory;
+struct OsSysman;
 
 class MemoryImp : public Memory, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp

@@ -15,7 +15,6 @@
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
-#include "level_zero/tools/source/sysman/pci/pci_imp.h"
 #include "level_zero/tools/source/sysman/pci/pci_utils.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 

level_zero/tools/source/sysman/pci/linux/os_pci_imp.h

@@ -11,7 +11,6 @@
 
 #include "level_zero/tools/source/sysman/pci/os_pci.h"
 
-#include <memory>
 namespace L0 {
 class SysfsAccess;
 class FsAccess;

level_zero/tools/source/sysman/pci/pci_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #include "pci_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/helpers/string.h"
-#include "shared/source/utilities/directory.h"
 
 #include "level_zero/tools/source/sysman/pci/os_pci.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"

level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
@@ -13,6 +14,9 @@
 #include "level_zero/tools/source/sysman/performance/performance_imp.h"
 
 namespace L0 {
+class SysfsAccess;
+struct Device;
+struct OsSysman;
 
 class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/performance/performance_imp.h

@@ -14,6 +14,8 @@
 #include "performance.h"
 
 namespace L0 {
+class OsPerformance;
+struct OsSysman;
 
 class PerformanceImp : public Performance, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h

@@ -13,13 +13,14 @@
 
 #include "neo_igfxfmid.h"
 
-#include <memory>
 #include <string>
 
 namespace L0 {
 
 class SysfsAccess;
 class PlatformMonitoringTech;
+struct OsSysman;
+
 class LinuxPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;

level_zero/tools/source/sysman/power/power.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 "level_zero/tools/source/sysman/power/power.h"
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include "level_zero/tools/source/sysman/power/power_imp.h"
 

level_zero/tools/source/sysman/power/power.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "level_zero/api/sysman/zes_handles_struct.h"
-#include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
 #include <mutex>
@@ -16,6 +15,7 @@
 namespace L0 {
 
 struct OsSysman;
+
 class Power : _zes_pwr_handle_t {
   public:
     virtual ~Power() = default;

level_zero/tools/source/sysman/power/power_imp.h

@@ -12,7 +12,11 @@
 #include "level_zero/tools/source/sysman/power/os_power.h"
 #include "level_zero/tools/source/sysman/power/power.h"
 #include <level_zero/zet_api.h>
+
 namespace L0 {
+class OsPower;
+struct OsSysman;
+
 class PowerImp : public Power, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t powerGetProperties(zes_power_properties_t *pProperties) override;

level_zero/tools/source/sysman/ras/linux/os_ras_imp.h

@@ -24,6 +24,7 @@ class LinuxSysmanImp;
 class LinuxRasSources;
 class FirmwareUtil;
 struct Device;
+struct OsSysman;
 
 class LinuxRasImp : public OsRas, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/ras/ras.cpp

@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include "level_zero/tools/source/sysman/ras/ras_imp.h"
 

level_zero/tools/source/sysman/ras/ras_imp.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 "level_zero/tools/source/sysman/ras/ras_imp.h"
 
-#include "shared/source/helpers/string.h"
-
 #include "level_zero/tools/source/sysman/sysman_const.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 

level_zero/tools/source/sysman/ras/ras_imp.h

@@ -13,6 +13,8 @@
 #include "level_zero/tools/source/sysman/ras/ras.h"
 
 namespace L0 {
+class OsRas;
+struct OsSysman;
 
 class RasImp : public Ras, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/scheduler/scheduler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,7 +10,6 @@
 
 #include <algorithm>
 
-class OsScheduler;
 namespace L0 {
 
 SchedulerHandleContext::SchedulerHandleContext(OsSysman *pOsSysman) {

level_zero/tools/source/sysman/scheduler/scheduler.h

@@ -9,7 +9,6 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/api/sysman/zes_handles_struct.h"
-#include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
 #include <mutex>
@@ -18,6 +17,7 @@
 
 namespace L0 {
 struct OsSysman;
+
 class Scheduler : _zes_sched_handle_t {
   public:
     virtual ~Scheduler() = default;

level_zero/tools/source/sysman/scheduler/scheduler_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,6 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/tools/source/sysman/sysman_const.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/scheduler/scheduler_imp.h

@@ -14,6 +14,8 @@
 #include "scheduler.h"
 
 namespace L0 {
+class OsScheduler;
+struct OsSysman;
 
 class SchedulerImp : public Scheduler, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/standby/linux/os_standby_imp.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
@@ -13,6 +14,8 @@
 #include "level_zero/tools/source/sysman/standby/standby_imp.h"
 
 namespace L0 {
+class SysfsAccess;
+struct OsSysman;
 
 class LinuxStandbyImp : public OsStandby, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/standby/standby.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 "standby.h"
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "standby_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/standby/standby_imp.h

@@ -14,6 +14,7 @@
 #include "standby.h"
 
 namespace L0 {
+struct OsSysman;
 
 class StandbyImp : public Standby, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/sysman.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "level_zero/tools/source/sysman/sysman.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/sleep.h"
 
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver.h"
@@ -17,9 +16,6 @@
 #include "level_zero/tools/source/sysman/os_sysman_driver.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
-#include <cstring>
-#include <vector>
-
 namespace L0 {
 bool sysmanInitFromCore = false;
 

level_zero/tools/source/sysman/sysman.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,16 +7,12 @@
 
 #pragma once
 #include "level_zero/tools/source/sysman/diagnostics/diagnostics.h"
-#include "level_zero/tools/source/sysman/ecc/ecc.h"
 #include "level_zero/tools/source/sysman/engine/engine.h"
-#include "level_zero/tools/source/sysman/events/events.h"
 #include "level_zero/tools/source/sysman/fabric_port/fabric_port.h"
 #include "level_zero/tools/source/sysman/fan/fan.h"
 #include "level_zero/tools/source/sysman/firmware/firmware.h"
 #include "level_zero/tools/source/sysman/frequency/frequency.h"
-#include "level_zero/tools/source/sysman/global_operations/global_operations.h"
 #include "level_zero/tools/source/sysman/memory/memory.h"
-#include "level_zero/tools/source/sysman/pci/pci.h"
 #include "level_zero/tools/source/sysman/performance/performance.h"
 #include "level_zero/tools/source/sysman/power/power.h"
 #include "level_zero/tools/source/sysman/ras/ras.h"
@@ -30,6 +26,8 @@ struct _zet_sysman_handle_t {};
 
 namespace L0 {
 struct Device;
+struct OsSysman;
+
 struct SysmanDevice : _ze_device_handle_t {
 
     static SysmanDevice *fromHandle(zes_device_handle_t handle) { return Device::fromHandle(handle)->getSysmanHandle(); }

level_zero/tools/source/sysman/sysman_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,15 +11,11 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/helpers/sleep.h"
 
-#include "level_zero/core/source/driver/driver.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/tools/source/sysman/ecc/ecc_imp.h"
 #include "level_zero/tools/source/sysman/events/events_imp.h"
 #include "level_zero/tools/source/sysman/global_operations/global_operations_imp.h"
 #include "level_zero/tools/source/sysman/pci/pci_imp.h"
-#include "level_zero/tools/source/sysman/sysman.h"
 #include "level_zero/tools/source/sysman/vf_management/vf_management.h"
 
 #include <vector>

level_zero/tools/source/sysman/sysman_imp.h

@@ -12,9 +12,27 @@
 #include "level_zero/tools/source/sysman/sysman.h"
 #include <level_zero/zes_api.h>
 
-#include <unordered_map>
-
 namespace L0 {
+class Ecc;
+class Events;
+class GlobalOperations;
+class Pci;
+struct Device;
+struct DiagnosticsHandleContext;
+struct EngineHandleContext;
+struct FabricPortHandleContext;
+struct FanHandleContext;
+struct FirmwareHandleContext;
+struct FrequencyHandleContext;
+struct MemoryHandleContext;
+struct OsSysman;
+struct PerformanceHandleContext;
+struct PowerHandleContext;
+struct RasHandleContext;
+struct SchedulerHandleContext;
+struct StandbyHandleContext;
+struct TemperatureHandleContext;
+struct VfManagementHandleContext;
 
 struct SysmanDeviceImp : SysmanDevice, NEO::NonCopyableAndNonMovableClass {
 

level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h

@@ -12,13 +12,13 @@
 
 #include "neo_igfxfmid.h"
 
-#include <memory>
-
 namespace L0 {
 
 class SysfsAccess;
 class PlatformMonitoringTech;
 struct Device;
+struct OsSysman;
+
 class LinuxTemperatureImp : public OsTemperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_temp_properties_t *pProperties) override;

level_zero/tools/source/sysman/temperature/temperature.cpp

@@ -1,12 +1,10 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/basic_math.h"
-
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include "level_zero/tools/source/sysman/temperature/temperature_imp.h"
 

level_zero/tools/source/sysman/temperature/temperature_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #include "level_zero/tools/source/sysman/temperature/temperature_imp.h"
 
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/temperature/temperature_imp.h

@@ -11,7 +11,10 @@
 
 #include "level_zero/tools/source/sysman/temperature/os_temperature.h"
 #include "level_zero/tools/source/sysman/temperature/temperature.h"
+
 namespace L0 {
+struct OsSysman;
+
 class TemperatureImp : public Temperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t temperatureGetProperties(zes_temp_properties_t *pProperties) override;

level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.cpp

@@ -7,13 +7,12 @@
 
 #include "level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h"
 
-#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/utilities/directory.h"
 
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
-#include "level_zero/tools/source/sysman/sysman_const.h"
 
 namespace L0 {
+
 static const std::string pathForVfTelemetryPrefix = "iov/vf";
 
 ze_result_t LinuxVfImp::getVfBDFAddress(uint32_t vfIdMinusOne, zes_pci_address_t *address) {

level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h

@@ -6,18 +6,21 @@
  */
 
 #pragma once
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
-#include "shared/source/os_interface/product_helper.h"
 
 #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/vf_management/vf_imp.h"
 
 #include <set>
-#include <string>
+
+namespace NEO {
+struct EngineInfo;
+} // namespace NEO
 
 namespace L0 {
 class SysfsAccess;
+class LinuxSysmanImp;
+struct OsSysman;
 
 class LinuxVfImp : public OsVf, NEO::NonCopyableAndNonMovableClass {
   public:

level_zero/tools/source/sysman/vf_management/vf_imp.h

@@ -15,6 +15,8 @@
 #include <memory>
 
 namespace L0 {
+class OsVf;
+struct OsSysman;
 
 class VfImp : public VfManagement, NEO::NonCopyableAndNonMovableClass {
   public: