diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15105cb28c..5392ff7e82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -777,6 +777,7 @@ include_directories(${NEO_BUILD_DIR})
 include_directories(${NEO_SOURCE_DIR})
 include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/core/sku_info/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
@@ -786,7 +787,6 @@ include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_
 include_directories(${NEO_SOURCE_DIR}/runtime/mem_obj/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${NEO_SOURCE_DIR}/runtime/os_interface/definitions${BRANCH_DIR_SUFFIX})
-include_directories(${NEO_SOURCE_DIR}/runtime/sku_info/definitions${BRANCH_DIR_SUFFIX})
 
 if(HAVE_INSTRUMENTATION)
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
diff --git a/core/compiler_interface/compiler_interface.h b/core/compiler_interface/compiler_interface.h
index 008b5b9ee6..88e219992d 100644
--- a/core/compiler_interface/compiler_interface.h
+++ b/core/compiler_interface/compiler_interface.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "core/compiler_interface/compiler_cache.h"
 #include "core/helpers/string.h"
+#include "core/os_interface/os_library.h"
 #include "core/utilities/arrayref.h"
 #include "runtime/built_ins/sip.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "cif/common/cif_main.h"
 #include "ocl_igc_interface/code_type.h"
diff --git a/core/compiler_interface/compiler_interface.inl b/core/compiler_interface/compiler_interface.inl
index 58e8a3120a..b7278bdbc5 100644
--- a/core/compiler_interface/compiler_interface.inl
+++ b/core/compiler_interface/compiler_interface.inl
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/validators.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "cif/common/cif.h"
diff --git a/core/gmm_helper/CMakeLists.txt b/core/gmm_helper/CMakeLists.txt
new file mode 100644
index 0000000000..ca34c5cda8
--- /dev/null
+++ b/core/gmm_helper/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_GMM_HELPER
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_GMM_HELPER ${NEO_CORE_GMM_HELPER})
+add_subdirectories()
diff --git a/runtime/gmm_helper/gmm_lib.h b/core/gmm_helper/gmm_lib.h
similarity index 100%
rename from runtime/gmm_helper/gmm_lib.h
rename to core/gmm_helper/gmm_lib.h
diff --git a/core/os_interface/CMakeLists.txt b/core/os_interface/CMakeLists.txt
index 92c2ae0237..2427c5ffe3 100644
--- a/core/os_interface/CMakeLists.txt
+++ b/core/os_interface/CMakeLists.txt
@@ -8,6 +8,7 @@ set(NEO_CORE_OS_INTERFACE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
 )
 
diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt
index e59b0d3ff2..23699b3909 100644
--- a/core/os_interface/linux/CMakeLists.txt
+++ b/core/os_interface/linux/CMakeLists.txt
@@ -8,6 +8,8 @@ set(NEO_CORE_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_env_reader.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_library_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.h
 )
diff --git a/runtime/os_interface/linux/os_library.cpp b/core/os_interface/linux/os_library_linux.cpp
similarity index 94%
rename from runtime/os_interface/linux/os_library.cpp
rename to core/os_interface/linux/os_library_linux.cpp
index 13ef17e137..8af9c20e60 100644
--- a/runtime/os_interface/linux/os_library.cpp
+++ b/core/os_interface/linux/os_library_linux.cpp
@@ -5,12 +5,10 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/linux/os_library_linux.h"
 
 #include "core/helpers/debug_helpers.h"
 
