Cleanup includes 57

Related-To: NEO-5548
Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

level_zero/api/core/ze_core_loader.cpp

@@ -1,17 +1,28 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/api/extensions/public/ze_exp_ext.h"
-#include "level_zero/experimental/source/tracing/tracing_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_barrier_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_cmdlist_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_cmdqueue_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_copy_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_device_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_driver_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_event_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_fence_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_global_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_image_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_memory_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_module_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_residency_imp.h"
+#include "level_zero/experimental/source/tracing/tracing_sampler_imp.h"
 #include "level_zero/source/inc/ze_intel_gpu.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/ze_ddi.h>
-#include <level_zero/zet_api.h>
-#include <level_zero/zet_ddi.h>
 
 #include "ze_core_all_api_entrypoints.h"
 #include "ze_ddi_tables.h"

level_zero/core/source/builtin/builtin_functions_lib_impl.h

@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include "shared/source/os_interface/os_thread.h"
-
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/module/module.h"
 

level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl

@@ -6,10 +6,8 @@
  */
 
 #include "shared/source/command_container/encode_surface_state.h"
-#include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/scratch_space_controller.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"

level_zero/core/source/image/image_hw.inl

@@ -12,7 +12,6 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/basic_math.h"
-#include "shared/source/helpers/string.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/image/image_surface_state.h"
 #include "shared/source/memory_manager/allocation_properties.h"

level_zero/core/source/module/module.h

@@ -10,7 +10,6 @@
 #include <level_zero/ze_api.h>
 
 #include <memory>
-#include <set>
 #include <vector>
 
 struct _ze_module_handle_t {};

level_zero/core/source/module/module_imp.h

@@ -17,6 +17,7 @@
 
 #include <list>
 #include <memory>
