Cleanup includes 35

Cleaned up files:
shared/source/command_stream/command_stream_receiver.h

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

level_zero/core/source/cmdqueue/cmdqueue.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/queue_throttle.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/debugger/debugger_l0.h"

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

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/blit_commands_helper.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"

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

@@ -7,6 +7,7 @@
 
 #include "shared/source/built_ins/sip.h"
 #include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/helpers/blit_commands_helper.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"

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

@@ -15,6 +15,7 @@
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/addressing_mode_helper.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/kernel/implicit_args.h"
 #include "shared/source/os_interface/os_inc_base.h"

opencl/source/command_queue/command_queue.cpp

@@ -8,6 +8,7 @@
 #include "opencl/source/command_queue/command_queue.h"
 
 #include "shared/source/built_ins/sip.h"
+#include "shared/source/command_stream/aub_subcapture_status.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/execution_environment/root_device_environment.h"

opencl/source/command_queue/enqueue_common.h

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"

opencl/source/command_queue/hardware_interface.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/command_stream/preemption_mode.h"
+#include "shared/source/helpers/vec.h"
 
 #include <cstdint>
 
@@ -22,6 +23,7 @@ class HwPerfCounter;
 class HwTimeStamps;
 struct KernelOperation;
 struct MultiDispatchInfo;
+struct TimestampPacketDependencies;
 
 template <class T>
 class TagNode;

opencl/source/event/event.cpp

@@ -32,6 +32,7 @@
 #include "opencl/source/helpers/task_information.h"
 
 #include <algorithm>
