diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9eb3e9ce99..4852da3b49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -311,7 +311,7 @@ else()
   if(NOT DEFINED AUB_STREAM_DIR)
     get_filename_component(TEMP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream/aub_mem_dump" ABSOLUTE)
     if(IS_DIRECTORY ${TEMP_DIR})
-      set(AUB_STREAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream")
+      get_filename_component(AUB_STREAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream" ABSOLUTE)
       message(STATUS "Aub Stream dir: ${AUB_STREAM_DIR}")
     endif()
   endif()
diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp
index 75db5be265..86e7779ccb 100644
--- a/level_zero/core/test/unit_tests/main.cpp
+++ b/level_zero/core/test/unit_tests/main.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/utilities/debug_settings_reader.h"
+#include "shared/source/utilities/logger.h"
 #include "shared/test/common/helpers/custom_event_listener.h"
 #include "shared/test/common/helpers/default_hw_info.inl"
 #include "shared/test/common/helpers/memory_leak_listener.h"
@@ -21,7 +22,6 @@
 #include "shared/test/unit_test/base_ult_config_listener.h"
 
 #include "opencl/source/program/kernel_info.h"
-#include "opencl/source/utilities/logger.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
 #include "level_zero/core/source/compiler_interface/l0_reg_path.h"
diff --git a/opencl/source/api/api_enter.h b/opencl/source/api/api_enter.h
index 10bd3fe0fe..aba6ed43b6 100644
--- a/opencl/source/api/api_enter.h
+++ b/opencl/source/api/api_enter.h
@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/utilities/logger.h"
 #include "shared/source/utilities/perf_profiler.h"
 
-#include "opencl/source/utilities/logger.h"
-
 #define API_ENTER(retValPointer) \
     LoggerApiEnterWrapper<NEO::FileLogger<globalDebugFunctionalityLevel>::enabled()> ApiWrapperForSingleCall(__FUNCTION__, retValPointer)
 
diff --git a/opencl/source/command_queue/gpgpu_walker.h b/opencl/source/command_queue/gpgpu_walker.h
index 8cdd4533a7..a317421e72 100644
--- a/opencl/source/command_queue/gpgpu_walker.h
+++ b/opencl/source/command_queue/gpgpu_walker.h
@@ -14,13 +14,13 @@
 #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/hw_timestamps.h"
+#include "shared/source/utilities/perf_counter.h"
 #include "shared/source/utilities/tag_allocator.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"
diff --git a/opencl/source/command_queue/gpgpu_walker_base.inl b/opencl/source/command_queue/gpgpu_walker_base.inl
index cfa7d5136d..4b0bb9645d 100644
--- a/opencl/source/command_queue/gpgpu_walker_base.inl
+++ b/opencl/source/command_queue/gpgpu_walker_base.inl
@@ -16,12 +16,12 @@
 #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/perf_counter.h"
 #include "shared/source/utilities/tag_allocator.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.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"
diff --git a/opencl/source/event/CMakeLists.txt b/opencl/source/event/CMakeLists.txt
index 445554c5e3..71527d6504 100644
--- a/opencl/source/event/CMakeLists.txt
+++ b/opencl/source/event/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -16,8 +16,6 @@ set(RUNTIME_SRCS_EVENT
     ${CMAKE_CURRENT_SOURCE_DIR}/event_tracker.h
     ${CMAKE_CURRENT_SOURCE_DIR}/user_event.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/user_event.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_timestamps.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/perf_counter.h
 )
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EVENT})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_EVENT ${RUNTIME_SRCS_EVENT})
diff --git a/opencl/source/event/event.h b/opencl/source/event/event.h
index 79761ef789..2a806aae74 100644
--- a/opencl/source/event/event.h
+++ b/opencl/source/event/event.h
@@ -10,12 +10,12 @@
 #include "shared/source/os_interface/os_time.h"
 #include "shared/source/os_interface/performance_counters.h"
 #include "shared/source/utilities/arrayref.h"
