diff --git a/opencl/source/device/CMakeLists.txt b/opencl/source/device/CMakeLists.txt
index f426d82185..456e18d99f 100644
--- a/opencl/source/device/CMakeLists.txt
+++ b/opencl/source/device/CMakeLists.txt
@@ -13,7 +13,6 @@ set(RUNTIME_SRCS_DEVICE
   ${CMAKE_CURRENT_SOURCE_DIR}/device_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_info_map.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
 )
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE ${RUNTIME_SRCS_DEVICE})
diff --git a/opencl/source/device/cl_device.cpp b/opencl/source/device/cl_device.cpp
index 6d50ec10b9..2e445a04c1 100644
--- a/opencl/source/device/cl_device.cpp
+++ b/opencl/source/device/cl_device.cpp
@@ -10,11 +10,11 @@
 #include "shared/source/device/device.h"
 #include "shared/source/device/sub_device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/program/sync_buffer_handler.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
-#include "opencl/source/device/driver_info.h"
 #include "opencl/source/platform/extensions.h"
 #include "opencl/source/platform/platform.h"
 
diff --git a/opencl/source/device/device_caps.cpp b/opencl/source/device/device_caps.cpp
index 380be38c6a..21c9cf0b00 100644
--- a/opencl/source/device/device_caps.cpp
+++ b/opencl/source/device/device_caps.cpp
@@ -10,12 +10,12 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
 #include "opencl/source/device/cl_device.h"
-#include "opencl/source/device/driver_info.h"
 #include "opencl/source/platform/extensions.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
diff --git a/opencl/source/os_interface/linux/CMakeLists.txt b/opencl/source/os_interface/linux/CMakeLists.txt
index 16a6c752e1..8b4be89b92 100644
--- a/opencl/source/os_interface/linux/CMakeLists.txt
+++ b/opencl/source/os_interface/linux/CMakeLists.txt
@@ -10,7 +10,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_bdw_plus.inl
diff --git a/opencl/source/os_interface/windows/CMakeLists.txt b/opencl/source/os_interface/windows/CMakeLists.txt
index debd9c4c1e..e37067fc43 100644
--- a/opencl/source/os_interface/windows/CMakeLists.txt
+++ b/opencl/source/os_interface/windows/CMakeLists.txt
@@ -12,8 +12,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_caps_init_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp
diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
index 337a957a00..9e1441b087 100644
--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
-#include "opencl/source/device/driver_info.h"
 #include "opencl/test/unit_test/helpers/hw_helper_tests.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
diff --git a/opencl/test/unit_test/mocks/mock_device.cpp b/opencl/test/unit_test/mocks/mock_device.cpp
index faa63a2f5b..d64bfee12f 100644
--- a/opencl/test/unit_test/mocks/mock_device.cpp
+++ b/opencl/test/unit_test/mocks/mock_device.cpp
@@ -8,9 +8,9 @@
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_context.h"
 
-#include "opencl/source/device/driver_info.h"
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "opencl/test/unit_test/mocks/mock_ostime.h"
diff --git a/opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp
index 299c03666d..9ee0abad29 100644
--- a/opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/device/driver_info.h"
+#include "shared/source/os_interface/driver_info.h"
 
 #include "gtest/gtest.h"
 
@@ -33,4 +33,4 @@ TEST(DriverInfo, GivenDriverInfoWhenLinuxThenReturnDefault) {
     EXPECT_STREQ(defaultVersion.c_str(), resultVersion.c_str());
 }
 
-} // namespace NEO
\ No newline at end of file
+} // namespace NEO
diff --git a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp
index ca4278901f..4391843261 100644
--- a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp
@@ -9,11 +9,11 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/windows/debug_registry_reader.h"
+#include "shared/source/os_interface/windows/driver_info_windows.h"
 #include "shared/source/os_interface/windows/os_interface.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
