diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h
index a91ffb8d58..ebf14c4d1f 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw.h
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.h
@@ -8,12 +8,12 @@
 #pragma once
 
 #include "shared/source/command_stream/stream_properties.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
 
 #include "igfxfmid.h"
-#include "pipe_control_args.h"
 
 namespace NEO {
 enum class ImageType;
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl
index deb0a06049..a87fe96902 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl
@@ -16,6 +16,7 @@
 #include "shared/source/helpers/heap_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/helpers/string.h"
@@ -38,8 +39,6 @@
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/module/module.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 
 namespace L0 {
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_base.inl b/level_zero/core/source/cmdlist/cmdlist_hw_base.inl
index 905cfd980a..a9c1976479 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw_base.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw_base.inl
@@ -10,6 +10,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/helpers/simd_helper.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
@@ -20,8 +21,6 @@
 
 #include "level_zero/core/source/kernel/kernel_imp.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 
 namespace L0 {
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
index 7550f6f7e6..6c7b37eb67 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
@@ -18,6 +18,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/residency_container.h"
@@ -35,8 +36,6 @@
 #include "level_zero/core/source/fence/fence.h"
 #include "level_zero/tools/source/metrics/metric.h"
 
-#include "pipe_control_args.h"
-
 #include <limits>
 #include <thread>
 
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
index 20f7a4a59a..3ba9af8780 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
@@ -10,13 +10,13 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
 
 #include "igfxfmid.h"
-#include "pipe_control_args.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/gen11/cmdlist_gen11.inl b/level_zero/core/source/gen11/cmdlist_gen11.inl
index ea32cc7f6c..43c8896309 100644
--- a/level_zero/core/source/gen11/cmdlist_gen11.inl
+++ b/level_zero/core/source/gen11/cmdlist_gen11.inl
@@ -5,7 +5,7 @@
  *
  */
 
-#include "pipe_control_args.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl
index 5ee18437aa..3c7a134ac3 100644
--- a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl
+++ b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl
@@ -6,11 +6,10 @@
  */
 
 #include "shared/source/helpers/cache_flush.inl"
+#include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
-#include "pipe_control_args.h"
-
 namespace L0 {
 
 template <GFXCORE_FAMILY gfxCoreFamily>
diff --git a/level_zero/core/source/gen9/cmdlist_gen9.inl b/level_zero/core/source/gen9/cmdlist_gen9.inl
index 21805faae5..7f19e78cb7 100644
--- a/level_zero/core/source/gen9/cmdlist_gen9.inl
+++ b/level_zero/core/source/gen9/cmdlist_gen9.inl
@@ -9,11 +9,10 @@
 
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/hw_info.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 
-#include "pipe_control_args.h"
-
 namespace L0 {
 
 template struct CommandListCoreFamily<IGFX_GEN9_CORE>;
diff --git a/opencl/source/built_ins/aux_translation_builtin.h b/opencl/source/built_ins/aux_translation_builtin.h
index 98aaafa48a..d7d894c22a 100644
--- a/opencl/source/built_ins/aux_translation_builtin.h
+++ b/opencl/source/built_ins/aux_translation_builtin.h
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
@@ -15,8 +16,6 @@
 #include "opencl/source/kernel/kernel_objects_for_aux_translation.h"
 #include "opencl/source/mem_obj/buffer.h"
 
-#include "pipe_control_args.h"
-
 #include <memory>
 
 namespace NEO {
diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h
index a89ca589bb..c6f52a5161 100644
--- a/opencl/source/command_queue/enqueue_common.h
+++ b/opencl/source/command_queue/enqueue_common.h
@@ -11,6 +11,7 @@
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/local_work_size.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/surface.h"
@@ -42,8 +43,6 @@
 #include "opencl/source/program/printf_handler.h"
 #include "opencl/source/utilities/cl_logger.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/opencl/source/command_queue/gpgpu_walker_base.inl b/opencl/source/command_queue/gpgpu_walker_base.inl
index f78877b828..1b78ca5bc0 100644
--- a/opencl/source/command_queue/gpgpu_walker_base.inl
+++ b/opencl/source/command_queue/gpgpu_walker_base.inl
@@ -13,6 +13,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/local_id_gen.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/os_interface/os_context.h"
@@ -28,8 +29,6 @@
 #include "opencl/source/helpers/queue_helpers.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 #include <cmath>
 
diff --git a/opencl/source/command_queue/gpgpu_walker_bdw_and_later.inl b/opencl/source/command_queue/gpgpu_walker_bdw_and_later.inl
index 91b52e89fc..05faa6973f 100644
--- a/opencl/source/command_queue/gpgpu_walker_bdw_and_later.inl
+++ b/opencl/source/command_queue/gpgpu_walker_bdw_and_later.inl
@@ -8,13 +8,12 @@
 #pragma once
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/simd_helper.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/gpgpu_walker_base.inl"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/opencl/source/command_queue/hardware_interface_base.inl b/opencl/source/command_queue/hardware_interface_base.inl
index a4541862d2..324c8d609a 100644
--- a/opencl/source/command_queue/hardware_interface_base.inl
+++ b/opencl/source/command_queue/hardware_interface_base.inl
@@ -9,6 +9,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pause_on_gpu_properties.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
@@ -18,8 +19,6 @@
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/source/mem_obj/buffer.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/opencl/source/device_queue/device_queue_hw_base.inl b/opencl/source/device_queue/device_queue_hw_base.inl
index af51cfd995..0373d484bd 100644
--- a/opencl/source/device_queue/device_queue_hw_base.inl
+++ b/opencl/source/device_queue/device_queue_hw_base.inl
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/helpers/hw_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/memory_manager.h"
@@ -16,8 +17,6 @@
 #include "opencl/source/device_queue/device_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 template <typename GfxFamily>
 void DeviceQueueHw<GfxFamily>::allocateSlbBuffer() {
diff --git a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
index 75d83e0685..accf98b16d 100644
--- a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
+++ b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
@@ -7,13 +7,12 @@
 
 #pragma once
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/kernel/kernel.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl b/opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl
index f7368ba2c5..d94a0bba44 100644
--- a/opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl
+++ b/opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/l3_range.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/string.h"
 
 #include "opencl/source/cl_device/cl_device.h"
@@ -17,8 +18,6 @@
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/kernel/kernel.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp
index f1ec481707..e7d460429c 100644
--- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/os_interface/hw_info_config.h"
@@ -29,8 +30,6 @@
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "pipe_control_args.h"
-
 #include <chrono>
 #include <iostream>
 #include <numeric>
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
index ef04d8cdd4..e6438385bf 100644
--- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
+++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.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/debug_manager_state_restore.h"
@@ -15,8 +16,6 @@
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 
-#include "pipe_control_args.h"
-
 using PipeControlHelperTestsDg2AndLater = ::testing::Test;
 using HwHelperTestsDg2AndLater = Test<ClDeviceFixture>;
 
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp
index 931ed0ab8a..96c0911b6d 100644
--- a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/pipe_control_args.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/debug_manager_state_restore.h"
@@ -22,7 +23,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "engine_node.h"
-#include "pipe_control_args.h"
 
 using HwHelperTestXeHPAndLater = Test<ClDeviceFixture>;
 
diff --git a/shared/source/command_container/command_encoder_bdw_and_later.inl b/shared/source/command_container/command_encoder_bdw_and_later.inl
index 86fea5c16d..ffef8ab0c2 100644
--- a/shared/source/command_container/command_encoder_bdw_and_later.inl
+++ b/shared/source/command_container/command_encoder_bdw_and_later.inl
@@ -13,13 +13,12 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/simd_helper.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/kernel/implicit_args.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 
 namespace NEO {
diff --git a/shared/source/command_container/command_encoder_xehp_and_later.inl b/shared/source/command_container/command_encoder_xehp_and_later.inl
index c8635cde4d..377f5df783 100644
--- a/shared/source/command_container/command_encoder_xehp_and_later.inl
+++ b/shared/source/command_container/command_encoder_xehp_and_later.inl
@@ -19,6 +19,7 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/ray_tracing_helper.h"
 #include "shared/source/helpers/simd_helper.h"
@@ -28,8 +29,6 @@
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "pipe_control_args.h"
-
 #include <algorithm>
 
 namespace NEO {
diff --git a/shared/source/command_container/walker_partition_xehp_and_later.h b/shared/source/command_container/walker_partition_xehp_and_later.h
index 2908ec3cd0..3e6b6a318d 100644
--- a/shared/source/command_container/walker_partition_xehp_and_later.h
+++ b/shared/source/command_container/walker_partition_xehp_and_later.h
@@ -13,10 +13,9 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/ptr_math.h"
 
-#include "pipe_control_args.h"
-
 #include <cassert>
 #include <optional>
 
diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h
index 85a0f903fd..bdc6884130 100644
--- a/shared/source/command_stream/command_stream_receiver.h
+++ b/shared/source/command_stream/command_stream_receiver.h
@@ -19,13 +19,12 @@
 #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/helpers/pipe_control_args.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/os_interface/os_thread.h"
 #include "shared/source/utilities/spinlock.h"
 
-#include "pipe_control_args.h"
-
 #include <cstddef>
 #include <cstdint>
 
diff --git a/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
index 0cce4242a3..4f1273acdf 100644
--- a/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
@@ -8,11 +8,10 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/state_compute_mode_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 template <typename GfxFamily>
 void CommandStreamReceiverHw<GfxFamily>::programComputeMode(LinearStream &stream, DispatchFlags &dispatchFlags, const HardwareInfo &hwInfo) {
diff --git a/shared/source/command_stream/experimental_command_buffer.inl b/shared/source/command_stream/experimental_command_buffer.inl
index 0ee3aeb3c7..2587c9c06c 100644
--- a/shared/source/command_stream/experimental_command_buffer.inl
+++ b/shared/source/command_stream/experimental_command_buffer.inl
@@ -10,10 +10,9 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/command_stream/preemption.inl b/shared/source/command_stream/preemption.inl
index 56936b5a23..36ab095438 100644
--- a/shared/source/command_stream/preemption.inl
+++ b/shared/source/command_stream/preemption.inl
@@ -9,11 +9,10 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/direct_submission/dispatchers/render_dispatcher.inl b/shared/source/direct_submission/dispatchers/render_dispatcher.inl
index fbb42ebba1..214651e16b 100644
--- a/shared/source/direct_submission/dispatchers/render_dispatcher.inl
+++ b/shared/source/direct_submission/dispatchers/render_dispatcher.inl
@@ -9,8 +9,7 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
 #include "shared/source/helpers/hw_helper.h"
-
-#include "pipe_control_args.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 namespace NEO {
 
diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp
index 0cfa03de8b..20619f2fb0 100644
--- a/shared/source/gen12lp/preamble_gen12lp.cpp
+++ b/shared/source/gen12lp/preamble_gen12lp.cpp
@@ -7,10 +7,10 @@
 
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "pipe_control_args.h"
 #include "reg_configs_common.h"
 
 namespace NEO {
diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index bb7afcd247..4efba34dcd 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -94,6 +94,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/pause_on_gpu_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/pipe_control_args.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/populate_factory.h
@@ -128,8 +129,6 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/engine_group_types.h
     ${CMAKE_CURRENT_SOURCE_DIR}/definitions/mi_flush_args.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}pipe_control_args.h
 )
 
 if(SUPPORT_XEHP_AND_LATER)
diff --git a/shared/source/helpers/definitions/pipe_control_args.h b/shared/source/helpers/definitions/pipe_control_args.h
deleted file mode 100644
index 31f7be30b3..0000000000
--- a/shared/source/helpers/definitions/pipe_control_args.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2020-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "shared/source/helpers/definitions/pipe_control_args_base.h"
-
-namespace NEO {
-struct HardwareInfo;
-
-struct PipeControlArgs : PipeControlArgsBase {
-    PipeControlArgs() = default;
-};
-} // namespace NEO
diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl
index e78708b9aa..fd1a8f231a 100644
--- a/shared/source/helpers/hw_helper_base.inl
+++ b/shared/source/helpers/hw_helper_base.inl
@@ -15,6 +15,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/memory_manager/allocation_properties.h"
@@ -23,8 +24,6 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/utilities/tag_allocator.h"
 
-#include "pipe_control_args.h"
-
 namespace NEO {
 
 template <typename Family>
diff --git a/shared/source/helpers/hw_helper_dg2_and_later.inl b/shared/source/helpers/hw_helper_dg2_and_later.inl
index 8e7e5b703b..701a355eaf 100644
--- a/shared/source/helpers/hw_helper_dg2_and_later.inl
+++ b/shared/source/helpers/hw_helper_dg2_and_later.inl
@@ -7,8 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/hw_helper.h"
-
-#include "pipe_control_args.h"
+#include "shared/source/helpers/pipe_control_args.h"
 
 namespace NEO {
 
diff --git a/shared/source/helpers/hw_helper_xehp_and_later.inl b/shared/source/helpers/hw_helper_xehp_and_later.inl
index acd43d20ab..6ddd3a1619 100644
--- a/shared/source/helpers/hw_helper_xehp_and_later.inl
+++ b/shared/source/helpers/hw_helper_xehp_and_later.inl
@@ -9,11 +9,11 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/heap_assigner.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "engine_node.h"
-#include "pipe_control_args.h"
 
 namespace NEO {
 
diff --git a/shared/source/helpers/definitions/pipe_control_args_base.h b/shared/source/helpers/pipe_control_args.h
similarity index 91%
rename from shared/source/helpers/definitions/pipe_control_args_base.h
rename to shared/source/helpers/pipe_control_args.h
index 35cc7009d9..ca7c26184c 100644
--- a/shared/source/helpers/definitions/pipe_control_args_base.h
+++ b/shared/source/helpers/pipe_control_args.h
@@ -6,8 +6,12 @@
  */
 
 #pragma once
+
 namespace NEO {
-struct PipeControlArgsBase {
+
+struct PipeControlArgs {
+    PipeControlArgs() = default;
+
     bool dcFlushEnable = false;
     bool renderTargetCacheFlushEnable = false;
     bool instructionCacheInvalidateEnable = false;
@@ -24,8 +28,6 @@ struct PipeControlArgsBase {
     bool workloadPartitionOffset = false;
     bool amfsFlushEnable = false;
     bool unTypedDataPortCacheFlush = false;
-
-  protected:
-    PipeControlArgsBase() = default;
 };
+
 } // namespace NEO
diff --git a/shared/source/helpers/timestamp_packet.h b/shared/source/helpers/timestamp_packet.h
index abee335165..834325fad8 100644
--- a/shared/source/helpers/timestamp_packet.h
+++ b/shared/source/helpers/timestamp_packet.h
@@ -12,11 +12,10 @@
 #include "shared/source/helpers/aux_translation.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/utilities/tag_allocator.h"
 
-#include "pipe_control_args.h"
-
 #include <cstdint>
 #include <vector>