Add absolute include paths

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

opencl/source/accelerators/intel_accelerator.cpp

@@ -7,8 +7,8 @@
 
 #include "opencl/source/accelerators/intel_accelerator.h"
 
-#include "helpers/get_info.h"
-#include "helpers/string.h"
+#include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/string.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
 

opencl/source/api/api.cpp

@@ -7,17 +7,17 @@
 
 #include "api.h"
 
-#include "command_stream/command_stream_receiver.h"
-#include "debug_settings/debug_settings_manager.h"
-#include "execution_environment/root_device_environment.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/get_info.h"
-#include "helpers/hw_info.h"
-#include "helpers/kernel_helpers.h"
-#include "memory_manager/unified_memory_manager.h"
-#include "os_interface/os_context.h"
-#include "utilities/api_intercept.h"
-#include "utilities/stackvec.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/kernel_helpers.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/source/os_interface/os_context.h"
+#include "shared/source/utilities/api_intercept.h"
+#include "shared/source/utilities/stackvec.h"
 #include "opencl/source/accelerators/intel_motion_estimation.h"
 #include "opencl/source/api/additional_extensions.h"
 #include "opencl/source/aub/aub_center.h"

opencl/source/api/api_enter.h

@@ -5,7 +5,7 @@
  *
  */
 
-#include "utilities/perf_profiler.h"
+#include "shared/source/utilities/perf_profiler.h"
 #include "opencl/source/utilities/logger.h"
 
 #define API_ENTER(retValPointer) \

opencl/source/api/dispatch.h

@@ -19,7 +19,7 @@
 #include "CL/cl_d3d11.h"
 #include "CL/cl_dx9_media_sharing.h"
 #define CL_DX9_MEDIA_SHARING_INTEL_EXT
-#include "os_interface/windows/windows_wrapper.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 #include "CL/cl_dx9_media_sharing_intel.h"
 #else

opencl/source/aub/aub_center.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/source/aub/aub_center.h"
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/hw_helper.h"
-#include "helpers/hw_info.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/aub/aub_helper.h"
 
 #include "third_party/aub_stream/headers/aub_manager.h"

opencl/source/aub/aub_center.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "helpers/options.h"
+#include "shared/source/helpers/options.h"
 #include "opencl/source/command_stream/aub_stream_provider.h"
 #include "opencl/source/command_stream/aub_subcapture.h"
 #include "opencl/source/memory_manager/address_mapper.h"

opencl/source/aub/aub_helper.cpp

