diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a7de2f923..59807f55f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -795,7 +795,6 @@ include_directories(${NEO_SHARED_DIRECTORY}/helpers/definitions${BRANCH_DIR_SUFF
 include_directories(${NEO_SHARED_DIRECTORY}/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/release_helper/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SHARED_DIRECTORY}/xe_hpc_core${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/xe_hpg_core${BRANCH_DIR_SUFFIX})
 
 macro(macro_for_each_platform)
diff --git a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp
index 60b3d30a3e..2509c3dae6 100644
--- a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp
+++ b/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/memory_manager/prefetch_manager.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
@@ -16,7 +17,6 @@
 #include "level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl"
 
 #include "cmdlist_extended.inl"
-#include "hw_cmds_xe_hpc_core_base.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp
index cff693b39e..984c932777 100644
--- a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
@@ -12,8 +13,6 @@
 #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
index 3c7ff28f3a..f68ede6530 100644
--- a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
@@ -7,12 +7,12 @@
 
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/kernel/implicit_args.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "opencl/source/gtpin/gtpin_gfx_core_helper.h"
 #include "opencl/source/gtpin/gtpin_gfx_core_helper.inl"
 #include "opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl"
 
-#include "hw_cmds_xe_hpc_core_base.h"
 #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 
 namespace NEO {
diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp
index 2b6dd6255c..248bcc5c1d 100644
--- a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
@@ -16,8 +17,6 @@
 #include "opencl/test/unit_test/fixtures/program_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 class SystemMemFenceViaMiMemFence : public AUBFixture,
diff --git a/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp b/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp
index 497c3d042f..e845a9eb45 100644
--- a/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp
+++ b/opencl/test/unit_test/os_interface/linux/cl_mem_cache_clos_tests_xe_hpc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/os_interface/linux/drm_memory_manager_prelim_fixtures.h"
 #include "shared/test/common/os_interface/linux/drm_mock_cache_info.h"
@@ -21,7 +22,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"
-#include "hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp
index d1a2ee7578..ba11a63b49 100644
--- a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp
@@ -9,6 +9,7 @@
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/timestamp_packet.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
@@ -23,8 +24,6 @@
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 struct BlitXeHpcCoreTests : public ::testing::Test {
diff --git a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
index 348b6a9399..e2db11771f 100644
--- a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.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/debug_manager_state_restore.h"
@@ -22,8 +23,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 struct EnqueueFixtureXeHpcCore : public ::testing::Test {
diff --git a/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp
index 14db925a83..5ac3f51e46 100644
--- a/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/product_helper.h"
 #include "shared/source/program/kernel_info.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -25,8 +26,6 @@
 #include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using ClGfxCoreHelperTestsXeHpcCore = Test<ClDeviceFixture>;
 
 XE_HPC_CORETEST_F(ClGfxCoreHelperTestsXeHpcCore, givenXeHpcThenAuxTranslationIsNotRequired) {
diff --git a/opencl/test/unit_test/xe_hpc_core/test_cl_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_cl_device_caps_xe_hpc_core.cpp
index d1a20f54fa..e43aaf6656 100644
--- a/opencl/test/unit_test/xe_hpc_core/test_cl_device_caps_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_cl_device_caps_xe_hpc_core.cpp
@@ -6,14 +6,13 @@
  */
 
 #include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_info_fixture.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using XeHpcCoreClDeviceCaps = Test<ClDeviceFixture>;
diff --git a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp
index defd593694..59aac773f3 100644
--- a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/memory_manager/allocation_properties.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
@@ -21,7 +22,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "encode_surface_state_args.h"
-#include "hw_cmds_xe_hpc_core_base.h"
 
 using namespace NEO;
 using CmdsProgrammingTestsXeHpcCore = UltCommandStreamReceiverTest;
diff --git a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp
index aa1237c734..c87472e664 100644
--- a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp
@@ -5,14 +5,13 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 struct XeHpcCorePlatformCaps : public PlatformFixture, public ::testing::Test {
diff --git a/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
index 0fce053131..4d44254863 100644
--- a/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/aub_mem_dump/aub_alloc_dump.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
@@ -17,8 +18,6 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 using AubCommandStreamReceiverXeHpcCoreTests = ::testing::Test;
 
diff --git a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp
index f111793dbc..7d2f207585 100644
--- a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp
@@ -1,17 +1,16 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using CmdParseTestsXeHpcCore = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp
index 96368b6c10..43a340024a 100644
--- a/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp
@@ -8,14 +8,13 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/product_helper.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using WalkerDispatchTestsXeHpcCore = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
index 347e2e64f9..a137fba2e5 100644
--- a/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
@@ -8,14 +8,13 @@
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/product_helper.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/gfx_core_helper_tests.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 using GfxCoreHelperXeHpcCoreTest = ::testing::Test;
 
diff --git a/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp
index 53c1ddc241..35787c868f 100644
--- a/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp
@@ -1,15 +1,14 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using XeHpcCoreHwCmdTest = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp
index 91513e3928..be823a0f87 100644
--- a/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp
@@ -6,12 +6,11 @@
  */
 
 #include "shared/source/command_container/encode_surface_state.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using ImageSurfaceStateTestsXeHpcCore = ImageSurfaceStateTests;
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp
index a42369f7b5..937994c64b 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp
@@ -6,14 +6,13 @@
  */
 
 #include "shared/source/os_interface/product_helper.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/fixtures/product_config_fixture.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 PVCTEST_F(ProductConfigTests, givenPvcXlDeviceIdWhenDifferentRevisionIsPassedThenCorrectProductConfigIsReturned) {
diff --git a/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
index 65f11e46c2..3e1ec023b1 100644
--- a/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
@@ -7,13 +7,12 @@
 
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/gfx_core_helper_tests.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using XeHpcCoreDeviceCaps = Test<DeviceFixture>;
diff --git a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp
index c9227d2e9d..2100d3297e 100644
--- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/product_helper.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
@@ -22,8 +23,6 @@
 #include "shared/test/unit_test/helpers/state_base_address_tests.h"
 #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterEncodeMiFlushDWTest, whenMiFlushDwIsProgrammedThenSetFlushCcsAndLlc, IGFX_XE_HPC_CORE);
diff --git a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp
index 209a719fe7..1121afd31f 100644
--- a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp
@@ -5,13 +5,12 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "hw_cmds_xe_hpc_core_base.h"
-
 using namespace NEO;
 
 using XeHpcCoreOnlyTest = Test<DeviceFixture>;
diff --git a/target_unit_tests/xe_hp_core/CMakeLists.txt b/target_unit_tests/xe_hp_core/CMakeLists.txt
deleted file mode 100644
index 0782493b2f..0000000000
--- a/target_unit_tests/xe_hp_core/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (C) 2021-2023 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#