diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5135b9043..0d9bf6e0e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,8 +293,6 @@ else()
   add_definitions(-DPURGE_DEBUG_KEY_NAMES=0)
 endif()
 
-set_property(GLOBAL PROPERTY NEO_INCLUDE_DIRECTORIES "")
-
 if(NOT NEO_SKIP_UNIT_TESTS)
   if(NOT DEFINED GTEST_REPEAT)
     set(GTEST_REPEAT 1)
@@ -755,6 +753,8 @@ endif()
 include_directories(${NEO_SHARED_DIRECTORY}/helpers/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SHARED_DIRECTORY}/memory_properties${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})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/command_queue/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX})
@@ -820,9 +820,6 @@ endif()
 
 add_subdirectory_unique(shared)
 
-get_property(NEO_INCLUDE_DIRECTORIES GLOBAL PROPERTY NEO_INCLUDE_DIRECTORIES)
-include_directories(${NEO_INCLUDE_DIRECTORIES})
-
 if(NEO_BUILD_WITH_OCL)
   add_subdirectory_unique(opencl)
 else()
diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp
index 8830bbb068..ecb3006934 100644
--- a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_hw_helper_xe_hpc_core.cpp
@@ -5,12 +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 "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 
+#include "hw_cmds_xe_hpc_core_base.h"
+
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp
index 7387fc3d38..39d63f2142 100644
--- a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
@@ -20,6 +19,7 @@
 #include <level_zero/ze_api.h>
 
 #include "gtest/gtest.h"
+#include "hw_cmds_xe_hpg_core_base.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp
index ec479afedc..886e17160e 100644
--- a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_hw_helper_xe_hpg_core.cpp
@@ -5,13 +5,14 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 namespace L0 {
 namespace ult {
 
diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp
index 3c0ab3c191..3d6cb7a516 100644
--- a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_test_excludes_xe_hpc_core.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/test_macros/hw_test_base.h"
 
 HWTEST_EXCLUDE_PRODUCT(MiAtomicAubTest, GivenSystemMemoryWhenDispatchingAtomicMove4BytesOperationThenExpectCorrectEndValues, IGFX_XE_HPC_CORE);
 HWTEST_EXCLUDE_PRODUCT(AubMemDumpTests, GivenReserveMaxAddressThenExpectationsAreMet, IGFX_XE_HPC_CORE);
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 e01286cd5c..3f455e40a7 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,7 +5,6 @@
  *
  */
 
-#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"
@@ -17,6 +16,8 @@
 #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/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp
index 7c788f3be1..417f2485ed 100644
--- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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"
@@ -22,6 +21,8 @@
 #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using namespace NEO;
 
 struct XeHpgCoreStatelessCompressionInSBA : public KernelAUBFixture<StatelessCopyKernelFixture>,
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 7261d40cbf..970b1e16f9 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
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/memory_manager/unified_memory_manager.h"
-#include "shared/source/xe_hpc_core/hw_cmds.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"
@@ -20,6 +19,7 @@
 #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/built_in_xe_hpc_core_tests_ocl.cpp b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp
index 747e1c1e0b..b8e513a917 100644
--- a/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp
@@ -5,11 +5,13 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/mocks/mock_builtinslib.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 XeHpcCoreBuiltInTests = Test<DeviceFixture>;
 
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 d99d81297f..1be5fbee77 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,7 +9,6 @@
 #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"
@@ -24,6 +23,8 @@
 #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 54f5086d9e..a4e0aabc8e 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
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/helpers/hw_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,6 +21,8 @@
 #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/excludes_ocl_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp
index f624dda929..2e64f13a51 100644
--- a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/test_macros/hw_test_base.h"
 
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HPC_CORE);
 HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPC_CORE);
diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
index a1e68ee41d..a1fd230465 100644
--- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/os_interface/hw_info_config.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/helpers/hw_helper_tests.h"
@@ -22,6 +21,8 @@
 #include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
