diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index 25486c7db8..53be46861d 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -200,16 +200,9 @@ if(BUILD_WITH_L0)
   else()
     include_directories(${LevelZero_INCLUDE_DIRS})
   endif()
-  include_directories(${NEO_SOURCE_DIR}/level_zero/api/experimental${BRANCH_DIR_SUFFIX})
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/gfx_core_helpers${BRANCH_DIR_SUFFIX})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX})
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
   include_directories(ddi${BRANCH_DIR_SUFFIX})
-  include_directories(tools/source)
-  include_directories(sysman/source)
-  include_directories(experimental${BRANCH_DIR_SUFFIX}source)
-  include_directories(experimental/source/tracing)
 
   # Create our shared library/DLL
   configure_file(ze_intel_gpu_version.h.in ${NEO_BUILD_DIR}/ze_intel_gpu_version.h)
@@ -248,9 +241,6 @@ if(BUILD_WITH_L0)
   endif()
 
   if(WIN32)
-    target_include_directories(${TARGET_NAME_L0} PUBLIC
-                               ${L0_ROOT_DIR}/core/source/os_interface/windows
-    )
     target_sources(${TARGET_NAME_L0}
                    PRIVATE
                    ${NEO_SHARED_DIRECTORY}/dll/wddm/create_gdi.cpp
@@ -282,9 +272,6 @@ if(BUILD_WITH_L0)
     )
     add_dependencies(${TARGET_NAME_L0} ${GMM_TARGET_NAME})
   else()
