Add absolute include paths

Change-Id: I67a6919bbbff1d30c7d6cdb257b41c87bad51e7f
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

opencl/test/unit_test/abort.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/abort.h"
+#include "shared/source/helpers/abort.h"
 
 #include <exception>
 

opencl/test/unit_test/accelerators/media_image_arg_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
-#include "memory_manager/surface.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/memory_manager/surface.h"
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/image.h"

opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/device/cl_device.h"
 #include "opencl/source/platform/platform.h"

opencl/test/unit_test/api/cl_api_tests.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "execution_environment/root_device_environment.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/api/api.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/tracing/tracing_api.h"

opencl/test/unit_test/api/cl_build_program_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/program.h"

opencl/test/unit_test/api/cl_clone_kernel_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/file_io.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_compile_program_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_create_command_queue_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/device/device.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/hw_helper.h"
-#include "os_interface/os_context.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/os_interface/os_context.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/device_queue/device_queue.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"

opencl/test/unit_test/api/cl_create_context_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 

opencl/test/unit_test/api/cl_create_image_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/api/cl_create_kernel_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/file_io.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/file_io.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_create_pipe_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "shared/source/device/device.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/base_object.h"
 

opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/file_io.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/built_ins/built_in_ops_vme.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/built_ins/vme_builtin.h"

opencl/test/unit_test/api/cl_create_sub_devices_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/api/api.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "test.h"

opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 

opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/surface_formats.h"

opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 

opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/device/device_info.h"

opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/event/user_event.h"

opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "device/device.h"
-#include "memory_manager/graphics_allocation.h"
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/device/device.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 

opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/command_queue/command_queue.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_get_context_info_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/context/context.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_get_device_ids_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/helpers/ult_hw_config.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "helpers/ult_hw_config.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 

opencl/test/unit_test/api/cl_get_device_info_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "helpers/hw_info.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include "cl_api_tests.h"
 

opencl/test/unit_test/api/cl_get_image_info_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/api/cl_get_image_params_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 

opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_get_kernel_info_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"

opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_get_platform_ids_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/helpers/ult_hw_config.h"
+#include "helpers/ult_hw_config.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"

opencl/test/unit_test/api/cl_get_platform_info_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "device/device.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/platform/platform.h"
 #include "test.h"
 

opencl/test/unit_test/api/cl_get_program_build_info_tests.inl

@@ -5,13 +5,13 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "compiler_interface/intermediate_representations.h"
-#include "device/device.h"
-#include "device_binary_format/elf/elf.h"
-#include "device_binary_format/elf/elf_encoder.h"
-#include "device_binary_format/elf/ocl_elf.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/compiler_interface/intermediate_representations.h"
+#include "shared/source/device/device.h"
+#include "shared/source/device_binary_format/elf/elf.h"
+#include "shared/source/device_binary_format/elf/elf_encoder.h"
+#include "shared/source/device_binary_format/elf/ocl_elf.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_get_program_info_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "device/device.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/test_files.h"

opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "shared/source/device/device.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 

opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl

@@ -6,10 +6,10 @@
  */
 
 #if defined(_WIN32)
-#include "os_interface/windows/windows_wrapper.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 #endif
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 

opencl/test/unit_test/api/cl_link_program_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "compiler_interface/compiler_interface.h"
-#include "helpers/file_io.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "gmm_helper/gmm_helper.h"
-#include "helpers/hw_cmds.h"
-#include "helpers/state_base_address.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/hw_cmds.h"
+#include "shared/source/helpers/state_base_address.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/api/api.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/extensions/public/cl_ext_private.h"

opencl/test/unit_test/api/cl_release_kernel_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/file_io.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/helpers/test_files.h"
 

opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/device_queue/device_queue.h"
 #include "test.h"

opencl/test/unit_test/api/cl_set_event_callback_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/event/event.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"

opencl/test/unit_test/api/cl_svm_alloc_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "shared/source/device/device.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/context/context.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "memory_manager/unified_memory_manager.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/api/api.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/device/cl_device.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 #include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h"

opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "device/device.h"
-#include "helpers/hw_info.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/test/unit_test/api/cl_api_tests.h"
 
 #include <cstring>

opencl/test/unit_test/aub/aub_center_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/basic_math.h"
-#include "helpers/hw_info.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/helpers/default_hw_info.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/hw_info.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "helpers/default_hw_info.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 

opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/hw_info.h"
-#include "helpers/options.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/helpers/default_hw_info.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/options.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "helpers/default_hw_info.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 

opencl/test/unit_test/aub/aub_helper_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "helpers/basic_math.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/helpers/basic_math.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"

opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "gmm_helper/gmm.h"
-#include "gmm_helper/gmm_helper.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "helpers/ptr_math.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h

@@ -5,9 +5,9 @@
  *
  */
 
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/api/api.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/api/api.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h"
 
-#include "memory_manager/allocations_list.h"
+#include "shared/source/memory_manager/allocations_list.h"
 #include "test.h"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"
 

opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp

@@ -7,11 +7,11 @@
 
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/hw_helper.h"
-#include "os_interface/os_context.h"
-#include "unit_tests/helpers/memory_management.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/os_interface/os_context.h"
+#include "helpers/memory_management.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
 #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "memory_manager/internal_allocation_storage.h"
-#include "os_interface/os_context.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver_hw.h"
-#include "helpers/ptr_math.h"
-#include "os_interface/os_context.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"

opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp

@@ -7,8 +7,8 @@
 
 #include "aub_mem_dump_tests.h"
 
-#include "helpers/hw_helper.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "helpers/debug_manager_state_restore.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"

opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "device/device.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "opencl/source/gen_common/aub_mapper.h"

opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"
 
-#include "memory_manager/graphics_allocation.h"
-#include "memory_manager/internal_allocation_storage.h"
-#include "memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/memory_manager/memory_manager.h"
 
 namespace NEO {
 

opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "helpers/hw_helper.h"
-#include "os_interface/os_interface.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/os_interface/os_interface.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"

opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"

opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/file_io.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/file_io.h"
 #include "opencl/source/program/program.h"
 #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"

opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"

opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "memory_manager/memory_constants.h"
+#include "shared/source/memory_manager/memory_constants.h"
 #include "opencl/source/api/api.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"
 

opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_cmds.h"
+#include "shared/source/helpers/hw_cmds.h"
 #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_cmds.h"
+#include "shared/source/helpers/hw_cmds.h"
 #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp

@@ -7,9 +7,9 @@
 
 #include "aub_batch_buffer_tests_gen12lp.h"
 
-#include "memory_manager/graphics_allocation.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_cmds.h"
+#include "shared/source/helpers/hw_cmds.h"
 #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_cmds.h"
+#include "shared/source/helpers/hw_cmds.h"
 #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/aligned_memory.h"
+#include "shared/source/helpers/aligned_memory.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/source/platform/platform.h"

opencl/test/unit_test/built_ins/built_in_tests.cpp

@@ -5,14 +5,14 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "gmm_helper/gmm.h"
-#include "gmm_helper/gmm_helper.h"
-#include "helpers/file_io.h"
-#include "helpers/hash.h"
-#include "helpers/string.h"
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/hash.h"
+#include "shared/source/helpers/string.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"

opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/command_queue/buffer_operations_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"

opencl/test/unit_test/command_queue/command_queue_fixture.cpp

@@ -7,7 +7,7 @@
 
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 
-#include "device/device.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/utilities/base_object_utils.h"
+#include "helpers/debug_manager_state_restore.h"
+#include "utilities/base_object_utils.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/dispatch_info_builder.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"