Add absolute path to include

Change-Id: Ib0782b4ab8d9a26ec358ecfb57721f4fe8d51b06

opencl/source/CMakeLists.txt

@@ -80,14 +80,14 @@ if(WIN32)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${WDK_INCLUDE_PATHS}
     ${NEO_SOURCE_DIR}/core/os_interface/windows
-    ${NEO_RUNTIME_SOURCE_DIR}/os_interface/windows
+    ${NEO_SOURCE_DIR}/opencl/source/os_interface/windows
   )
   target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1)
 else()
   set(IGDRCL_EXTRA_LIBS dl pthread)
   target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
     ${NEO_SOURCE_DIR}/core/os_interface/linux
-    ${NEO_RUNTIME_SOURCE_DIR}/os_interface/linux
+    ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux
     ${I915_INCLUDES_DIR}
   )
 endif()
@@ -127,7 +127,7 @@ if(${GENERATE_EXECUTABLE})
 
   add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
     ${NEO_DYNAMIC_LIB__TARGET_OBJECTS}
-    ${NEO_RUNTIME_SOURCE_DIR}/aub/aub_stream_interface.cpp
+    ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp
   )
 
   if(UNIX)

opencl/source/accelerators/intel_accelerator.cpp

@@ -5,13 +5,12 @@
  *
  */
 
-#include "accelerators/intel_accelerator.h"
+#include "opencl/source/accelerators/intel_accelerator.h"
 
 #include "core/helpers/get_info.h"
 #include "core/helpers/string.h"
