From 6cbb3cfb0563406574a48c50dd202fefb7e6e4cd Mon Sep 17 00:00:00 2001
From: "Warchulski, Jaroslaw" <jaroslaw.warchulski@intel.com>
Date: Mon, 7 Nov 2022 13:04:52 +0000
Subject: [PATCH] Cleanup includes 3

Related-To: NEO-5548
Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
---
 level_zero/core/source/cmdqueue/cmdqueue.cpp                 | 1 -
 opencl/source/program/create.inl                             | 3 ---
 shared/source/ail/ail_configuration.h                        | 4 +++-
 shared/source/ail/ail_configuration_base.inl                 | 2 ++
 shared/source/ail/ail_configuration_extra.cpp                | 1 +
 shared/source/ail/gen12lp/adln/ail_configuration_adln.cpp    | 2 +-
 shared/source/ail/gen12lp/adlp/ail_configuration_adlp.cpp    | 2 +-
 shared/source/ail/gen12lp/adls/ail_configuration_adls.cpp    | 2 +-
 shared/source/ail/gen12lp/dg1/ail_configuration_dg1.cpp      | 2 +-
 shared/source/ail/gen12lp/rkl/ail_configuration_rkl.cpp      | 2 +-
 shared/source/ail/gen12lp/tgllp/ail_configuration_tgllp.cpp  | 2 +-
 .../ail/xe_hp_core/xe_hp_sdv/ail_configuration_xe_hp_sdv.cpp | 2 +-
 shared/source/ail/xe_hpc_core/pvc/ail_configuration_pvc.cpp  | 2 +-
 shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp  | 5 ++---
 shared/source/built_ins/built_in_ops_base.h                  | 1 -
 shared/source/built_ins/sip.h                                | 1 -
 shared/source/command_stream/command_stream_receiver.h       | 2 --
 .../source/command_stream/tbx_command_stream_receiver_hw.inl | 1 +
 shared/source/debugger/debugger_l0.cpp                       | 2 --
 shared/source/device_binary_format/ar/ar_encoder.h           | 3 +--
 shared/source/device_binary_format/debug_zebin.h             | 1 -
 .../source/device_binary_format/device_binary_format_ar.cpp  | 1 -
 .../device_binary_format/device_binary_format_ocl_elf.cpp    | 4 +---
 shared/source/gen12lp/preamble_gen12lp.cpp                   | 2 --
 shared/source/helpers/state_base_address_xehp_and_later.inl  | 1 -
 25 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/level_zero/core/source/cmdqueue/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp
index e76b09916a..214d144bd9 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue.cpp
+++ b/level_zero/core/source/cmdqueue/cmdqueue.cpp
@@ -15,7 +15,6 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
diff --git a/opencl/source/program/create.inl b/opencl/source/program/create.inl
index 51829c686f..8579f05f0a 100644
--- a/opencl/source/program/create.inl
+++ b/opencl/source/program/create.inl
@@ -6,10 +6,7 @@
  */
 
 #include "shared/source/ail/ail_configuration.h"
-#include "shared/source/compiler_interface/compiler_options.h"
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
-#include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/string_helpers.h"
 
 #include "opencl/source/cl_device/cl_device.h"
diff --git a/shared/source/ail/ail_configuration.h b/shared/source/ail/ail_configuration.h
index 582a89cf64..efb1e126ed 100644
--- a/shared/source/ail/ail_configuration.h
+++ b/shared/source/ail/ail_configuration.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/helpers/hw_info.h"
+#include "igfxfmid.h"
 
 #include <string>
 