+#include "hw_cmds_xe_hpc_core_base.h"
+
 using HwHelperTestsXeHpcCore = Test<ClDeviceFixture>;
 
 XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenXeHpcThenAuxTranslationIsNotRequired) {
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 501bbd4576..975a4f4eaf 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
@@ -8,7 +8,6 @@
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/state_base_address.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/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
@@ -17,6 +16,8 @@
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.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_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
index c4d7a0aba9..f40011416d 100644
--- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/helpers/hw_helper.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/helpers/gtest_helpers.h"
@@ -16,6 +15,8 @@
 #include "opencl/test/unit_test/fixtures/device_info_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
+#include "hw_cmds_xe_hpc_core_base.h"
+
 using namespace NEO;
 
 typedef Test<ClDeviceFixture> XeHpcCoreDeviceCaps;
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 8e9dbff09d..ff4de42a40 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,12 +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/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 {
@@ -27,4 +28,4 @@ XE_HPC_CORETEST_F(XeHpcCorePlatformCaps, givenXeHpcSkusThenItSupportFP64) {
     const auto &caps = pPlatform->getPlatformInfo();
 
     EXPECT_NE(std::string::npos, caps.extensions.find(std::string("cl_khr_fp64")));
-}
\ No newline at end of file
+}
diff --git a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp
index 099e158203..402d3fc0d1 100644
--- a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/program/kernel_info.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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/test_macros/header/per_product_test_definitions.h"
@@ -16,6 +15,8 @@
 #include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using ClHwHelperTestsXeHpgCore = ::testing::Test;
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp
index 7db9e9e184..a494be70b8 100644
--- a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp
@@ -5,13 +5,14 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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"
 
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using namespace NEO;
 
 class CommandStreamReceiverHwTestXeHpgCore : public ClDeviceFixture,
diff --git a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp
index 7dcdbafa65..de77cd7f31 100644
--- a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp
@@ -10,7 +10,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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"
@@ -24,6 +23,8 @@
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using namespace NEO;
 
 struct BlitXeHpgCoreTests : public ::testing::Test {
diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp
index ddcc4ab370..c42e419a9f 100644
--- a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp
@@ -6,13 +6,14 @@
  */
 
 #include "shared/source/helpers/hw_helper.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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/helpers/gtest_helpers.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using namespace NEO;
 
 typedef Test<ClDeviceFixture> XeHpgCoreDeviceCaps;
diff --git a/shared/source/xe_hpc_core/CMakeLists.txt b/shared/source/xe_hpc_core/CMakeLists.txt
index 7c7c48c406..35b992237c 100644
--- a/shared/source/xe_hpc_core/CMakeLists.txt
+++ b/shared/source/xe_hpc_core/CMakeLists.txt
@@ -6,6 +6,4 @@
 
 if(SUPPORT_XE_HPC_CORE)
   add_subdirectories()
-
-  set_property(GLOBAL APPEND PROPERTY NEO_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}")
 endif()
diff --git a/shared/source/xe_hpg_core/CMakeLists.txt b/shared/source/xe_hpg_core/CMakeLists.txt
index c37d22619d..bb96bd2c28 100644
--- a/shared/source/xe_hpg_core/CMakeLists.txt
+++ b/shared/source/xe_hpg_core/CMakeLists.txt
@@ -6,6 +6,4 @@
 
 if(SUPPORT_XE_HPG_CORE)
   add_subdirectories()
-
-  set_property(GLOBAL APPEND PROPERTY NEO_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}")
 endif()
diff --git a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp
index 04eeda12a8..7c4a38012c 100644
--- a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp
+++ b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp
@@ -6,11 +6,12 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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_hpg_core_base.h"
+
 using namespace NEO;
 
 using ImageSurfaceStateTestsXeHpgCore = ImageSurfaceStateTests;
diff --git a/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
index a4419e1b2c..2b8eb27f49 100644
--- a/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
@@ -8,12 +8,13 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_info.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_aub_center.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 XeHpcCoreAubCenterTests = ::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 b6d0288549..00f5172d99 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
@@ -6,7 +6,6 @@
  */
 
 #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"
@@ -16,6 +15,8 @@
 #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 1f434d1caf..f111793dbc 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
@@ -5,12 +5,13 @@
  *
  */
 
-#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 3fe10a0f04..5feba0418e 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
@@ -7,12 +7,13 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/os_interface/hw_info_config.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/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/hw_cmds_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp
index 61da9faaeb..53c1ddc241 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
@@ -5,10 +5,11 @@
  *
  */
 
-#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/hw_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
index d69231ea8a..537e71a9ad 100644
--- a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
@@ -6,12 +6,13 @@
  */
 
 #include "shared/source/helpers/hw_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/hw_helper_tests.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 HwHelperXeHpcCoreTest = ::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 f12ee1f655..01e56b1f28 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,11 +6,12 @@
  */
 
 #include "shared/source/command_container/command_encoder.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 2196a6d358..dd6cd2730c 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,12 +6,12 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/product_config_fixture.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "device_ids_configs_pvc.h"
+#include "hw_cmds_xe_hpc_core_base.h"
 
 using namespace NEO;
 
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 6df12acd10..4e542d28ad 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
@@ -11,7 +11,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/hw_info_config.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/fixtures/command_container_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -19,6 +18,8 @@
 #include "shared/test/common/mocks/mock_dispatch_kernel_encoder_interface.h"
 #include "shared/test/common/test_macros/test.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 f93a75b6ee..6b7029a90c 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,11 +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/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/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp
index 1273aa4b9e..ac70a55f64 100644
--- a/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp
@@ -8,12 +8,13 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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_aub_center.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_hpg_core_base.h"
 using namespace NEO;
 using XeHpgCoreAubCenterTests = ::testing::Test;
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/product_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/product_config_tests_dg2.cpp
index 3cad9e2e78..19ae997afb 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/product_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/product_config_tests_dg2.cpp
@@ -6,12 +6,12 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/product_config_fixture.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "device_ids_configs_dg2.h"
+#include "hw_cmds_xe_hpc_core_base.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp b/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp
index 49d4e4add7..d605e4d5a6 100644
--- a/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp
@@ -5,10 +5,11 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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_hpg_core_base.h"
+
 using namespace NEO;
 
 using XeHpgCoreHwCmdTest = ::testing::Test;
diff --git a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
index cd7b26b2d5..ecabeb0b40 100644
--- a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_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"
@@ -15,6 +14,8 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using HwHelperTestXeHpgCore = HwHelperTest;
 
 XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenDifferentBufferSizesWhenEnableStatelessCompressionThenEveryBufferSizeIsSuitableForCompression) {
diff --git a/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp
index 761008d1db..729ce84547 100644
--- a/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp
@@ -7,11 +7,12 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "hw_cmds_xe_hpg_core_base.h"
+
 using namespace NEO;
 
 using CommandEncodeStatesTestXeHpgCore = ::testing::Test;