+#include <set>
 #include <string>
 
 namespace NEO {

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

@@ -8,6 +8,7 @@
 #include "zello_common.h"
 
 #include <bitset>
+#include <cstring>
 #include <iomanip>
 
 bool verbose;

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

@@ -9,7 +9,6 @@
 
 #include <level_zero/ze_api.h>
 
-#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <limits>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,8 @@
 
 #include "ocloc_api.h"
 
+#include <cstring>
+
 std::vector<uint8_t> compileToSpirV(const std::string &src, const std::string &options, std::string &outCompilerLog) {
     std::vector<uint8_t> ret;
 

level_zero/core/test/black_box_tests/common/zello_compile.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <cstdint>
-#include <cstring>
 #include <string>
 #include <vector>
 

level_zero/core/test/black_box_tests/zello_commandlist_immediate.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <limits>

level_zero/core/test/black_box_tests/zello_copy.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <iomanip>
 
 void testAppendMemoryCopyFromHeapToDeviceToStack(ze_context_handle_t &context, ze_device_handle_t &device, bool &validRet) {

level_zero/core/test/black_box_tests/zello_copy_fence.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <limits>

level_zero/core/test/black_box_tests/zello_copy_image.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_copy_kernel_printf.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_copy_only.cpp

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

level_zero/core/test/black_box_tests/zello_copy_tracing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <ctime>
 #include <fstream>
 #include <iomanip>

level_zero/core/test/black_box_tests/zello_dyn_local_arg.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_events.cpp

@@ -9,6 +9,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_fence.cpp

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

level_zero/core/test/black_box_tests/zello_function_pointers_cl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_host_pointer.cpp

@@ -7,6 +7,8 @@
 
 #include "zello_common.h"
 
+#include <cstring>
+
 typedef ze_result_t (*pFnzexDriverImportExternalPointer)(ze_driver_handle_t, void *, size_t);
 typedef ze_result_t (*pFnzexDriverReleaseImportedPointer)(ze_driver_handle_t, void *);
 typedef ze_result_t (*pFnzexDriverGetHostPointerBaseAddress)(ze_driver_handle_t, void *, void **);

level_zero/core/test/black_box_tests/zello_image_view.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
+
 const char *readNV12Module = R"===(
     __kernel void
     ReadNV12Kernel(

level_zero/core/test/black_box_tests/zello_immediate.cpp

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

level_zero/core/test/black_box_tests/zello_multidev.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/black_box_tests/zello_printf.cpp

@@ -11,6 +11,7 @@
 #include "zello_compile.h"
 
 #include <array>
+#include <cstring>
 #include <iostream>
 #include <numeric>
 #ifdef WIN32

level_zero/core/test/black_box_tests/zello_sandbox.cpp

@@ -8,6 +8,7 @@
 #include "zello_common.h"
 
 #include <bitset>
+#include <cstring>
 #include <sstream>
 
 void executeMemoryTransferAndValidate(ze_context_handle_t &context, ze_device_handle_t &device,

level_zero/core/test/black_box_tests/zello_scratch.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
+
 const char *moduleSrc = R"===(
 typedef long16 TYPE;
 __attribute__((reqd_work_group_size(32, 1, 1))) // force LWS to 32

level_zero/core/test/black_box_tests/zello_timestamp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <functional>
 #include <map>
 

level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
+
 const char *moduleSrc = R"===(
 __kernel void kernel_copy(__global char *dst, __global char *src){
     uint gid = get_global_id(0);

level_zero/core/test/black_box_tests/zello_world_gpu.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "zello_common.h"
 
+#include <cstring>
+
 void executeGpuKernelAndValidate(ze_context_handle_t &context, ze_device_handle_t &device, bool &outputValidationSuccessful) {
     ze_command_queue_handle_t cmdQueue;
     ze_command_queue_desc_t cmdQueueDesc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC};

level_zero/core/test/black_box_tests/zello_world_jitc_ocloc.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"
 
+#include <cstring>
+
 const char *moduleSrc = R"===(
 __kernel void kernel_copy(__global char *dst, __global char *src){
     uint gid = get_global_id(0);

level_zero/core/test/black_box_tests/zello_world_usm.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 
 #include "zello_common.h"
 
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>

level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h

@@ -16,8 +16,6 @@
 
 #include <gtest/gtest.h>
 
-#include <iostream>
-
 namespace L0 {
 
 extern struct APITracerContextImp *pGlobalAPITracerContextImp;

level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

level_zero/experimental/source/tracing/tracing_barrier_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

level_zero/experimental/source/tracing/tracing_event_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

level_zero/experimental/source/tracing/tracing_imp.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,6 @@
 #include "level_zero/experimental/source/tracing/tracing_residency_imp.h"
 #include "level_zero/experimental/source/tracing/tracing_sampler_imp.h"
 #include <level_zero/ze_api.h>
-#include <level_zero/ze_ddi.h>
 
 #include "ze_ddi_tables.h"
 
@@ -31,7 +30,6 @@
 #include <chrono>
 #include <list>
 #include <mutex>
-#include <thread>
 #include <vector>
 
 extern ze_gpu_driver_dditable_t driver_ddiTable;

level_zero/sysman/source/sysman_device.h

@@ -12,8 +12,6 @@
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
-#include <vector>
-
 namespace L0 {
 namespace Sysman {
 

level_zero/sysman/source/sysman_driver_handle.h

@@ -12,8 +12,6 @@
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
-#include <vector>
-
 namespace L0 {
 namespace Sysman {
 

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

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
 #include <mutex>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,6 @@
 #include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
-#include <map>
 #include <mutex>
 #include <vector>
 

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

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-
-#include "level_zero/tools/source/sysman/os_sysman.h"
 #include <level_zero/zes_api.h>
 
 #include <memory>
@@ -16,6 +14,8 @@
 
 namespace L0 {
 
+struct OsSysman;
+
 class OsFirmware {
   public:
     virtual void osGetFwProperties(zes_firmware_properties_t *pProperties) = 0;

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

@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include "shared/source/helpers/non_copyable_or_moveable.h"
-
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/firmware_util/igsc_wrapper.h"
 #include <level_zero/zes_api.h>

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

@@ -13,7 +13,6 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 
-#include <cinttypes>
 #include <mutex>
 #include <string>
 #include <vector>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,13 +8,10 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include <level_zero/zet_api.h>
-
 #include "global_operations.h"
 #include "os_global_operations.h"
 
 #include <mutex>
-#include <vector>
 
 namespace L0 {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include <level_zero/zes_api.h>
 
-#include <string>
 #include <vector>
 
 namespace L0 {

level_zero/tools/source/sysman/pci/os_pci.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "level_zero/tools/source/sysman/os_sysman.h"
-#include <level_zero/zet_api.h>
 
 #include <vector>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,9 +9,6 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "level_zero/core/source/device/device.h"
-#include <level_zero/zet_api.h>
-
 #include "os_pci.h"
 #include "pci.h"
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "level_zero/core/source/device/device.h"
 #include <level_zero/zes_api.h>
 
-#include <map>
 #include <mutex>
 #include <string>
 #include <vector>

level_zero/tools/source/sysman/windows/kmd_sys_manager.h

@@ -8,13 +8,10 @@
 #pragma once
 
 #include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/os_interface/os_interface.h"
 
 #include "level_zero/tools/source/sysman/windows/kmd_sys.h"
 #include "level_zero/ze_api.h"
-#include "level_zero/zet_api.h"
 
-#include <string>
 #include <vector>
 
 namespace NEO {

level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h

@@ -8,7 +8,6 @@
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h"
-#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 #include "gmock/gmock.h"
 

opencl/source/cl_device/cl_device_info_map.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,6 @@
 
 #include "CL/cl_ext.h"
 #include <CL/cl.h>
-#include <CL/cl_ext.h>
 
 namespace NEO {
 

opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl

@@ -11,10 +11,8 @@
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/l3_range.h"
 #include "shared/source/helpers/pipe_control_args.h"
-#include "shared/source/helpers/string.h"
 #include "shared/source/kernel/implicit_args.h"
 
-#include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/kernel/kernel.h"

opencl/test/unit_test/api/cl_create_command_queue_tests.inl

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/device/device.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/context/context.h"

opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 
 #include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"

opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h

@@ -7,14 +7,12 @@
 
 #pragma once
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/aub_mem_dump/page_table_entry_bits.h"
 #include "shared/source/command_stream/aub_command_stream_receiver.h"
 #include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
-#include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 #include "shared/test/common/tests_configuration.h"

opencl/test/unit_test/gen9/cl_get_platform_ids_tests_gen9.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
+#include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 
 using namespace NEO;

opencl/test/unit_test/mocks/mock_async_event_handler.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 
 #include <atomic>
 #include <iterator>
-#include <memory>
-#include <mutex>
 #include <vector>
 
 using namespace NEO;

opencl/test/unit_test/mocks/mock_kernel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,6 @@
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/kernel/kernel_objects_for_aux_translation.h"
 #include "opencl/source/kernel/multi_device_kernel.h"
-#include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"

opencl/test/unit_test/mocks/mock_program.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/device/device.h"
-#include "shared/source/helpers/hash.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/program/kernel_info.h"

opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h"
 
 #include "shared/source/helpers/product_config_helper.h"
+#include "shared/source/os_interface/os_library.h"
 
 namespace NEO {
 TEST_P(OclocProductConfigTests, GivenProductConfigValuesWhenInitHardwareInfoThenCorrectValuesAreSet) {

opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/os_library.h"
 #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h"
 
 #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h"

opencl/test/unit_test/offline_compiler/xe_hpg_core/dg2/offline_compiler_tests_dg2.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/os_library.h"
 #include "shared/test/common/xe_hpg_core/dg2/product_configs_dg2.h"
 
 #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h"

opencl/test/unit_test/offline_compiler/xe_hpg_core/mtl/offline_compiler_tests_mtl.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/os_interface/os_library.h"
+
 #include "opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.h"
 
 namespace NEO {

opencl/test/unit_test/program/program_tests.h

@@ -13,8 +13,6 @@
 
 #include "gtest/gtest.h"
 
-#include <vector>
-
 class ProgramTests : public NEO::ClDeviceFixture,
                      public ::testing::Test,
                      public NEO::ContextFixture {

shared/offline_compiler/source/decoder/binary_decoder.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,7 @@
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/source/os_interface/os_library.h"
 #include "shared/source/utilities/directory.h"
 
 #include <cstring>

shared/offline_compiler/source/decoder/binary_encoder.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hash.h"
+#include "shared/source/os_interface/os_library.h"
 
 #include "CL/cl.h"
 #include "helper.h"

shared/offline_compiler/source/decoder/binary_encoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,8 @@
 #pragma once
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 
-#include "helper.h"
 #include "iga_wrapper.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 

shared/offline_compiler/source/decoder/helper.h

@@ -1,16 +1,13 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/os_interface/os_library.h"
-
 #include "igfxfmid.h"
 
-#include <exception>
 #include <memory>
 #include <sstream>
 #include <string>

shared/offline_compiler/source/ocloc_arg_helper.h

@@ -12,7 +12,6 @@
 #include "shared/source/utilities/const_stringref.h"
 
 #include <algorithm>
-#include <cctype>
 #include <fstream>
 #include <map>
 #include <memory>

shared/offline_compiler/source/ocloc_fatbinary.cpp

@@ -17,6 +17,7 @@
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/product_config_helper.h"
+#include "shared/source/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 #include "platforms.h"

shared/offline_compiler/source/ocloc_fatbinary.h

@@ -11,8 +11,6 @@
 #include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/utilities/const_stringref.h"
 
-#include "igfxfmid.h"
-
 #include <cstdint>
 #include <string>
 #include <vector>

shared/offline_compiler/source/offline_compiler.cpp

@@ -22,6 +22,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/validators.h"
+#include "shared/source/os_interface/os_library.h"
 
 #include "platforms.h"
 

shared/offline_compiler/source/offline_linker.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/string.h"
+#include "shared/source/os_interface/os_library.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/import/library_api.h"

shared/source/command_stream/command_stream_receiver.h

@@ -20,8 +20,10 @@
 #include <functional>
 
 namespace NEO {
+
 enum class DebugPauseState : uint32_t;
 struct BatchBuffer;
+struct HardwareInfo;
 struct WaitParams;
 class SubmissionAggregator;
 class FlushStampTracker;

shared/source/command_stream/definitions/stream_properties.inl

@@ -5,11 +5,11 @@
  *
  */
 
-#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/stream_property.h"
-#include "shared/source/helpers/hw_info.h"
 
 namespace NEO {
+enum PreemptionMode : uint32_t;
+struct HardwareInfo;
 struct RootDeviceEnvironment;
 
 struct StateComputeModePropertiesSupport {

shared/source/dll/wddm/create_gdi.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
+#include "shared/source/os_interface/windows/os_inc.h"
 
 namespace NEO {
 

shared/source/gen12lp/adlp/os_agnostic_product_helper_adlp.inl

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
+
 #include "aubstream/product_family.h"
 
 namespace NEO {

shared/source/gen12lp/adls/os_agnostic_product_helper_adls.inl

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
+
 #include "aubstream/product_family.h"
 
 namespace NEO {

shared/source/gen12lp/dg1/os_agnostic_product_helper_dg1.inl

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
+
 #include "aubstream/product_family.h"
 
 namespace NEO {

shared/source/gen12lp/rkl/os_agnostic_product_helper_rkl.inl

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
+
 namespace NEO {
 template <>
 uint32_t ProductHelperHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {

shared/source/gen12lp/tgllp/os_agnostic_product_helper_tgllp.inl

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
+
 #include "aubstream/product_family.h"
 
 namespace NEO {

shared/source/gmm_helper/page_table_mngr.h

@@ -10,8 +10,6 @@
 
 #include "External/Common/GmmPageTableMgr.h"
 
-#include <functional>
-
 namespace NEO {
 class Gmm;
 class GmmClientContext;

shared/source/memory_manager/memory_manager.h

@@ -18,7 +18,6 @@
 #include "memory_properties_flags.h"
 
 #include <cstdint>
-#include <cstring>
 #include <map>
 #include <mutex>
 #include <unordered_map>

shared/source/memory_manager/memory_operations_handler.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,8 +9,6 @@
 #include "shared/source/memory_manager/memory_operations_status.h"
 #include "shared/source/utilities/arrayref.h"
 
-#include <vector>
-
 namespace NEO {
 class Device;
 class GraphicsAllocation;

shared/source/memory_manager/page_table.h

@@ -1,20 +1,16 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/basic_math.h"
 #include "shared/source/memory_manager/physical_address_allocator.h"
 
 #include <array>
-#include <atomic>
 #include <cinttypes>
 #include <functional>
-#include <memory>
-#include <vector>
 
 namespace NEO {
 

shared/source/os_interface/device_factory.h

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>

shared/source/os_interface/hw_info_config.inl

@@ -9,10 +9,8 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/cache_policy.h"
 #include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/memory_manager/graphics_allocation.h"

shared/source/os_interface/windows/gdi_interface.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,11 +8,9 @@
 #pragma once
 #include "shared/source/os_interface/os_library.h"
 #include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
-#include "shared/source/os_interface/windows/os_inc.h"
 #include "shared/source/os_interface/windows/thk_wrapper.h"
 
 #include <memory>
-#include <string>
 
 namespace NEO {
 

shared/source/os_interface/windows/wddm/adapter_factory_dxgi.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,7 +10,6 @@
 #include "shared/source/os_interface/windows/dxgi_wrapper.h"
 #include "shared/source/os_interface/windows/wddm/adapter_factory.h"
 
-#include <memory>
 #include <vector>
 
 namespace NEO {

shared/source/os_interface/windows/wddm_memory_manager.h

@@ -6,16 +6,12 @@
  */
 
 #pragma once
-#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/windows/wddm_allocation.h"
-#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 #include <d3dkmthk.h>
 
-#include <map>
-#include <mutex>
 #include <vector>
 
 namespace NEO {

shared/source/program/sync_buffer_handler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,8 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
+#include <cstring>
+
 namespace NEO {
 
 SyncBufferHandler::~SyncBufferHandler() {

shared/source/utilities/perf_profiler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 
 #include <atomic>
 #include <cstring>
+#include <fstream>
 #include <sstream>
 #include <thread>
 

shared/source/utilities/perf_profiler.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,6 @@
 #include "shared/source/utilities/timer_util.h"
 
 #include <atomic>
-#include <fstream>
 #include <memory>
 #include <sstream>
 #include <vector>

shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "aubstream/product_family.h"

shared/source/xe_hpg_core/mtl/os_agnostic_product_helper_mtl.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/memory_manager/allocation_type.h"
 
 #include "aubstream/product_family.h"

shared/test/common/cmd_parse/hw_parse.h

@@ -13,7 +13,6 @@
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #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_execution_environment.h"
 
 #include "gtest/gtest.h"

shared/test/common/helpers/cmd_buffer_validator.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,7 +10,6 @@
 #include "shared/source/utilities/stackvec.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 
-#include <memory>
 #include <string>
 #include <vector>