-    target_include_directories(${TARGET_NAME_L0} PUBLIC
-                               ${L0_ROOT_DIR}/core/source/os_interface/linux
-    )
     target_sources(${TARGET_NAME_L0}
                    PRIVATE
                    ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
@@ -329,8 +316,6 @@ if(BUILD_WITH_L0)
     )
   endif()
 
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/inc)
-
   target_compile_definitions(${TARGET_NAME_L0}
                              PUBLIC
                              ZE_MAKEDLL
diff --git a/level_zero/api/sysman/zes_sysman_api_entrypoints.h b/level_zero/api/sysman/zes_sysman_api_entrypoints.h
index b6fb48a8db..6a0dcedbe4 100644
--- a/level_zero/api/sysman/zes_sysman_api_entrypoints.h
+++ b/level_zero/api/sysman/zes_sysman_api_entrypoints.h
@@ -11,8 +11,7 @@
 #include "level_zero/sysman/source/sysman_device.h"
 #include "level_zero/sysman/source/sysman_driver.h"
 #include "level_zero/sysman/source/sysman_driver_handle.h"
-
-#include "sysman/sysman.h"
+#include "level_zero/tools/source/sysman/sysman.h"
 
 namespace L0 {
 ze_result_t zesInit(
diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index a349eb68c0..54b14a8c6a 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -81,7 +81,6 @@ if(DEFINED AUB_STREAM_PROJECT_NAME)
                              ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests
                              ${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX}
                              ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
-                             ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests
                              ${ENGINE_NODE_DIR}
                              ${CIF_BASE_DIR}
                              ${NEO__GMM_INCLUDE_DIR}
diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt
index 5ab5e70b9b..ff57f5aba0 100644
--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 Intel Corporation
+# Copyright (C) 2020-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -51,31 +51,11 @@ target_compile_definitions(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABL
 target_include_directories(${TARGET_NAME}
                            BEFORE
                            PRIVATE
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/../../../../instrumentation/inc/common/instrumentation/api/
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
                            ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
 )
 
-if(UNIX)
-  target_include_directories(${TARGET_NAME}
-                             BEFORE
-                             PRIVATE
-                             $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/linux
-                             $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/linux
-  )
-else()
-  target_include_directories(${TARGET_NAME}
-                             BEFORE
-                             PRIVATE
-                             $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/windows
-                             $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/windows
-  )
-endif()
-
 if(WIN32)
   target_link_libraries(${TARGET_NAME} dbghelp)
 endif()
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
index ef80064f2f..852ffb633a 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
@@ -5,7 +5,8 @@
  *
  */
 
-#include "test/unit_tests/mocks/mock_cmdlist.h"
+#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
+
 #include "test_api_tracing_common.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/CMakeLists.txt b/level_zero/sysman/test/unit_tests/CMakeLists.txt
index 9a7bbe758d..5e5cb9d6f9 100644
--- a/level_zero/sysman/test/unit_tests/CMakeLists.txt
+++ b/level_zero/sysman/test/unit_tests/CMakeLists.txt
@@ -51,7 +51,6 @@ target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABL
 target_include_directories(${TARGET_NAME}
                            BEFORE
                            PRIVATE
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
 )
diff --git a/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h b/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
index 5a96c10b82..499ac0f467 100644
--- a/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
+++ b/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/diagnostics/diagnostics_imp.h"
-#include "sysman/diagnostics/os_diagnostics.h"
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h"
+#include "level_zero/tools/source/sysman/diagnostics/os_diagnostics.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 class FirmwareUtil;
diff --git a/level_zero/tools/source/sysman/diagnostics/windows/os_diagnostics_imp.h b/level_zero/tools/source/sysman/diagnostics/windows/os_diagnostics_imp.h
index aa9695aa15..88dc105ee8 100644
--- a/level_zero/tools/source/sysman/diagnostics/windows/os_diagnostics_imp.h
+++ b/level_zero/tools/source/sysman/diagnostics/windows/os_diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/diagnostics/os_diagnostics.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/diagnostics/os_diagnostics.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 class WddmDiagnosticsImp : public OsDiagnostics {
diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp
index c49cb6a4c5..35fe926346 100644
--- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp
+++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,7 @@
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
index 62e692e1b2..8cb6e1edd5 100644
--- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
+++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
@@ -9,10 +9,9 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
+#include "level_zero/tools/source/sysman/engine/os_engine.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "sysman/engine/os_engine.h"
-
 #include <unistd.h>
 
 namespace L0 {
diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp
index 72e4f5d739..4e085d6765 100644
--- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,7 @@
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
 #include "level_zero/tools/source/sysman/engine/linux/os_engine_imp.h"
-
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.cpp b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.cpp
index e201f5c05f..9c262ea9f5 100644
--- a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.cpp
+++ b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/engine/windows/os_engine_imp.h"
+#include "level_zero/tools/source/sysman/engine/windows/os_engine_imp.h"
 
 #include "level_zero/tools/source/sysman/windows/kmd_sys.h"
 #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h"
diff --git a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
index 211f49a3ef..24f2bec6af 100644
--- a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
+++ b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/engine/os_engine.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/engine/os_engine.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 class KmdSysManager;
diff --git a/level_zero/tools/source/sysman/events/linux/os_events_imp.cpp b/level_zero/tools/source/sysman/events/linux/os_events_imp.cpp
index e60b0735bf..5625bb3bfd 100644
--- a/level_zero/tools/source/sysman/events/linux/os_events_imp.cpp
+++ b/level_zero/tools/source/sysman/events/linux/os_events_imp.cpp
@@ -10,12 +10,11 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/utilities/directory.h"
 
+#include "level_zero/tools/source/sysman/events/events_imp.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h"
 
-#include "sysman/events/events_imp.h"
-#include "sysman/linux/os_sysman_imp.h"
-
 #include <sys/stat.h>
 
 namespace L0 {
diff --git a/level_zero/tools/source/sysman/events/windows/os_events_imp.h b/level_zero/tools/source/sysman/events/windows/os_events_imp.h
index 9cbb000e54..2cf2a44d69 100644
--- a/level_zero/tools/source/sysman/events/windows/os_events_imp.h
+++ b/level_zero/tools/source/sysman/events/windows/os_events_imp.h
@@ -12,8 +12,6 @@
 #include "level_zero/tools/source/sysman/events/os_events.h"
 #include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
-#include "sysman/windows/os_sysman_imp.h"
-
 namespace L0 {
 class KmdSysManager;
 
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
index 635c5f34cd..15f16b39cf 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/zes_api.h"
 
-#include "sysman/linux/fs_access.h"
-
 #include <vector>
 
 namespace L0 {
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h
index 6402b286cb..0bad3fbd39 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 #include "fabric_device_access.h"
-#include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
index 68b02c7546..a7410aaa33 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/fabric_port/fabric_port_imp.h"
-#include "sysman/fabric_port/os_fabric_port.h"
-#include "sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h"
+#include "level_zero/tools/source/sysman/fabric_port/os_fabric_port.h"
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.cpp b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.cpp
index 4b971fb78a..622bfed3fc 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.cpp
@@ -10,7 +10,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 #include <cstdio>
 
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
index e64ca60c54..a9f828c471 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
@@ -8,9 +8,10 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
+#include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h"
+#include "level_zero/tools/source/sysman/fabric_port/os_fabric_port.h"
+
 #include "fabric_device_access.h"
-#include "sysman/fabric_port/fabric_port_imp.h"
-#include "sysman/fabric_port/os_fabric_port.h"
 
 #include <vector>
 
diff --git a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
index 8a0836cf52..ed21a9a69b 100644
--- a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/fabric_port/fabric_port_imp.h"
-#include "sysman/fabric_port/os_fabric_port.h"
+#include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h"
+#include "level_zero/tools/source/sysman/fabric_port/os_fabric_port.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp b/level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp
index 405cda4c79..755389dcc9 100644
--- a/level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp
+++ b/level_zero/tools/source/sysman/fan/linux/os_fan_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,9 @@
 
 #include "level_zero/tools/source/sysman/fan/linux/os_fan_imp.h"
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 ze_result_t LinuxFanImp::getProperties(zes_fan_properties_t *pProperties) {
diff --git a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.cpp b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.cpp
index c16acedcbf..18c5f988e0 100644
--- a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.cpp
+++ b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/fan/windows/os_fan_imp.h"
+#include "level_zero/tools/source/sysman/fan/windows/os_fan_imp.h"
 
 #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h"
 
diff --git a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
index 57276275c2..c76fc7c903 100644
--- a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
+++ b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/fan/os_fan.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/fan/os_fan.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h b/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
index 2da96dac71..b2733a267b 100644
--- a/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
+++ b/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/firmware/firmware_imp.h"
-#include "sysman/firmware/os_firmware.h"
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/firmware/firmware_imp.h"
+#include "level_zero/tools/source/sysman/firmware/os_firmware.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 class FirmwareUtil;
diff --git a/level_zero/tools/source/sysman/firmware/windows/os_firmware_imp.h b/level_zero/tools/source/sysman/firmware/windows/os_firmware_imp.h
index d4e5611714..2c12213b31 100644
--- a/level_zero/tools/source/sysman/firmware/windows/os_firmware_imp.h
+++ b/level_zero/tools/source/sysman/firmware/windows/os_firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/firmware/os_firmware.h"
+#include "level_zero/tools/source/sysman/firmware/os_firmware.h"
 
 namespace L0 {
 class FirmwareUtil;
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
index 5bb35ecd43..a29c2ca0ea 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
@@ -9,7 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 #include <cmath>
 
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
index f61e40b89b..5f129b75d5 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/frequency/frequency_imp.h"
-#include "sysman/frequency/os_frequency.h"
-#include "sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/frequency/frequency_imp.h"
+#include "level_zero/tools/source/sysman/frequency/os_frequency.h"
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
index 462d6fbc3b..d8b01faf3e 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
@@ -11,8 +11,9 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_info.h"
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+
 #include "igfxfmid.h"
-#include "sysman/linux/os_sysman_imp.h"
 
 #include <cmath>
 
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
index d0583bd512..8e18792627 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/frequency/frequency_imp.h"
-#include "sysman/frequency/os_frequency.h"
-#include "sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/frequency/frequency_imp.h"
+#include "level_zero/tools/source/sysman/frequency/os_frequency.h"
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h b/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
index ffba03a43a..b35aab6e1a 100644
--- a/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
+++ b/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/frequency/os_frequency.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/frequency/os_frequency.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 #define KMD_BIT_RANGE(endbit, startbit) ((endbit) - (startbit) + 1)
 
diff --git a/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h b/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
index f70ec98c48..8d11cf69e5 100644
--- a/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
+++ b/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/global_operations/os_global_operations.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/global_operations/os_global_operations.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp b/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp
index 6dea4a2f63..66783b437b 100644
--- a/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp
+++ b/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp
@@ -18,8 +18,6 @@
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 
-#include "sysman/firmware_util/firmware_util.h"
-
 namespace L0 {
 
 const std::string LinuxSysmanImp::deviceDir("device");
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.cpp
index 5fe4be4e53..eb676c8673 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.cpp
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,7 @@
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "level_zero/core/source/driver/driver_handle.h"
-
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
index 839ef5813f..a4fdaa8788 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "sysman/memory/os_memory.h"
+#include "level_zero/tools/source/sysman/memory/os_memory.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
index b1497a2610..b74f85fd7f 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,10 +10,9 @@
 #include "shared/source/os_interface/linux/memory_info.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 LinuxMemoryImp::LinuxMemoryImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId) : isSubdevice(onSubdevice), subdeviceId(subdeviceId) {
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
index f815910094..4fbd64dd63 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
@@ -17,11 +17,11 @@
 
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
 #include "drm/intel_hwconfig_types.h"
 #include "igfxfmid.h"
-#include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h
index cbf16e950e..726699fd9d 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "sysman/memory/os_memory.h"
+#include "level_zero/tools/source/sysman/memory/os_memory.h"
 
 #include <map>
 
diff --git a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.cpp b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.cpp
index ae98684eff..b4a5558fce 100644
--- a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.cpp
+++ b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/memory/windows/os_memory_imp.h"
+#include "level_zero/tools/source/sysman/memory/windows/os_memory_imp.h"
 
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
diff --git a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
index 481681b736..a00972d861 100644
--- a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
+++ b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
@@ -8,10 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
+#include "level_zero/tools/source/sysman/memory/os_memory.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
-
-#include "sysman/memory/os_memory.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 #include <pdh.h>
 
diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
index 51d1a88919..0543885e6a 100644
--- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
+++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,10 +11,9 @@
 
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/pci/pci_imp.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "sysman/pci/pci_imp.h"
-
 #include <linux/pci_regs.h>
 
 namespace L0 {
diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
index d4b4c9ab15..8124ef19f0 100644
--- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
+++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,8 +9,8 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/pci/os_pci.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/pci/os_pci.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
index bbc18d43e0..f7181ea887 100644
--- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
+++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/pci/windows/os_pci_imp.h"
+#include "level_zero/tools/source/sysman/pci/windows/os_pci_imp.h"
 
 #include "shared/source/memory_manager/memory_manager.h"
 
diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
index 1f393c78dd..32a8610d8f 100644
--- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
+++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/pci/os_pci.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/pci/os_pci.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 class KmdSysManager;
diff --git a/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h b/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
index 8ac262f29a..b3d1d0d104 100644
--- a/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
+++ b/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/performance/os_performance.h"
-#include "sysman/performance/performance_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/performance/os_performance.h"
+#include "level_zero/tools/source/sysman/performance/performance_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
index c979cab925..55338fe6e3 100644
--- a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
+++ b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/performance/os_performance.h"
-#include "sysman/performance/performance_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/performance/os_performance.h"
+#include "level_zero/tools/source/sysman/performance/performance_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/performance/windows/os_performance_imp.h b/level_zero/tools/source/sysman/performance/windows/os_performance_imp.h
index 926d88d76d..909896d12d 100644
--- a/level_zero/tools/source/sysman/performance/windows/os_performance_imp.h
+++ b/level_zero/tools/source/sysman/performance/windows/os_performance_imp.h
@@ -7,8 +7,7 @@
 
 #pragma once
 #include "level_zero/tools/source/sysman/performance/os_performance.h"
-
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/power/linux/os_power_imp.cpp b/level_zero/tools/source/sysman/power/linux/os_power_imp.cpp
index 8703365190..c6ccb645f6 100644
--- a/level_zero/tools/source/sysman/power/linux/os_power_imp.cpp
+++ b/level_zero/tools/source/sysman/power/linux/os_power_imp.cpp
@@ -9,11 +9,10 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 const std::string LinuxPowerImp::hwmonDir("device/hwmon");
diff --git a/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.cpp b/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.cpp
index e37761b335..eea50f64eb 100644
--- a/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.cpp
@@ -9,11 +9,10 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 const std::string LinuxPowerImp::hwmonDir("device/hwmon");
diff --git a/level_zero/tools/source/sysman/power/windows/os_power_imp.cpp b/level_zero/tools/source/sysman/power/windows/os_power_imp.cpp
index ff5c7943de..acc5b11a9b 100644
--- a/level_zero/tools/source/sysman/power/windows/os_power_imp.cpp
+++ b/level_zero/tools/source/sysman/power/windows/os_power_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/power/windows/os_power_imp.h"
+#include "level_zero/tools/source/sysman/power/windows/os_power_imp.h"
 
 #include "level_zero/tools/source/sysman/sysman_const.h"
 #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h"
diff --git a/level_zero/tools/source/sysman/power/windows/os_power_imp.h b/level_zero/tools/source/sysman/power/windows/os_power_imp.h
index c9a76a1074..b80b5514b2 100644
--- a/level_zero/tools/source/sysman/power/windows/os_power_imp.h
+++ b/level_zero/tools/source/sysman/power/windows/os_power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/power/os_power.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/power/os_power.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 class KmdSysManager;
diff --git a/level_zero/tools/source/sysman/ras/linux/os_ras_imp.cpp b/level_zero/tools/source/sysman/ras/linux/os_ras_imp.cpp
index 3ef2526619..e3e634ccfb 100644
--- a/level_zero/tools/source/sysman/ras/linux/os_ras_imp.cpp
+++ b/level_zero/tools/source/sysman/ras/linux/os_ras_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "level_zero/tools/source/sysman/ras/linux/os_ras_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_gt.cpp b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_gt.cpp
index b32ff44d3d..262c3d4161 100644
--- a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_gt.cpp
+++ b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_gt.cpp
@@ -5,11 +5,10 @@
  *
  */
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 static const std::map<zes_ras_error_cat_t, std::vector<std::string>> categoryToListOfEventsUncorrectable = {
     {ZES_RAS_ERROR_CAT_CACHE_ERRORS,
diff --git a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_hbm.cpp b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_hbm.cpp
index 75cf340076..9590193236 100644
--- a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_hbm.cpp
+++ b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_hbm.cpp
@@ -1,15 +1,14 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 void LinuxRasSourceHbm::getSupportedRasErrorTypes(std::set<zes_ras_error_type_t> &errorType, OsSysman *pOsSysman, ze_device_handle_t deviceHandle) {
diff --git a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.cpp b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.cpp
index 28d48b3d7e..728881d134 100644
--- a/level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.cpp
@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/string.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/ras/windows/os_ras_imp.cpp b/level_zero/tools/source/sysman/ras/windows/os_ras_imp.cpp
index d92f2b301a..d89f01473d 100644
--- a/level_zero/tools/source/sysman/ras/windows/os_ras_imp.cpp
+++ b/level_zero/tools/source/sysman/ras/windows/os_ras_imp.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "sysman/ras/os_ras.h"
+#include "level_zero/tools/source/sysman/ras/os_ras.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.cpp b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.cpp
index 2589a8500a..b2fd348e6c 100644
--- a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.cpp
+++ b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
index e7914189f3..8aa6a02789 100644
--- a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
+++ b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/scheduler/scheduler_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/scheduler/scheduler_imp.h"
 
 #include <string>
 
diff --git a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp
index ad1cece93d..fba0b0994d 100644
--- a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp
@@ -10,10 +10,9 @@
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
 #include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 const std::string LinuxSchedulerImp::preemptTimeoutMilliSecs("preempt_timeout_ms");
diff --git a/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.cpp b/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.cpp
index 18ffe77dd9..712172ba2f 100644
--- a/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.cpp
+++ b/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.h"
 
-#include "sysman/scheduler/scheduler_imp.h"
+#include "level_zero/tools/source/sysman/scheduler/scheduler_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.h b/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.h
index 5cb9ebc327..7000713484 100644
--- a/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.h
+++ b/level_zero/tools/source/sysman/scheduler/windows/os_scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "sysman/scheduler/scheduler_imp.h"
+#include "level_zero/tools/source/sysman/scheduler/scheduler_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
index d8cb82ec7c..9740772e29 100644
--- a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
+++ b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/standby/os_standby.h"
-#include "sysman/standby/standby_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/standby/os_standby.h"
+#include "level_zero/tools/source/sysman/standby/standby_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp
index ea24dc00cb..a7830655b6 100644
--- a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp
+++ b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.cpp
@@ -9,10 +9,9 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 namespace L0 {
 
 constexpr uint32_t numSocTemperatureEntries = 7;     // entries would be PCH or GT_TEMP, DRAM, SA, PSF, DE, PCIE, TYPEC
diff --git a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.cpp b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.cpp
index 71dd8c31aa..a306ce6eec 100644
--- a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.cpp
+++ b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "sysman/temperature/windows/os_temperature_imp.h"
+#include "level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h"
 
 #include "level_zero/tools/source/sysman/windows/kmd_sys_manager.h"
 
diff --git a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
index e50c33757e..326b198ed7 100644
--- a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
+++ b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "sysman/temperature/os_temperature.h"
-#include "sysman/windows/os_sysman_imp.h"
+#include "level_zero/tools/source/sysman/temperature/os_temperature.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 
 namespace L0 {
 class KmdSysManager;
diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt
index 5951ff7566..6addf99bc6 100644
--- a/level_zero/tools/test/unit_tests/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/CMakeLists.txt
@@ -51,7 +51,6 @@ target_include_directories(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABL
 target_include_directories(${TARGET_NAME}
                            BEFORE
                            PRIVATE
-                           $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
                            ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
 )
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h
index 446b26ef6a..d25ef55796 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h
@@ -11,12 +11,11 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/engine/engine_imp.h"
 #include "level_zero/tools/source/sysman/engine/linux/os_engine_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
 
-#include "sysman/engine/engine_imp.h"
-#include "sysman/linux/os_sysman_imp.h"
-
 using namespace NEO;
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine_prelim.h
index dee5ba0439..5e29d28b31 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine_prelim.h
@@ -10,12 +10,11 @@
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/engine/engine_imp.h"
 #include "level_zero/tools/source/sysman/engine/linux/os_engine_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
 
-#include "sysman/engine/engine_imp.h"
-#include "sysman/linux/os_sysman_imp.h"
-
 using namespace NEO;
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h
index 573243c96d..079f3e3b4c 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h
@@ -7,11 +7,11 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/tools/source/sysman/fabric_port/fabric_port.h"
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 
 #include "gmock/gmock.h"
-#include "sysman/fabric_port/fabric_port.h"
-#include "sysman/linux/fs_access.h"
-#include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_device_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
index d09407641d..5bbb86bb0c 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "sysman/fabric_port/linux/fabric_device_access_imp.h"
 
 #include <limits>
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_port_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
index 067689e513..0a0e67e6d3 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
@@ -5,15 +5,15 @@
  *
  */
 
+#include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h"
+#include "level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access_imp.h"
+#include "level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/fabric_port/linux/mock_fabric_device.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "sysman/fabric_port/fabric_port_imp.h"
-#include "sysman/fabric_port/linux/fabric_device_access_imp.h"
-#include "sysman/fabric_port/linux/os_fabric_port_imp_prelim.h"
 
 #include <limits>
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fan/linux/test_zes_fan.cpp b/level_zero/tools/test/unit_tests/sources/sysman/fan/linux/test_zes_fan.cpp
index 501fe02561..231e353956 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fan/linux/test_zes_fan.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fan/linux/test_zes_fan.cpp
@@ -1,15 +1,14 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "level_zero/tools/source/sysman/fan/fan_imp.h"
 #include "level_zero/tools/source/sysman/fan/linux/os_fan_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 
-#include "sysman/fan/fan_imp.h"
-
 extern bool sysmanUltsEnable;
 
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fan/windows/mock_fan.h b/level_zero/tools/test/unit_tests/sources/sysman/fan/windows/mock_fan.h
index bd23442340..e3496cb582 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/fan/windows/mock_fan.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/fan/windows/mock_fan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,9 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
+#include "level_zero/tools/source/sysman/fan/fan_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/fan/fan_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/frequency/windows/mock_frequency.h b/level_zero/tools/test/unit_tests/sources/sysman/frequency/windows/mock_frequency.h
index c439e9b9f3..921e4c2d79 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/frequency/windows/mock_frequency.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/frequency/windows/mock_frequency.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,9 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
+#include "level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/frequency/windows/os_frequency_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h
index f31aca7e6d..f10bbf7044 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h
@@ -10,10 +10,9 @@
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/sysman.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 using namespace NEO;
 
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h
index c014e4491f..96f5b05bac 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h
@@ -8,10 +8,9 @@
 #pragma once
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/sysman.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 using namespace NEO;
 
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h
index 13ae222563..951d41f10b 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h
@@ -15,13 +15,12 @@
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/sysman.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_procfs_access_fixture.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 extern bool sysmanUltsEnable;
 
 using namespace NEO;
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.cpp
index 9ef247b85b..e1399b62e8 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "mock_iaf_nl_api_prelim.h"
 
-#include "sysman/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h
index e1ec4400f2..e16c5a94eb 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_iaf_nl_api_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,9 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
 
 #include "gmock/gmock.h"
-#include "sysman/linux/nl_api/iaf_nl_api.h"
 
 #include <sstream>
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.cpp
index 915b4e6354..3d97a9be82 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "mock_nl_api_prelim.h"
 
-#include "sysman/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h
index 5813c8e3e3..6a40174852 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/mock_nl_api_prelim.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
+#include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/tools/source/sysman/linux/nl_api/nl_api.h"
 
 #include "gmock/gmock.h"
-#include "sysman/linux/nl_api/iaf_nl_api.h"
-#include "sysman/linux/nl_api/nl_api.h"
 
 #include <map>
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
index c71ca69979..e97adf2c91 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
@@ -7,9 +7,10 @@
 
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 
+#include "level_zero/tools/source/sysman/linux/nl_api/iaf_nl_api.h"
+
 #include "gmock/gmock.h"
 #include "mock_nl_api_prelim.h"
-#include "sysman/linux/nl_api/iaf_nl_api.h"
 
 #include <limits>
 #include <netlink/handlers.h>
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/pmt/mock_pmt.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/pmt/mock_pmt.h
index d803ef2006..1534d5c52d 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/linux/pmt/mock_pmt.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/pmt/mock_pmt.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "sysman/linux/pmt/pmt.h"
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h
index b8d6372ab6..7414bc8dea 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h
@@ -10,11 +10,10 @@
 #include "shared/source/os_interface/linux/memory_info.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
 #include "level_zero/tools/source/sysman/memory/memory_imp.h"
 
-#include "sysman/linux/os_sysman_imp.h"
-
 using namespace NEO;
 constexpr uint64_t probedSizeRegionZero = 8 * GB;
 constexpr uint64_t probedSizeRegionOne = 16 * GB;
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory_prelim.h
index 5b5b31cd94..3ae3f15542 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory_prelim.h
@@ -11,12 +11,12 @@
 #include "shared/source/os_interface/linux/system_info.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h"
 #include "level_zero/tools/source/sysman/memory/memory_imp.h"
 
 #include "drm/i915_drm.h"
 #include "drm/intel_hwconfig_types.h"
-#include "sysman/linux/os_sysman_imp.h"
 
 using namespace NEO;
 constexpr uint64_t probedSizeRegionZero = 8 * GB;
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/memory/windows/mock_memory.h b/level_zero/tools/test/unit_tests/sources/sysman/memory/windows/mock_memory.h
index 333d897931..c68abed754 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/memory/windows/mock_memory.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/memory/windows/mock_memory.h
@@ -8,10 +8,9 @@
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/memory/memory_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/memory/memory_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/pci/linux/mock_sysfs_pci.h b/level_zero/tools/test/unit_tests/sources/sysman/pci/linux/mock_sysfs_pci.h
index 5d86584160..c5510c5b68 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/pci/linux/mock_sysfs_pci.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/pci/linux/mock_sysfs_pci.h
@@ -8,8 +8,7 @@
 #pragma once
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/pci/linux/os_pci_imp.h"
-
-#include "sysman/pci/pci_imp.h"
+#include "level_zero/tools/source/sysman/pci/pci_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/mock_pci.h b/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/mock_pci.h
index d1a08c0e8e..140375c34e 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/mock_pci.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/pci/windows/mock_pci.h
@@ -7,11 +7,10 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
+#include "level_zero/tools/source/sysman/pci/pci_imp.h"
 #include "level_zero/tools/source/sysman/pci/windows/os_pci_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/pci/pci_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance.h b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance.h
index 6907690402..9d0160c552 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance.h
@@ -1,16 +1,15 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/performance/linux/os_performance_imp.h"
-
-#include "sysman/linux/fs_access.h"
-#include "sysman/performance/performance.h"
-#include "sysman/performance/performance_imp.h"
+#include "level_zero/tools/source/sysman/performance/performance.h"
+#include "level_zero/tools/source/sysman/performance/performance_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h
index 58f307ad56..b343792207 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h
@@ -6,11 +6,10 @@
  */
 
 #pragma once
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h"
-
-#include "sysman/linux/fs_access.h"
-#include "sysman/performance/performance.h"
-#include "sysman/performance/performance_imp.h"
+#include "level_zero/tools/source/sysman/performance/performance.h"
+#include "level_zero/tools/source/sysman/performance/performance_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h
index 36720c24bb..e13d79b2e1 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power.h
@@ -8,13 +8,12 @@
 #pragma once
 #include "shared/source/helpers/string.h"
 
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/power/linux/os_power_imp.h"
+#include "level_zero/tools/source/sysman/power/power_imp.h"
+#include "level_zero/tools/source/sysman/sysman_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 
-#include "sysman/linux/pmt/pmt.h"
-#include "sysman/power/power_imp.h"
-#include "sysman/sysman_imp.h"
-
 extern bool sysmanUltsEnable;
 
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power_prelim.h
index 5be1bf8f94..b37a261fe8 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/power/linux/mock_sysfs_power_prelim.h
@@ -8,13 +8,12 @@
 #pragma once
 #include "shared/source/helpers/string.h"
 
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h"
+#include "level_zero/tools/source/sysman/power/power_imp.h"
+#include "level_zero/tools/source/sysman/sysman_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
 
-#include "sysman/linux/pmt/pmt.h"
-#include "sysman/power/power_imp.h"
-#include "sysman/sysman_imp.h"
-
 extern bool sysmanUltsEnable;
 
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/power/windows/mock_power.h b/level_zero/tools/test/unit_tests/sources/sysman/power/windows/mock_power.h
index f4d8053b22..ad1e0a3c79 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/power/windows/mock_power.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/power/windows/mock_power.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,9 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
+#include "level_zero/tools/source/sysman/power/power_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/power/power_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras.h b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras.h
index 78733a99c4..8fd80ff5f1 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras.h
@@ -6,11 +6,10 @@
  */
 
 #pragma once
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/ras/linux/os_ras_imp.h"
-
-#include "sysman/linux/fs_access.h"
-#include "sysman/ras/ras.h"
-#include "sysman/ras/ras_imp.h"
+#include "level_zero/tools/source/sysman/ras/ras.h"
+#include "level_zero/tools/source/sysman/ras/ras_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras_prelim.h
index ac45f93b1f..f95de7808c 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/ras/linux/mock_fs_ras_prelim.h
@@ -7,13 +7,12 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
+#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
 #include "level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.h"
-
-#include "sysman/linux/fs_access.h"
-#include "sysman/linux/os_sysman_imp.h"
-#include "sysman/ras/ras.h"
-#include "sysman/ras/ras_imp.h"
+#include "level_zero/tools/source/sysman/ras/ras.h"
+#include "level_zero/tools/source/sysman/ras/ras_imp.h"
 
 using namespace NEO;
 namespace L0 {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h
index d48c1c5abe..e06e2f4424 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler.h
@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 
-#include "sysman/linux/fs_access.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h
index 3178caa0da..4895e5ab2a 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h
@@ -11,10 +11,9 @@
 #include "shared/source/os_interface/linux/i915_prelim.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 
+#include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 
-#include "sysman/linux/fs_access.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h
index 32b0e5d093..f6f883658d 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/temperature/linux/mock_sysfs_temperature.h
@@ -6,10 +6,9 @@
  */
 
 #pragma once
+#include "level_zero/tools/source/sysman/linux/pmt/pmt.h"
 #include "level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h"
-
-#include "sysman/linux/pmt/pmt.h"
-#include "sysman/temperature/temperature_imp.h"
+#include "level_zero/tools/source/sysman/temperature/temperature_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/temperature/windows/mock_temperature.h b/level_zero/tools/test/unit_tests/sources/sysman/temperature/windows/mock_temperature.h
index d94fea8f2c..b8729a10e7 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/temperature/windows/mock_temperature.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/temperature/windows/mock_temperature.h
@@ -7,10 +7,9 @@
 
 #pragma once
 #include "level_zero/core/test/unit_tests/mock.h"
+#include "level_zero/tools/source/sysman/temperature/temperature_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_kmd_sys_manager.h"
 
-#include "sysman/temperature/temperature_imp.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h
index 8f9b09acd0..53b620a546 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h
+++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h
@@ -15,10 +15,10 @@
 #include "level_zero/tools/source/sysman/sysman.h"
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 #include "level_zero/tools/source/sysman/windows/os_sysman_driver_imp.h"
+#include "level_zero/tools/source/sysman/windows/os_sysman_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_env_vars.h"
 
 #include "gmock/gmock.h"
-#include "sysman/windows/os_sysman_imp.h"
 
 extern bool sysmanUltsEnable;