+#include "shared/source/utilities/hw_timestamps.h"
 #include "shared/source/utilities/idlist.h"
 #include "shared/source/utilities/iflist.h"
 
 #include "opencl/source/api/cl_types.h"
 #include "opencl/source/command_queue/copy_engine_state.h"
-#include "opencl/source/event/hw_timestamps.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/task_information.h"
 
diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
index d8f2e6ea98..0c3577eb0a 100644
--- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
+++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
@@ -9,10 +9,10 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/utilities/perf_counter.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/device_queue/device_queue_hw.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
index ce7cfaa671..4d31962e2b 100644
--- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
+++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
@@ -9,10 +9,10 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h"
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/utilities/perf_counter.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/device_queue/device_queue_hw.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
diff --git a/opencl/source/kernel/CMakeLists.txt b/opencl/source/kernel/CMakeLists.txt
index 66c751602a..4087ab3a65 100644
--- a/opencl/source/kernel/CMakeLists.txt
+++ b/opencl/source/kernel/CMakeLists.txt
@@ -12,7 +12,6 @@ set(RUNTIME_SRCS_KERNEL
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_execution_type.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_info_cl.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_objects_for_aux_translation.h
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}kernel_extra.cpp
diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h
index 66fb8f5441..1fd408b6b4 100644
--- a/opencl/source/kernel/kernel.h
+++ b/opencl/source/kernel/kernel.h
@@ -15,6 +15,7 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/kernel/implicit_args.h"
+#include "shared/source/kernel/kernel_execution_type.h"
 #include "shared/source/unified_memory/unified_memory.h"
 #include "shared/source/utilities/stackvec.h"
 
@@ -24,7 +25,6 @@
 #include "opencl/source/device_queue/device_queue.h"
 #include "opencl/source/helpers/base_object.h"
 #include "opencl/source/helpers/properties_helper.h"
-#include "opencl/source/kernel/kernel_execution_type.h"
 #include "opencl/source/kernel/kernel_objects_for_aux_translation.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/program.h"
diff --git a/opencl/source/os_interface/CMakeLists.txt b/opencl/source/os_interface/CMakeLists.txt
index 699acff417..6eefc085eb 100644
--- a/opencl/source/os_interface/CMakeLists.txt
+++ b/opencl/source/os_interface/CMakeLists.txt
@@ -7,7 +7,6 @@
 set(RUNTIME_SRCS_OS_INTERFACE_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.h
 )
 
diff --git a/opencl/source/os_interface/linux/os_metrics_library.cpp b/opencl/source/os_interface/linux/os_metrics_library.cpp
index 9d22c4f16c..89ec4a8686 100644
--- a/opencl/source/os_interface/linux/os_metrics_library.cpp
+++ b/opencl/source/os_interface/linux/os_metrics_library.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/metrics_library.h"
+#include "shared/source/utilities/metrics_library.h"
 
 namespace NEO {
 //////////////////////////////////////////////////////
@@ -48,4 +48,4 @@ bool MetricsLibrary::userConfigurationDelete(
     // Not supported on Linux.
     return true;
 }
-} // namespace NEO
\ No newline at end of file
+} // namespace NEO
diff --git a/opencl/source/os_interface/metrics_library.cpp b/opencl/source/os_interface/metrics_library.cpp
index 53d7c52100..58e2aa8ea3 100644
--- a/opencl/source/os_interface/metrics_library.cpp
+++ b/opencl/source/os_interface/metrics_library.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/metrics_library.h"
+#include "shared/source/utilities/metrics_library.h"
 
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_inc_base.h"
@@ -200,4 +200,4 @@ bool MetricsLibrary::oaConfigurationDelete(
 
     return api->functions.ConfigurationDelete(handle) == StatusCode::Success;
 }