+#include <iostream>
 
 namespace NEO {
 Event::Event(

opencl/source/kernel/kernel.cpp

@@ -15,6 +15,7 @@
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
+#include "shared/source/helpers/address_patch.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"

opencl/test/unit_test/device/device_timers_tests.cpp

@@ -14,6 +14,8 @@
 #include "gtest/gtest.h"
 #include <CL/cl_platform.h>
 
+#include <thread>
+
 using namespace NEO;
 
 namespace ULT {

opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp

@@ -8,6 +8,7 @@
 #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/helpers/address_patch.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/kernel/implicit_args.h"

opencl/test/unit_test/kernel/kernel_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/address_patch.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/surface_format_info.h"

opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/address_patch.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"

shared/source/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -15,6 +15,7 @@
 #include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/execution_environment.h"
@@ -24,6 +25,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/hash.h"
 #include "shared/source/helpers/neo_driver_version.h"
 #include "shared/source/helpers/ptr_math.h"

shared/source/command_stream/command_stream_receiver.cpp

@@ -9,10 +9,12 @@
 
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_container/implicit_scaling.h"
+#include "shared/source/command_stream/aub_subcapture_status.h"
 #include "shared/source/command_stream/experimental_command_buffer.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/command_stream/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/tag_allocation_layout.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
@@ -23,6 +25,7 @@
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/array_count.h"
+#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/logical_state_helper.h"
@@ -44,6 +47,8 @@
 #include "shared/source/utilities/tag_allocator.h"
 #include "shared/source/utilities/wait_util.h"
 
+#include <iostream>
+
 namespace AubMemDump {
 #include "aub_services.h"
 }
@@ -506,6 +511,10 @@ GraphicsAllocation *CommandStreamReceiver::getScratchAllocation() {
     return scratchSpaceController->getScratchSpaceAllocation();
 }
 
+void CommandStreamReceiver::overwriteFlatBatchBufferHelper(FlatBatchBufferHelper *newHelper) {
+    flatBatchBufferHelper.reset(newHelper);
+}
+
 void CommandStreamReceiver::initProgrammingFlags() {
     isPreambleSent = false;
     GSBAFor32BitProgrammed = false;
@@ -1001,4 +1010,6 @@ uint64_t CommandStreamReceiver::getCompletionAddress() const {
     completionFenceAddress += TagAllocationLayout::completionFenceOffset;
     return completionFenceAddress;
 }
+
+std::function<void()> CommandStreamReceiver::debugConfirmationFunction = []() { std::cin.get(); };
 } // namespace NEO

shared/source/command_stream/command_stream_receiver.h

@@ -6,27 +6,24 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/aub_subcapture_status.h"
-#include "shared/source/command_stream/csr_definitions.h"
-#include "shared/source/command_stream/csr_properties_flags.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/stream_properties.h"
-#include "shared/source/command_stream/submissions_aggregator.h"
-#include "shared/source/command_stream/task_count_helper.h"
-#include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/blit_commands_helper.h"
+#include "shared/source/helpers/blit_properties_container.h"
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/completion_stamp.h"
-#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/options.h"
 #include "shared/source/utilities/spinlock.h"
 
-#include <chrono>
+#include <atomic>
 #include <cstddef>
 #include <cstdint>
-#include <iostream>
+#include <functional>
 
 namespace NEO {
+struct BatchBuffer;
+struct WaitParams;
+class SubmissionAggregator;
+class FlushStampTracker;
 class Thread;
 class FlatBatchBufferHelper;
 class AllocationsList;
@@ -52,6 +49,8 @@ class LogicalStateHelper;
 class KmdNotifyHelper;
 class GfxCoreHelper;
 class ProductHelper;
+enum class WaitStatus;
+struct AubSubCaptureStatus;
 
 template <typename TSize>
 class TimestampPackets;
@@ -177,7 +176,7 @@ class CommandStreamReceiver {
     void setSamplerCacheFlushRequired(SamplerCacheFlushState value) { this->samplerCacheFlushRequired = value; }
 
     FlatBatchBufferHelper &getFlatBatchBufferHelper() const { return *flatBatchBufferHelper; }
-    void overwriteFlatBatchBufferHelper(FlatBatchBufferHelper *newHelper) { flatBatchBufferHelper.reset(newHelper); }
+    void overwriteFlatBatchBufferHelper(FlatBatchBufferHelper *newHelper);
 
     MOCKABLE_VIRTUAL void initProgrammingFlags();
     virtual AubSubCaptureStatus checkAndActivateAubSubCapture(const std::string &kernelName);
@@ -425,7 +424,7 @@ class CommandStreamReceiver {
     volatile DebugPauseState *debugPauseStateAddress = nullptr;
     SpinLock debugPauseStateLock;
     static void *asyncDebugBreakConfirmation(void *arg);
-    std::function<void()> debugConfirmationFunction = []() { std::cin.get(); };
+    static std::function<void()> debugConfirmationFunction;
     std::function<void(GraphicsAllocation &)> downloadAllocationImpl;
 
     GraphicsAllocation *tagAllocation = nullptr;

shared/source/command_stream/command_stream_receiver_hw.h

@@ -12,8 +12,8 @@
 #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
 #include "shared/source/helpers/dirty_state_helpers.h"
-
 namespace NEO {
+class TagNodeBase;
 template <typename GfxFamily>
 class DeviceCommandStreamReceiver;
 struct PipeControlArgs;

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -14,6 +14,7 @@
 #include "shared/source/command_stream/scratch_space_controller_base.h"
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/command_stream/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/debugger/debugger_l0.h"

shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/ray_tracing_helper.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/os_interface/hw_info_config.h"

shared/source/command_stream/command_stream_receiver_with_aub_dump.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,8 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
+#include <igfxfmid.h>
+
 namespace NEO {
 
 extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];

shared/source/command_stream/tbx_command_stream_receiver_hw.inl

@@ -13,6 +13,7 @@
 #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/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.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"

shared/source/direct_submission/direct_submission_controller.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,7 @@
 #include "shared/source/os_interface/os_thread.h"
 
 #include <chrono>
+#include <thread>
 
 namespace NEO {
 

shared/source/direct_submission/linux/drm_direct_submission.inl

@@ -17,6 +17,7 @@
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/utilities/wait_util.h"
 
+#include <iostream>
 #include <memory>
 
 namespace NEO {

shared/source/helpers/blit_commands_helper.h

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/csr_deps.h"
 #include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/aux_translation.h"
+#include "shared/source/helpers/blit_properties_container.h"
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/vec.h"
@@ -35,7 +36,6 @@ class TagNodeBase;
 struct BlitProperties;
 struct HardwareInfo;
 struct TimestampPacketDependencies;
-using BlitPropertiesContainer = StackVec<BlitProperties, 16>;
 
 struct BlitProperties {
     static BlitProperties constructPropertiesForReadWrite(BlitterConstants::BlitDirection blitDirection,

shared/source/helpers/blit_properties_container.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/utilities/stackvec.h"
+
+namespace NEO {
+
+struct BlitProperties;
+
+using BlitPropertiesContainer = StackVec<BlitProperties, 16>;
+
+} // namespace NEO

shared/source/helpers/flat_batch_buffer_helper_hw.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/helpers/timestamp_packet.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,8 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/utilities/tag_allocator.h"
 
+#include <iterator>
+
 using namespace NEO;
 
 void TimestampPacketContainer::add(TagNodeBase *timestampPacketNode) {

shared/source/memory_manager/memory_manager.cpp

@@ -19,6 +19,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/memory_properties_helpers.h"

shared/source/os_interface/linux/drm_command_stream.inl

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/tag_allocation_layout.h"
 #include "shared/source/direct_submission/linux/drm_direct_submission.h"
 #include "shared/source/execution_environment/execution_environment.h"

shared/source/os_interface/windows/wddm_device_command_stream.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -24,6 +24,7 @@
 
 #pragma warning(pop)
 
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/source/os_interface/windows/os_context_win.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"

shared/test/common/libult/ult_command_stream_receiver.h

@@ -6,14 +6,17 @@
  */
 
 #pragma once
+#include "shared/source/command_stream/aub_subcapture_status.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/device/device.h"
 #include "shared/source/direct_submission/direct_submission_hw.h"
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/common/helpers/batch_buffer_helper.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/mocks/mock_experimental_command_buffer.h"
@@ -22,7 +25,6 @@
 #include <optional>
 
 namespace NEO {
-
 class GmmPageTableMngr;
 
 template <typename GfxFamily>

shared/test/common/mocks/mock_command_stream_receiver.h

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/submission_status.h"
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
@@ -23,6 +24,10 @@
 #include <optional>
 #include <vector>
 
+namespace NEO {
+struct CommandBuffer;
+}
+
 using namespace NEO;
 
 class MockCommandStreamReceiver : public CommandStreamReceiver {

shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/page_table_entry_bits.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/hardware_context_controller.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"

shared/test/unit_test/command_stream/aub_file_stream_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "shared/source/aub_mem_dump/page_table_entry_bits.h"
 #include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "shared/source/helpers/address_patch.h"
+#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/hardware_context_controller.h"
 #include "shared/source/helpers/neo_driver_version.h"
 #include "shared/source/os_interface/os_context.h"

shared/test/unit_test/debugger/test_l0_debugger.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/built_ins/sip.h"
 #include "shared/source/gen_common/reg_configs_common.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/memory_manager/allocation_properties.h"

shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/walker_partition_interface.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"

shared/test/unit_test/fixtures/direct_submission_fixture.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/device_factory.h"

shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble.h"

shared/test/unit_test/gen9/test_command_encoder_gen9.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/mocks/mock_device.h"

shared/test/unit_test/helpers/hw_helper_tests.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/logical_state_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/allocation_type.h"

shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"

shared/test/unit_test/program/program_initialization_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/compiler_interface/external_functions.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/program/program_initialization.h"
 #include "shared/test/common/compiler_interface/linker_mock.h"

shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/scratch_space_controller_base.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_device.h"

shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/scratch_space_controller_xehp_and_later.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"

shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"