@@ -27,6 +27,8 @@
 
 namespace NEO {
 
+struct RuntimeCapabilityTable;
+
 enum class AILEnumeration : uint32_t {
     DISABLE_BLITTER,
     DISABLE_COMPRESSION,
diff --git a/shared/source/ail/ail_configuration_base.inl b/shared/source/ail/ail_configuration_base.inl
index 3f234d9b5a..ba8ebd592b 100644
--- a/shared/source/ail/ail_configuration_base.inl
+++ b/shared/source/ail/ail_configuration_base.inl
@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/ail/ail_configuration.h"
+
 #include <string>
 
 namespace NEO {
diff --git a/shared/source/ail/ail_configuration_extra.cpp b/shared/source/ail/ail_configuration_extra.cpp
index 99ff350fe8..e216cecfce 100644
--- a/shared/source/ail/ail_configuration_extra.cpp
+++ b/shared/source/ail/ail_configuration_extra.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/ail/ail_configuration.h"
 #include "shared/source/helpers/hash.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include <map>
 #include <string_view>
diff --git a/shared/source/ail/gen12lp/adln/ail_configuration_adln.cpp b/shared/source/ail/gen12lp/adln/ail_configuration_adln.cpp
index 1be5ef38f7..bf017f92aa 100644
--- a/shared/source/ail/gen12lp/adln/ail_configuration_adln.cpp
+++ b/shared/source/ail/gen12lp/adln/ail_configuration_adln.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_ALDERLAKE_N> enableAILADLN;
diff --git a/shared/source/ail/gen12lp/adlp/ail_configuration_adlp.cpp b/shared/source/ail/gen12lp/adlp/ail_configuration_adlp.cpp
index f467c6ab4e..2cfc0eb490 100644
--- a/shared/source/ail/gen12lp/adlp/ail_configuration_adlp.cpp
+++ b/shared/source/ail/gen12lp/adlp/ail_configuration_adlp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_ALDERLAKE_P> enableAILADLP;
diff --git a/shared/source/ail/gen12lp/adls/ail_configuration_adls.cpp b/shared/source/ail/gen12lp/adls/ail_configuration_adls.cpp
index 3216644949..e9dd0086ab 100644
--- a/shared/source/ail/gen12lp/adls/ail_configuration_adls.cpp
+++ b/shared/source/ail/gen12lp/adls/ail_configuration_adls.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_ALDERLAKE_S> enableAILADLS;
diff --git a/shared/source/ail/gen12lp/dg1/ail_configuration_dg1.cpp b/shared/source/ail/gen12lp/dg1/ail_configuration_dg1.cpp
index 9a80df431f..cd163a71f9 100644
--- a/shared/source/ail/gen12lp/dg1/ail_configuration_dg1.cpp
+++ b/shared/source/ail/gen12lp/dg1/ail_configuration_dg1.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_DG1> enableAILDG1;
diff --git a/shared/source/ail/gen12lp/rkl/ail_configuration_rkl.cpp b/shared/source/ail/gen12lp/rkl/ail_configuration_rkl.cpp
index fd70482486..515e68b0fc 100644
--- a/shared/source/ail/gen12lp/rkl/ail_configuration_rkl.cpp
+++ b/shared/source/ail/gen12lp/rkl/ail_configuration_rkl.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_ROCKETLAKE> enableAILRKL;
diff --git a/shared/source/ail/gen12lp/tgllp/ail_configuration_tgllp.cpp b/shared/source/ail/gen12lp/tgllp/ail_configuration_tgllp.cpp
index d556ff9f80..e2f3833ff5 100644
--- a/shared/source/ail/gen12lp/tgllp/ail_configuration_tgllp.cpp
+++ b/shared/source/ail/gen12lp/tgllp/ail_configuration_tgllp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_TIGERLAKE_LP> enableAILTGLLP;
diff --git a/shared/source/ail/xe_hp_core/xe_hp_sdv/ail_configuration_xe_hp_sdv.cpp b/shared/source/ail/xe_hp_core/xe_hp_sdv/ail_configuration_xe_hp_sdv.cpp
index 006a0aed41..4db39d736f 100644
--- a/shared/source/ail/xe_hp_core/xe_hp_sdv/ail_configuration_xe_hp_sdv.cpp
+++ b/shared/source/ail/xe_hp_core/xe_hp_sdv/ail_configuration_xe_hp_sdv.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_XE_HP_SDV> enableAILXEHPSDV;
diff --git a/shared/source/ail/xe_hpc_core/pvc/ail_configuration_pvc.cpp b/shared/source/ail/xe_hpc_core/pvc/ail_configuration_pvc.cpp
index e388d4a450..915d096c5a 100644
--- a/shared/source/ail/xe_hpc_core/pvc/ail_configuration_pvc.cpp
+++ b/shared/source/ail/xe_hpc_core/pvc/ail_configuration_pvc.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "shared/source/ail/ail_configuration.h"
 #include "shared/source/ail/ail_configuration_base.inl"
 
 #include <map>
+#include <vector>
 
 namespace NEO {
 static EnableAIL<IGFX_PVC> enableAILPVC;
diff --git a/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp b/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp
index d05daf1421..a69fecdd80 100644
--- a/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp
+++ b/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp
@@ -6,14 +6,13 @@
  */
 
 #include "shared/source/ail/ail_configuration.h"
-#include "shared/source/ail/ail_configuration_base.inl"
+#include "shared/source/helpers/hw_info.h"
 
 #include <algorithm>
 #include <map>
-#include <string>
-#include <vector>
 
 namespace NEO {
+
 static EnableAIL<IGFX_DG2> enableAILDG2;
 
 std::map<std::string_view, std::vector<AILEnumeration>> applicationMapDG2 = {
diff --git a/shared/source/built_ins/built_in_ops_base.h b/shared/source/built_ins/built_in_ops_base.h
index 4c842c166d..3a18bc1985 100644
--- a/shared/source/built_ins/built_in_ops_base.h
+++ b/shared/source/built_ins/built_in_ops_base.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include <algorithm>
 #include <array>
 #include <cstdint>
 
diff --git a/shared/source/built_ins/sip.h b/shared/source/built_ins/sip.h
index 7e2d59d229..ea57f4a99b 100644
--- a/shared/source/built_ins/sip.h
+++ b/shared/source/built_ins/sip.h
@@ -10,7 +10,6 @@
 #include "shared/source/built_ins/sip_kernel_type.h"
 
 #include <cstddef>
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h
index 593275e44a..5fffac37ba 100644
--- a/shared/source/command_stream/command_stream_receiver.h
+++ b/shared/source/command_stream/command_stream_receiver.h
@@ -23,12 +23,10 @@
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/os_interface/os_thread.h"
 #include "shared/source/utilities/spinlock.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
-#include <optional>
 
 namespace NEO {
 class AllocationsList;
diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
index 07717812b8..388c50345f 100644
--- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
@@ -12,6 +12,7 @@
 #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/command_stream_receiver_with_aub_dump.h"
+#include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
diff --git a/shared/source/debugger/debugger_l0.cpp b/shared/source/debugger/debugger_l0.cpp
index 7bfcca289f..484b2655fa 100644
--- a/shared/source/debugger/debugger_l0.cpp
+++ b/shared/source/debugger/debugger_l0.cpp
@@ -17,8 +17,6 @@
 #include "shared/source/memory_manager/memory_operations_handler.h"
 #include "shared/source/os_interface/os_context.h"
 
-#include <cstring>
-
 namespace NEO {
 
 DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE] = {};
diff --git a/shared/source/device_binary_format/ar/ar_encoder.h b/shared/source/device_binary_format/ar/ar_encoder.h
index c4e2671d7c..f30db2589b 100644
--- a/shared/source/device_binary_format/ar/ar_encoder.h
+++ b/shared/source/device_binary_format/ar/ar_encoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
-#include <cstring>
 #include <vector>
 
 namespace NEO {
diff --git a/shared/source/device_binary_format/debug_zebin.h b/shared/source/device_binary_format/debug_zebin.h
index 6b7ad0375b..9fb8ba388a 100644
--- a/shared/source/device_binary_format/debug_zebin.h
+++ b/shared/source/device_binary_format/debug_zebin.h
@@ -9,7 +9,6 @@
 
 #include "shared/source/device_binary_format/elf/zebin_elf.h"
 #include "shared/source/utilities/arrayref.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <limits>
 #include <string>
diff --git a/shared/source/device_binary_format/device_binary_format_ar.cpp b/shared/source/device_binary_format/device_binary_format_ar.cpp
index 04c9742ae7..4cc3588da5 100644
--- a/shared/source/device_binary_format/device_binary_format_ar.cpp
+++ b/shared/source/device_binary_format/device_binary_format_ar.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/device_binary_format/ar/ar.h"
 #include "shared/source/device_binary_format/ar/ar_decoder.h"
 #include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/helpers/string.h"
diff --git a/shared/source/device_binary_format/device_binary_format_ocl_elf.cpp b/shared/source/device_binary_format/device_binary_format_ocl_elf.cpp
index 67635f1a7a..7c460fae7b 100644
--- a/shared/source/device_binary_format/device_binary_format_ocl_elf.cpp
+++ b/shared/source/device_binary_format/device_binary_format_ocl_elf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,6 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 
-#include <tuple>
-
 namespace NEO {
 
 template <>
diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp
index cb83d0ed54..1e3b73e631 100644
--- a/shared/source/gen12lp/preamble_gen12lp.cpp
+++ b/shared/source/gen12lp/preamble_gen12lp.cpp
@@ -7,11 +7,9 @@
 
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/gen12lp/hw_cmds_base.h"
-#include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
-#include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {
 
diff --git a/shared/source/helpers/state_base_address_xehp_and_later.inl b/shared/source/helpers/state_base_address_xehp_and_later.inl
index 96b8969170..108d5b9875 100644
--- a/shared/source/helpers/state_base_address_xehp_and_later.inl
+++ b/shared/source/helpers/state_base_address_xehp_and_later.inl
@@ -9,7 +9,6 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/cache_settings_helper.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
-#include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/state_base_address_base.inl"
 
 namespace NEO {