-} // namespace NEO
\ No newline at end of file
+} // namespace NEO
diff --git a/opencl/source/os_interface/windows/os_metrics_library.cpp b/opencl/source/os_interface/windows/os_metrics_library.cpp
index e1e54921a5..f721070457 100644
--- a/opencl/source/os_interface/windows/os_metrics_library.cpp
+++ b/opencl/source/os_interface/windows/os_metrics_library.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/metrics_library.h"
+#include "shared/source/utilities/metrics_library.h"
 
 namespace NEO {
 //////////////////////////////////////////////////////
@@ -52,4 +52,4 @@ bool MetricsLibrary::userConfigurationDelete(
     const ConfigurationHandle_1_0 &handle) {
     return api->functions.ConfigurationDelete(handle) == StatusCode::Success;
 }
-} // namespace NEO
\ No newline at end of file
+} // namespace NEO
diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp
index ca364c406e..584b9acc75 100644
--- a/opencl/source/program/build.cpp
+++ b/opencl/source/program/build.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/compiler_options_parser.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
+#include "shared/source/utilities/logger.h"
 #include "shared/source/utilities/time_measure_wrapper.h"
 
 #include "opencl/source/cl_device/cl_device.h"
@@ -19,7 +20,6 @@
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/program.h"
-#include "opencl/source/utilities/logger.h"
 
 #include "compiler_options.h"
 
diff --git a/opencl/source/utilities/CMakeLists.txt b/opencl/source/utilities/CMakeLists.txt
index 3866f3e84b..b7b0d9a4dc 100644
--- a/opencl/source/utilities/CMakeLists.txt
+++ b/opencl/source/utilities/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,7 +7,6 @@
 set(RUNTIME_SRCS_UTILITIES_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/logger.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/logger.h
 )
 
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE})
diff --git a/opencl/source/utilities/logger.cpp b/opencl/source/utilities/logger.cpp
index 87ba421287..e3e5872126 100644
--- a/opencl/source/utilities/logger.cpp
+++ b/opencl/source/utilities/logger.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/utilities/logger.h"
+#include "shared/source/utilities/logger.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/timestamp_packet.h"
diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
index e3001c6f2a..6f8fe78814 100644
--- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
+++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/source/utilities/perf_counter.h"
 #include "shared/source/utilities/tag_allocator.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -17,7 +18,6 @@
 #include "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/hardware_interface.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
@@ -1617,4 +1617,4 @@ HWTEST_F(DispatchWalkerTest, WhenKernelRequiresImplicitArgsThenIohRequiresMoreSp
         size = alignUp(size, MemoryConstants::cacheLineSize);
         EXPECT_EQ(size, iohSizeWithImplicitArgs);
     }
-}
\ No newline at end of file
+}
diff --git a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp
index 317203353e..4f6d8a7b39 100644
--- a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/built_ins/built_ins.h"
+#include "shared/source/utilities/perf_counter.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
@@ -15,7 +16,6 @@
 #include "opencl/source/command_queue/enqueue_write_image.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/event.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp
index c53ec208de..b0c4868245 100644
--- a/opencl/test/unit_test/event/event_tests.cpp
+++ b/opencl/test/unit_test/event/event_tests.cpp
@@ -9,13 +9,13 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/utilities/perf_counter.h"
 #include "shared/source/utilities/tag_allocator.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
diff --git a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp
index 3fa24a5fc1..f4595b667a 100644
--- a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp
+++ b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp
@@ -5,13 +5,13 @@
  *
  */
 
+#include "shared/source/utilities/perf_counter.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 
 #include "opencl/source/command_queue/enqueue_kernel.h"
 #include "opencl/source/command_queue/hardware_interface.h"
-#include "opencl/source/event/perf_counter.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/sampler/sampler.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
diff --git a/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp
index 2c752f0a34..bc4af5eb2d 100644
--- a/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp
+++ b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "shared/source/utilities/hw_timestamps.h"
 #include "shared/source/utilities/tag_allocator.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/hardware_interface.h"
-#include "opencl/source/event/hw_timestamps.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp
index 1fd2ca1b06..956113efc3 100644
--- a/opencl/test/unit_test/utilities/file_logger_tests.cpp
+++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp
@@ -7,10 +7,10 @@
 
 #include "opencl/test/unit_test/utilities/file_logger_tests.h"
 
