diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt
index 68593e9d9b..5773ef6505 100644
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@@ -224,7 +224,7 @@ if(BUILD_WITH_L0 AND "${NEO_BITS}" STREQUAL "64")
                 ${NEO_CORE_DIRECTORY}/os_interface/windows/os_interface.cpp
                 ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
                 ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-                ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/environment_variables.cpp
+                ${NEO_CORE_DIRECTORY}/dll/windows/environment_variables.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/options_windows.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/os_interface.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/create_wddm_memory_manager.cpp
diff --git a/opencl/source/dll/CMakeLists.txt b/opencl/source/dll/CMakeLists.txt
index c14aedc20b..e17ea115ae 100644
--- a/opencl/source/dll/CMakeLists.txt
+++ b/opencl/source/dll/CMakeLists.txt
@@ -19,7 +19,6 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
-
   ${NEO_CORE_DIRECTORY}/dll/options_dll.cpp
   ${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
   ${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr.cpp
@@ -52,11 +51,11 @@ set(RUNTIME_SRCS_DLL_LINUX
 
 set(RUNTIME_SRCS_DLL_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/create_wddm_memory_manager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/windows/environment_variables.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
-  ${NEO_CORE_DIRECTORY}/os_interface/windows/sys_calls.cpp
+  ${NEO_CORE_DIRECTORY}/dll/windows/environment_variables.cpp
   ${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
+  ${NEO_CORE_DIRECTORY}/os_interface/windows/sys_calls.cpp
   ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
   ${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
 )
diff --git a/opencl/source/os_interface/windows/CMakeLists.txt b/opencl/source/os_interface/windows/CMakeLists.txt
index 3927878db0..c078b82add 100644
--- a/opencl/source/os_interface/windows/CMakeLists.txt
+++ b/opencl/source/os_interface/windows/CMakeLists.txt
@@ -14,7 +14,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${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}/environment_variables.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/os_interface/windows/mock_environment_variables.cpp b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp
index e370f8560b..76357599bc 100644
--- a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp
+++ b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp
@@ -7,7 +7,7 @@
 
 #include "opencl/test/unit_test/os_interface/windows/mock_environment_variables.h"
 
-#include "opencl/source/os_interface/windows/environment_variables.h"
+#include "shared/source/os_interface/windows/environment_variables.h"
 
 extern uint32_t (*getEnvironmentVariableMock)(const char *name, char *outBuffer, uint32_t outBufferSize) = nullptr;
 
diff --git a/opencl/source/dll/windows/environment_variables.cpp b/shared/source/dll/windows/environment_variables.cpp
similarity index 87%
rename from opencl/source/dll/windows/environment_variables.cpp
rename to shared/source/dll/windows/environment_variables.cpp
index d98178fac0..4a57730b5e 100644
--- a/opencl/source/dll/windows/environment_variables.cpp
+++ b/shared/source/dll/windows/environment_variables.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/os_interface/windows/environment_variables.h"
+#include "shared/source/os_interface/windows/environment_variables.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
diff --git a/shared/source/os_interface/windows/CMakeLists.txt b/shared/source/os_interface/windows/CMakeLists.txt
index 3ba49f0f5b..022659ecdb 100644
--- a/shared/source/os_interface/windows/CMakeLists.txt
+++ b/shared/source/os_interface/windows/CMakeLists.txt
@@ -19,6 +19,7 @@ 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}/environment_variables.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id_win.cpp
diff --git a/opencl/source/os_interface/windows/environment_variables.h b/shared/source/os_interface/windows/environment_variables.h
similarity index 100%
rename from opencl/source/os_interface/windows/environment_variables.h
rename to shared/source/os_interface/windows/environment_variables.h