@@ -7,8 +7,8 @@
 
 #include "opencl/source/aub/aub_helper.h"
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/basic_math.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/basic_math.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {

opencl/source/aub/aub_helper.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "helpers/hw_info.h"
-#include "helpers/non_copyable_or_moveable.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/gen_common/aub_mapper_base.h"
 
 namespace NEO {

opencl/source/aub/aub_helper_add_mmio.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "opencl/source/aub/aub_helper.h"
 
 #include "third_party/aub_stream/headers/aubstream.h"

opencl/source/aub_mem_dump/aub_alloc_dump.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "debug_settings/debug_settings_manager.h"
-#include "gmm_helper/resource_info.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/resource_info.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 using namespace NEO;

opencl/source/aub_mem_dump/aub_alloc_dump.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "gmm_helper/gmm.h"
-#include "gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 
 #include "third_party/aub_stream/headers/aubstream.h"

opencl/source/aub_mem_dump/aub_mem_dump.cpp

@@ -7,9 +7,9 @@
 
 #include "aub_mem_dump.h"
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/ptr_math.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/ptr_math.h"
 #include "opencl/source/aub/aub_helper.h"
 
 namespace AubMemDump {

opencl/source/aub_mem_dump/aub_mem_dump.inl

@@ -5,9 +5,9 @@
  *
  */
 
-#include "helpers/debug_helpers.h"
-#include "helpers/ptr_math.h"
-#include "memory_manager/memory_constants.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/memory_manager/memory_constants.h"
 #include "opencl/source/aub/aub_helper.h"
 
 #include "aub_mem_dump.h"

opencl/source/built_ins/aux_translation_builtin.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "helpers/hw_helper.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/dispatch_info_builder.h"

opencl/source/built_ins/built_ins.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/source/built_ins/built_ins.h"
 
-#include "compiler_interface/compiler_interface.h"
-#include "helpers/basic_math.h"
-#include "helpers/debug_helpers.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/built_ins/sip.h"
 #include "opencl/source/device/cl_device.h"

opencl/source/built_ins/built_ins.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "built_ins/sip_kernel_type.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/non_copyable_or_moveable.h"
-#include "helpers/vec.h"
+#include "shared/source/built_ins/sip_kernel_type.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/non_copyable_or_moveable.h"
+#include "shared/source/helpers/vec.h"
 
 #include "CL/cl.h"
 #include "built_in_ops.h"

opencl/source/built_ins/built_ins_storage.cpp

@@ -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/built_ins/built_ins.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 

opencl/source/built_ins/builtins_dispatch_builder.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
-#include "compiler_interface/compiler_interface.h"
-#include "helpers/basic_math.h"
-#include "helpers/debug_helpers.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/built_ins/built_ins.inl"

opencl/source/built_ins/builtins_dispatch_builder.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "helpers/vec.h"
+#include "shared/source/helpers/vec.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/kernel/kernel.h"
 

opencl/source/built_ins/sip.cpp

@@ -7,13 +7,13 @@
 
 #include "opencl/source/built_ins/sip.h"
 
-#include "device/device.h"
-#include "execution_environment/execution_environment.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/hw_helper.h"
-#include "helpers/ptr_math.h"
-#include "helpers/string.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/device/device.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/program.h"

opencl/source/built_ins/sip.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "built_ins/sip_kernel_type.h"
-#include "helpers/hw_info.h"
+#include "shared/source/built_ins/sip_kernel_type.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include <memory>
 

opencl/source/built_ins/vme_builtin.cpp

@@ -7,7 +7,7 @@
 
 #include "opencl/source/built_ins/vme_builtin.h"
 
-#include "device/device.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/builtins_dispatch_builder.h"

opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "gen11/hw_cmds.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl"

opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "gen12lp/hw_cmds.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl"

opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "gen8/hw_cmds.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl"

opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "gen9/hw_cmds.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl"

opencl/source/builtin_kernels_simulation/opencl_c.cpp

@@ -7,7 +7,7 @@
 
 #include "opencl_c.h"
 
-#include "helpers/string.h"
+#include "shared/source/helpers/string.h"
 
 namespace BuiltinKernelsSimulation {
 

opencl/source/builtin_kernels_simulation/scheduler_simulation.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 
 #include <cstdint>

opencl/source/command_queue/command_queue.cpp

@@ -7,18 +7,18 @@
 
 #include "opencl/source/command_queue/command_queue.h"
 
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/array_count.h"
-#include "helpers/engine_node_helper.h"
-#include "helpers/get_info.h"
-#include "helpers/ptr_math.h"
-#include "helpers/string.h"
-#include "helpers/timestamp_packet.h"
-#include "memory_manager/internal_allocation_storage.h"
-#include "os_interface/os_context.h"
-#include "utilities/api_intercept.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/array_count.h"
+#include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/helpers/timestamp_packet.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/os_interface/os_context.h"
+#include "shared/source/utilities/api_intercept.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/device/cl_device.h"

opencl/source/command_queue/command_queue.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "helpers/engine_control.h"
+#include "shared/source/helpers/engine_control.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/dispatch_info.h"

opencl/source/command_queue/command_queue_hw.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "command_stream/preemption.h"
-#include "helpers/engine_control.h"
-#include "helpers/hw_helper.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/preemption.h"
+#include "shared/source/helpers/engine_control.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/device/cl_device.h"

opencl/source/command_queue/command_queue_hw_base.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/blit_commands_helper.h"
+#include "shared/source/helpers/blit_commands_helper.h"
 #include "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/command_queue/enqueue_barrier.h"
 #include "opencl/source/command_queue/enqueue_copy_buffer.h"

opencl/source/command_queue/cpu_data_transfer_handler.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/get_info.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/get_info.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/event/event.h"

opencl/source/command_queue/enqueue_barrier.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "memory_manager/surface.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/memory_manager/surface.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/event.h"
 

opencl/source/command_queue/enqueue_common.h

@@ -6,16 +6,16 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/array_count.h"
-#include "helpers/engine_node_helper.h"
-#include "memory_manager/internal_allocation_storage.h"
-#include "memory_manager/memory_manager.h"
-#include "memory_manager/surface.h"
-#include "os_interface/os_context.h"
-#include "program/sync_buffer_handler.h"
-#include "utilities/range.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/array_count.h"
+#include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/surface.h"
+#include "shared/source/os_interface/os_context.h"
+#include "shared/source/program/sync_buffer_handler.h"
+#include "shared/source/utilities/range.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"

opencl/source/command_queue/enqueue_copy_buffer.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/enqueue_common.h"

opencl/source/command_queue/enqueue_copy_buffer_rect.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_copy_buffer_to_image.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_copy_image.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/basic_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/basic_math.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_copy_image_to_buffer.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_fill_buffer.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "memory_manager/internal_allocation_storage.h"
-#include "memory_manager/memory_manager.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/memory_manager/memory_manager.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_fill_image.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/basic_math.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/basic_math.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_kernel.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"

opencl/source/command_queue/enqueue_marker.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/event.h"

opencl/source/command_queue/enqueue_migrate_mem_objects.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "memory_manager/surface.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/memory_manager/surface.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/event.h"

opencl/source/command_queue/enqueue_read_buffer.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/cache_policy.h"
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/cache_policy.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/enqueue_common.h"

opencl/source/command_queue/enqueue_read_buffer_rect.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/enqueue_common.h"

opencl/source/command_queue/enqueue_read_image.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/basic_math.h"
-#include "helpers/cache_policy.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/cache_policy.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/context/context.h"

opencl/source/command_queue/enqueue_svm.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "memory_manager/surface.h"
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/memory_manager/surface.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/enqueue_common.h"

opencl/source/command_queue/enqueue_write_buffer.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/string.h"
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_write_buffer_rect.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/enqueue_write_image.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/basic_math.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/finish.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 
 namespace NEO {

opencl/source/command_queue/gpgpu_walker.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
-#include "command_stream/linear_stream.h"
-#include "command_stream/preemption.h"
-#include "helpers/register_offsets.h"
-#include "helpers/timestamp_packet.h"
-#include "helpers/vec.h"
-#include "indirect_heap/indirect_heap.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/command_stream/linear_stream.h"
+#include "shared/source/command_stream/preemption.h"
+#include "shared/source/helpers/register_offsets.h"
+#include "shared/source/helpers/timestamp_packet.h"
+#include "shared/source/helpers/vec.h"
+#include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"

opencl/source/command_queue/gpgpu_walker_base.inl

@@ -6,15 +6,15 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/engine_node_helper.h"
-#include "helpers/hw_helper.h"
-#include "indirect_heap/indirect_heap.h"
-#include "memory_manager/graphics_allocation.h"
-#include "os_interface/os_context.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/os_interface/os_context.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/local_id_gen.h"

opencl/source/command_queue/gpgpu_walker_bdw_plus.inl

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "execution_environment/root_device_environment.h"
-#include "helpers/simd_helper.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/simd_helper.h"
 #include "opencl/source/command_queue/gpgpu_walker_base.inl"
 #include "opencl/source/device/cl_device.h"
 

opencl/source/command_queue/hardware_interface.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/preemption_mode.h"
+#include "shared/source/command_stream/preemption_mode.h"
 
 #include "CL/cl.h"
 

opencl/source/command_queue/hardware_interface_base.inl

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "memory_manager/internal_allocation_storage.h"
+#include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/hardware_interface.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/command_queue/hardware_interface_bdw_plus.inl

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "helpers/engine_node_helper.h"
-#include "os_interface/os_context.h"
+#include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/command_queue/hardware_interface_base.inl"
 
 namespace NEO {

opencl/source/command_queue/local_id_gen.cpp

@@ -7,8 +7,8 @@
 
 #include "opencl/source/command_queue/local_id_gen.h"
 
-#include "helpers/aligned_memory.h"
-#include "utilities/cpu_info.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/utilities/cpu_info.h"
 
 #include <array>
 

opencl/source/command_queue/local_id_gen.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "helpers/ptr_math.h"
+#include "shared/source/helpers/ptr_math.h"
 
 #include <algorithm>
 #include <array>

opencl/source/command_queue/local_work_size.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "device/device.h"
-#include "helpers/array_count.h"
-#include "helpers/basic_math.h"
-#include "helpers/debug_helpers.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/array_count.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/kernel/kernel.h"

opencl/source/command_stream/aub_command_stream_receiver.cpp

@@ -7,12 +7,12 @@
 
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/hw_helper.h"
-#include "helpers/hw_info.h"
-#include "helpers/options.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/options.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/source/os_interface/os_inc_base.h"
 

opencl/source/command_stream/aub_command_stream_receiver_hw.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "helpers/array_count.h"
-#include "utilities/spinlock.h"
+#include "shared/source/helpers/array_count.h"
+#include "shared/source/utilities/spinlock.h"
 #include "opencl/source/aub/aub_center.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/gen_common/aub_mapper.h"

opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -5,19 +5,19 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "debug_settings/debug_settings_manager.h"
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/engine_node_helper.h"
-#include "helpers/hash.h"
-#include "helpers/ptr_math.h"
-#include "helpers/string.h"
-#include "memory_manager/graphics_allocation.h"
-#include "memory_manager/memory_constants.h"
-#include "os_interface/os_context.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/hash.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/memory_constants.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl"

opencl/source/command_stream/aub_subcapture.cpp

@@ -7,7 +7,7 @@
 
 #include "opencl/source/command_stream/aub_subcapture.h"
 
-#include "utilities/debug_settings_reader.h"
+#include "shared/source/utilities/debug_settings_reader.h"
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/os_interface/ocl_reg_path.h"

opencl/source/command_stream/aub_subcapture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/aub_subcapture_status.h"
+#include "shared/source/command_stream/aub_subcapture_status.h"
 
 #include <atomic>
 #include <memory>

opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "opencl/source/gen_common/aub_mapper.h"
 #include "opencl/source/memory_manager/memory_banks.h"
 

opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl

@@ -5,12 +5,12 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "gmm_helper/gmm.h"
-#include "gmm_helper/gmm_helper.h"
-#include "gmm_helper/resource_info.h"
-#include "memory_manager/memory_manager.h"
-#include "os_interface/os_context.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/gmm_helper/resource_info.h"
+#include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
 #include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h"

opencl/source/command_stream/command_stream_receiver_with_aub_dump.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 
 #include <memory>
 

opencl/source/command_stream/command_stream_receiver_with_aub_dump.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/aub/aub_center.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"

opencl/source/command_stream/create_command_stream_impl.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
-#include "os_interface/device_factory.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/os_interface/device_factory.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"

opencl/source/command_stream/create_command_stream_impl.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 
 namespace NEO {
 class ExecutionEnvironment;

opencl/source/command_stream/device_command_stream.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver_hw.h"
+#include "shared/source/command_stream/command_stream_receiver_hw.h"
 
 namespace NEO {
 

opencl/source/command_stream/per_dss_backed_buffer.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 
 namespace NEO {
 

opencl/source/command_stream/tbx_command_stream_receiver.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
 
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
-#include "helpers/hw_info.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include <string>
 

opencl/source/command_stream/tbx_command_stream_receiver_hw.inl

@@ -5,16 +5,16 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "execution_environment/execution_environment.h"
-#include "execution_environment/root_device_environment.h"
-#include "helpers/aligned_memory.h"
-#include "helpers/debug_helpers.h"
-#include "helpers/hw_helper.h"
-#include "helpers/ptr_math.h"
-#include "memory_manager/graphics_allocation.h"
-#include "memory_manager/memory_constants.h"
-#include "os_interface/os_context.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/memory_constants.h"
+#include "shared/source/os_interface/os_context.h"
 #include "opencl/source/aub/aub_center.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"

opencl/source/command_stream/tbx_stream.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/debug_helpers.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "opencl/source/aub/aub_helper.h"
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
 #include "opencl/source/tbx/tbx_sockets.h"

opencl/source/compiler_interface/default_cache_config.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "compiler_interface/default_cache_config.h"
+#include "shared/source/compiler_interface/default_cache_config.h"
 
 #include "opencl/source/compiler_interface/default_cl_cache_config.h"
 

opencl/source/compiler_interface/default_cl_cache_config.cpp

@@ -7,7 +7,7 @@
 
 #include "default_cl_cache_config.h"
 
-#include "utilities/debug_settings_reader.h"
+#include "shared/source/utilities/debug_settings_reader.h"
 #include "opencl/source/os_interface/ocl_reg_path.h"
 
 #include "config.h"

opencl/source/compiler_interface/default_cl_cache_config.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "compiler_interface/compiler_cache.h"
+#include "shared/source/compiler_interface/compiler_cache.h"
 
 namespace NEO {
 

opencl/source/context/context.cpp

@@ -7,15 +7,15 @@
 
 #include "opencl/source/context/context.h"
 
-#include "command_stream/command_stream_receiver.h"
-#include "compiler_interface/compiler_interface.h"
-#include "debug_settings/debug_settings_manager.h"
-#include "helpers/get_info.h"
-#include "helpers/ptr_math.h"
-#include "helpers/string.h"
-#include "memory_manager/deferred_deleter.h"
-#include "memory_manager/memory_manager.h"
-#include "memory_manager/unified_memory_manager.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/compiler_interface/compiler_interface.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/deferred_deleter.h"
+#include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/device/cl_device.h"

opencl/source/context/context.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "debug_settings/debug_settings_manager.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "opencl/source/context/context_type.h"
 #include "opencl/source/context/driver_diagnostics.h"
 #include "opencl/source/device/cl_device_vector.h"

opencl/source/context/context_extra.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 

opencl/source/context/driver_diagnostics.cpp

@@ -7,7 +7,7 @@
 
 #include "driver_diagnostics.h"
 
-#include "helpers/debug_helpers.h"
+#include "shared/source/helpers/debug_helpers.h"
 
 namespace NEO {
 

opencl/source/device/cl_device.cpp

@@ -7,11 +7,11 @@
 
 #include "opencl/source/device/cl_device.h"
 
-#include "device/device.h"
-#include "device/sub_device.h"
-#include "execution_environment/root_device_environment.h"
-#include "os_interface/os_interface.h"
-#include "program/sync_buffer_handler.h"
+#include "shared/source/device/device.h"
+#include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/os_interface/os_interface.h"
+#include "shared/source/program/sync_buffer_handler.h"
 #include "opencl/source/platform/extensions.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/source_level_debugger/source_level_debugger.h"

opencl/source/device/cl_device.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "command_stream/preemption_mode.h"
-#include "utilities/reference_tracked_object.h"
+#include "shared/source/command_stream/preemption_mode.h"
+#include "shared/source/utilities/reference_tracked_object.h"
 #include "opencl/source/api/cl_types.h"
 #include "opencl/source/device/device_info_map.h"
 #include "opencl/source/helpers/base_object.h"

opencl/source/device/device_caps.cpp

@@ -5,13 +5,13 @@
  *
  */
 
-#include "command_stream/command_stream_receiver.h"
-#include "device/device.h"
-#include "helpers/basic_math.h"
-#include "helpers/hw_helper.h"
-#include "memory_manager/memory_manager.h"
-#include "os_interface/hw_info_config.h"
-#include "os_interface/os_interface.h"
+#include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/os_interface.h"
 #include "opencl/source/device/driver_info.h"
 #include "opencl/source/platform/extensions.h"
 #include "opencl/source/sharings/sharing_factory.h"

opencl/source/device/device_info.cpp

@@ -7,9 +7,9 @@
 
 #include "opencl/source/device/device_info.h"
 
-#include "device/device.h"
-#include "helpers/get_info.h"
-#include "os_interface/os_time.h"
+#include "shared/source/device/device.h"
+#include "shared/source/helpers/get_info.h"
+#include "shared/source/os_interface/os_time.h"
 #include "opencl/source/device/cl_device.h"
 #include "opencl/source/device/cl_device_vector.h"
 #include "opencl/source/device/device_info_map.h"

opencl/source/device/linux/fp64_override.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "utilities/debug_settings_reader_creator.h"
+#include "shared/source/utilities/debug_settings_reader_creator.h"
 #include "opencl/source/os_interface/ocl_reg_path.h"
 
 namespace NEO {

opencl/source/device_queue/device_queue.cpp

@@ -7,8 +7,8 @@
 
 #include "opencl/source/device_queue/device_queue.h"
 
-#include "helpers/hw_helper.h"
-#include "memory_manager/memory_manager.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/memory_manager/memory_manager.h"
 #include "opencl/source/context/context.h"
 #include "opencl/source/device/cl_device.h"
 #include "opencl/source/device_queue/device_queue_hw.h"

opencl/source/device_queue/device_queue.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "helpers/hw_info.h"
-#include "indirect_heap/indirect_heap.h"
-#include "memory_manager/graphics_allocation.h"
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "opencl/source/api/cl_types.h"
 #include "opencl/source/execution_model/device_enqueue.h"
 #include "opencl/source/helpers/base_object.h"

opencl/source/device_queue/device_queue_hw.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "command_stream/linear_stream.h"
-#include "helpers/hw_cmds.h"
-#include "helpers/ptr_math.h"
-#include "indirect_heap/indirect_heap.h"
+#include "shared/source/command_stream/linear_stream.h"
+#include "shared/source/helpers/hw_cmds.h"
+#include "shared/source/helpers/ptr_math.h"
+#include "shared/source/indirect_heap/indirect_heap.h"
 #include "opencl/source/device_queue/device_queue.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/program/program.h"

opencl/source/device_queue/device_queue_hw_base.inl

@@ -6,11 +6,11 @@
  */
 
 #pragma once
-#include "helpers/hw_helper.h"
-#include "helpers/preamble.h"
-#include "helpers/string.h"
-#include "memory_manager/memory_manager.h"
-#include "utilities/tag_allocator.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/preamble.h"
+#include "shared/source/helpers/string.h"
+#include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/utilities/tag_allocator.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/device_queue/device_queue_hw.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/source/dll/create_command_stream.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "helpers/hw_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
 #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "opencl/source/command_stream/create_command_stream_impl.h"

opencl/source/dll/create_deferred_deleter.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "memory_manager/deferred_deleter.h"
+#include "shared/source/memory_manager/deferred_deleter.h"
 
 namespace NEO {
 std::unique_ptr<DeferredDeleter> createDeferredDeleter() {

opencl/source/dll/debug_manager.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "debug_settings/debug_settings_manager.h"
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "opencl/source/os_interface/ocl_reg_path.h"
 
 using namespace std;

opencl/source/dll/debugger.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "debugger/debugger.h"
+#include "shared/source/debugger/debugger.h"
 
-#include "built_ins/sip_kernel_type.h"
-#include "helpers/hw_info.h"
+#include "shared/source/built_ins/sip_kernel_type.h"
+#include "shared/source/helpers/hw_info.h"
 #include "opencl/source/built_ins/sip.h"
 #include "opencl/source/source_level_debugger/source_level_debugger.h"
 

opencl/source/dll/get_devices.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "execution_environment/execution_environment.h"
-#include "os_interface/device_factory.h"
+#include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/os_interface/device_factory.h"
 #include "opencl/source/command_stream/create_command_stream_impl.h"
 
 namespace NEO {

opencl/source/dll/linux/allocator_helper.cpp

@@ -5,10 +5,10 @@
  *
  */
 
-#include "os_interface/linux/allocator_helper.h"
+#include "shared/source/os_interface/linux/allocator_helper.h"
 
-#include "helpers/aligned_memory.h"
-#include "helpers/basic_math.h"
+#include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/basic_math.h"
 
 namespace NEO {