-#include "os_library.h"
-
 #include <dlfcn.h>
 
 namespace NEO {
diff --git a/runtime/os_interface/linux/os_library.h b/core/os_interface/linux/os_library_linux.h
similarity index 90%
rename from runtime/os_interface/linux/os_library.h
rename to core/os_interface/linux/os_library_linux.h
index e28106ecf6..a282cf78a9 100644
--- a/runtime/os_interface/linux/os_library.h
+++ b/core/os_interface/linux/os_library_linux.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 namespace NEO {
 namespace Linux {
diff --git a/runtime/os_interface/os_library.h b/core/os_interface/os_library.h
similarity index 100%
rename from runtime/os_interface/os_library.h
rename to core/os_interface/os_library.h
diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt
index fa504d5369..92758f18da 100644
--- a/core/os_interface/windows/CMakeLists.txt
+++ b/core/os_interface/windows/CMakeLists.txt
@@ -8,6 +8,8 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h
diff --git a/runtime/os_interface/windows/os_library.cpp b/core/os_interface/windows/os_library_win.cpp
similarity index 96%
rename from runtime/os_interface/windows/os_library.cpp
rename to core/os_interface/windows/os_library_win.cpp
index 0a1bdd3e86..afa690b707 100644
--- a/runtime/os_interface/windows/os_library.cpp
+++ b/core/os_interface/windows/os_library_win.cpp
@@ -5,9 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
-
-#include "os_library.h"
+#include "core/os_interface/windows/os_library_win.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/windows/os_library.h b/core/os_interface/windows/os_library_win.h
similarity index 93%
rename from runtime/os_interface/windows/os_library.h
rename to core/os_interface/windows/os_library_win.h
index 0e605af9dd..df20d1596e 100644
--- a/runtime/os_interface/windows/os_library.h
+++ b/core/os_interface/windows/os_library_win.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #define UMDF_USING_NTSTATUS
 #include "core/os_interface/windows/windows_wrapper.h"
diff --git a/core/sku_info/CMakeLists.txt b/core/sku_info/CMakeLists.txt
new file mode 100644
index 0000000000..ad5a995389
--- /dev/null
+++ b/core/sku_info/CMakeLists.txt
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_SKU_INFO_BASE
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_transfer.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/sku_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_transfer.cpp
+)
+
+set(NEO_CORE_SKU_INFO_WINDOWS
+  ${CMAKE_CURRENT_SOURCE_DIR}/operations/windows/sku_info_receiver.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/operations/windows${BRANCH_DIR_SUFFIX}/sku_info_receiver.cpp
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE ${NEO_CORE_SKU_INFO_BASE})
+set_property(GLOBAL PROPERTY NEO_CORE_SKU_INFO_WINDOWS ${NEO_CORE_SKU_INFO_WINDOWS})
diff --git a/runtime/sku_info/definitions/sku_info.h b/core/sku_info/definitions/sku_info.h
similarity index 84%
rename from runtime/sku_info/definitions/sku_info.h
rename to core/sku_info/definitions/sku_info.h
index 2fef931c4f..e4dff08ec7 100644
--- a/runtime/sku_info/definitions/sku_info.h
+++ b/core/sku_info/definitions/sku_info.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/sku_info/sku_info_base.h"
+#include "core/sku_info/sku_info_base.h"
 
 namespace NEO {
 struct FeatureTable : FeatureTableBase {};
diff --git a/runtime/sku_info/operations/sku_info_transfer.cpp b/core/sku_info/operations/sku_info_transfer.cpp
similarity index 88%
rename from runtime/sku_info/operations/sku_info_transfer.cpp
rename to core/sku_info/operations/sku_info_transfer.cpp
index 89d191f4b0..0f955db2af 100644
--- a/runtime/sku_info/operations/sku_info_transfer.cpp
+++ b/core/sku_info/operations/sku_info_transfer.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/sku_info/operations/sku_info_transfer.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 
 namespace NEO {
 void SkuInfoTransfer::transferWaTableForGmm(_WA_TABLE *dstWaTable, const NEO::WorkaroundTable *srcWaTable) {
diff --git a/runtime/sku_info/operations/sku_info_transfer.h b/core/sku_info/operations/sku_info_transfer.h
similarity index 95%
rename from runtime/sku_info/operations/sku_info_transfer.h
rename to core/sku_info/operations/sku_info_transfer.h
index 800a415cb5..0ee473de89 100644
--- a/runtime/sku_info/operations/sku_info_transfer.h
+++ b/core/sku_info/operations/sku_info_transfer.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
-#include "runtime/sku_info/operations/sku_info_transfer.h"
+#include "core/gmm_helper/gmm_lib.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 
 #include "sku_info.h"
 
diff --git a/runtime/sku_info/operations/sku_info_receiver.cpp b/core/sku_info/operations/windows/sku_info_receiver.cpp
similarity index 88%
rename from runtime/sku_info/operations/sku_info_receiver.cpp
rename to core/sku_info/operations/windows/sku_info_receiver.cpp
index f1efe1460e..fb36e4ea19 100644
--- a/runtime/sku_info/operations/sku_info_receiver.cpp
+++ b/core/sku_info/operations/windows/sku_info_receiver.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/sku_info/operations/sku_info_receiver.h"
+#include "core/sku_info/operations/windows/sku_info_receiver.h"
 
 namespace NEO {
 void SkuInfoReceiver::receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _ADAPTER_INFO *adapterInfo) {
diff --git a/runtime/sku_info/operations/sku_info_receiver.h b/core/sku_info/operations/windows/sku_info_receiver.h
similarity index 100%
rename from runtime/sku_info/operations/sku_info_receiver.h
rename to core/sku_info/operations/windows/sku_info_receiver.h
diff --git a/runtime/sku_info/sku_info_base.h b/core/sku_info/sku_info_base.h
similarity index 100%
rename from runtime/sku_info/sku_info_base.h
rename to core/sku_info/sku_info_base.h
diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt
index abf134d729..fa149f1faf 100644
--- a/offline_compiler/CMakeLists.txt
+++ b/offline_compiler/CMakeLists.txt
@@ -10,6 +10,7 @@ set(CLOC_SRCS_LIB
   ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
   ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp
   ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp
+  ${NEO_SOURCE_DIR}/core/os_interface/os_library.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
   ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
@@ -44,12 +45,14 @@ endif()
 
 if(WIN32)
   list(APPEND CLOC_SRCS_LIB
-    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
     ${NEO_SOURCE_DIR}/runtime/dll/windows/options.cpp
   )
 else()
   list(APPEND CLOC_SRCS_LIB
-    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
     ${NEO_SOURCE_DIR}/runtime/dll/linux/options.cpp
   )
 endif()
diff --git a/offline_compiler/decoder/helper.cpp b/offline_compiler/decoder/helper.cpp
index 15aafec0b7..5652cb33fe 100644
--- a/offline_compiler/decoder/helper.cpp
+++ b/offline_compiler/decoder/helper.cpp
@@ -7,9 +7,9 @@
 
 #include "helper.h"
 
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_inc_base.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 
diff --git a/offline_compiler/decoder/helper.h b/offline_compiler/decoder/helper.h
index c6c9afa91e..48b76a2e63 100644
--- a/offline_compiler/decoder/helper.h
+++ b/offline_compiler/decoder/helper.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 
diff --git a/offline_compiler/decoder/iga_wrapper.cpp b/offline_compiler/decoder/iga_wrapper.cpp
index b7b2466dae..a48b1a9a7f 100644
--- a/offline_compiler/decoder/iga_wrapper.cpp
+++ b/offline_compiler/decoder/iga_wrapper.cpp
@@ -7,9 +7,9 @@
 
 #include "iga_wrapper.h"
 
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_inc_base.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "helper.h"
 #include "igfxfmid.h"
diff --git a/offline_compiler/extra_settings.cpp b/offline_compiler/extra_settings.cpp
index 7a04f44342..31dbd5de80 100644
--- a/offline_compiler/extra_settings.cpp
+++ b/offline_compiler/extra_settings.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "offline_compiler.h"
 
diff --git a/offline_compiler/main.cpp b/offline_compiler/main.cpp
index c8f440f4d4..09dd92bfe3 100644
--- a/offline_compiler/main.cpp
+++ b/offline_compiler/main.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "offline_compiler/multi_command.h"
 #include "offline_compiler/offline_compiler.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "decoder/binary_decoder.h"
 #include "decoder/binary_encoder.h"
diff --git a/offline_compiler/multi_command.h b/offline_compiler/multi_command.h
index 2fe3dfe7e2..94e04966d8 100644
--- a/offline_compiler/multi_command.h
+++ b/offline_compiler/multi_command.h
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "offline_compiler/offline_compiler.h"
 #include "offline_compiler/utilities/safety_caller.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "decoder/binary_decoder.h"
 #include "decoder/binary_encoder.h"
diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp
index f5f163c342..64113e59e2 100644
--- a/offline_compiler/offline_compiler.cpp
+++ b/offline_compiler/offline_compiler.cpp
@@ -11,11 +11,11 @@
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/string.h"
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/platform/extensions.h"
 
 #include "cif/common/cif_main.h"
diff --git a/offline_compiler/utilities/linux/safety_caller_linux.cpp b/offline_compiler/utilities/linux/safety_caller_linux.cpp
index 049a2ebc69..577bf6d3b0 100644
--- a/offline_compiler/utilities/linux/safety_caller_linux.cpp
+++ b/offline_compiler/utilities/linux/safety_caller_linux.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "offline_compiler/offline_compiler.h"
 #include "offline_compiler/utilities/linux/safety_guard_linux.h"
-#include "runtime/os_interface/os_library.h"
 
 using namespace NEO;
 
diff --git a/offline_compiler/utilities/windows/seh_exception.cpp b/offline_compiler/utilities/windows/seh_exception.cpp
index dcece1ecc6..5e45cdfd0c 100644
--- a/offline_compiler/utilities/windows/seh_exception.cpp
+++ b/offline_compiler/utilities/windows/seh_exception.cpp
@@ -7,7 +7,7 @@
 
 #include "seh_exception.h"
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include <memory>
 #include <string>
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index e5a2ba8c85..038e0340ca 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -32,6 +32,7 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
 add_subdirectories()
 add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
 include(enable_gens.cmake)
+include(core_files.cmake)
 
 # Enable SSE4/AVX2 options for files that need them
 if(MSVC)
diff --git a/runtime/core_files.cmake b/runtime/core_files.cmake
new file mode 100644
index 0000000000..deed6ca456
--- /dev/null
+++ b/runtime/core_files.cmake
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+get_property(NEO_CORE_GMM_HELPER GLOBAL PROPERTY NEO_CORE_GMM_HELPER)
+target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_GMM_HELPER})
+
+get_property(NEO_CORE_SKU_INFO_BASE GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE)
+target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_BASE})
+
+if(WIN32)
+  get_property(NEO_CORE_SKU_INFO_WINDOWS GLOBAL PROPERTY NEO_CORE_SKU_INFO_WINDOWS)
+  target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_WINDOWS})
+endif()
\ No newline at end of file
diff --git a/runtime/dll/linux/options.cpp b/runtime/dll/linux/options.cpp
index 7d57c3ef54..9675eb7362 100644
--- a/runtime/dll/linux/options.cpp
+++ b/runtime/dll/linux/options.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "External/Common/GmmLibDllName.h"
 #include "igc.opencl.h"
diff --git a/runtime/gmm_helper/CMakeLists.txt b/runtime/gmm_helper/CMakeLists.txt
index d66ea9cdc5..9bcbf22777 100644
--- a/runtime/gmm_helper/CMakeLists.txt
+++ b/runtime/gmm_helper/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -15,7 +15,6 @@ set(RUNTIME_SRCS_GMM_HELPER_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_interface.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/gmm_lib.h
   ${CMAKE_CURRENT_SOURCE_DIR}/resource_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/resource_info_impl.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/gmm_utils.cpp
diff --git a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp
index d839499be6..871a35941e 100644
--- a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp
+++ b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp
@@ -8,11 +8,11 @@
 #include "runtime/gmm_helper/client_context/gmm_client_context_base.h"
 
 #include "core/helpers/debug_helpers.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
-#include "runtime/sku_info/operations/sku_info_transfer.h"
 
 namespace NEO {
 GmmClientContextBase::GmmClientContextBase(HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) : destroyFunc(destroyFunc) {
diff --git a/runtime/gmm_helper/client_context/gmm_client_context_base.h b/runtime/gmm_helper/client_context/gmm_client_context_base.h
index 962dea2eed..8d4719bdfd 100644
--- a/runtime/gmm_helper/client_context/gmm_client_context_base.h
+++ b/runtime/gmm_helper/client_context/gmm_client_context_base.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include <memory>
 
diff --git a/runtime/gmm_helper/gmm.h b/runtime/gmm_helper/gmm.h
index 476921839d..e5e087cdf1 100644
--- a/runtime/gmm_helper/gmm.h
+++ b/runtime/gmm_helper/gmm.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/gmm_helper/gmm_lib.h"
 #include "runtime/api/cl_types.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 
 #include "storage_info.h"
 
diff --git a/runtime/gmm_helper/gmm_helper.cpp b/runtime/gmm_helper/gmm_helper.cpp
index c7265b0384..c6861f8cbc 100644
--- a/runtime/gmm_helper/gmm_helper.cpp
+++ b/runtime/gmm_helper/gmm_helper.cpp
@@ -9,13 +9,13 @@
 
 #include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/graphics_allocation.h"
+#include "core/os_interface/os_library.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/surface_formats.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/platform/platform.h"
-#include "runtime/sku_info/operations/sku_info_transfer.h"
 
 #include "gmm_client_context.h"
 
diff --git a/runtime/gmm_helper/gmm_helper.h b/runtime/gmm_helper/gmm_helper.h
index 4bc1bf88ec..0fa40081ec 100644
--- a/runtime/gmm_helper/gmm_helper.h
+++ b/runtime/gmm_helper/gmm_helper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/gmm_helper/gmm_lib.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 
 #include <memory>
 
diff --git a/runtime/gmm_helper/gmm_interface.cpp b/runtime/gmm_helper/gmm_interface.cpp
index 1d32451624..d765b8f4ca 100644
--- a/runtime/gmm_helper/gmm_interface.cpp
+++ b/runtime/gmm_helper/gmm_interface.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "core/helpers/debug_helpers.h"
+#include "core/os_interface/os_library.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/os_interface/os_library.h"
 
 namespace Os {
 extern const char *gmmDllName;
diff --git a/runtime/gmm_helper/gmm_memory_base.h b/runtime/gmm_helper/gmm_memory_base.h
index 4b7dd89482..ea5001013d 100644
--- a/runtime/gmm_helper/gmm_memory_base.h
+++ b/runtime/gmm_helper/gmm_memory_base.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include <memory>
 
diff --git a/runtime/gmm_helper/page_table_mngr.h b/runtime/gmm_helper/page_table_mngr.h
index f76765a8b0..0a751620f6 100644
--- a/runtime/gmm_helper/page_table_mngr.h
+++ b/runtime/gmm_helper/page_table_mngr.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include <functional>
 #include <memory>
diff --git a/runtime/gmm_helper/resource_info.h b/runtime/gmm_helper/resource_info.h
index c5ff12da68..966603f5d8 100644
--- a/runtime/gmm_helper/resource_info.h
+++ b/runtime/gmm_helper/resource_info.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include <functional>
 #include <memory>
diff --git a/runtime/helpers/cache_policy.h b/runtime/helpers/cache_policy.h
index c09171a276..8724427be2 100644
--- a/runtime/helpers/cache_policy.h
+++ b/runtime/helpers/cache_policy.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 namespace CacheSettings {
 constexpr uint32_t unknownMocs = GMM_RESOURCE_USAGE_UNKNOWN;
diff --git a/runtime/helpers/surface_formats.cpp b/runtime/helpers/surface_formats.cpp
index d7f102afe8..d8c5a393dd 100644
--- a/runtime/helpers/surface_formats.cpp
+++ b/runtime/helpers/surface_formats.cpp
@@ -7,8 +7,8 @@
 
 #include "surface_formats.h"
 
+#include "core/gmm_helper/gmm_lib.h"
 #include "runtime/api/cl_types.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/mem_obj/image.h"
 
diff --git a/runtime/helpers/surface_formats.h b/runtime/helpers/surface_formats.h
index eeb342de91..1afbc4f787 100644
--- a/runtime/helpers/surface_formats.h
+++ b/runtime/helpers/surface_formats.h
@@ -13,8 +13,8 @@
 #include "CL/cl_ext.h"
 #endif
 
+#include "core/gmm_helper/gmm_lib.h"
 #include "core/utilities/arrayref.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 
 namespace NEO {
 enum GFX3DSTATE_SURFACEFORMAT : unsigned short {
diff --git a/runtime/helpers/windows/gl_helper.h b/runtime/helpers/windows/gl_helper.h
index eabcd150ee..6c55d0a417 100644
--- a/runtime/helpers/windows/gl_helper.h
+++ b/runtime/helpers/windows/gl_helper.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "GL/gl.h"
 
diff --git a/runtime/os_interface/CMakeLists.txt b/runtime/os_interface/CMakeLists.txt
index 201a97050d..42fe3b88d7 100644
--- a/runtime/os_interface/CMakeLists.txt
+++ b/runtime/os_interface/CMakeLists.txt
@@ -22,7 +22,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/os_context.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt
index 3cba57c8cb..00ac717511 100644
--- a/runtime/os_interface/linux/CMakeLists.txt
+++ b/runtime/os_interface/linux/CMakeLists.txt
@@ -43,8 +43,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_linux.h
diff --git a/runtime/os_interface/metrics_library.h b/runtime/os_interface/metrics_library.h
index 8cf5766631..3c000efae6 100644
--- a/runtime/os_interface/metrics_library.h
+++ b/runtime/os_interface/metrics_library.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "instrumentation.h"
 
diff --git a/runtime/os_interface/os_inc_base.h b/runtime/os_interface/os_inc_base.h
index 1cdd0a8d8e..e9165d42a3 100644
--- a/runtime/os_interface/os_inc_base.h
+++ b/runtime/os_interface/os_inc_base.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 namespace Os {
 // Compiler library names
diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
index c9b4c03311..3dc8433e55 100644
--- a/runtime/os_interface/windows/CMakeLists.txt
+++ b/runtime/os_interface/windows/CMakeLists.txt
@@ -33,8 +33,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_socket.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.cpp
diff --git a/runtime/os_interface/windows/gdi_interface.h b/runtime/os_interface/windows/gdi_interface.h
index 88c6b9b18d..5e4925aa0d 100644
--- a/runtime/os_interface/windows/gdi_interface.h
+++ b/runtime/os_interface/windows/gdi_interface.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/os_interface/windows/os_library_win.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/windows/os_inc.h"
-#include "runtime/os_interface/windows/os_library.h"
 #include "runtime/os_interface/windows/thk_wrapper.h"
 
 #include <d3d9types.h>
diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp
index bb8d4afe19..d1821b3f4a 100644
--- a/runtime/os_interface/windows/wddm/wddm.cpp
+++ b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -10,6 +10,7 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/interlocked_max.h"
 #include "core/os_interface/windows/debug_registry_reader.h"
+#include "core/sku_info/operations/windows/sku_info_receiver.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -27,7 +28,6 @@
 #include "runtime/os_interface/windows/wddm_engine_mapper.h"
 #include "runtime/os_interface/windows/wddm_residency_allocations_container.h"
 #include "runtime/platform/platform.h"
-#include "runtime/sku_info/operations/sku_info_receiver.h"
 
 #include "gmm_memory.h"
 
diff --git a/runtime/os_interface/windows/wddm/wddm.h b/runtime/os_interface/windows/wddm/wddm.h
index 04593a9b46..bdf5c4ae31 100644
--- a/runtime/os_interface/windows/wddm/wddm.h
+++ b/runtime/os_interface/windows/wddm/wddm.h
@@ -7,10 +7,10 @@
 
 #pragma once
 #include "core/command_stream/preemption_mode.h"
+#include "core/gmm_helper/gmm_lib.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/gfx_partition.h"
 #include "core/utilities/spinlock.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/os_interface/os_context.h"
 
 #include "sku_info.h"
diff --git a/runtime/sharings/gl/gl_sharing.h b/runtime/sharings/gl/gl_sharing.h
index a0666fbc98..f745794a4b 100644
--- a/runtime/sharings/gl/gl_sharing.h
+++ b/runtime/sharings/gl/gl_sharing.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/windows/gl_helper.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/windows/gl/gl_sharing_os.h"
 #include "runtime/sharings/sharing.h"
 
diff --git a/runtime/sharings/unified/unified_sharing.h b/runtime/sharings/unified/unified_sharing.h
index 79297f5e1a..1abf1efff8 100644
--- a/runtime/sharings/unified/unified_sharing.h
+++ b/runtime/sharings/unified/unified_sharing.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/os_interface/os_library.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/sharings/sharing.h"
 #include "runtime/sharings/unified/unified_sharing_types.h"
 
diff --git a/runtime/sku_info/CMakeLists.txt b/runtime/sku_info/CMakeLists.txt
deleted file mode 100644
index 8e6ff34a1a..0000000000
--- a/runtime/sku_info/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(RUNTIME_SRCS_SKU_INFO_BASE
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/sku_info_base.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_transfer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/sku_info.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_transfer.cpp
-)
-
-set(RUNTIME_SRCS_SKU_INFO_WINDOWS
-  ${CMAKE_CURRENT_SOURCE_DIR}/operations/sku_info_receiver.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/operations${BRANCH_DIR_SUFFIX}/sku_info_receiver.cpp
-)
-
-target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_BASE})
-set_property(GLOBAL PROPERTY RUNTIME_SRCS_SKU_INFO_BASE ${RUNTIME_SRCS_SKU_INFO_BASE})
-
-if(WIN32)
-  target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_WINDOWS})
-endif()
diff --git a/runtime/source_level_debugger/source_level_debugger.h b/runtime/source_level_debugger/source_level_debugger.h
index f0d3ec0573..5394585d4b 100644
--- a/runtime/source_level_debugger/source_level_debugger.h
+++ b/runtime/source_level_debugger/source_level_debugger.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include <memory>
 #include <string>
diff --git a/unit_tests/global_environment.h b/unit_tests/global_environment.h
index 2eb072c499..e0f32e607d 100644
--- a/unit_tests/global_environment.h
+++ b/unit_tests/global_environment.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/os_interface/os_library.h"
 #include "unit_tests/mocks/mock_compilers.h"
 
 #include "gtest/gtest.h"
diff --git a/unit_tests/gmm_helper/gmm_interface_tests.cpp b/unit_tests/gmm_helper/gmm_interface_tests.cpp
index 0e2dd6ecf0..f9b1264989 100644
--- a/unit_tests/gmm_helper/gmm_interface_tests.cpp
+++ b/unit_tests/gmm_helper/gmm_interface_tests.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
-#include "runtime/sku_info/operations/sku_info_transfer.h"
 #include "unit_tests/helpers/variable_backup.h"
 
 #include "gtest/gtest.h"
diff --git a/unit_tests/helpers/windows/gl_helper_tests.cpp b/unit_tests/helpers/windows/gl_helper_tests.cpp
index 1ecfb15141..adf24ac255 100644
--- a/unit_tests/helpers/windows/gl_helper_tests.cpp
+++ b/unit_tests/helpers/windows/gl_helper_tests.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "core/os_interface/windows/windows_wrapper.h"
 #include "runtime/helpers/windows/gl_helper.h"
-#include "runtime/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/helpers/windows/mock_function.h"
 
diff --git a/unit_tests/igdrcl_tests_pch.h b/unit_tests/igdrcl_tests_pch.h
index ffc8979b17..9ceeffb3e2 100644
--- a/unit_tests/igdrcl_tests_pch.h
+++ b/unit_tests/igdrcl_tests_pch.h
@@ -5,16 +5,16 @@
  *
  */
 
+#include "core/gmm_helper/gmm_lib.h"
 #include "core/helpers/abort.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
+#include "core/sku_info/sku_info_base.h"
 #include "runtime/gen_common/hw_cmds.h"
-#include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/completion_stamp.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/kmd_notify_properties.h"
-#include "runtime/sku_info/sku_info_base.h"
 #include "test.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 
diff --git a/unit_tests/libult/source_level_debugger_library.h b/unit_tests/libult/source_level_debugger_library.h
index eec1c2424a..3346c3d0f5 100644
--- a/unit_tests/libult/source_level_debugger_library.h
+++ b/unit_tests/libult/source_level_debugger_library.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "igfx_debug_interchange_types.h"
 
diff --git a/unit_tests/linux/main_linux.cpp b/unit_tests/linux/main_linux.cpp
index d983fa2e2d..009e5503d1 100644
--- a/unit_tests/linux/main_linux.cpp
+++ b/unit_tests/linux/main_linux.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "runtime/os_interface/linux/drm_neo.h"
-#include "runtime/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/custom_event_listener.h"
 
diff --git a/unit_tests/mock_gdi/mock_gdi.h b/unit_tests/mock_gdi/mock_gdi.h
index 44bd2575c5..3daf67636d 100644
--- a/unit_tests/mock_gdi/mock_gdi.h
+++ b/unit_tests/mock_gdi/mock_gdi.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 #include "runtime/os_interface/windows/os_time_win.h"
 
 #include <d3d10_1.h>
diff --git a/unit_tests/offline_compiler/main.cpp b/unit_tests/offline_compiler/main.cpp
index c6aba04e84..e3a360b83d 100644
--- a/unit_tests/offline_compiler/main.cpp
+++ b/unit_tests/offline_compiler/main.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 #include "unit_tests/custom_event_listener.h"
 #include "unit_tests/helpers/test_files.h"
 
diff --git a/unit_tests/offline_compiler/segfault_test/CMakeLists.txt b/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
index 354377c8bf..76d14660ff 100644
--- a/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
+++ b/unit_tests/offline_compiler/segfault_test/CMakeLists.txt
@@ -9,22 +9,24 @@ set(CLOC_SEGFAULT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
   ${NEO_SOURCE_DIR}/core/helpers/abort.cpp
-  ${NEO_SOURCE_DIR}/runtime/os_interface/os_library.h
+  ${NEO_SOURCE_DIR}/core/os_interface/os_library.h
   ${NEO_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
 )
 
 if(WIN32)
   list(APPEND CLOC_SEGFAULT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/windows/os_library_win.h
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
     ${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
-    ${NEO_SOURCE_DIR}/runtime/os_interface/windows/os_library.cpp
   )
 else()
   list(APPEND CLOC_SEGFAULT_TEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
-    ${NEO_SOURCE_DIR}/runtime/os_interface/linux/os_library.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.cpp
+    ${NEO_SOURCE_DIR}/core/os_interface/linux/os_library_linux.h
   )
 endif()
 
diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp
index 7d8bbb1c5b..88890655f7 100644
--- a/unit_tests/os_interface/device_factory_tests.cpp
+++ b/unit_tests/os_interface/device_factory_tests.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "core/memory_manager/memory_constants.h"
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/os_interface.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_execution_environment.h"
 
diff --git a/unit_tests/os_interface/linux/options.cpp b/unit_tests/os_interface/linux/options.cpp
index a31fb5c3f9..61e3bd3f7b 100644
--- a/unit_tests/os_interface/linux/options.cpp
+++ b/unit_tests/os_interface/linux/options.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "common/gtsysinfo.h"
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 
diff --git a/unit_tests/os_interface/os_library_tests.cpp b/unit_tests/os_interface/os_library_tests.cpp
index 0d4fa8a0fe..f7447d0bea 100644
--- a/unit_tests/os_interface/os_library_tests.cpp
+++ b/unit_tests/os_interface/os_library_tests.cpp
@@ -6,11 +6,11 @@
  */
 
 #if defined(_WIN32)
-#include "runtime/os_interface/windows/os_library.h"
+#include "core/os_interface/windows/os_library_win.h"
 #elif defined(__linux__)
-#include "runtime/os_interface/linux/os_library.h"
+#include "core/os_interface/linux/os_library_linux.h"
 #endif
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 
diff --git a/unit_tests/os_interface/windows/gdi_dll_fixture.h b/unit_tests/os_interface/windows/gdi_dll_fixture.h
index 2666a2c1f0..81bd3a208c 100644
--- a/unit_tests/os_interface/windows/gdi_dll_fixture.h
+++ b/unit_tests/os_interface/windows/gdi_dll_fixture.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/os_interface/os_library.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
-#include "runtime/os_interface/os_library.h"
 #include "unit_tests/mock_gdi/mock_gdi.h"
 
 using namespace NEO;
diff --git a/unit_tests/os_interface/windows/gdi_interface_tests.cpp b/unit_tests/os_interface/windows/gdi_interface_tests.cpp
index c4c71ad38b..5f5c48a5bd 100644
--- a/unit_tests/os_interface/windows/gdi_interface_tests.cpp
+++ b/unit_tests/os_interface/windows/gdi_interface_tests.cpp
@@ -6,8 +6,8 @@
  */
 
 #if defined(_WIN32)
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "test.h"
 
diff --git a/unit_tests/os_interface/windows/gl/gl_dll_helper.h b/unit_tests/os_interface/windows/gl/gl_dll_helper.h
index 24b82a945f..9fc43aa5ce 100644
--- a/unit_tests/os_interface/windows/gl/gl_dll_helper.h
+++ b/unit_tests/os_interface/windows/gl/gl_dll_helper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/os_interface/os_library.h"
 #include "public/cl_gl_private_intel.h"
-#include "runtime/os_interface/os_library.h"
 
 #include "Gl/gl.h"
 
diff --git a/unit_tests/os_interface/windows/options.cpp b/unit_tests/os_interface/windows/options.cpp
index d0579cdfb2..aacd319730 100644
--- a/unit_tests/os_interface/windows/options.cpp
+++ b/unit_tests/os_interface/windows/options.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "common/gtsysinfo.h"
-#include "runtime/os_interface/os_library.h"
+#include "core/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 
diff --git a/unit_tests/os_interface/windows/os_library_win_tests.cpp b/unit_tests/os_interface/windows/os_library_win_tests.cpp
index 12f3f4ff45..c502c9dacf 100644
--- a/unit_tests/os_interface/windows/os_library_win_tests.cpp
+++ b/unit_tests/os_interface/windows/os_library_win_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/windows/os_library.h"
+#include "core/os_interface/windows/os_library_win.h"
 #include "test.h"
 #include "unit_tests/helpers/variable_backup.h"
 
diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp
index 8d556af2eb..c9e71c82db 100644
--- a/unit_tests/os_interface/windows/wddm20_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm20_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -12,7 +13,6 @@
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/os_time.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
index 4628380d8d..f98dd6c0fb 100644
--- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp
@@ -8,6 +8,7 @@
 #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h"
 
 #include "core/helpers/aligned_memory.h"
+#include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -17,7 +18,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
-#include "runtime/os_interface/os_library.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
 #include "runtime/platform/platform.h"
diff --git a/unit_tests/sku_info/sku_info_base_reference.h b/unit_tests/sku_info/sku_info_base_reference.h
index f9fda6e93d..100e461c62 100644
--- a/unit_tests/sku_info/sku_info_base_reference.h
+++ b/unit_tests/sku_info/sku_info_base_reference.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/gmm_helper/gmm_lib.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include "sku_info.h"
 
diff --git a/unit_tests/sku_info/sku_info_receiver_tests.cpp b/unit_tests/sku_info/sku_info_receiver_tests.cpp
index 2e12b99e33..81435081b6 100644
--- a/unit_tests/sku_info/sku_info_receiver_tests.cpp
+++ b/unit_tests/sku_info/sku_info_receiver_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/sku_info/operations/sku_info_receiver.h"
+#include "core/sku_info/operations/windows/sku_info_receiver.h"
 #include "unit_tests/sku_info/sku_info_base_reference.h"
 
 #include "gtest/gtest.h"
diff --git a/unit_tests/sku_info/sku_info_transfer_tests.cpp b/unit_tests/sku_info/sku_info_transfer_tests.cpp
index fc295bd509..df30aa1c1a 100644
--- a/unit_tests/sku_info/sku_info_transfer_tests.cpp
+++ b/unit_tests/sku_info/sku_info_transfer_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/sku_info/operations/sku_info_transfer.h"
+#include "core/sku_info/operations/sku_info_transfer.h"
 #include "unit_tests/sku_info/sku_info_base_reference.h"
 
 #include "gtest/gtest.h"