diff --git a/opencl/source/helpers/CMakeLists.txt b/opencl/source/helpers/CMakeLists.txt
index 7779ddb9eb..2d1b0b3b5b 100644
--- a/opencl/source/helpers/CMakeLists.txt
+++ b/opencl/source/helpers/CMakeLists.txt
@@ -39,8 +39,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_helpers_base.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mipmap.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.h
     ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers.h
diff --git a/opencl/source/helpers/hardware_commands_helper.h b/opencl/source/helpers/hardware_commands_helper.h
index 9b41bd70f7..a0de0f6176 100644
--- a/opencl/source/helpers/hardware_commands_helper.h
+++ b/opencl/source/helpers/hardware_commands_helper.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "shared/source/built_ins/built_ins.h"
+#include "shared/source/helpers/per_thread_data.h"
 
-#include "opencl/source/helpers/per_thread_data.h"
 #include "opencl/source/kernel/kernel.h"
 
 #include <algorithm>
diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp
index f36f9c32a3..a245053833 100644
--- a/opencl/source/kernel/kernel.cpp
+++ b/opencl/source/kernel/kernel.cpp
@@ -19,6 +19,7 @@
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/kernel_helpers.h"
+#include "shared/source/helpers/per_thread_data.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/kernel/kernel_arg_descriptor_extended_device_side_enqueue.h"
 #include "shared/source/kernel/kernel_arg_descriptor_extended_vme.h"
@@ -40,7 +41,6 @@
 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
-#include "opencl/source/helpers/per_thread_data.h"
 #include "opencl/source/helpers/sampler_helpers.h"
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/kernel/image_transformer.h"
diff --git a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
index 9ffa61d765..b151c5be62 100644
--- a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
+++ b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/local_id_gen.h"
+#include "shared/source/helpers/per_thread_data.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
@@ -16,7 +17,6 @@
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/device_queue/device_queue_hw.h"
 #include "opencl/source/event/user_event.h"
-#include "opencl/source/helpers/per_thread_data.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp
index 5e4b453bee..980dc2bd15 100644
--- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp
+++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp
@@ -8,10 +8,10 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/local_id_gen.h"
+#include "shared/source/helpers/per_thread_data.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 
-#include "opencl/source/helpers/per_thread_data.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"
diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt
index 0cb6ec3f5c..bf1d250499 100644
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -81,6 +81,8 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h
     ${CMAKE_CURRENT_SOURCE_DIR}/options.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pause_on_gpu_properties.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h
     ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/populate_factory.h
diff --git a/opencl/source/helpers/per_thread_data.cpp b/shared/source/helpers/per_thread_data.cpp
similarity index 97%
rename from opencl/source/helpers/per_thread_data.cpp
rename to shared/source/helpers/per_thread_data.cpp
index 3d5ccfe5a4..632c0124b7 100644
--- a/opencl/source/helpers/per_thread_data.cpp
+++ b/shared/source/helpers/per_thread_data.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/helpers/per_thread_data.h"
+#include "shared/source/helpers/per_thread_data.h"
 
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/debug_helpers.h"
diff --git a/opencl/source/helpers/per_thread_data.h b/shared/source/helpers/per_thread_data.h
similarity index 100%
rename from opencl/source/helpers/per_thread_data.h
rename to shared/source/helpers/per_thread_data.h