+#include "shared/source/utilities/logger.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
-#include "opencl/source/utilities/logger.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
diff --git a/opencl/test/unit_test/utilities/file_logger_tests.h b/opencl/test/unit_test/utilities/file_logger_tests.h
index b4d54971e4..0110bbe81a 100644
--- a/opencl/test/unit_test/utilities/file_logger_tests.h
+++ b/opencl/test/unit_test/utilities/file_logger_tests.h
@@ -10,8 +10,7 @@
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/string_helpers.h"
 #include "shared/source/utilities/directory.h"
-
-#include "opencl/source/utilities/logger.h"
+#include "shared/source/utilities/logger.h"
 
 #include <map>
 
diff --git a/shared/source/command_stream/csr_definitions.h b/shared/source/command_stream/csr_definitions.h
index bf656e2627..d65969b7a3 100644
--- a/shared/source/command_stream/csr_definitions.h
+++ b/shared/source/command_stream/csr_definitions.h
@@ -15,8 +15,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipeline_select_args.h"
 #include "shared/source/kernel/grf_config.h"
-
-#include "opencl/source/kernel/kernel_execution_type.h"
+#include "shared/source/kernel/kernel_execution_type.h"
 
 #include <limits>
 
diff --git a/shared/source/device_binary_format/device_binary_format_patchtokens.cpp b/shared/source/device_binary_format/device_binary_format_patchtokens.cpp
index 6c5b1d0a7f..81a96322b8 100644
--- a/shared/source/device_binary_format/device_binary_format_patchtokens.cpp
+++ b/shared/source/device_binary_format/device_binary_format_patchtokens.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,8 +11,7 @@
 #include "shared/source/device_binary_format/patchtokens_validator.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/program/program_info_from_patchtokens.h"