-
-#include "context/context.h"
-#include "helpers/get_info_status_mapper.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/helpers/get_info_status_mapper.h"
 
 namespace NEO {
 

opencl/source/accelerators/intel_accelerator.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "api/cl_types.h"
-#include "helpers/base_object.h"
+#include "opencl/source/api/cl_types.h"
+#include "opencl/source/helpers/base_object.h"
 
 //------------------------------------------------------------------------------
 // cl_intel_accelerator Class Stuff

opencl/source/accelerators/intel_motion_estimation.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "accelerators/intel_motion_estimation.h"
+#include "opencl/source/accelerators/intel_motion_estimation.h"
 
 namespace NEO {
 

opencl/source/accelerators/intel_motion_estimation.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "accelerators/intel_accelerator.h"
+#include "opencl/source/accelerators/intel_accelerator.h"
 
 //------------------------------------------------------------------------------
 // VmeAccelerator Class Stuff

opencl/source/api/additional_extensions.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "api/additional_extensions.h"
+#include "opencl/source/api/additional_extensions.h"
 
 namespace NEO {
 void *CL_API_CALL getAdditionalExtensionFunctionAddress(const char *funcName) {

opencl/source/api/api.cpp

@@ -18,38 +18,38 @@
 #include "core/os_interface/os_context.h"
 #include "core/utilities/api_intercept.h"
 #include "core/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"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/vme_builtin.h"
+#include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/context/driver_diagnostics.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/device_queue/device_queue.h"
+#include "opencl/source/event/user_event.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
+#include "opencl/source/helpers/get_info_status_mapper.h"
+#include "opencl/source/helpers/mem_properties_parser_helper.h"
+#include "opencl/source/helpers/memory_properties_flags_helpers.h"
+#include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/helpers/validators.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/kernel/kernel_info_cl.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/mem_obj/mem_obj_helper.h"
+#include "opencl/source/mem_obj/pipe.h"
+#include "opencl/source/platform/platform.h"
+#include "opencl/source/program/program.h"
+#include "opencl/source/sampler/sampler.h"
+#include "opencl/source/sharings/sharing_factory.h"
+#include "opencl/source/tracing/tracing_api.h"
+#include "opencl/source/tracing/tracing_notify.h"
 
 #include "CL/cl.h"
-#include "accelerators/intel_motion_estimation.h"
-#include "api/additional_extensions.h"
-#include "aub/aub_center.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/vme_builtin.h"
-#include "command_queue/command_queue.h"
 #include "config.h"
-#include "context/context.h"
-#include "context/driver_diagnostics.h"
-#include "device/cl_device.h"
-#include "device_queue/device_queue.h"
-#include "event/user_event.h"
-#include "gtpin/gtpin_notify.h"
-#include "helpers/get_info_status_mapper.h"
-#include "helpers/mem_properties_parser_helper.h"
-#include "helpers/memory_properties_flags_helpers.h"
-#include "helpers/queue_helpers.h"
-#include "helpers/validators.h"
-#include "kernel/kernel.h"
-#include "kernel/kernel_info_cl.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
-#include "mem_obj/mem_obj_helper.h"
-#include "mem_obj/pipe.h"
-#include "platform/platform.h"
-#include "program/program.h"
-#include "sampler/sampler.h"
-#include "sharings/sharing_factory.h"
-#include "tracing/tracing_api.h"
-#include "tracing/tracing_notify.h"
 
 #include <algorithm>
 #include <cstring>

opencl/source/api/api.h

@@ -5,11 +5,12 @@
  *
  */
 
+#include "opencl/source/api/api_enter.h"
+#include "opencl/source/api/dispatch.h"
+#include "opencl/source/extensions/public/cl_ext_private.h"
+
 #include "CL/cl.h"
 #include "CL/cl_gl.h"
-#include "api/api_enter.h"
-#include "api/dispatch.h"
-#include "extensions/public/cl_ext_private.h"
 
 #ifdef __cplusplus
 extern "C" {

opencl/source/api/api_enter.h

@@ -6,8 +6,7 @@
  */
 
 #include "core/utilities/perf_profiler.h"
-
-#include "utilities/logger.h"
+#include "opencl/source/utilities/logger.h"
 
 #define API_ENTER(retValPointer) \
     LoggerApiEnterWrapper<NEO::FileLogger<globalDebugFunctionalityLevel>::enabled()> ApiWrapperForSingleCall(__FUNCTION__, retValPointer)

opencl/source/api/cl_types.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "api/dispatch.h"
+#include "opencl/source/api/dispatch.h"
 
 #include <cstdint>
 

opencl/source/aub/aub_center.cpp

@@ -5,13 +5,13 @@
  *
  */
 
-#include "aub/aub_center.h"
+#include "opencl/source/aub/aub_center.h"
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 

opencl/source/aub/aub_center.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/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"
+#include "opencl/source/memory_manager/physical_address_allocator.h"
 
-#include "command_stream/aub_stream_provider.h"
-#include "command_stream/aub_subcapture.h"
-#include "memory_manager/address_mapper.h"
-#include "memory_manager/physical_address_allocator.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace NEO {

opencl/source/aub/aub_helper.cpp

@@ -5,12 +5,11 @@
  *
  */
 
-#include "aub/aub_helper.h"
+#include "opencl/source/aub/aub_helper.h"
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/basic_math.h"
-
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper.h

@@ -9,8 +9,7 @@
 #include "core/helpers/hw_info.h"
 #include "core/helpers/non_copyable_or_moveable.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "gen_common/aub_mapper_base.h"
+#include "opencl/source/gen_common/aub_mapper_base.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper_add_mmio.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
 namespace NEO {

opencl/source/aub/aub_helper_base.inl

@@ -5,8 +5,8 @@
  *
  */
 
-#include "aub/aub_helper.h"
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub/aub_helper.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {
 

opencl/source/aub/aub_helper_bdw_plus.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub/aub_helper_base.inl"
+#include "opencl/source/aub/aub_helper_base.inl"
 
 namespace NEO {
 

opencl/source/aub/aub_stream_interface.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub/aub_center.h"
+#include "opencl/source/aub/aub_center.h"
 using namespace aub_stream;
 namespace NEO {
 AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) {

opencl/source/aub_mem_dump/aub_alloc_dump.h

@@ -10,8 +10,7 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 using namespace NEO;
 

opencl/source/aub_mem_dump/aub_alloc_dump.inl

@@ -7,8 +7,8 @@
 
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
+#include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 
-#include "aub_mem_dump/aub_alloc_dump.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
 using namespace NEO;

opencl/source/aub_mem_dump/aub_mem_dump.cpp

@@ -10,8 +10,7 @@
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
-
-#include "aub/aub_helper.h"
+#include "opencl/source/aub/aub_helper.h"
 
 namespace AubMemDump {
 

opencl/source/aub_mem_dump/aub_mem_dump.h

@@ -16,7 +16,7 @@
 #define BIT(x) (((uint64_t)1) << (x))
 #endif
 
-#include "aub_mem_dump/aub_data.h"
+#include "opencl/source/aub_mem_dump/aub_data.h"
 
 namespace NEO {
 class AubHelper;

opencl/source/aub_mem_dump/aub_mem_dump.inl

@@ -8,8 +8,8 @@
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
+#include "opencl/source/aub/aub_helper.h"
 
-#include "aub/aub_helper.h"
 #include "aub_mem_dump.h"
 
 #include <algorithm>

opencl/source/aub_mem_dump/context_flags.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace AubMemDump {
 void LrcaHelper::setContextSaveRestoreFlags(uint32_t &ctxSrCtlValue) const {

opencl/source/built_ins/aux_translation_builtin.h

@@ -7,10 +7,9 @@
 
 #pragma once
 #include "core/helpers/hw_helper.h"
-
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "helpers/dispatch_info_builder.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"
 
 #include <memory>
 

opencl/source/built_ins/built_ins.cpp

@@ -5,22 +5,22 @@
  *
  */
 
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/basic_math.h"
 #include "core/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"
+#include "opencl/source/helpers/built_ins_helper.h"
+#include "opencl/source/helpers/convert_color.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/program/program.h"
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/sip.h"
 #include "compiler_options.h"
-#include "device/cl_device.h"
-#include "helpers/built_ins_helper.h"
-#include "helpers/convert_color.h"
-#include "helpers/dispatch_info_builder.h"
-#include "kernel/kernel.h"
-#include "mem_obj/image.h"
-#include "program/program.h"
 
 #include <cstdint>
 #include <sstream>

opencl/source/built_ins/built_ins.inl

@@ -5,10 +5,10 @@
  *
  */
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/populate_built_ins.inl"
-#include "kernel/kernel.h"
-#include "mem_obj/buffer.h"
+#include "opencl/source/built_ins/aux_translation_builtin.h"
+#include "opencl/source/built_ins/populate_built_ins.inl"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/buffer.h"
 namespace NEO {
 
 BuiltInOp<EBuiltInOps::AuxTranslation>::BuiltInOp(BuiltIns &kernelsLib, Device &device) : BuiltinDispatchInfoBuilder(kernelsLib) {

opencl/source/built_ins/built_ins_storage.cpp

@@ -7,9 +7,9 @@
 
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/device/device.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
 #include "os_inc.h"
 
 #include <cstdint>

opencl/source/built_ins/builtinops/built_in_ops.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "built_ins/built_in_ops_base.h"
+#include "opencl/source/built_ins/built_in_ops_base.h"
 
 namespace NEO {
 namespace EBuiltInOps {

opencl/source/built_ins/builtins_dispatch_builder.cpp

@@ -5,25 +5,25 @@
  *
  */
 
-#include "built_ins/builtins_dispatch_builder.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
 #include "core/compiler_interface/compiler_interface.h"
 #include "core/helpers/basic_math.h"
 #include "core/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"
+#include "opencl/source/built_ins/sip.h"
+#include "opencl/source/built_ins/vme_dispatch_builder.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/helpers/built_ins_helper.h"
+#include "opencl/source/helpers/convert_color.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/program/program.h"
 
-#include "built_ins/aux_translation_builtin.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/built_ins.inl"
-#include "built_ins/sip.h"
-#include "built_ins/vme_dispatch_builder.h"
 #include "compiler_options.h"
-#include "device/cl_device.h"
-#include "helpers/built_ins_helper.h"
-#include "helpers/convert_color.h"
-#include "helpers/dispatch_info_builder.h"
-#include "kernel/kernel.h"
-#include "mem_obj/image.h"
-#include "program/program.h"
 
 #include <cstdint>
 #include <sstream>

opencl/source/built_ins/builtins_dispatch_builder.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/helpers/vec.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/kernel/kernel.h"
 
 #include "CL/cl.h"
 #include "built_in_ops.h"
-#include "built_ins/built_ins.h"
-#include "kernel/kernel.h"
 
 #include <array>
 #include <cstdint>

opencl/source/built_ins/kernels/CMakeLists.txt

@@ -98,7 +98,7 @@ macro(macro_for_each_gen)
       set(target_name builtins_${family_name_with_type})
       add_custom_target(${target_name} DEPENDS ${BUILTINS_COMMANDS})
       add_dependencies(builtins ${target_name})
-      set_target_properties(${target_name} PROPERTIES FOLDER "built_ins/${family_name_with_type}")
+      set_target_properties(${target_name} PROPERTIES FOLDER "opencl/source/built_ins/${family_name_with_type}")
     endif()
   endforeach()
 endmacro()

opencl/source/built_ins/registry/built_ins_registry.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "built_ins/built_ins.h"
+#include "opencl/source/built_ins/built_ins.h"
 
 #include <string>
 #include <unordered_map>

opencl/source/built_ins/registry/register_copy_kernels_source.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "built_ins/registry/built_ins_registry.h"
+#include "opencl/source/built_ins/registry/built_ins_registry.h"
 
 #include <string>
 
@@ -17,7 +17,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
@@ -26,7 +26,7 @@ static RegisterEmbeddedResource registerCopyBufferToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectSrc(
@@ -35,7 +35,7 @@ static RegisterEmbeddedResource registerCopyBufferRectSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_rect.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_rect.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
@@ -44,7 +44,7 @@ static RegisterEmbeddedResource registerCopyBufferRectStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_rect_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_rect_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferSrc(
@@ -53,7 +53,7 @@ static RegisterEmbeddedResource registerFillBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillBufferStatelessSrc(
@@ -62,7 +62,7 @@ static RegisterEmbeddedResource registerFillBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
@@ -71,7 +71,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
@@ -80,7 +80,7 @@ static RegisterEmbeddedResource registerCopyBufferToImage3dStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_buffer_to_image3d_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_buffer_to_image3d_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
@@ -89,7 +89,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image3d_to_buffer.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image3d_to_buffer.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
@@ -98,7 +98,7 @@ static RegisterEmbeddedResource registerCopyImage3dToBufferStatelessSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image3d_to_buffer_stateless.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image3d_to_buffer_stateless.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
@@ -107,7 +107,7 @@ static RegisterEmbeddedResource registerCopyImageToImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image1d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
@@ -116,7 +116,7 @@ static RegisterEmbeddedResource registerCopyImageToImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image2d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
@@ -125,7 +125,7 @@ static RegisterEmbeddedResource registerCopyImageToImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/copy_image_to_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/copy_image_to_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage1dSrc(
@@ -134,7 +134,7 @@ static RegisterEmbeddedResource registerFillImage1dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image1d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image1d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage2dSrc(
@@ -143,7 +143,7 @@ static RegisterEmbeddedResource registerFillImage2dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image2d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image2d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerFillImage3dSrc(
@@ -152,7 +152,7 @@ static RegisterEmbeddedResource registerFillImage3dSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/fill_image3d.builtin_kernel"
+#include "opencl/source/built_ins/kernels/fill_image3d.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerAuxTranslationSrc(
@@ -161,7 +161,7 @@ static RegisterEmbeddedResource registerAuxTranslationSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/aux_translation.builtin_kernel"
+#include "opencl/source/built_ins/kernels/aux_translation.builtin_kernel"
         ));
 
 } // namespace NEO

opencl/source/built_ins/registry/register_ext_vme_source.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "built_ins/built_in_ops_vme.h"
-#include "built_ins/registry/built_ins_registry.h"
+#include "opencl/source/built_ins/built_in_ops_vme.h"
+#include "opencl/source/built_ins/registry/built_ins_registry.h"
 
 #include <string>
 
@@ -18,7 +18,7 @@ static RegisterEmbeddedResource registerVmeSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_motion_estimate_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_motion_estimate_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedSrc(
@@ -27,7 +27,7 @@ static RegisterEmbeddedResource registerVmeAdvancedSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_advanced_motion_estimate_check_intel.builtin_kernel"
         ));
 
 static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
@@ -36,7 +36,7 @@ static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc(
         BuiltinCode::getExtension(BuiltinCode::ECodeType::Source))
         .c_str(),
     std::string(
-#include "built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel"
+#include "opencl/source/built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.builtin_kernel"
         ));
 
 } // namespace NEO

opencl/source/built_ins/sip.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "built_ins/sip.h"
+#include "opencl/source/built_ins/sip.h"
 
 #include "core/device/device.h"
 #include "core/execution_environment/execution_environment.h"
@@ -14,10 +14,9 @@
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "built_ins/built_ins.h"
-#include "program/kernel_info.h"
-#include "program/program.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/program/kernel_info.h"
+#include "opencl/source/program/program.h"
 
 namespace NEO {
 

opencl/source/built_ins/unknown_built_in_name.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 
 namespace NEO {
 

opencl/source/built_ins/vme_builtin.cpp

@@ -5,16 +5,15 @@
  *
  */
 
-#include "built_ins/vme_builtin.h"
+#include "opencl/source/built_ins/vme_builtin.h"
 
 #include "core/device/device.h"
-
-#include "built_ins/built_in_ops_vme.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "built_ins/populate_built_ins.inl"
-#include "built_ins/vme_dispatch_builder.h"
-#include "program/program.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"
+#include "opencl/source/built_ins/populate_built_ins.inl"
+#include "opencl/source/built_ins/vme_dispatch_builder.h"
+#include "opencl/source/program/program.h"
 
 namespace NEO {
 

opencl/source/built_ins/vme_builtin.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "built_ins/built_in_ops_vme.h"
+#include "opencl/source/built_ins/built_in_ops_vme.h"
 
 namespace NEO {
 class Program;

opencl/source/built_ins/vme_dispatch_builder.h

@@ -7,14 +7,14 @@
 
 #pragma once
 
-#include "accelerators/intel_accelerator.h"
-#include "accelerators/intel_motion_estimation.h"
-#include "built_ins/built_in_ops_vme.h"
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "helpers/dispatch_info_builder.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
+#include "opencl/source/accelerators/intel_accelerator.h"
+#include "opencl/source/accelerators/intel_motion_estimation.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"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
 
 namespace NEO {
 class VmeBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder {

opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp

@@ -7,12 +7,12 @@
 
 #include "core/gen11/hw_cmds.h"
 #include "core/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"
+#include "opencl/source/execution_model/device_enqueue.h"
 
 #include "CL/cl.h"
-#include "builtin_kernels_simulation/opencl_c.h"
-#include "builtin_kernels_simulation/scheduler_simulation.h"
-#include "builtin_kernels_simulation/scheduler_simulation.inl"
-#include "execution_model/device_enqueue.h"
 
 using namespace NEO;
 using namespace BuiltinKernelsSimulation;
@@ -27,9 +27,9 @@ float __intel__getProfilingTimerResolution() {
     return static_cast<float>(DEFAULT_GEN11_PLATFORM::hwInfo.capabilityTable.defaultProfilingTimerResolution);
 }
 
-#include "gen11/device_enqueue.h"
-#include "gen11/scheduler_builtin_kernel.inl"
-#include "scheduler/scheduler.cl"
+#include "opencl/source/gen11/device_enqueue.h"
+#include "opencl/source/gen11/scheduler_builtin_kernel.inl"
+#include "opencl/source/scheduler/scheduler.cl"
 } // namespace Gen11SchedulerSimulation
 
 namespace BuiltinKernelsSimulation {

opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp

@@ -7,12 +7,12 @@
 
 #include "core/gen12lp/hw_cmds.h"
 #include "core/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"
+#include "opencl/source/execution_model/device_enqueue.h"
 
 #include "CL/cl.h"
-#include "builtin_kernels_simulation/opencl_c.h"
-#include "builtin_kernels_simulation/scheduler_simulation.h"
-#include "builtin_kernels_simulation/scheduler_simulation.inl"
-#include "execution_model/device_enqueue.h"
 
 #include <type_traits>
 
@@ -29,9 +29,9 @@ float __intel__getProfilingTimerResolution() {
     return static_cast<float>(DEFAULT_GEN12LP_PLATFORM::hwInfo.capabilityTable.defaultProfilingTimerResolution);
 }
 
-#include "gen12lp/device_enqueue.h"
-#include "gen12lp/scheduler_builtin_kernel.inl"
-#include "scheduler/scheduler.cl"
+#include "opencl/source/gen12lp/device_enqueue.h"
+#include "opencl/source/gen12lp/scheduler_builtin_kernel.inl"
+#include "opencl/source/scheduler/scheduler.cl"
 } // namespace Gen12LPSchedulerSimulation
 
 namespace BuiltinKernelsSimulation {

opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp

@@ -7,12 +7,12 @@
 
 #include "core/gen8/hw_cmds.h"
 #include "core/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"
+#include "opencl/source/execution_model/device_enqueue.h"
 
 #include "CL/cl.h"
-#include "builtin_kernels_simulation/opencl_c.h"
-#include "builtin_kernels_simulation/scheduler_simulation.h"
-#include "builtin_kernels_simulation/scheduler_simulation.inl"
-#include "execution_model/device_enqueue.h"
 
 using namespace NEO;
 using namespace BuiltinKernelsSimulation;
@@ -27,9 +27,9 @@ float __intel__getProfilingTimerResolution() {
     return static_cast<float>(DEFAULT_GEN8_PLATFORM::hwInfo.capabilityTable.defaultProfilingTimerResolution);
 }
 
-#include "gen8/device_enqueue.h"
-#include "gen8/scheduler_builtin_kernel.inl"
-#include "scheduler/scheduler.cl"
+#include "opencl/source/gen8/device_enqueue.h"
+#include "opencl/source/gen8/scheduler_builtin_kernel.inl"
+#include "opencl/source/scheduler/scheduler.cl"
 } // namespace Gen8SchedulerSimulation
 
 namespace BuiltinKernelsSimulation {

opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp

@@ -7,12 +7,12 @@
 
 #include "core/gen9/hw_cmds.h"
 #include "core/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"
+#include "opencl/source/execution_model/device_enqueue.h"
 
 #include "CL/cl.h"
-#include "builtin_kernels_simulation/opencl_c.h"
-#include "builtin_kernels_simulation/scheduler_simulation.h"
-#include "builtin_kernels_simulation/scheduler_simulation.inl"
-#include "execution_model/device_enqueue.h"
 
 using namespace NEO;
 using namespace BuiltinKernelsSimulation;
@@ -29,9 +29,9 @@ float __intel__getProfilingTimerResolution() {
     return static_cast<float>(DEFAULT_GEN9_PLATFORM::hwInfo.capabilityTable.defaultProfilingTimerResolution);
 }
 
-#include "gen9/device_enqueue.h"
-#include "gen9/scheduler_builtin_kernel.inl"
-#include "scheduler/scheduler.cl"
+#include "opencl/source/gen9/device_enqueue.h"
+#include "opencl/source/gen9/scheduler_builtin_kernel.inl"
+#include "opencl/source/scheduler/scheduler.cl"
 } // namespace Gen9SchedulerSimulation
 
 namespace BuiltinKernelsSimulation {

opencl/source/builtin_kernels_simulation/scheduler_simulation.cpp

@@ -5,9 +5,9 @@
  *
  */
 
-#include "builtin_kernels_simulation/scheduler_simulation.h"
+#include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 
-#include "builtin_kernels_simulation/opencl_c.h"
+#include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 
 #include <thread>
 

opencl/source/builtin_kernels_simulation/scheduler_simulation.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "builtin_kernels_simulation/opencl_c.h"
+#include "opencl/source/builtin_kernels_simulation/opencl_c.h"
 
 #include <cstdint>
 #include <thread>

opencl/source/builtin_kernels_simulation/scheduler_simulation.inl

@@ -6,8 +6,7 @@
  */
 
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "builtin_kernels_simulation/scheduler_simulation.h"
+#include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
 
 #include <cstdint>
 #include <mutex>

opencl/source/command_queue/command_queue.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_queue/command_queue.h"
+#include "opencl/source/command_queue/command_queue.h"
 
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/aligned_memory.h"
@@ -19,21 +19,21 @@
 #include "core/os_interface/os_context.h"
 #include "core/utilities/api_intercept.h"
 #include "core/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"
+#include "opencl/source/device_queue/device_queue.h"
+#include "opencl/source/event/event_builder.h"
+#include "opencl/source/event/user_event.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
+#include "opencl/source/helpers/convert_color.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
 
 #include "CL/cl_ext.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "context/context.h"
-#include "device/cl_device.h"
-#include "device_queue/device_queue.h"
-#include "event/event_builder.h"
-#include "event/user_event.h"
-#include "gtpin/gtpin_notify.h"
-#include "helpers/convert_color.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "helpers/queue_helpers.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
 
 #include <map>
 

opencl/source/command_queue/command_queue.h

@@ -7,11 +7,10 @@
 
 #pragma once
 #include "core/helpers/engine_control.h"
-
-#include "event/event.h"
-#include "helpers/base_object.h"
-#include "helpers/dispatch_info.h"
-#include "helpers/task_information.h"
+#include "opencl/source/event/event.h"
+#include "opencl/source/helpers/base_object.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/helpers/task_information.h"
 
 #include <atomic>
 #include <cstdint>

opencl/source/command_queue/command_queue_hw.h

@@ -11,15 +11,14 @@
 #include "core/helpers/engine_control.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "command_queue/command_queue.h"
-#include "command_queue/gpgpu_walker.h"
-#include "device/cl_device.h"
-#include "device_queue/device_queue_hw.h"
-#include "helpers/dispatch_info.h"
-#include "helpers/queue_helpers.h"
-#include "mem_obj/mem_obj.h"
-#include "program/printf_handler.h"
+#include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/command_queue/gpgpu_walker.h"
+#include "opencl/source/device/cl_device.h"
+#include "opencl/source/device_queue/device_queue_hw.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/mem_obj/mem_obj.h"
+#include "opencl/source/program/printf_handler.h"
 
 #include <memory>
 

opencl/source/command_queue/command_queue_hw_base.inl

@@ -6,29 +6,28 @@
  */
 
 #include "core/helpers/blit_commands_helper.h"
-
-#include "built_ins/aux_translation_builtin.h"
-#include "command_queue/enqueue_barrier.h"
-#include "command_queue/enqueue_copy_buffer.h"
-#include "command_queue/enqueue_copy_buffer_rect.h"
-#include "command_queue/enqueue_copy_buffer_to_image.h"
-#include "command_queue/enqueue_copy_image.h"
-#include "command_queue/enqueue_copy_image_to_buffer.h"
-#include "command_queue/enqueue_fill_buffer.h"
-#include "command_queue/enqueue_fill_image.h"
-#include "command_queue/enqueue_kernel.h"
-#include "command_queue/enqueue_marker.h"
-#include "command_queue/enqueue_migrate_mem_objects.h"
-#include "command_queue/enqueue_read_buffer.h"
-#include "command_queue/enqueue_read_buffer_rect.h"
-#include "command_queue/enqueue_read_image.h"
-#include "command_queue/enqueue_svm.h"
-#include "command_queue/enqueue_write_buffer.h"
-#include "command_queue/enqueue_write_buffer_rect.h"
-#include "command_queue/enqueue_write_image.h"
-#include "command_queue/finish.h"
-#include "command_queue/flush.h"
-#include "command_queue/gpgpu_walker.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"
+#include "opencl/source/command_queue/enqueue_copy_buffer_rect.h"
+#include "opencl/source/command_queue/enqueue_copy_buffer_to_image.h"
+#include "opencl/source/command_queue/enqueue_copy_image.h"
+#include "opencl/source/command_queue/enqueue_copy_image_to_buffer.h"
+#include "opencl/source/command_queue/enqueue_fill_buffer.h"
+#include "opencl/source/command_queue/enqueue_fill_image.h"
+#include "opencl/source/command_queue/enqueue_kernel.h"
+#include "opencl/source/command_queue/enqueue_marker.h"
+#include "opencl/source/command_queue/enqueue_migrate_mem_objects.h"
+#include "opencl/source/command_queue/enqueue_read_buffer.h"
+#include "opencl/source/command_queue/enqueue_read_buffer_rect.h"
+#include "opencl/source/command_queue/enqueue_read_image.h"
+#include "opencl/source/command_queue/enqueue_svm.h"
+#include "opencl/source/command_queue/enqueue_write_buffer.h"
+#include "opencl/source/command_queue/enqueue_write_buffer_rect.h"
+#include "opencl/source/command_queue/enqueue_write_image.h"
+#include "opencl/source/command_queue/finish.h"
+#include "opencl/source/command_queue/flush.h"
+#include "opencl/source/command_queue/gpgpu_walker.h"
 
 namespace NEO {
 template <typename Family>

opencl/source/command_queue/command_queue_hw_bdw_plus.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_queue/command_queue_hw_base.inl"
+#include "opencl/source/command_queue/command_queue_hw_base.inl"
 
 namespace NEO {
 

opencl/source/command_queue/cpu_data_transfer_handler.cpp

@@ -8,14 +8,13 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/device/device.h"
 #include "core/helpers/get_info.h"
-
-#include "command_queue/command_queue.h"
-#include "context/context.h"
-#include "event/event.h"
-#include "event/event_builder.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
+#include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/event/event.h"
+#include "opencl/source/event/event_builder.h"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
 
 namespace NEO {
 void *CommandQueue::cpuDataTransferHandler(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &retVal) {

opencl/source/command_queue/definitions/enqueue_init_dispatch_globals.h

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

opencl/source/command_queue/enqueue_barrier.h

@@ -9,9 +9,8 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/device/device.h"
 #include "core/memory_manager/surface.h"
-
-#include "command_queue/command_queue_hw.h"
-#include "event/event.h"
+#include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/event/event.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_common.h

@@ -16,25 +16,24 @@
 #include "core/program/sync_buffer_handler.h"
 #include "core/utilities/range.h"
 #include "core/utilities/tag_allocator.h"
-
-#include "built_ins/built_ins.h"
-#include "built_ins/builtins_dispatch_builder.h"
-#include "builtin_kernels_simulation/scheduler_simulation.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/gpgpu_walker.h"
-#include "command_queue/hardware_interface.h"
-#include "event/event_builder.h"
-#include "event/user_event.h"
-#include "gtpin/gtpin_notify.h"
-#include "helpers/cl_blit_properties.h"
-#include "helpers/dispatch_info_builder.h"
-#include "helpers/enqueue_properties.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/task_information.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
-#include "program/block_kernel_manager.h"
-#include "program/printf_handler.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"
+#include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/command_queue/gpgpu_walker.h"
+#include "opencl/source/command_queue/hardware_interface.h"
+#include "opencl/source/event/event_builder.h"
+#include "opencl/source/event/user_event.h"
+#include "opencl/source/gtpin/gtpin_notify.h"
+#include "opencl/source/helpers/cl_blit_properties.h"
+#include "opencl/source/helpers/dispatch_info_builder.h"
+#include "opencl/source/helpers/enqueue_properties.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/task_information.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/program/block_kernel_manager.h"
+#include "opencl/source/program/printf_handler.h"
 
 #include <algorithm>
 #include <new>

opencl/source/command_queue/enqueue_copy_buffer.h

@@ -7,13 +7,12 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/enqueue_common.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_copy_buffer_rect.h

@@ -7,12 +7,11 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_copy_buffer_to_image.h

@@ -7,14 +7,13 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_copy_image.h

@@ -8,13 +8,12 @@
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/basic_math.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/image.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <algorithm>
 #include <new>

opencl/source/command_queue/enqueue_copy_image_to_buffer.h

@@ -7,14 +7,13 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/buffer.h"
-#include "mem_obj/image.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_fill_buffer.h

@@ -9,12 +9,11 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_manager.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_fill_image.h

@@ -8,12 +8,11 @@
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/basic_math.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/image.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <algorithm>
 #include <new>

opencl/source/command_queue/enqueue_kernel.h

@@ -7,14 +7,13 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/builtins_dispatch_builder.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/gpgpu_walker.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/task_information.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/task_information.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_marker.h

@@ -8,11 +8,10 @@
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/device/device.h"
-
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/gpgpu_walker.h"
-#include "event/event.h"
-#include "memory_manager/mem_obj_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"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_migrate_mem_objects.h

@@ -9,10 +9,9 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/device/device.h"
 #include "core/memory_manager/surface.h"
-
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/gpgpu_walker.h"
-#include "event/event.h"
+#include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/command_queue/gpgpu_walker.h"
+#include "opencl/source/event/event.h"
 
 namespace NEO {
 

opencl/source/command_queue/enqueue_read_buffer.h

@@ -9,13 +9,12 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/cache_policy.h"
 #include "core/memory_manager/unified_memory_manager.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/enqueue_common.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_read_buffer_rect.h

@@ -7,13 +7,12 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/enqueue_common.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_read_image.h

@@ -10,15 +10,14 @@
 #include "core/helpers/basic_math.h"
 #include "core/helpers/cache_policy.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "context/context.h"
-#include "event/event.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/image.h"
-#include "memory_manager/mem_obj_surface.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/event/event.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/image.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <algorithm>
 #include <new>

opencl/source/command_queue/enqueue_resource_barrier.h

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

opencl/source/command_queue/enqueue_svm.h

@@ -8,11 +8,10 @@
 #pragma once
 #include "core/memory_manager/surface.h"
 #include "core/memory_manager/unified_memory_manager.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "command_queue/enqueue_common.h"
-#include "event/event.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"
+#include "opencl/source/event/event.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_write_buffer.h

@@ -9,12 +9,11 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/unified_memory_manager.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_write_buffer_rect.h

@@ -7,12 +7,11 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "mem_obj/buffer.h"
-#include "memory_manager/mem_obj_surface.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"
+#include "opencl/source/mem_obj/buffer.h"
+#include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
 

opencl/source/command_queue/enqueue_write_image.h

@@ -9,12 +9,11 @@
 #include "core/command_stream/command_stream_receiver.h"
 #include "core/helpers/basic_math.h"
 #include "core/memory_manager/graphics_allocation.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue_hw.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/mipmap.h"
-#include "mem_obj/image.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"
+#include "opencl/source/helpers/mipmap.h"
+#include "opencl/source/mem_obj/image.h"
 
 #include <algorithm>
 #include <new>

opencl/source/command_queue/finish.h

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

opencl/source/command_queue/gpgpu_walker.h

@@ -14,18 +14,17 @@
 #include "core/helpers/vec.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/utilities/tag_allocator.h"
-
-#include "built_ins/built_ins.h"
-#include "command_queue/command_queue.h"
-#include "context/context.h"
-#include "device_queue/device_queue_hw.h"
-#include "event/hw_timestamps.h"
-#include "event/perf_counter.h"
-#include "helpers/dispatch_info.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/task_information.h"
-#include "kernel/kernel.h"
-#include "program/kernel_info.h"
+#include "opencl/source/built_ins/built_ins.h"
+#include "opencl/source/command_queue/command_queue.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/device_queue/device_queue_hw.h"
+#include "opencl/source/event/hw_timestamps.h"
+#include "opencl/source/event/perf_counter.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/task_information.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/program/kernel_info.h"
 
 namespace NEO {
 

opencl/source/command_queue/gpgpu_walker_base.inl

@@ -15,17 +15,16 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/os_interface/os_context.h"
 #include "core/utilities/tag_allocator.h"
-
-#include "command_queue/command_queue.h"
-#include "command_queue/gpgpu_walker.h"
-#include "command_queue/local_id_gen.h"
-#include "device/device_info.h"
-#include "event/perf_counter.h"
-#include "event/user_event.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/queue_helpers.h"
-#include "helpers/validators.h"
-#include "mem_obj/mem_obj.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"
+#include "opencl/source/device/device_info.h"
+#include "opencl/source/event/perf_counter.h"
+#include "opencl/source/event/user_event.h"
+#include "opencl/source/helpers/hardware_commands_helper.h"
+#include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/helpers/validators.h"
+#include "opencl/source/mem_obj/mem_obj.h"
 
 #include <algorithm>
 #include <cmath>

opencl/source/command_queue/gpgpu_walker_bdw_plus.inl

@@ -8,9 +8,8 @@
 #pragma once
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/simd_helper.h"
-
-#include "command_queue/gpgpu_walker_base.inl"
-#include "device/cl_device.h"
+#include "opencl/source/command_queue/gpgpu_walker_base.inl"
+#include "opencl/source/device/cl_device.h"
 
 namespace NEO {
 

opencl/source/command_queue/hardware_interface_base.inl

@@ -7,11 +7,10 @@
 
 #pragma once
 #include "core/memory_manager/internal_allocation_storage.h"
-
-#include "command_queue/gpgpu_walker.h"
-#include "command_queue/hardware_interface.h"
-#include "helpers/hardware_commands_helper.h"
-#include "helpers/task_information.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"
+#include "opencl/source/helpers/task_information.h"
 
 namespace NEO {
 

opencl/source/command_queue/hardware_interface_bdw_plus.inl

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

opencl/source/command_queue/local_id_gen.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_queue/local_id_gen.h"
+#include "opencl/source/command_queue/local_id_gen.h"
 
 #include "core/helpers/aligned_memory.h"
 #include "core/utilities/cpu_info.h"

opencl/source/command_queue/local_id_gen.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_queue/local_id_gen.h"
+#include "opencl/source/command_queue/local_id_gen.h"
 
 #include <array>
 

opencl/source/command_queue/local_id_gen_avx2.cpp

@@ -6,8 +6,8 @@
  */
 
 #if __AVX2__
-#include "command_queue/local_id_gen.inl"
-#include "helpers/uint16_avx2.h"
+#include "opencl/source/command_queue/local_id_gen.inl"
+#include "opencl/source/helpers/uint16_avx2.h"
 
 #include <array>
 

opencl/source/command_queue/local_id_gen_sse4.cpp

@@ -5,8 +5,8 @@
  *
  */
 
-#include "command_queue/local_id_gen.inl"
-#include "helpers/uint16_sse4.h"
+#include "opencl/source/command_queue/local_id_gen.inl"
+#include "opencl/source/helpers/uint16_sse4.h"
 
 #include <array>
 

opencl/source/command_queue/local_work_size.cpp

@@ -9,10 +9,9 @@
 #include "core/helpers/array_count.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/debug_helpers.h"
-
-#include "context/context.h"
-#include "helpers/dispatch_info.h"
-#include "kernel/kernel.h"
+#include "opencl/source/context/context.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/kernel/kernel.h"
 
 #include <algorithm>
 #include <cmath>

opencl/source/command_stream/aub_command_stream_receiver.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/aub_command_stream_receiver.h"
+#include "opencl/source/command_stream/aub_command_stream_receiver.h"
 
 #include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
@@ -13,9 +13,8 @@
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
-
-#include "memory_manager/os_agnostic_memory_manager.h"
-#include "os_interface/os_inc_base.h"
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
+#include "opencl/source/os_interface/os_inc_base.h"
 
 #include <algorithm>
 #include <cstring>

opencl/source/command_stream/aub_command_stream_receiver.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 #include <string>
 

opencl/source/command_stream/aub_command_stream_receiver_hw.h

@@ -8,14 +8,14 @@
 #pragma once
 #include "core/helpers/array_count.h"
 #include "core/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"
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
+#include "opencl/source/memory_manager/page_table.h"
+#include "opencl/source/memory_manager/physical_address_allocator.h"
 
-#include "aub/aub_center.h"
-#include "command_stream/aub_command_stream_receiver.h"
 #include "command_stream_receiver_simulated_hw.h"
-#include "gen_common/aub_mapper.h"
-#include "memory_manager/os_agnostic_memory_manager.h"
-#include "memory_manager/page_table.h"
-#include "memory_manager/physical_address_allocator.h"
 
 namespace NEO {
 

opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -18,19 +18,19 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/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"
+#include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
+#include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
+#include "opencl/source/command_stream/aub_stream_provider.h"
+#include "opencl/source/command_stream/aub_subcapture.h"
+#include "opencl/source/helpers/hardware_context_controller.h"
+#include "opencl/source/helpers/neo_driver_version.h"
+#include "opencl/source/memory_manager/memory_banks.h"
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 
-#include "aub/aub_helper.h"
-#include "aub_mem_dump/aub_alloc_dump.h"
-#include "aub_mem_dump/aub_alloc_dump.inl"
-#include "aub_mem_dump/page_table_entry_bits.h"
-#include "command_stream/aub_command_stream_receiver_hw.h"
-#include "command_stream/aub_stream_provider.h"
-#include "command_stream/aub_subcapture.h"
 #include "driver_version.h"
-#include "helpers/hardware_context_controller.h"
-#include "helpers/neo_driver_version.h"
-#include "memory_manager/memory_banks.h"
-#include "memory_manager/os_agnostic_memory_manager.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 

opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/aub_command_stream_receiver_hw_base.inl"
+#include "opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl"
 
 namespace NEO {
 

opencl/source/command_stream/aub_stream_provider.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 #include <string>
 

opencl/source/command_stream/aub_subcapture.cpp

@@ -5,13 +5,12 @@
  *
  */
 
-#include "command_stream/aub_subcapture.h"
+#include "opencl/source/command_stream/aub_subcapture.h"
 
 #include "core/utilities/debug_settings_reader.h"
-
-#include "helpers/dispatch_info.h"
-#include "kernel/kernel.h"
-#include "os_interface/ocl_reg_path.h"
+#include "opencl/source/helpers/dispatch_info.h"
+#include "opencl/source/kernel/kernel.h"
+#include "opencl/source/os_interface/ocl_reg_path.h"
 
 namespace NEO {
 

opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "core/command_stream/command_stream_receiver_hw.h"
+#include "opencl/source/gen_common/aub_mapper.h"
+#include "opencl/source/memory_manager/memory_banks.h"
 
-#include "gen_common/aub_mapper.h"
-#include "memory_manager/memory_banks.h"
 #include "third_party/aub_stream/headers/hardware_context.h"
 
 namespace aub_stream {

opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl

@@ -11,12 +11,12 @@
 #include "core/gmm_helper/resource_info.h"
 #include "core/memory_manager/memory_manager.h"
 #include "core/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"
+#include "opencl/source/helpers/hardware_context_controller.h"
+#include "opencl/source/memory_manager/address_mapper.h"
 
-#include "aub/aub_helper.h"
-#include "aub_mem_dump/page_table_entry_bits.h"
-#include "command_stream/command_stream_receiver_simulated_common_hw.h"
-#include "helpers/hardware_context_controller.h"
-#include "memory_manager/address_mapper.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace NEO {

opencl/source/command_stream/command_stream_receiver_simulated_common_hw_bdw_plus.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/command_stream_receiver_simulated_common_hw_base.inl"
+#include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl"
 
 namespace NEO {
 

opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl

@@ -7,10 +7,9 @@
 
 #include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
-
-#include "aub/aub_center.h"
-#include "command_stream/aub_command_stream_receiver.h"
-#include "command_stream/command_stream_receiver_with_aub_dump.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"
 
 namespace NEO {
 

opencl/source/command_stream/create_command_stream_impl.cpp

@@ -8,10 +8,9 @@
 #include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/os_interface/device_factory.h"
-
-#include "command_stream/aub_command_stream_receiver.h"
-#include "command_stream/command_stream_receiver_with_aub_dump.h"
-#include "command_stream/tbx_command_stream_receiver.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"
 
 namespace NEO {
 

opencl/source/command_stream/definitions/command_stream_receiver_simulated_hw.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "command_stream/command_stream_receiver_simulated_common_hw.h"
-#include "memory_manager/memory_banks.h"
-#include "memory_manager/physical_address_allocator.h"
+#include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h"
+#include "opencl/source/memory_manager/memory_banks.h"
+#include "opencl/source/memory_manager/physical_address_allocator.h"
 
 namespace NEO {
 class GraphicsAllocation;

opencl/source/command_stream/tbx_command_stream_receiver.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "command_stream/tbx_command_stream_receiver.h"
+#include "opencl/source/command_stream/tbx_command_stream_receiver.h"
 
 #include "core/execution_environment/execution_environment.h"
 #include "core/execution_environment/root_device_environment.h"

opencl/source/command_stream/tbx_command_stream_receiver.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "aub_mem_dump/aub_mem_dump.h"
+#include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 
 namespace NEO {
 class CommandStreamReceiver;