refactor: cleanup header includes in level_zero

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

level_zero/api/driver_experimental/public/zex_event.cpp

@@ -8,8 +8,6 @@
 #include "level_zero/driver_experimental/zex_event.h"
 
 #include "shared/source/helpers/in_order_cmd_helpers.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/memory_manager/unified_memory_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/device/bcs_split.h"
@@ -17,7 +15,6 @@
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/core/source/helpers/default_descriptors.h"
 
 #include <numeric>
 

level_zero/api/driver_experimental/public/zex_memory.cpp

@@ -7,7 +7,6 @@
 
 #include "level_zero/core/source/context/context.h"
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/driver_experimental/zex_api.h"
 
 namespace L0 {
 

level_zero/api/driver_experimental/public/zex_module.cpp

@@ -6,8 +6,6 @@
  */
 
 #include "level_zero/core/source/kernel/kernel.h"
-#include "level_zero/core/source/module/module.h"
-#include "level_zero/driver_experimental/zex_api.h"
 #include "level_zero/ze_intel_gpu.h"
 
 namespace L0 {

level_zero/api/sysman/ze_sysman_loader.cpp

@@ -7,11 +7,7 @@
 
 #include "level_zero/ddi/ze_ddi_tables.h"
 #include <level_zero/ze_api.h>
-#include <level_zero/ze_ddi.h>
-#include <level_zero/zes_api.h>
 #include <level_zero/zes_ddi.h>
-#include <level_zero/zet_api.h>
-#include <level_zero/zet_ddi.h>
 
 ZE_DLLEXPORT ze_result_t ZE_APICALL
 zesGetDeviceProcAddrTable(

level_zero/api/tools/ze_tools_loader.cpp

@@ -7,10 +7,6 @@
 
 #include "level_zero/ddi/ze_ddi_tables.h"
 #include <level_zero/ze_api.h>
-#include <level_zero/ze_ddi.h>
-#include <level_zero/zes_api.h>
-#include <level_zero/zes_ddi.h>
-#include <level_zero/zet_api.h>
 #include <level_zero/zet_ddi.h>
 
 ZE_DLLEXPORT ze_result_t ZE_APICALL

level_zero/core/source/builtin/builtin_functions_lib_impl.cpp

@@ -11,7 +11,6 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/compiler_product_helper.h"
-#include "shared/source/os_interface/os_interface.h"
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/kernel/kernel.h"

level_zero/core/source/builtin/builtin_functions_lib_impl.h

@@ -11,7 +11,7 @@
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/module/module.h"
 
-#include <future>
+#include <atomic>
 #include <vector>
 
 namespace NEO {

level_zero/core/source/cache/linux/cache_reservation_impl_prelim.h

@@ -6,12 +6,13 @@
  */
 
 #pragma once
+
 #include "shared/source/helpers/common_types.h"
-#include "shared/source/os_interface/linux/cache_info.h"
 
 #include "level_zero/core/source/cache/cache_reservation.h"
 
 namespace L0 {
+struct Device;
 
 class CacheReservationImpl : public CacheReservation {
   public:

level_zero/core/source/cmdlist/cmdlist.cpp

@@ -8,9 +8,6 @@
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/command_stream/preemption.h"
-#include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/device/device_info.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
@@ -25,8 +22,6 @@
 #include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/experimental/source/graph/graph.h"
 
-#include "implicit_args.h"
-
 namespace L0 {
 
 CommandList::~CommandList() {

level_zero/core/source/cmdlist/cmdlist.h

@@ -32,7 +32,6 @@
 
 #include <map>
 #include <optional>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -43,6 +42,8 @@ namespace NEO {
 class ScratchSpaceController;
 class TagNodeBase;
 struct EncodeDispatchKernelArgs;
+class CommandStreamReceiver;
+class GraphicsAllocation;
 } // namespace NEO
 
 namespace L0 {

level_zero/core/source/cmdlist/cmdlist_extended/cmdlist_extended.inl

@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/command_stream/linear_stream.h"
-
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
 namespace L0 {

level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl

@@ -10,15 +10,11 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/cache_flush_xehp_and_later.inl"
 #include "shared/source/helpers/pause_on_gpu_properties.h"
-#include "shared/source/helpers/pipeline_select_helper.h"
-#include "shared/source/helpers/simd_helper.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
-#include "shared/source/kernel/grf_config.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/residency_container.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/program/kernel_info.h"
-#include "shared/source/release_helper/release_helper.h"
 #include "shared/source/unified_memory/unified_memory.h"
 #include "shared/source/utilities/software_tags_manager.h"
 
@@ -32,7 +28,6 @@
 
 #include "encode_dispatch_kernel_args_ext.h"
 #include "encode_surface_state_args.h"
-#include "neo_igfxfmid.h"
 
 namespace L0 {
 

level_zero/core/source/cmdlist/cmdlist_imp.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"

level_zero/core/source/cmdlist/cmdlist_imp.h

@@ -7,13 +7,19 @@
 
 #pragma once
 #include "shared/source/helpers/in_order_cmd_helpers.h"
-#include "shared/source/os_interface/os_time.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 
 #include <memory>
 
+namespace NEO {
+class CommandStreamReceiver;
+class InOrderExecInfo;
+struct StreamProperties;
+} // namespace NEO
+
 namespace L0 {
+struct Event;
 
 struct CommandListImp : public CommandList {
     using CommandList::CommandList;

level_zero/core/source/cmdqueue/cmdqueue.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/assert_handler/assert_handler.h"
-#include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/linear_stream.h"
@@ -32,8 +31,6 @@
 #include "level_zero/core/source/helpers/properties_parser.h"
 #include "level_zero/core/source/kernel/kernel.h"
 
-#include "neo_igfxfmid.h"
-
 namespace L0 {
 
 CommandQueueAllocatorFn commandQueueFactory[IGFX_MAX_PRODUCT] = {};

level_zero/core/source/cmdqueue/cmdqueue.h

@@ -8,7 +8,6 @@
 #pragma once
 #include "shared/source/command_stream/task_count_helper.h"
 #include "shared/source/helpers/common_types.h"
-#include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/heap_base_address_model.h"
 
 #include "level_zero/core/source/helpers/api_handle_helper.h"

level_zero/core/source/cmdqueue/cmdqueue_hw.inl

@@ -19,12 +19,10 @@
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
-#include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/definitions/command_encoder_args.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/heap_base_address_model.h"
-#include "shared/source/helpers/pause_on_gpu_properties.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/state_base_address_helper.h"

level_zero/core/source/context/context_imp.cpp

@@ -7,12 +7,10 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
-#include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/allocation_properties.h"
@@ -27,7 +25,6 @@
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/core/source/helpers/default_descriptors.h"
 #include "level_zero/core/source/helpers/properties_parser.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/memory/memory_operations_helper.h"

level_zero/core/source/context/context_imp.h

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/sys_calls_common.h"
 #include "shared/source/utilities/stackvec.h"
 
 #include "level_zero/core/source/context/context.h"
@@ -17,11 +18,20 @@
 
 #include <map>
 
+namespace NEO {
+class GraphicsAllocation;
+enum class HeapIndex : uint32_t;
+struct SvmAllocationData;
+struct VirtualMemoryReservation;
+} // namespace NEO
+
 namespace L0 {
 struct StructuresLookupTable;
 struct DriverHandleImp;
 struct Device;
 struct IpcCounterBasedEventData;
+class ContextExt;
+struct DriverHandle;
 
 ContextExt *createContextExt(DriverHandle *driverHandle);
 void destroyContextExt(ContextExt *ctxExt);

level_zero/core/source/context/context_imp_drm_or_wddm/context_imp_drm_or_wddm_helper.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
+#include <level_zero/ze_api.h>
 
 namespace L0 {
 

level_zero/core/source/context/context_imp_helper.cpp

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/device/device.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 
 namespace L0 {
 

level_zero/core/source/context/context_imp_wddm/context_imp_wddm_helper.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
+#include <level_zero/ze_api.h>
 
 namespace L0 {
 

level_zero/core/source/device/bcs_split.h

@@ -8,8 +8,6 @@
 #pragma once
 
 #include "shared/source/command_stream/transfer_direction.h"
-#include "shared/source/helpers/engine_node_helper.h"
-#include "shared/source/sku_info/sku_info_base.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
@@ -22,7 +20,8 @@
 
 namespace NEO {
 class CommandStreamReceiver;
-}
+enum class TransferDirection;
+} // namespace NEO
 
 namespace L0 {
 struct CommandQueue;

level_zero/core/source/device/device.h

@@ -31,6 +31,9 @@ struct DeviceInfo;
 class CompilerProductHelper;
 class TagAllocatorBase;
 enum class AllocationType;
+class GraphicsAllocation;
+class OSInterface;
+struct HardwareInfo;
 } // namespace NEO
 
 namespace L0 {
@@ -41,7 +44,6 @@ class MetricDeviceContext;
 struct SysmanDevice;
 struct DebugSession;
 class L0GfxCoreHelper;
-
 enum class ModuleType;
 
 struct Device : _ze_device_handle_t {

level_zero/core/source/device/device_imp.cpp

@@ -17,7 +17,6 @@
 #include "shared/source/device/sub_device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/constants.h"
@@ -48,10 +47,8 @@
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/device/bcs_split.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/fabric/fabric.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
-#include "level_zero/core/source/helpers/default_descriptors.h"
 #include "level_zero/core/source/helpers/properties_parser.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/module/module.h"

level_zero/core/source/device/device_imp.h

@@ -19,9 +19,17 @@
 #include <map>
 #include <mutex>
 
+namespace aub_stream {
+enum EngineType : uint32_t;
+} // namespace aub_stream
+
 namespace NEO {
 class AllocationsList;
 class DriverInfo;
+class CommandStreamReceiver;
+class GraphicsAllocation;
+enum class EngineUsage : uint32_t;
+struct HardwareInfo;
 } // namespace NEO
 
 namespace L0 {
@@ -30,6 +38,11 @@ struct Image;
 struct SysmanDevice;
 struct FabricVertex;
 class CacheReservation;
+class MetricDeviceContext;
+struct BuiltinFunctionsLib;
+struct DebugSession;
+struct DriverHandle;
+struct Image;
 
 struct DeviceImp : public Device, NEO::NonCopyableAndNonMovableClass {
     DeviceImp();

level_zero/core/source/device/device_imp_helper.cpp

@@ -5,7 +5,6 @@
  *
  */
 
-#include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/device/device_imp.h"
 
 namespace L0 {

level_zero/core/source/driver/driver.cpp

@@ -9,7 +9,6 @@
 
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/debug_env_reader.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/sys_calls_common.h"
@@ -20,11 +19,7 @@
 #include "level_zero/core/source/driver/driver_imp.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
-#include "driver_version.h"
-
-#include <memory>
 #include <mutex>
-#include <thread>
 
 namespace L0 {
 

level_zero/core/source/driver/driver_handle_imp.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
@@ -18,14 +17,12 @@
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/helpers/string_helpers.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/memory_manager/usm_pool_params.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/logger.h"
 #include "shared/source/utilities/staging_buffer_manager.h"
@@ -46,10 +43,6 @@
 
 #include "driver_version.h"
 
-#include <cstdarg>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
 #include <vector>
 
 namespace L0 {

level_zero/core/source/driver/driver_handle_imp.h

@@ -11,17 +11,22 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/unified_memory_pooling.h"
 #include "shared/source/os_interface/os_library.h"
-#include "shared/source/os_interface/sys_calls_common.h"
 
-#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/context/context.h"
 #include "level_zero/core/source/driver/driver_handle.h"
-#include "level_zero/ze_intel_gpu.h"
 
 #include <map>
 #include <mutex>
 #include <unordered_map>
 
+namespace NEO {
+class Device;
+class MemoryManager;
+class OsLibrary;
+enum class AllocationType;
+struct SvmAllocationData;
+} // namespace NEO
+
 namespace L0 {
 class HostPointerManager;
 struct FabricVertex;

level_zero/core/source/driver/host_pointer_manager.cpp

@@ -7,8 +7,6 @@
 
 #include "level_zero/core/source/driver/host_pointer_manager.h"
 
-#include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/helpers/constants.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"

level_zero/core/source/event/event.cpp

@@ -17,13 +17,10 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/device_bitfield.h"
 #include "shared/source/helpers/gfx_core_helper.h"
-#include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/memory_operations_handler.h"
-#include "shared/source/utilities/cpuintrinsics.h"
 #include "shared/source/utilities/timestamp_pool_allocator.h"
-#include "shared/source/utilities/wait_util.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
@@ -35,8 +32,6 @@
 #include "level_zero/core/source/event/event_impl.inl"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 
-#include <set>
-
 namespace L0 {
 template Event *Event::create<uint64_t>(EventPool *, const ze_event_desc_t *, Device *, ze_result_t &);
 template Event *Event::create<uint32_t>(EventPool *, const ze_event_desc_t *, Device *, ze_result_t &);

level_zero/core/source/event/event.h

@@ -37,6 +37,8 @@ class GraphicsAllocation;
 class MultiGraphicsAllocation;
 struct RootDeviceEnvironment;
 class InOrderExecInfo;
+class TagNodeBase;
+struct TimeStampData;
 } // namespace NEO
 
 namespace L0 {

level_zero/core/source/fabric/linux/fabric_device_iaf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,6 +16,7 @@
 namespace L0 {
 
 class FabricSubDeviceIaf;
+struct Device;
 
 struct FabricPortConnection {
     IafPortId currentid;

level_zero/core/source/fence/fence.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,8 @@
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
+#include <limits>
+
 namespace L0 {
 namespace FenceDefinition {
 static constexpr TaskCountType fenceNotReady = NEO::CompletionStamp::notReady;

level_zero/core/source/fence/fence.h

@@ -13,7 +13,6 @@
 #include "level_zero/core/source/helpers/api_handle_helper.h"
 
 #include <chrono>
-#include <limits>
 
 struct _ze_fence_handle_t : BaseHandleWithLoaderTranslation<ZEL_HANDLE_FENCE> {};
 static_assert(IsCompliantWithDdiHandlesExt<_ze_fence_handle_t>);

level_zero/core/source/helpers/api_specific_config_l0.cpp

@@ -17,7 +17,6 @@
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 
 #include <string>
-#include <vector>
 
 namespace NEO {
 StackVec<const char *, 4> validL0Prefixes;

level_zero/core/source/helpers/l0_populate_factory.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,9 @@
 
 namespace L0 {
 
+template <typename GfxFamily>
+class L0GfxCoreHelperHw;
+
 // Method called by global factory enabler
 template <typename Type>
 void populateFactoryTable();

level_zero/core/source/image/image_hw.inl

@@ -20,7 +20,6 @@
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_pooling.h"
-#include "shared/source/release_helper/release_helper.h"
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/driver/driver_handle.h"

level_zero/core/source/image/image_imp.h

@@ -15,7 +15,13 @@
 #include <memory>
 #include <optional>
 
+namespace NEO {
+class GraphicsAllocation;
+struct SurfaceStateInHeapInfo;
+} // namespace NEO
+
 namespace L0 {
+struct Device;
 
 struct ImageImp : public Image, NEO::NonCopyableAndNonMovableClass {
     ze_result_t destroy() override;

level_zero/core/source/kernel/kernel.h

@@ -26,6 +26,9 @@ class Device;
 struct KernelInfo;
 class MemoryManager;
 class SharedPoolAllocation;
+class GraphicsAllocation;
+struct KernelDescriptor;
+struct SvmAllocationData;
 } // namespace NEO
 
 namespace L0 {

level_zero/core/source/kernel/kernel_imp.cpp

@@ -36,7 +36,6 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/program/work_size_info.h"
-#include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/arrayref.h"
 
 #include "level_zero/core/source/device/device.h"

level_zero/core/source/kernel/kernel_imp.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/unified_memory/unified_memory.h"
@@ -23,10 +22,12 @@
 #include <vector>
 
 namespace NEO {
+class GraphicsAllocation;
 struct ImplicitArgs;
-}
+} // namespace NEO
 
 namespace L0 {
+struct Module;
 
 struct KernelSharedState;
 

level_zero/core/source/memory/cpu_page_fault_memory_manager.cpp

@@ -7,7 +7,6 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/os_interface/os_interface.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"

level_zero/core/source/memory_manager/compression_selector_l0.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 "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/compression_selector.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
 
 namespace NEO {
 bool CompressionSelector::preferCompressedAllocation(const AllocationProperties &properties) {

level_zero/core/source/module/module_build_log.cpp

@@ -10,9 +10,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/core/source/module/module.h"
-
-#include <memory>
 #include <string>
 
 namespace L0 {

level_zero/core/source/module/module_imp.cpp

@@ -12,7 +12,6 @@
 #include "shared/source/compiler_interface/compiler_options_extra.h"
 #include "shared/source/compiler_interface/compiler_warnings/compiler_warnings.h"
 #include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
@@ -21,8 +20,6 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/device_binary_format/zebin/debug_zebin.h"
-#include "shared/source/device_binary_format/zebin/zebin_decoder.h"
-#include "shared/source/device_binary_format/zebin/zeinfo_decoder.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/addressing_mode_helper.h"
@@ -56,9 +53,9 @@
 #include "program_debug_data.h"
 
 #include <algorithm>
-#include <list>
 #include <memory>
 #include <unordered_map>
+
 namespace L0 {
 
 namespace BuildOptions {

level_zero/core/source/module/module_imp.h

@@ -16,7 +16,6 @@
 
 #include "neo_igfxfmid.h"
 
-#include <list>
 #include <memory>
 #include <set>
 #include <string>
@@ -25,12 +24,15 @@ namespace NEO {
 struct KernelDescriptor;
 struct MetadataGeneration;
 class SharedPoolAllocation;
+class Device;
 
 namespace Zebin::Debug {
 struct Segments;
 } // namespace Zebin::Debug
 } // namespace NEO
 namespace L0 {
+struct Device;
+struct ModuleBuildLog;
 
 namespace BuildOptions {
 extern NEO::ConstStringRef optDisable;

level_zero/core/source/mutable_cmdlist/mutable_cmdlist_hw.inl

@@ -10,18 +10,16 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#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/helpers/kernel_helpers.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/utilities/const_stringref.h"
 
+#include "level_zero/core/source/cmdlist/cmdlist_launch_params.h"
+#include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/kernel/kernel_imp.h"
-#include "level_zero/core/source/mutable_cmdlist/helper.h"
 #include "level_zero/core/source/mutable_cmdlist/mcl_kernel_ext.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_cmdlist_hw.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_command_walker_hw.h"
@@ -31,15 +29,10 @@
 #include "level_zero/core/source/mutable_cmdlist/mutable_semaphore_wait_hw.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_store_data_imm_hw.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_store_register_mem_hw.h"
-#include "level_zero/core/source/mutable_cmdlist/usage.h"
 #include "level_zero/core/source/mutable_cmdlist/variable.h"
 #include "level_zero/experimental/source/mutable_cmdlist/mutable_cmdlist_hw_experimental.inl"
 
-#include "encode_surface_state_args.h"
-#include "implicit_args.h"
-
 #include <cstddef>
-#include <optional>
 
 namespace L0 {
 namespace MCL {

level_zero/core/source/mutable_cmdlist/mutable_cmdlist_imp.h

@@ -9,7 +9,6 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/utilities/arrayref.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_launch_params.h"
 #include "level_zero/core/source/mutable_cmdlist/mcl_types.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_cmdlist.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_command_walker.h"

level_zero/core/source/mutable_cmdlist/mutable_kernel_group.cpp

@@ -7,8 +7,6 @@
 
 #include "level_zero/core/source/mutable_cmdlist/mutable_kernel_group.h"
 
-#include "shared/source/helpers/debug_helpers.h"
-
 #include "level_zero/core/source/kernel/kernel.h"
 
 #include <algorithm>

level_zero/core/source/printf_handler/printf_handler.h

@@ -21,6 +21,7 @@ class GraphicsAllocation;
 
 namespace L0 {
 struct Device;
+struct KernelImmutableData;
 
 struct PrintfHandler : NEO::NonCopyableAndNonMovableClass {
     static NEO::GraphicsAllocation *createPrintfBuffer(Device *device);

level_zero/core/source/rtas/rtas.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/core/source/rtas/rtas.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/string.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 

level_zero/core/source/sampler/sampler_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "level_zero/core/source/sampler/sampler.h"
 
 namespace L0 {
+struct Device;
 
 class SamplerImp : public Sampler {
   public:

level_zero/core/source/semaphore/external_semaphore_imp.cpp

@@ -7,8 +7,6 @@
 
 #include "level_zero/core/source/semaphore/external_semaphore_imp.h"
 
-#include "shared/source/device/device.h"
-
 #include "level_zero/core/source/context/context.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"

level_zero/core/source/semaphore/external_semaphore_imp.h

@@ -22,6 +22,7 @@
 #include <thread>
 
 namespace L0 {
+struct Device;
 
 class ExternalSemaphoreImp : public ExternalSemaphore {
   public:

level_zero/core/source/xe2_hpg_core/enable_family_full_l0_xe2_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #include "shared/source/xe2_hpg_core/hw_cmds.h"
 
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 
 namespace NEO {

level_zero/core/source/xe3_core/enable_family_full_l0_xe3_core.cpp

@@ -7,7 +7,6 @@
 
 #include "shared/source/xe3_core/hw_cmds_base.h"
 
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 
 namespace NEO {

level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 
 namespace NEO {

level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/source/helpers/l0_populate_factory.h"
 
 namespace NEO {

level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp

@@ -11,6 +11,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/fabric/fabric.h"
 #include "level_zero/core/source/fabric/linux/fabric_device_iaf.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"

level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_multi_hop.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/fabric/fabric.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_fabric.h"

level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp

@@ -9,6 +9,7 @@
 #include "shared/test/common/mocks/mock_driver_info.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/fabric/fabric.h"
 #include "level_zero/core/source/fabric/fabric_device_interface.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"

level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/test/common/helpers/variable_backup.h"
 
+#include "level_zero/core/source/cmdlist/cmdlist_launch_params.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
 #include "level_zero/core/test/unit_tests/sources/mutable_cmdlist/mocks/mock_mutable_cmdlist.h"

level_zero/core/test/unit_tests/sources/rtas/test_rtas.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/rtas/rtas.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 

level_zero/core/test/unit_tests/sources/rtas/test_rtas_ext.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/rtas/rtas.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 

level_zero/experimental/source/mutable_cmdlist/mutable_cmdlist_hw_experimental.inl

@@ -10,18 +10,14 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#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/helpers/kernel_helpers.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/utilities/const_stringref.h"
 
+#include "level_zero/core/source/cmdlist/cmdlist_launch_params.h"
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/kernel/kernel_imp.h"
-#include "level_zero/core/source/mutable_cmdlist/helper.h"
 #include "level_zero/core/source/mutable_cmdlist/mcl_kernel_ext.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_cmdlist_hw.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_command_walker_hw.h"
@@ -34,7 +30,6 @@
 #include "encode_surface_state_args.h"
 
 #include <cstddef>
-#include <optional>
 
 namespace L0 {
 namespace MCL {

level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp

@@ -9,6 +9,7 @@
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test_base.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h"

level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp

@@ -9,6 +9,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/common/test_macros/test_base.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.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/core/test/unit_tests/mocks/mock_cmdlist.h"

level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"

level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_5.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/tools/source/metrics/metric_oa_source.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h"

level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp

@@ -8,6 +8,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/common/test_macros/test_base.h"
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h"
 

shared/source/memory_manager/memory_manager.h

@@ -38,6 +38,7 @@ struct AllocationData;
 class GmmHelper;
 enum class DriverModelType;
 enum class AtomicAccessMode : uint32_t;
+enum class HeapIndex : uint32_t;
 struct AllocationProperties;
 class LocalMemoryUsageBankSelector;
 class DeferredDeleter;