-
-#include "opencl/source/utilities/logger.h"
+#include "shared/source/utilities/logger.h"
 
 namespace NEO {
 
diff --git a/shared/source/helpers/aligned_memory.h b/shared/source/helpers/aligned_memory.h
index 680d3c5abd..3ea0caf63b 100644
--- a/shared/source/helpers/aligned_memory.h
+++ b/shared/source/helpers/aligned_memory.h
@@ -8,8 +8,7 @@
 #pragma once
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/debug_helpers.h"
-
-#include "opencl/source/utilities/logger.h"
+#include "shared/source/utilities/logger.h"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/shared/source/helpers/preamble.h b/shared/source/helpers/preamble.h
index 8506b04923..c28a3093c4 100644
--- a/shared/source/helpers/preamble.h
+++ b/shared/source/helpers/preamble.h
@@ -7,8 +7,7 @@
 
 #pragma once
 #include "shared/source/helpers/pipeline_select_helper.h"
-
-#include "opencl/source/kernel/kernel_execution_type.h"
+#include "shared/source/kernel/kernel_execution_type.h"
 
 #include "engine_group_types.h"
 #include "engine_node.h"
diff --git a/shared/source/helpers/preamble_bdw_and_later.inl b/shared/source/helpers/preamble_bdw_and_later.inl
index de144aba2f..ca55c6a9de 100644
--- a/shared/source/helpers/preamble_bdw_and_later.inl
+++ b/shared/source/helpers/preamble_bdw_and_later.inl
@@ -9,8 +9,7 @@
 #include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/preamble_base.inl"
-
-#include "opencl/source/kernel/kernel_execution_type.h"
+#include "shared/source/kernel/kernel_execution_type.h"
 
 namespace NEO {
 
diff --git a/shared/source/kernel/CMakeLists.txt b/shared/source/kernel/CMakeLists.txt
index 91d39bf65f..329150a8ea 100644
--- a/shared/source/kernel/CMakeLists.txt
+++ b/shared/source/kernel/CMakeLists.txt
@@ -18,6 +18,7 @@ set(NEO_CORE_KERNEL
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor_from_patchtokens.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_descriptor_from_patchtokens.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/kernel_execution_type.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/read_extended_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}read_extended_info.cpp
diff --git a/opencl/source/kernel/kernel_execution_type.h b/shared/source/kernel/kernel_execution_type.h
similarity index 81%
rename from opencl/source/kernel/kernel_execution_type.h
rename to shared/source/kernel/kernel_execution_type.h
index 8da6b84c78..14b0a3f849 100644
--- a/opencl/source/kernel/kernel_execution_type.h
+++ b/shared/source/kernel/kernel_execution_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/source/memory_manager/graphics_allocation.cpp b/shared/source/memory_manager/graphics_allocation.cpp
index f810108b85..1a18463cce 100644
--- a/shared/source/memory_manager/graphics_allocation.cpp
+++ b/shared/source/memory_manager/graphics_allocation.cpp
@@ -10,8 +10,7 @@
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/memory_manager.h"
-
-#include "opencl/source/utilities/logger.h"
+#include "shared/source/utilities/logger.h"
 
 namespace NEO {
 void GraphicsAllocation::setAllocationType(AllocationType allocationType) {
diff --git a/shared/source/os_interface/performance_counters.h b/shared/source/os_interface/performance_counters.h
index ba7f36ccea..1072d638da 100644
--- a/shared/source/os_interface/performance_counters.h
+++ b/shared/source/os_interface/performance_counters.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "opencl/source/event/perf_counter.h"
-#include "opencl/source/os_interface/metrics_library.h"
+#include "shared/source/utilities/metrics_library.h"
+#include "shared/source/utilities/perf_counter.h"
 
 #include <mutex>
 
diff --git a/shared/source/utilities/CMakeLists.txt b/shared/source/utilities/CMakeLists.txt
index f8c5bbc684..97a86d0dab 100644
--- a/shared/source/utilities/CMakeLists.txt
+++ b/shared/source/utilities/CMakeLists.txt
@@ -20,10 +20,14 @@ set(NEO_CORE_UTILITIES
     ${CMAKE_CURRENT_SOURCE_DIR}/directory.h
     ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/hw_timestamps.h
     ${CMAKE_CURRENT_SOURCE_DIR}/iflist.h
     ${CMAKE_CURRENT_SOURCE_DIR}/idlist.h
     ${CMAKE_CURRENT_SOURCE_DIR}/io_functions.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/logger.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h
     ${CMAKE_CURRENT_SOURCE_DIR}/numeric.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/perf_counter.h
     ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/range.h
diff --git a/opencl/source/event/hw_timestamps.h b/shared/source/utilities/hw_timestamps.h
similarity index 100%
rename from opencl/source/event/hw_timestamps.h
rename to shared/source/utilities/hw_timestamps.h
diff --git a/opencl/source/utilities/logger.h b/shared/source/utilities/logger.h
similarity index 100%
rename from opencl/source/utilities/logger.h
rename to shared/source/utilities/logger.h
diff --git a/opencl/source/os_interface/metrics_library.h b/shared/source/utilities/metrics_library.h
similarity index 100%
rename from opencl/source/os_interface/metrics_library.h
rename to shared/source/utilities/metrics_library.h
diff --git a/opencl/source/event/perf_counter.h b/shared/source/utilities/perf_counter.h
similarity index 91%
rename from opencl/source/event/perf_counter.h
rename to shared/source/utilities/perf_counter.h
index 944089d431..7c0ca50028 100644
--- a/opencl/source/event/perf_counter.h
+++ b/shared/source/utilities/perf_counter.h
@@ -8,9 +8,8 @@
 #pragma once
 
 #include "shared/source/memory_manager/graphics_allocation.h"
-
-#include "opencl/source/event/hw_timestamps.h"
-#include "opencl/source/os_interface/metrics_library.h"
+#include "shared/source/utilities/hw_timestamps.h"
+#include "shared/source/utilities/metrics_library.h"
 
 namespace NEO {