test: cleanup header includes 1/n

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

level_zero/core/test/black_box_tests/common/zello_common.cpp

@@ -8,7 +8,6 @@
 #include "zello_common.h"
 
 #include <bitset>
-#include <cstdlib>
 #include <cstring>
 #include <iomanip>
 #include <map>

level_zero/core/test/black_box_tests/zello_bindless_kernel.cpp

@@ -6,16 +6,13 @@
  */
 
 #include "level_zero/core/source/image/image_format_desc_helper.h"
-#include "level_zero/driver_experimental/ze_bindless_image_exp.h"
 #include <level_zero/ze_api.h>
 
 #include "zello_common.h"
 #include "zello_compile.h"
 
-#include <array>
 #include <cstring>
 #include <iostream>
-#include <numeric>
 #include <sstream>
 
 namespace {

level_zero/core/test/black_box_tests/zello_copy_fence.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,10 +10,8 @@
 #include "zello_common.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
 #include <limits>
-#include <memory>
 
 void testAppendMemoryCopy(ze_context_handle_t &context, ze_device_handle_t &device, bool &validRet) {
     const size_t allocSize = 4096;

level_zero/core/test/black_box_tests/zello_copy_image.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,9 +10,7 @@
 #include "zello_common.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 bool testAppendImageCopy(ze_context_handle_t &context, ze_device_handle_t &device) {
     const size_t width = 32;

level_zero/core/test/black_box_tests/zello_copy_kernel_printf.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,9 +11,7 @@
 #include "zello_compile.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 int main(int argc, char *argv[]) {
     const std::string blackBoxName = "Zello Copy With Printf";

level_zero/core/test/black_box_tests/zello_copy_only.cpp

@@ -10,7 +10,6 @@
 #include "zello_common.h"
 
 #include <cstring>
-#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <limits>

level_zero/core/test/black_box_tests/zello_copy_tracing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,11 +13,9 @@
 
 #include <cstring>
 #include <ctime>
-#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <limits>
-#include <memory>
 
 struct UserTracerData {
     uint32_t tracerData;

level_zero/core/test/black_box_tests/zello_debug_info.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,9 +11,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 int main(int argc, char *argv[]) {
 

level_zero/core/test/black_box_tests/zello_dp_support.cpp

@@ -9,9 +9,6 @@
 
 #include "zello_common.h"
 
-#include <cstring>
-#include <iomanip>
-
 int main(int argc, char *argv[]) {
     const std::string blackBoxName = "Zello DP Support";
     LevelZeroBlackBoxTests::verbose = LevelZeroBlackBoxTests::isVerbose(argc, argv);

level_zero/core/test/black_box_tests/zello_dyn_local_arg.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,9 +9,7 @@
 #include "zello_compile.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 #include <vector>
 
 void createModule(ze_module_handle_t &module, ze_context_handle_t &context, ze_device_handle_t &device) {

level_zero/core/test/black_box_tests/zello_dynamic_link.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,9 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 int main(int argc, char *argv[]) {
     const std::string blackBoxName = "Zello Dynamic Link";

level_zero/core/test/black_box_tests/zello_events.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,9 +10,7 @@
 #include "zello_common.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 #include <vector>
 
 void createCmdQueueAndCmdList(ze_device_handle_t &device,

level_zero/core/test/black_box_tests/zello_fence.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,9 +11,7 @@
 #include "zello_compile.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 void createModule(ze_context_handle_t &context, ze_module_handle_t &module, ze_device_handle_t &device) {
     // Prepare spirV

level_zero/core/test/black_box_tests/zello_fill.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "zello_common.h"
 
 #include <cstring>
-#include <iomanip>
 
 void testAppendMemoryCopyFill(ze_context_handle_t &context, ze_device_handle_t &device, bool &validRet, ze_command_queue_handle_t &cmdQueue, size_t maxElemenets, bool useInitFill) {
     size_t numElements = maxElemenets;

level_zero/core/test/black_box_tests/zello_function_pointers_cl.cpp

@@ -11,9 +11,7 @@
 #include "zello_compile.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 int main(int argc, char *argv[]) {
     const std::string blackBoxName = "Zello Function Pointers CL";

level_zero/core/test/black_box_tests/zello_image.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,10 +10,7 @@
 #include "zello_common.h"
 
 #include <algorithm>
-#include <fstream>
 #include <iostream>
-#include <memory>
-#include <vector>
 
 #define imageIndex(buf, x, y, z, chan) \
     (buf)[(chan) +                     \

level_zero/core/test/black_box_tests/zello_immediate.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,6 @@
 #include <chrono>
 #include <cstring>
 #include <fstream>
-#include <iomanip>
 #include <iostream>
 #include <limits>
 #include <memory>

level_zero/core/test/black_box_tests/zello_multidev.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,9 +9,7 @@
 #include "zello_compile.h"
 
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 int main(int argc, char *argv[]) {
     const std::string blackBoxName = "Zello Multidev";

level_zero/core/test/black_box_tests/zello_p2p_copy.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,7 @@
 
 #include "zello_common.h"
 
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 struct DevObjects {
     ze_command_queue_handle_t cmdQueue;

level_zero/core/test/black_box_tests/zello_printf.cpp

@@ -13,7 +13,6 @@
 #include <array>
 #include <cstring>
 #include <iostream>
-#include <numeric>
 #include <sstream>
 
 #ifdef _WIN32

level_zero/core/test/common/ult_config_listener_l0.cpp

@@ -8,7 +8,6 @@
 #include "level_zero/core/test/common/ult_config_listener_l0.h"
 
 #include "level_zero/core/source/driver/driver.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/ddi/ze_ddi_tables.h"
 #include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 

level_zero/core/test/common/ult_specific_config_l0.cpp

@@ -8,9 +8,10 @@
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/tests_configuration.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/test/common/ult_config_listener_l0.h"
 
+struct _ze_driver_handle_t;
+
 namespace L0 {
 extern std::vector<_ze_driver_handle_t *> *globalDriverHandles;
 }

level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp

@@ -7,17 +7,14 @@
 
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/implicit_scaling.h"
-#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/ray_tracing_helper.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/product_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
 

level_zero/core/test/unit_tests/fixtures/device_fixture.cpp

@@ -7,7 +7,6 @@
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
@@ -15,10 +14,8 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_context.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 
 #include "gtest/gtest.h"
 

level_zero/core/test/unit_tests/fixtures/device_fixture.h

@@ -21,17 +21,20 @@
 #include "level_zero/core/test/unit_tests/mock.h"
 
 class MockPageFaultManager;
+
 namespace NEO {
 struct UltDeviceFactory;
 class MockMemoryManager;
 class OsAgnosticMemoryManager;
 class MemoryManagerMemHandleMock;
+class Device;
 } // namespace NEO
 
 namespace L0 {
 struct Context;
 struct Device;
 struct ContextImp;
+struct DeviceImp;
 
 namespace ult {
 class MockBuiltins;

level_zero/core/test/unit_tests/fixtures/event_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #include "level_zero/core/test/unit_tests/fixtures/event_fixture.h"
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/event/event_impl.inl"
 
 #include "gtest/gtest.h"

level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h

@@ -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 "shared/source/helpers/constants.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 
-#include "level_zero/core/test/unit_tests/white_box.h"
 #include <level_zero/ze_api.h>
 
 namespace NEO {
@@ -22,7 +21,10 @@ struct Context;
 struct Device;
 struct DriverHandleImp;
 class HostPointerManager;
+
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 struct HostPointerManagerFixure {
     void setUp();

level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.cpp

@@ -8,18 +8,14 @@
 #include "level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h"
 
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/common/ult_helpers_l0.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 
 #include "gtest/gtest.h"
 

level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/memory_manager/memory_allocation.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -19,9 +20,14 @@
 namespace NEO {
 class MockDevice;
 class MemoryManagerMemHandleMock;
+class ExecutionEnvironment;
+class SVMAllocsManager;
 } // namespace NEO
 
 namespace L0 {
+struct Device;
+struct DriverHandle;
+
 namespace ult {
 
 struct DriverHandleGetFdMock : public L0::DriverHandleImp {

level_zero/core/test/unit_tests/fixtures/module_fixture.cpp

@@ -17,6 +17,8 @@
 #include "gtest/gtest.h"
 
 namespace L0 {
+struct ModuleBuildLog;
+
 namespace ult {
 
 ModuleImmutableDataFixture::MockImmutableMemoryManager::MockImmutableMemoryManager(NEO::ExecutionEnvironment &executionEnvironment) : NEO::MockMemoryManager(const_cast<NEO::ExecutionEnvironment &>(executionEnvironment)) {}

level_zero/core/test/unit_tests/fixtures/module_fixture.h

@@ -16,7 +16,16 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
+namespace NEO {
+class ExecutionEnvironment;
+struct KernelDescriptor;
+struct KernelInfo;
+} // namespace NEO
+
 namespace L0 {
+struct Device;
+struct ModuleBuildLog;
+
 namespace ult {
 
 struct ModuleImmutableDataFixture : public DeviceFixture {

level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,8 +12,11 @@
 namespace L0 {
 struct ContextImp;
 struct Device;
+struct CommandListImp;
 
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 struct MultiTileCommandListAppendLaunchKernelFixture : public MultiDeviceModuleFixture {
     MultiTileCommandListAppendLaunchKernelFixture();

level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp

@@ -5,20 +5,15 @@
  *
  */
 
-#include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/helpers/register_offsets.h"
-#include "shared/source/helpers/state_base_address.h"
 #include "shared/source/os_interface/product_helper.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 
 namespace L0 {
 namespace ult {

level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp

@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/os_interface/product_helper.h"
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/hw_test.h"

level_zero/core/test/unit_tests/mocks/mock_cmdlist.h

@@ -23,8 +23,11 @@ class GraphicsAllocation;
 
 namespace L0 {
 struct Device;
+enum class Builtin : uint32_t;
+struct Event;
 
 namespace ult {
+struct Device;
 
 template <GFXCORE_FAMILY gfxCoreFamily>
 struct WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>

level_zero/core/test/unit_tests/mocks/mock_cmdqueue.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,9 @@
 
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 
-#include "shared/source/device/device.h"
-#include "shared/source/helpers/engine_control.h"
-
 namespace L0 {
+struct Device;
+
 namespace ult {
 
 WhiteBox<::L0::CommandQueue>::WhiteBox(L0::Device *device, NEO::CommandStreamReceiver *csr, const ze_command_queue_desc_t *desc)

level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h

@@ -18,8 +18,22 @@
 #include <cstddef>
 #include <optional>
 
+namespace NEO {
+class GraphicsAllocation;
+class LinearStream;
+class ScratchSpaceController;
+enum class SubmissionStatus : uint32_t;
+enum class WaitStatus;
+} // namespace NEO
+
 namespace L0 {
+struct Device;
+
 namespace ult {
+template <typename Type>
+struct Mock;
+template <typename Type>
+struct WhiteBox;
 
 template <>
 struct WhiteBox<::L0::CommandQueue> : public ::L0::CommandQueueImp {

level_zero/core/test/unit_tests/mocks/mock_device_for_built_ins.cpp

@@ -10,6 +10,8 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 
 namespace L0 {
+struct Device;
+
 namespace ult {
 
 MockDeviceForBuiltinTests::MockModuleForBuiltinTests::MockModuleForBuiltinTests(Device *device, ModuleType type) : ModuleImp(device, nullptr, type){};

level_zero/core/test/unit_tests/mocks/mock_device_for_built_ins.h

@@ -11,6 +11,8 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 
 namespace L0 {
+struct Device;
+
 namespace ult {
 
 struct MockDeviceForBuiltinTests : public MockDeviceImp {

level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,13 +8,11 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.h"
 
 #include "shared/source/helpers/file_io.h"
-#include "shared/test/common/helpers/kernel_binary_helper.h"
 #include "shared/test/common/helpers/test_files.h"
-#include "shared/test/common/libult/global_environment.h"
-
-#include "level_zero/tools/source/debug/debug_session.h"
 
 namespace L0 {
+struct ModuleBuildLog;
+
 namespace ult {
 template <bool useImagesBuiltins, bool isStateless>
 ze_result_t MockDeviceForSpv<useImagesBuiltins, isStateless>::createModule(const ze_module_desc_t *desc, ze_module_handle_t *module,

level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.h

@@ -11,7 +11,14 @@
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/module/module.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
+
+namespace NEO {
+class Device;
+} // namespace NEO
+
 namespace L0 {
+struct DriverHandleImp;
+
 namespace ult {
 
 template <bool useImagesBuiltins, bool isStateless>

level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp

@@ -7,9 +7,6 @@
 
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
 
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
-
-#include "level_zero/core/source/driver/host_pointer_manager.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 
 namespace L0 {

level_zero/core/test/unit_tests/mocks/mock_driver_handle.h

@@ -1,17 +1,24 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
 
+namespace NEO {
+class Device;
+class GraphicsAllocation;
+class SVMAllocsManager;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/mocks/mock_module.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,6 @@
 
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
-#include "level_zero/core/source/device/device.h"
-
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/mocks/mock_module.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/test/common/mocks/mock_cif.h"
@@ -17,8 +18,21 @@
 #include "level_zero/core/test/unit_tests/white_box.h"
 
 #include "gtest/gtest.h"
+
+namespace NEO {
+class GraphicsAllocation;
+} // namespace NEO
+
 namespace L0 {
+struct Device;
+struct KernelImmutableData;
+struct ModuleBuildLog;
+
 namespace ult {
+template <typename Type>
+struct Mock;
+template <typename Type>
+struct WhiteBox;
 
 struct MockModuleTranslationUnit : public L0::ModuleTranslationUnit {
     using BaseClass = L0::ModuleTranslationUnit;

level_zero/core/test/unit_tests/os_interface/os_context_l0_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,10 @@
 
 #include "gtest/gtest.h"
 
+namespace NEO {
+class OSInterface;
+} // namespace NEO
+
 using namespace NEO;
 
 struct DeferredOsContextCreationL0Tests : ::testing::Test {

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp

@@ -12,12 +12,9 @@
 #include "shared/test/common/mocks/mock_command_encoder.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
-#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
 
 namespace L0 {

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp

@@ -7,7 +7,6 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp

@@ -16,7 +16,6 @@
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl"
-#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/command_container/implicit_scaling.h"
-#include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
@@ -19,6 +18,9 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 
 namespace L0 {
+struct Context;
+struct DriverHandle;
+
 namespace ult {
 
 struct CopyTestInput {

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp

@@ -5,24 +5,16 @@
  *
  */
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/helpers/register_offsets.h"
-#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/builtin/builtin_functions_lib_impl.h"
-#include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl"
-#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
-
-#include <limits>
 
 namespace L0 {
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 using AppendFillTest = Test<AppendFillFixture>;
 

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/command_container/implicit_scaling.h"
-#include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
@@ -17,9 +16,10 @@
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 
-#include <limits>
-
 namespace L0 {
+struct Context;
+struct DriverHandle;
+
 namespace ult {
 
 struct FillTestInput {

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp

@@ -14,14 +14,18 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
 
 namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamily;
+
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded, IGFX_XE2_HPG_CORE);
 HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand, IGFX_XE2_HPG_CORE);

level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp

@@ -14,7 +14,6 @@
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
@@ -31,6 +30,18 @@
 using namespace NEO;
 #include "shared/test/common/test_macros/header/heapless_matchers.h"
 
+namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamily;
+} // namespace L0
+namespace NEO {
+class InternalAllocationStorage;
+class ScratchSpaceController;
+enum QueueThrottle : uint32_t;
+template <typename GfxFamily>
+class UltAubCommandStreamReceiver;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_debugger.cpp

@@ -12,10 +12,8 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
-#include "shared/test/common/mocks/mock_bindless_heaps_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
@@ -23,9 +21,10 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h"
 
-#include "test_traits_common.h"
-
 namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandQueueHw;
+
 namespace ult {
 
 using L0CmdQueueDebuggerTest = Test<L0DebuggerPerContextAddressSpaceFixture>;

level_zero/core/test/unit_tests/sources/context/test_context.cpp

@@ -5,9 +5,7 @@
  *
  */
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/gmm_helper/gmm.h"
-#include "shared/source/helpers/blit_properties.h"
 #include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/utilities/cpu_info.h"
@@ -34,6 +32,9 @@
 #include "gtest/gtest.h"
 
 namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamily;
+
 namespace ult {
 
 using MultiDeviceContextTests = Test<MultiDeviceFixture>;

level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp

@@ -1,27 +1,17 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/built_ins/sip.h"
-#include "shared/test/common/mocks/mock_command_stream_receiver.h"
-#include "shared/test/common/mocks/mock_compilers.h"
-#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_driver_model.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
-#include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/context/context_imp.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/core/source/image/image.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
-#include "level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
 
 #include "gtest/gtest.h"
 

level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp

@@ -5,16 +5,10 @@
  *
  */
 
-#include "shared/source/compiler_interface/external_functions.h"
-#include "shared/source/device_binary_format/patchtokens_decoder.h"
-#include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/program/kernel_info.h"
-#include "shared/source/program/kernel_info_from_patchtokens.h"
 #include "shared/test/common/compiler_interface/linker_mock.h"
 #include "shared/test/common/helpers/mock_file_io.h"
-#include "shared/test/common/helpers/unit_test_helper.h"
-#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 #include "shared/test/common/test_macros/hw_test.h"
@@ -26,6 +20,8 @@
 #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h"
 
 namespace L0 {
+struct ModuleBuildLog;
+
 namespace ult {
 
 using ModuleWithDebuggerL0Test = Test<L0DebuggerHwFixture>;

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

@@ -1,16 +1,14 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/fabric/fabric.h"

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

@@ -5,10 +5,8 @@
  *
  */
 
-#include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_driver_info.h"
-#include "shared/test/common/mocks/mock_driver_model.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/fabric/fabric.h"
@@ -16,7 +14,6 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
 namespace L0 {
-class FabricDeviceMdfi;
 namespace ult {
 
 class MockFabricDeviceInterface {

level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp

@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/heap_assigner.h"
-#include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/gfx_partition.h"
-#include "shared/source/os_interface/product_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/hw_test.h"

level_zero/core/test/unit_tests/sources/helper/l0_gfx_core_helper_tests.cpp

@@ -11,7 +11,6 @@
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/ptr_math.h"
-#include "shared/source/os_interface/product_helper.h"
 #include "shared/source/release_helper/release_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"

level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp

@@ -14,7 +14,6 @@
 #include "shared/test/common/mocks/mock_bindless_heaps_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/common/mocks/mock_l0_debugger.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test.h"
@@ -30,6 +29,7 @@
 
 namespace L0 {
 #include "level_zero/core/source/kernel/patch_with_implicit_surface.inl"
+
 namespace ult {
 
 using KernelImpTest = Test<DeviceFixture>;

level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp

@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/built_ins/sip.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"

level_zero/core/test/unit_tests/sources/memory/test_memory.cpp

@@ -42,7 +42,10 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_context.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 #include "level_zero/driver_experimental/zex_memory.h"
+
 namespace L0 {
+struct ModuleBuildLog;
+
 namespace ult {
 
 TEST_F(MemoryExportImportImplicitScalingTest,

level_zero/core/test/unit_tests/sources/module/test_module_2.cpp

@@ -6,15 +6,11 @@
  */
 
 #include "shared/source/compiler_interface/compiler_options.h"
-#include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/helpers/file_io.h"
-#include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module_build_log.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

@@ -14,7 +14,14 @@
 #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"
 
+namespace NEO {
+class GraphicsAllocation;
+} // namespace NEO
+
 namespace L0 {
+struct Event;
+struct Kernel;
+
 namespace ult {
 
 struct MutableCommandListFixtureInit : public ModuleImmutableDataFixture {

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

@@ -22,8 +22,21 @@
 
 #include <map>
 
+namespace NEO {
+class IndirectHeap;
+} // namespace NEO
+
+namespace L0 {
+struct CommandList;
+struct Event;
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamily;
+} // namespace L0
+
 namespace L0 {
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 struct VariableFixture : public MutableCommandListFixtureInit {
     constexpr static size_t kernelArgVariableSize = sizeof(void *);

level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_cmdlist_kernels_tests.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
-#include "shared/source/helpers/ptr_math.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"

level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_kernel_group_tests.cpp

@@ -6,18 +6,13 @@
  */
 
 #include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/helpers/ptr_math.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
-#include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/mutable_cmdlist/mutable_command_walker_hw.h"
 #include "level_zero/core/source/mutable_cmdlist/mutable_kernel_dispatch.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/sources/mutable_cmdlist/mocks/mock_mutable_kernel.h"
 #include "level_zero/core/test/unit_tests/sources/mutable_cmdlist/mocks/mock_mutable_kernel_group.h"
-#include "level_zero/core/test/unit_tests/sources/mutable_cmdlist/mocks/mock_variable.h"
 
 namespace L0 {
 namespace ult {

level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_pipe_control_tests.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/helpers/gfx_core_helper.h"
-#include "shared/test/common/helpers/ult_gfx_core_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/mutable_cmdlist/mutable_pipe_control_hw.h"

level_zero/core/test/unit_tests/sources/printf_handler/test_printf_handler.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/printf_handler/printf_handler.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"

level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp

@@ -8,7 +8,6 @@
 #include "shared/source/utilities/numeric.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/sampler/sampler_hw.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_sampler.h"
 

level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp

@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/os_interface/os_interface.h"
-#include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
@@ -15,13 +13,16 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
-#include "level_zero/ze_intel_gpu.h"
 
 using namespace NEO;
 #include "gtest/gtest.h"
 
+namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamilyImmediate;
+} // namespace L0
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/xe2_hpg_core/test_cmdqueue_xe2_hpg_core.cpp

@@ -6,13 +6,10 @@
  */
 
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-#include "shared/test/common/helpers/default_hw_info.h"
-#include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 

level_zero/core/test/unit_tests/xe2_hpg_core/test_module_xe2_hpg_core.cpp

@@ -14,6 +14,10 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
+namespace NEO {
+class Device;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/xe3_core/CMakeLists.txt

@@ -7,7 +7,6 @@
 if(TESTS_XE3_CORE)
   target_sources(${TARGET_NAME} PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/excludes_l0_xe3_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_xe3_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_device_xe3_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_l0_gfx_core_helper_xe3_core.cpp

level_zero/core/test/unit_tests/xe3_core/excludes_l0_xe3_core.cpp

@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2025 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/test/common/test_macros/hw_test_base.h"

level_zero/core/test/unit_tests/xe3_core/test_module_xe3_core.cpp

@@ -14,6 +14,10 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
+namespace NEO {
+class Device;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp

@@ -22,7 +22,12 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
 namespace L0 {
+template <GFXCORE_FAMILY gfxCoreFamily>
+struct CommandListCoreFamily;
+
 namespace ult {
+template <typename Type>
+struct WhiteBox;
 
 struct LocalMemoryModuleFixture : public ModuleFixture {
     void setUp() {

level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp

@@ -10,12 +10,10 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
-#include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
-#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"

level_zero/core/test/unit_tests/xe_hpc_core/test_event_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,10 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
 
+namespace NEO {
+class ExecutionEnvironment;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 

level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp

@@ -7,9 +7,9 @@
 
 #include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h"
 
-#include "shared/test/common/test_macros/hw_test.h"
-
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
+namespace NEO {
+struct HardwareInfo;
+} // namespace NEO
 
 using namespace L0;
 using namespace ult;

level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h

@@ -12,6 +12,10 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
 
+namespace NEO {
+struct HardwareInfo;
+} // namespace NEO
+
 namespace L0 {
 namespace ult {
 struct DeviceFixtureXeHpcTests : public DeviceFixture {

level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp

@@ -10,12 +10,8 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
-#include "level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.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/mocks/mock_cmdlist.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_module.h"
 
 namespace L0 {
 namespace ult {

level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_kernel_dg2.cpp

@@ -1,18 +1,15 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-#include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
-#include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 
 namespace L0 {
 namespace ult {

level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp

@@ -1,19 +1,13 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/command_stream/linear_stream.h"
-#include "shared/source/device/device.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/source/image/image.h"
-#include "level_zero/core/source/image/image_hw.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/white_box.h"