-#include "opencl/source/os_interface/windows/driver_info.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp
index 7437028011..97f077124e 100644
--- a/shared/source/device/device.cpp
+++ b/shared/source/device/device.cpp
@@ -14,13 +14,12 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/os_time.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
-#include "opencl/source/device/driver_info.h"
-
 namespace NEO {
 
 decltype(&PerformanceCounters::create) Device::createPerformanceCountersFunc = PerformanceCounters::create;
diff --git a/shared/source/os_interface/CMakeLists.txt b/shared/source/os_interface/CMakeLists.txt
index 370f024bbe..b91b3d8584 100644
--- a/shared/source/os_interface/CMakeLists.txt
+++ b/shared/source/os_interface/CMakeLists.txt
@@ -10,6 +10,7 @@ set(NEO_CORE_OS_INTERFACE
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_bdw_plus.inl
diff --git a/opencl/source/device/driver_info.h b/shared/source/os_interface/driver_info.h
similarity index 100%
rename from opencl/source/device/driver_info.h
rename to shared/source/os_interface/driver_info.h
diff --git a/shared/source/os_interface/linux/CMakeLists.txt b/shared/source/os_interface/linux/CMakeLists.txt
index ff6aa46ce4..1701efe8a1 100644
--- a/shared/source/os_interface/linux/CMakeLists.txt
+++ b/shared/source/os_interface/linux/CMakeLists.txt
@@ -9,6 +9,7 @@ set(NEO_CORE_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/allocator_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.cpp
diff --git a/opencl/source/os_interface/linux/driver_info.cpp b/shared/source/os_interface/linux/driver_info_linux.cpp
similarity index 80%
rename from opencl/source/os_interface/linux/driver_info.cpp
rename to shared/source/os_interface/linux/driver_info_linux.cpp
index 0ce971af8e..9933d5b922 100644
--- a/opencl/source/os_interface/linux/driver_info.cpp
+++ b/shared/source/os_interface/linux/driver_info_linux.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/device/driver_info.h"
+#include "shared/source/os_interface/driver_info.h"
 
 namespace NEO {
 
diff --git a/shared/source/os_interface/windows/CMakeLists.txt b/shared/source/os_interface/windows/CMakeLists.txt
index 022659ecdb..6dd4f83742 100644
--- a/shared/source/os_interface/windows/CMakeLists.txt
+++ b/shared/source/os_interface/windows/CMakeLists.txt
@@ -19,6 +19,8 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h
   ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_windows.h
   ${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.h
diff --git a/opencl/source/os_interface/windows/driver_info.cpp b/shared/source/os_interface/windows/driver_info_windows.cpp
similarity index 93%
rename from opencl/source/os_interface/windows/driver_info.cpp
rename to shared/source/os_interface/windows/driver_info_windows.cpp
index 35ccdfd46d..d51e126f54 100644
--- a/opencl/source/os_interface/windows/driver_info.cpp
+++ b/shared/source/os_interface/windows/driver_info_windows.cpp
@@ -5,14 +5,12 @@
  *
  */
 
-#include "opencl/source/device/driver_info.h"
+#include "shared/source/os_interface/windows/driver_info_windows.h"
 
 #include "shared/source/os_interface/windows/debug_registry_reader.h"
 #include "shared/source/os_interface/windows/os_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "opencl/source/os_interface/windows/driver_info.h"
-
 namespace NEO {
 
 DriverInfoWindows::DriverInfoWindows(std::string &&fullPath) : path(DriverInfoWindows::trimRegistryKey(fullPath)) {}
diff --git a/opencl/source/os_interface/windows/driver_info.h b/shared/source/os_interface/windows/driver_info_windows.h
similarity index 92%
rename from opencl/source/os_interface/windows/driver_info.h
rename to shared/source/os_interface/windows/driver_info_windows.h
index c949d7b9d3..1ad7d08cfe 100644
--- a/opencl/source/os_interface/windows/driver_info.h
+++ b/shared/source/os_interface/windows/driver_info_windows.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "opencl/source/device/driver_info.h"
+#include "shared/source/os_interface/driver_info.h"
 
 #include <memory>
 #include <string>