diff --git a/CMakeLists.txt b/CMakeLists.txt
index feafe76713..15105cb28c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -788,8 +788,6 @@ include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH
 include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
 
-set(HW_SRC_INCLUDE_PATH ${NEO_SOURCE_DIR}/runtime/gen_common)
-
 if(HAVE_INSTRUMENTATION)
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
   message(STATUS "Instrumentation include dirs: ${INSTRUMENTATION_INCLUDE_PATHS}")
diff --git a/core/helpers/preamble_base.inl b/core/helpers/preamble_base.inl
index a71939bb2e..6796dcb4e2 100644
--- a/core/helpers/preamble_base.inl
+++ b/core/helpers/preamble_base.inl
@@ -10,10 +10,10 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/preamble.h"
 #include "runtime/device/device.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/kernel/kernel.h"
 
-#include "hw_cmds.h"
 #include "reg_configs_common.h"
 
 #include <cstddef>
diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt
index a014475ee9..abf134d729 100644
--- a/offline_compiler/CMakeLists.txt
+++ b/offline_compiler/CMakeLists.txt
@@ -103,7 +103,6 @@ set(CLOC_INCLUDES
   ${ENGINE_NODE_DIR}
   ${IGC_OCL_ADAPTOR_DIR}
   ${CIF_BASE_DIR}
-  ${HW_SRC_INCLUDE_PATH}
   ${UMKM_SHAREDDATA_INCLUDE_PATHS}
   ${KHRONOS_HEADERS_DIR}
   ${IGDRCL__IGC_INCLUDE_DIR}
diff --git a/offline_compiler/options.cpp b/offline_compiler/options.cpp
index 4d17e90798..3040f2433a 100644
--- a/offline_compiler/options.cpp
+++ b/offline_compiler/options.cpp
@@ -7,10 +7,9 @@
 
 #include "runtime/helpers/options.h"
 
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
-#include "hw_cmds.h"
-
 #include <cstddef>
 
 namespace NEO {
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 1c81e65626..e5a2ba8c85 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -63,7 +63,6 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
   ${KHRONOS_GL_HEADERS_DIR}
   ${CIF_BASE_DIR}
   ${GMM_INCLUDE_PATHS}
-  ${HW_SRC_INCLUDE_PATH}
   ${IGC_OCL_ADAPTOR_DIR}
   ${VISA_INCLUDE_DIR}
   ${IGDRCL__IGC_INCLUDE_DIR}
diff --git a/runtime/command_queue/enqueue_barrier.h b/runtime/command_queue/enqueue_barrier.h
index 3818198e85..9c077a3553 100644
--- a/runtime/command_queue/enqueue_barrier.h
+++ b/runtime/command_queue/enqueue_barrier.h
@@ -12,8 +12,6 @@
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h
index 0f91a54226..46be96d34e 100644
--- a/runtime/command_queue/enqueue_common.h
+++ b/runtime/command_queue/enqueue_common.h
@@ -33,8 +33,6 @@
 #include "runtime/program/printf_handler.h"
 #include "runtime/utilities/tag_allocator.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/runtime/command_queue/enqueue_copy_buffer.h b/runtime/command_queue/enqueue_copy_buffer.h
index af4a01047e..2debe3b30f 100644
--- a/runtime/command_queue/enqueue_copy_buffer.h
+++ b/runtime/command_queue/enqueue_copy_buffer.h
@@ -14,8 +14,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_copy_buffer_to_image.h b/runtime/command_queue/enqueue_copy_buffer_to_image.h
index 0c04e7dd07..4b460d506b 100644
--- a/runtime/command_queue/enqueue_copy_buffer_to_image.h
+++ b/runtime/command_queue/enqueue_copy_buffer_to_image.h
@@ -16,8 +16,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_copy_image.h b/runtime/command_queue/enqueue_copy_image.h
index f82a4f1a10..f119aa67bc 100644
--- a/runtime/command_queue/enqueue_copy_image.h
+++ b/runtime/command_queue/enqueue_copy_image.h
@@ -15,8 +15,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/runtime/command_queue/enqueue_copy_image_to_buffer.h b/runtime/command_queue/enqueue_copy_image_to_buffer.h
index 255e8788e8..233673898b 100644
--- a/runtime/command_queue/enqueue_copy_image_to_buffer.h
+++ b/runtime/command_queue/enqueue_copy_image_to_buffer.h
@@ -16,8 +16,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_fill_buffer.h b/runtime/command_queue/enqueue_fill_buffer.h
index 65c103860a..2bd68e7f13 100644
--- a/runtime/command_queue/enqueue_fill_buffer.h
+++ b/runtime/command_queue/enqueue_fill_buffer.h
@@ -15,8 +15,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_fill_image.h b/runtime/command_queue/enqueue_fill_image.h
index da11a3a76d..57f58017aa 100644
--- a/runtime/command_queue/enqueue_fill_image.h
+++ b/runtime/command_queue/enqueue_fill_image.h
@@ -15,8 +15,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/runtime/command_queue/enqueue_kernel.h b/runtime/command_queue/enqueue_kernel.h
index 11ac72f097..73418a6ee6 100644
--- a/runtime/command_queue/enqueue_kernel.h
+++ b/runtime/command_queue/enqueue_kernel.h
@@ -15,8 +15,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_marker.h b/runtime/command_queue/enqueue_marker.h
index 026c151289..5db3e49b93 100644
--- a/runtime/command_queue/enqueue_marker.h
+++ b/runtime/command_queue/enqueue_marker.h
@@ -13,8 +13,6 @@
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_migrate_mem_objects.h b/runtime/command_queue/enqueue_migrate_mem_objects.h
index ff5f940f27..857098fe83 100644
--- a/runtime/command_queue/enqueue_migrate_mem_objects.h
+++ b/runtime/command_queue/enqueue_migrate_mem_objects.h
@@ -13,8 +13,6 @@
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/runtime/command_queue/enqueue_read_buffer.h b/runtime/command_queue/enqueue_read_buffer.h
index c1c23daf72..f9032a7fe7 100644
--- a/runtime/command_queue/enqueue_read_buffer.h
+++ b/runtime/command_queue/enqueue_read_buffer.h
@@ -15,8 +15,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_read_image.h b/runtime/command_queue/enqueue_read_image.h
index f34f106ba4..230c2f7284 100644
--- a/runtime/command_queue/enqueue_read_image.h
+++ b/runtime/command_queue/enqueue_read_image.h
@@ -20,8 +20,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/runtime/command_queue/enqueue_write_buffer.h b/runtime/command_queue/enqueue_write_buffer.h
index 5e6c3ae8d8..e7631f246d 100644
--- a/runtime/command_queue/enqueue_write_buffer.h
+++ b/runtime/command_queue/enqueue_write_buffer.h
@@ -14,8 +14,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
 
-#include "hw_cmds.h"
-
 #include <new>
 
 namespace NEO {
diff --git a/runtime/command_queue/enqueue_write_image.h b/runtime/command_queue/enqueue_write_image.h
index c2c2c67ec3..c1e17f286a 100644
--- a/runtime/command_queue/enqueue_write_image.h
+++ b/runtime/command_queue/enqueue_write_image.h
@@ -16,8 +16,6 @@
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 #include <new>
 
diff --git a/runtime/command_queue/finish.h b/runtime/command_queue/finish.h
index ce5d8403e3..91ecc19c54 100644
--- a/runtime/command_queue/finish.h
+++ b/runtime/command_queue/finish.h
@@ -8,9 +8,6 @@
 #pragma once
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
-
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
index 031ff6f01c..d2fef2338c 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -17,6 +17,7 @@
 #include "runtime/aub_mem_dump/aub_alloc_dump.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.inl"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
+#include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_stream_provider.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -28,9 +29,7 @@
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
-#include "aub_command_stream_receiver_hw.h"
 #include "driver_version.h"
-#include "hw_cmds.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
index ed6a012b0b..2f4d429ce5 100644
--- a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
+++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
@@ -17,7 +17,6 @@
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
-#include "aub_mapper.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace NEO {
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index c98258854c..e31d323f7a 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -25,8 +25,6 @@
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
-#include "hw_cmds.h"
-
 #include <cstring>
 
 namespace NEO {
diff --git a/runtime/device_queue/device_queue_hw.h b/runtime/device_queue/device_queue_hw.h
index d5eb665f1e..8423e3dd3d 100644
--- a/runtime/device_queue/device_queue_hw.h
+++ b/runtime/device_queue/device_queue_hw.h
@@ -9,13 +9,12 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/device_queue/device_queue.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"
 #include "runtime/scheduler/scheduler_kernel.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/runtime/dll/linux/drm_neo_create.cpp b/runtime/dll/linux/drm_neo_create.cpp
index 65e5b83c59..92da9f481b 100644
--- a/runtime/dll/linux/drm_neo_create.cpp
+++ b/runtime/dll/linux/drm_neo_create.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/hw_helper.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
@@ -14,7 +15,6 @@
 #include "runtime/os_interface/linux/drm_null_device.h"
 
 #include "drm/i915_drm.h"
-#include "hw_cmds.h"
 
 #include <array>
 #include <cstdio>
diff --git a/runtime/dll/options.cpp b/runtime/dll/options.cpp
index c319410898..623b333db2 100644
--- a/runtime/dll/options.cpp
+++ b/runtime/dll/options.cpp
@@ -7,10 +7,9 @@
 
 #include "runtime/helpers/options.h"
 
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 // AUB file folder location
 const char *folderAUB = ".";
diff --git a/runtime/gtpin/gtpin_hw_helper.inl b/runtime/gtpin/gtpin_hw_helper.inl
index 5a8d05fb4e..a847a58b50 100644
--- a/runtime/gtpin/gtpin_hw_helper.inl
+++ b/runtime/gtpin/gtpin_hw_helper.inl
@@ -6,11 +6,10 @@
  */
 
 #include "core/helpers/string.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/kernel/kernel.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/runtime/helpers/hw_info.cpp b/runtime/helpers/hw_info.cpp
index ce6d1e1e2b..15d0cd671b 100644
--- a/runtime/helpers/hw_info.cpp
+++ b/runtime/helpers/hw_info.cpp
@@ -5,12 +5,11 @@
  *
  */
 
-#include "hw_info.h"
+#include "runtime/helpers/hw_info.h"
 
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
-#include "hw_cmds.h"
-
 #include <algorithm>
 
 namespace NEO {
diff --git a/runtime/helpers/options.cpp b/runtime/helpers/options.cpp
index 74d719d08e..86a6282108 100644
--- a/runtime/helpers/options.cpp
+++ b/runtime/helpers/options.cpp
@@ -7,10 +7,9 @@
 
 #include "runtime/helpers/options.h"
 
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
-#include "hw_cmds.h"
-
 #include <cstddef>
 
 namespace NEO {
diff --git a/runtime/helpers/state_base_address_base.inl b/runtime/helpers/state_base_address_base.inl
index 61d1eeb1e9..fa1e72944e 100644
--- a/runtime/helpers/state_base_address_base.inl
+++ b/runtime/helpers/state_base_address_base.inl
@@ -6,13 +6,12 @@
  */
 
 #include "core/memory_manager/memory_constants.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/state_base_address.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 template <typename GfxFamily>
 void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(
diff --git a/runtime/helpers/state_compute_mode_helper.h b/runtime/helpers/state_compute_mode_helper.h
index 278d7be37e..7069c6ccd7 100644
--- a/runtime/helpers/state_compute_mode_helper.h
+++ b/runtime/helpers/state_compute_mode_helper.h
@@ -7,8 +7,7 @@
 
 #pragma once
 #include "runtime/command_stream/csr_definitions.h"
-
-#include "hw_cmds.h"
+#include "runtime/gen_common/hw_cmds.h"
 
 namespace NEO {
 template <typename GfxFamily>
diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl
index 709c2b74fa..de6a89275d 100644
--- a/runtime/mem_obj/buffer_base.inl
+++ b/runtime/mem_obj/buffer_base.inl
@@ -8,6 +8,7 @@
 #include "common/helpers/bit_helpers.h"
 #include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
@@ -15,7 +16,6 @@
 #include "runtime/mem_obj/buffer.h"
 
 #include "buffer_ext.inl"
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl
index 8f5abc6bd2..56ab250372 100644
--- a/runtime/mem_obj/image.inl
+++ b/runtime/mem_obj/image.inl
@@ -7,13 +7,13 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 
-#include "hw_cmds.h"
 #include "image_ext.inl"
 
 namespace NEO {
diff --git a/runtime/os_interface/linux/device_command_stream.inl b/runtime/os_interface/linux/device_command_stream.inl
index 73979ca48f..521e6d62ed 100644
--- a/runtime/os_interface/linux/device_command_stream.inl
+++ b/runtime/os_interface/linux/device_command_stream.inl
@@ -10,7 +10,6 @@
 #include "runtime/os_interface/linux/drm_command_stream.h"
 
 #include "drm_command_stream.h"
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl
index 6969bcd06d..f62f420855 100644
--- a/runtime/os_interface/linux/drm_command_stream.inl
+++ b/runtime/os_interface/linux/drm_command_stream.inl
@@ -21,8 +21,6 @@
 #include "runtime/os_interface/linux/os_interface.h"
 #include "runtime/platform/platform.h"
 
-#include "hw_cmds.h"
-
 #include <cstdlib>
 #include <cstring>
 
diff --git a/runtime/os_interface/linux/drm_engine_mapper.cpp b/runtime/os_interface/linux/drm_engine_mapper.cpp
index 37eeb08933..96dc80f5b8 100644
--- a/runtime/os_interface/linux/drm_engine_mapper.cpp
+++ b/runtime/os_interface/linux/drm_engine_mapper.cpp
@@ -7,8 +7,9 @@
 
 #include "runtime/os_interface/linux/drm_engine_mapper.h"
 
+#include "core/helpers/debug_helpers.h"
+
 #include "drm/i915_drm.h"
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/windows/device_command_stream.inl b/runtime/os_interface/windows/device_command_stream.inl
index 1a8e192f55..93d8522d7d 100644
--- a/runtime/os_interface/windows/device_command_stream.inl
+++ b/runtime/os_interface/windows/device_command_stream.inl
@@ -11,9 +11,8 @@
 #pragma warning(disable : 4005)
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/device_command_stream.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
-
-#include "hw_cmds.h"
 #pragma warning(pop)
 
 namespace NEO {
diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl
index 13f9b7d2ab..73b4cfa583 100644
--- a/runtime/os_interface/windows/wddm_device_command_stream.inl
+++ b/runtime/os_interface/windows/wddm_device_command_stream.inl
@@ -13,13 +13,12 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/device/device.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/page_table_mngr.h"
 #include "runtime/helpers/gmm_callbacks.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
-
-#include "hw_cmds.h"
 #pragma warning(pop)
 
 #include "runtime/os_interface/windows/gdi_interface.h"
diff --git a/runtime/os_interface/windows/wddm_engine_mapper.cpp b/runtime/os_interface/windows/wddm_engine_mapper.cpp
index c23296c4ab..a5ff93b147 100644
--- a/runtime/os_interface/windows/wddm_engine_mapper.cpp
+++ b/runtime/os_interface/windows/wddm_engine_mapper.cpp
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"
 
-#include "hw_cmds.h"
+#include "runtime/gen_common/hw_cmds.h"
 
 namespace NEO {
 
diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp
index 6d37f27d73..d21c129308 100644
--- a/runtime/program/kernel_info.cpp
+++ b/runtime/program/kernel_info.cpp
@@ -9,6 +9,7 @@
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/device/device.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
@@ -16,8 +17,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/sampler/sampler.h"
 
-#include "hw_cmds.h"
-
 #include <cstdint>
 #include <cstring>
 #include <map>
diff --git a/unit_tests/accelerators/media_image_arg_tests.cpp b/unit_tests/accelerators/media_image_arg_tests.cpp
index 603aac2003..caa75863dc 100644
--- a/unit_tests/accelerators/media_image_arg_tests.cpp
+++ b/unit_tests/accelerators/media_image_arg_tests.cpp
@@ -17,8 +17,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 class MediaImageSetArgTest : public DeviceFixture,
diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
index b11a105f15..2ffe53dfa3 100644
--- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
+++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h
@@ -11,11 +11,10 @@
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
+#include "runtime/gen_common/aub_mapper.h"
 #include "runtime/helpers/options.h"
 #include "test.h"
 
-#include "aub_mapper.h"
-
 namespace Os {
 extern const char *fileSeparator;
 }
diff --git a/unit_tests/built_ins/built_in_kernels_tests.cpp b/unit_tests/built_ins/built_in_kernels_tests.cpp
index 6ce1c1093b..47e382818e 100644
--- a/unit_tests/built_ins/built_in_kernels_tests.cpp
+++ b/unit_tests/built_ins/built_in_kernels_tests.cpp
@@ -9,8 +9,6 @@
 
 #include "gtest/gtest.h"
 
-//#include "unit_tests/test_files/4265157215134882557.cl"
-
 namespace BuiltinKernelsSimulation {
 
 __kernel void CopyImage3dToBuffer16Bytes(__read_only image3d_t input,
diff --git a/unit_tests/command_queue/command_queue_fixture.cpp b/unit_tests/command_queue/command_queue_fixture.cpp
index e1a390cdc4..8334d6038a 100644
--- a/unit_tests/command_queue/command_queue_fixture.cpp
+++ b/unit_tests/command_queue/command_queue_fixture.cpp
@@ -13,7 +13,6 @@
 #include "unit_tests/mocks/mock_device.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/unit_tests/command_queue/dispatch_walker_tests.cpp
index 58b94cb9ec..b900607092 100644
--- a/unit_tests/command_queue/dispatch_walker_tests.cpp
+++ b/unit_tests/command_queue/dispatch_walker_tests.cpp
@@ -26,8 +26,6 @@
 #include "unit_tests/mocks/mock_mdi.h"
 #include "unit_tests/mocks/mock_program.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test {
diff --git a/unit_tests/command_queue/work_group_size_tests.cpp b/unit_tests/command_queue/work_group_size_tests.cpp
index f8f1daab89..6acd244b98 100644
--- a/unit_tests/command_queue/work_group_size_tests.cpp
+++ b/unit_tests/command_queue/work_group_size_tests.cpp
@@ -10,7 +10,6 @@
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 
-#include "hw_cmds.h"
 #include "patch_shared.h"
 
 using namespace NEO;
diff --git a/unit_tests/context/context_multi_device_tests.cpp b/unit_tests/context/context_multi_device_tests.cpp
index 7f80efb270..77e730d768 100644
--- a/unit_tests/context/context_multi_device_tests.cpp
+++ b/unit_tests/context/context_multi_device_tests.cpp
@@ -11,7 +11,6 @@
 #include "unit_tests/fixtures/device_fixture.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 using namespace NEO;
 
diff --git a/unit_tests/context/context_negative_tests.cpp b/unit_tests/context/context_negative_tests.cpp
index e7e4e89432..7c055f8e4e 100644
--- a/unit_tests/context/context_negative_tests.cpp
+++ b/unit_tests/context/context_negative_tests.cpp
@@ -13,7 +13,6 @@
 
 #include "CL/cl_gl.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <memory>
 
diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/unit_tests/device/gl/device_caps_gl_tests.cpp
index 2f0c13c57f..41186e9601 100644
--- a/unit_tests/device/gl/device_caps_gl_tests.cpp
+++ b/unit_tests/device/gl/device_caps_gl_tests.cpp
@@ -15,7 +15,6 @@
 #include "unit_tests/fixtures/device_fixture.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
 
 #include <memory>
 
diff --git a/unit_tests/device_queue/device_queue_hw_tests.cpp b/unit_tests/device_queue/device_queue_hw_tests.cpp
index a698c02169..b799fce7f2 100644
--- a/unit_tests/device_queue/device_queue_hw_tests.cpp
+++ b/unit_tests/device_queue/device_queue_hw_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/gpgpu_walker.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/utilities/tag_allocator.h"
@@ -18,8 +19,6 @@
 #include "unit_tests/mocks/mock_device_queue.h"
 #include "unit_tests/mocks/mock_kernel.h"
 
-#include "hw_cmds.h"
-
 #include <memory>
 
 using namespace NEO;
diff --git a/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp b/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
index 2c0b0b2ffb..1023e85849 100644
--- a/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
+++ b/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp b/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
index 10822c7028..75e8c93761 100644
--- a/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
+++ b/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp b/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
index 3421e4ed81..0eb4970a83 100644
--- a/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
+++ b/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
index ec10be872a..a5c4067046 100644
--- a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
+++ b/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp b/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
index d189f08af6..63efbd7c50 100644
--- a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
+++ b/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp b/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp
index 16ee8e6ad7..77a9218d09 100644
--- a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp
+++ b/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
index f7babd1e60..288ce2967d 100644
--- a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
+++ b/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp b/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp
index 0879c6a387..f727177099 100644
--- a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp
+++ b/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp b/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
index fa64126311..9b77e41198 100644
--- a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
+++ b/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp b/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp
index 7ed8e50e89..103506428d 100644
--- a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp
+++ b/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp
@@ -8,8 +8,6 @@
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <array>
 
 using namespace NEO;
diff --git a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp b/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp
index 40410bdcea..f38855ae64 100644
--- a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp
+++ b/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp
@@ -5,10 +5,9 @@
  *
  */
 
+#include "runtime/helpers/hw_info.h"
 #include "test.h"
 
-#include "hw_cmds.h"
-
 #include <type_traits>
 
 template <uint32_t prohibitedValue>
diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp
index 95e6645fb1..476d04ada5 100644
--- a/unit_tests/helpers/hardware_commands_helper_tests.cpp
+++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp
@@ -23,8 +23,6 @@
 #include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 void HardwareCommandsTest::SetUp() {
diff --git a/unit_tests/helpers/unit_test_helper.h b/unit_tests/helpers/unit_test_helper.h
index eab912df6d..ca36865b09 100644
--- a/unit_tests/helpers/unit_test_helper.h
+++ b/unit_tests/helpers/unit_test_helper.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "hw_cmds.h"
+#include "runtime/gen_common/hw_cmds.h"
 
 namespace NEO {
 
diff --git a/unit_tests/kernel/kernel_slm_tests.cpp b/unit_tests/kernel/kernel_slm_tests.cpp
index d578e0f1dd..2c691c45d8 100644
--- a/unit_tests/kernel/kernel_slm_tests.cpp
+++ b/unit_tests/kernel/kernel_slm_tests.cpp
@@ -14,8 +14,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 struct KernelSLMAndBarrierTest : public DeviceFixture,
diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index 15bc362ebb..56db5ef8d3 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -23,7 +23,6 @@
 #include "global_environment.h"
 #include "gmock/gmock.h"
 #include "helpers/test_files.h"
-#include "hw_cmds.h"
 #include "mock_gmm_client_context.h"
 
 #include <algorithm>
diff --git a/unit_tests/mem_obj/image1d_tests.cpp b/unit_tests/mem_obj/image1d_tests.cpp
index 00b6c9c0d0..356611db5a 100644
--- a/unit_tests/mem_obj/image1d_tests.cpp
+++ b/unit_tests/mem_obj/image1d_tests.cpp
@@ -12,8 +12,6 @@
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 static const unsigned int testImageDimensions = 32;
diff --git a/unit_tests/mem_obj/image2d_tests.cpp b/unit_tests/mem_obj/image2d_tests.cpp
index a5e076ed5b..13faaf148f 100644
--- a/unit_tests/mem_obj/image2d_tests.cpp
+++ b/unit_tests/mem_obj/image2d_tests.cpp
@@ -12,8 +12,6 @@
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/mock_context.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 static const unsigned int testImageDimensions = 32;
diff --git a/unit_tests/mem_obj/image3d_tests.cpp b/unit_tests/mem_obj/image3d_tests.cpp
index 4b1cb2ef44..b6750fe0d8 100644
--- a/unit_tests/mem_obj/image3d_tests.cpp
+++ b/unit_tests/mem_obj/image3d_tests.cpp
@@ -14,8 +14,6 @@
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_gmm.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 static const unsigned int testImageDimensions = 31;
diff --git a/unit_tests/mem_obj/image_array_size_tests.cpp b/unit_tests/mem_obj/image_array_size_tests.cpp
index 5f4adac015..380fd7e47b 100644
--- a/unit_tests/mem_obj/image_array_size_tests.cpp
+++ b/unit_tests/mem_obj/image_array_size_tests.cpp
@@ -13,8 +13,6 @@
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/mock_context.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 static const unsigned int testImageDimensions = 17;
diff --git a/unit_tests/mem_obj/image_set_arg_tests.cpp b/unit_tests/mem_obj/image_set_arg_tests.cpp
index 8a1eaff8a0..ab53da24e6 100644
--- a/unit_tests/mem_obj/image_set_arg_tests.cpp
+++ b/unit_tests/mem_obj/image_set_arg_tests.cpp
@@ -25,7 +25,6 @@
 #include "unit_tests/mocks/mock_program.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
 
 using namespace NEO;
 using namespace ::testing;
diff --git a/unit_tests/memory_manager/surface_tests.cpp b/unit_tests/memory_manager/surface_tests.cpp
index 387865df04..804abc589c 100644
--- a/unit_tests/memory_manager/surface_tests.cpp
+++ b/unit_tests/memory_manager/surface_tests.cpp
@@ -15,7 +15,6 @@
 #include "unit_tests/mocks/mock_csr.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <type_traits>
 
diff --git a/unit_tests/os_interface/linux/device_command_stream_tests.cpp b/unit_tests/os_interface/linux/device_command_stream_tests.cpp
index b3ec040321..b97a768ce6 100644
--- a/unit_tests/os_interface/linux/device_command_stream_tests.cpp
+++ b/unit_tests/os_interface/linux/device_command_stream_tests.cpp
@@ -19,7 +19,6 @@
 #include "unit_tests/os_interface/linux/device_command_stream_fixture.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <memory>
 
diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
index de99fd5fa0..9ce52ffb11 100644
--- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp
@@ -21,7 +21,6 @@
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <iostream>
 #include <memory>
diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
index 4b96f33f37..a4d36f4905 100644
--- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
@@ -38,7 +38,6 @@
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 #include <iostream>
 #include <memory>
diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
index 39b24ebc03..4cf1273796 100644
--- a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
+++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp
@@ -12,7 +12,6 @@
 #include "runtime/device/device.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 
 namespace NEO {
 
diff --git a/unit_tests/perf_tests/options.cpp b/unit_tests/perf_tests/options.cpp
index e1b209c42a..78606a639a 100644
--- a/unit_tests/perf_tests/options.cpp
+++ b/unit_tests/perf_tests/options.cpp
@@ -5,11 +5,9 @@
  *
  */
 
+#include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/array_count.h"
 
-#include "hw_cmds.h"
-#include "hw_info.h"
-
 namespace NEO {
 // IP address for TBX server
 const char *tbxServerIp = "127.0.0.1";
diff --git a/unit_tests/sampler/sampler_set_arg_tests.cpp b/unit_tests/sampler/sampler_set_arg_tests.cpp
index bddf31a87a..1b950e8a55 100644
--- a/unit_tests/sampler/sampler_set_arg_tests.cpp
+++ b/unit_tests/sampler/sampler_set_arg_tests.cpp
@@ -17,8 +17,6 @@
 #include "unit_tests/mocks/mock_kernel.h"
 #include "unit_tests/mocks/mock_program.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 
 namespace NEO {
diff --git a/unit_tests/scheduler/scheduler_source_tests.cpp b/unit_tests/scheduler/scheduler_source_tests.cpp
index bee864951b..53adce4bcc 100644
--- a/unit_tests/scheduler/scheduler_source_tests.cpp
+++ b/unit_tests/scheduler/scheduler_source_tests.cpp
@@ -8,6 +8,7 @@
 #include "unit_tests/scheduler/scheduler_source_tests.h"
 
 #include "runtime/device_queue/device_queue_hw.h"
+#include "runtime/gen_common/hw_cmds.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"
 #include "unit_tests/fixtures/execution_model_fixture.h"
@@ -15,7 +16,6 @@
 #include "unit_tests/mocks/mock_device_queue.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
 // Keep this include after execution_model_fixture.h otherwise there is high chance of conflict with macros
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"