diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddd028f98f..9e318141e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -776,6 +776,7 @@ endif()
 include_directories(${NEO_BUILD_DIR})
 include_directories(${NEO_SOURCE_DIR})
 include_directories(${NEO_SOURCE_DIR}/core/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
+include_directories(${NEO_SOURCE_DIR}/core/debug_settings/definitions${BRANCH_DIR_SUFFIX})
 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})
@@ -787,7 +788,7 @@ include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/client_context${BRANCH_
 include_directories(${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory${BRANCH_DIR_SUFFIX})
 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})
+
 
 if(HAVE_INSTRUMENTATION)
   set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
diff --git a/core/compiler_interface/compiler_interface.cpp b/core/compiler_interface/compiler_interface.cpp
index abca1c7da5..d8be4ef1dd 100644
--- a/core/compiler_interface/compiler_interface.cpp
+++ b/core/compiler_interface/compiler_interface.cpp
@@ -9,9 +9,9 @@
 
 #include "core/compiler_interface/compiler_cache.h"
 #include "core/compiler_interface/compiler_interface.inl"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
 
 #include "cif/common/cif_main.h"
diff --git a/core/debug_settings/CMakeLists.txt b/core/debug_settings/CMakeLists.txt
new file mode 100644
index 0000000000..cd9db9e84a
--- /dev/null
+++ b/core/debug_settings/CMakeLists.txt
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_DEBUG_SETTINGS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/translate_debug_settings.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions/translate_debug_settings.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_DEBUG_SETTINGS ${NEO_CORE_DEBUG_SETTINGS})
diff --git a/runtime/os_interface/debug_settings_manager.cpp b/core/debug_settings/debug_settings_manager.cpp
similarity index 90%
rename from runtime/os_interface/debug_settings_manager.cpp
rename to core/debug_settings/debug_settings_manager.cpp
index c73089a8fc..b702146734 100644
--- a/runtime/os_interface/debug_settings_manager.cpp
+++ b/core/debug_settings/debug_settings_manager.cpp
@@ -7,14 +7,11 @@
 
 #include "debug_settings_manager.h"
 
+#include "core/debug_settings/definitions/translate_debug_settings.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/utilities/debug_settings_reader_creator.h"
-#include "runtime/os_interface/definitions/translate_debug_settings.h"
-#include "runtime/os_interface/ocl_reg_path.h"
-
-#include "CL/cl.h"
 
 #include <cstdio>
 #include <sstream>
@@ -27,12 +24,10 @@ static std::string to_string(const std::string &arg) {
 
 namespace NEO {
 
-DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager;
-
 template <DebugFunctionalityLevel DebugLevel>
-DebugSettingsManager<DebugLevel>::DebugSettingsManager() {
+DebugSettingsManager<DebugLevel>::DebugSettingsManager(const char *registryPath) {
     if (registryReadAvailable()) {
-        readerImpl = SettingsReaderCreator::create(oclRegPath);
+        readerImpl = SettingsReaderCreator::create(std::string(registryPath));
         injectSettingsFromReader();
         dumpFlags();
     }
diff --git a/runtime/os_interface/debug_settings_manager.h b/core/debug_settings/debug_settings_manager.h
similarity index 98%
rename from runtime/os_interface/debug_settings_manager.h
rename to core/debug_settings/debug_settings_manager.h
index 9d885fa8ca..010f2ad4ae 100644
--- a/runtime/os_interface/debug_settings_manager.h
+++ b/core/debug_settings/debug_settings_manager.h
@@ -73,7 +73,7 @@ struct DebugVariables {
 template <DebugFunctionalityLevel DebugLevel>
 class DebugSettingsManager {
   public:
-    DebugSettingsManager();
+    DebugSettingsManager(const char *registryPath);
     ~DebugSettingsManager();
 
     DebugSettingsManager(const DebugSettingsManager &) = delete;
diff --git a/runtime/os_interface/debug_variables_base.inl b/core/debug_settings/debug_variables_base.inl
similarity index 100%
rename from runtime/os_interface/debug_variables_base.inl
rename to core/debug_settings/debug_variables_base.inl
diff --git a/core/debug_settings/definitions/debug_variables.inl b/core/debug_settings/definitions/debug_variables.inl
new file mode 100644
index 0000000000..426052364d
--- /dev/null
+++ b/core/debug_settings/definitions/debug_variables.inl
@@ -0,0 +1,8 @@
+/*
+ * Copyright (C) 2018-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/debug_settings/debug_variables_base.inl"
diff --git a/runtime/os_interface/definitions/translate_debug_settings.cpp b/core/debug_settings/definitions/translate_debug_settings.cpp
similarity index 76%
rename from runtime/os_interface/definitions/translate_debug_settings.cpp
rename to core/debug_settings/definitions/translate_debug_settings.cpp
index 64562bd3e8..e4a8714727 100644
--- a/runtime/os_interface/definitions/translate_debug_settings.cpp
+++ b/core/debug_settings/definitions/translate_debug_settings.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/definitions/translate_debug_settings.h"
+#include "core/debug_settings/definitions/translate_debug_settings.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/definitions/translate_debug_settings.h b/core/debug_settings/definitions/translate_debug_settings.h
similarity index 100%
rename from runtime/os_interface/definitions/translate_debug_settings.h
rename to core/debug_settings/definitions/translate_debug_settings.h
diff --git a/core/helpers/allow_deferred_deleter.cpp b/core/helpers/allow_deferred_deleter.cpp
index 28472ad0b0..13ccf028c1 100644
--- a/core/helpers/allow_deferred_deleter.cpp
+++ b/core/helpers/allow_deferred_deleter.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/deferred_deleter_helper.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 bool isDeferredDeleterEnabled() {
diff --git a/core/helpers/debug_helpers.cpp b/core/helpers/debug_helpers.cpp
index 9b03b218ff..63cbe7a635 100644
--- a/core/helpers/debug_helpers.cpp
+++ b/core/helpers/debug_helpers.cpp
@@ -7,7 +7,7 @@
 
 #include "core/helpers/debug_helpers.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 
 #include <assert.h>
 #include <cstdio>
diff --git a/core/helpers/hw_helper.cpp b/core/helpers/hw_helper.cpp
index 41f5c559d7..8493ce6d5a 100644
--- a/core/helpers/hw_helper.cpp
+++ b/core/helpers/hw_helper.cpp
@@ -7,7 +7,7 @@
 
 #include "core/helpers/hw_helper.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 
 namespace NEO {
 HwHelper *hwHelperFactory[IGFX_MAX_CORE] = {};
diff --git a/core/helpers/hw_info.cpp b/core/helpers/hw_info.cpp
index 33b08e792b..cc2adfd5c0 100644
--- a/core/helpers/hw_info.cpp
+++ b/core/helpers/hw_info.cpp
@@ -7,8 +7,8 @@
 
 #include "core/helpers/hw_info.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_cmds.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <algorithm>
 
diff --git a/core/helpers/kmd_notify_properties.cpp b/core/helpers/kmd_notify_properties.cpp
index 847b5cc427..a2675007e9 100644
--- a/core/helpers/kmd_notify_properties.cpp
+++ b/core/helpers/kmd_notify_properties.cpp
@@ -7,7 +7,7 @@
 
 #include "core/helpers/kmd_notify_properties.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 
 #include <cstdint>
 
diff --git a/core/os_interface/linux/debug_env_reader.h b/core/os_interface/linux/debug_env_reader.h
index 3b91b265f3..ce2238cdfc 100644
--- a/core/os_interface/linux/debug_env_reader.h
+++ b/core/os_interface/linux/debug_env_reader.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/utilities/debug_settings_reader.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 
diff --git a/core/os_interface/windows/debug_registry_reader.cpp b/core/os_interface/windows/debug_registry_reader.cpp
index 0f63c55d73..0fc637fa4e 100644
--- a/core/os_interface/windows/debug_registry_reader.cpp
+++ b/core/os_interface/windows/debug_registry_reader.cpp
@@ -7,9 +7,9 @@
 
 #include "core/os_interface/windows/debug_registry_reader.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/os_interface/windows/windows_wrapper.h"
 #include "core/utilities/debug_settings_reader.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <stdint.h>
 
diff --git a/core/unit_tests/debug_settings/CMakeLists.txt b/core/unit_tests/debug_settings/CMakeLists.txt
new file mode 100644
index 0000000000..c34073503a
--- /dev/null
+++ b/core/unit_tests/debug_settings/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_DEBUG_SETTINGS_TESTS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_fixture.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_tests.cpp
+)
+  
+set_property(GLOBAL PROPERTY NEO_CORE_DEBUG_SETTINGS_TESTS ${NEO_CORE_DEBUG_SETTINGS_TESTS})
\ No newline at end of file
diff --git a/unit_tests/os_interface/debug_settings_manager_fixture.h b/core/unit_tests/debug_settings/debug_settings_manager_fixture.h
similarity index 91%
rename from unit_tests/os_interface/debug_settings_manager_fixture.h
rename to core/unit_tests/debug_settings/debug_settings_manager_fixture.h
index dd169e2411..6e5386fc14 100644
--- a/unit_tests/os_interface/debug_settings_manager_fixture.h
+++ b/core/unit_tests/debug_settings/debug_settings_manager_fixture.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/file_io.h"
 #include "core/utilities/directory.h"
-#include "runtime/helpers/string_helpers.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <map>
 
@@ -44,6 +43,7 @@ class TestDebugSettingsManager : public DebugSettingsManager<DebugLevel> {
     using DebugSettingsManager<DebugLevel>::dumpFlags;
     using DebugSettingsManager<DebugLevel>::settingsDumpFileName;
 
+    TestDebugSettingsManager() : DebugSettingsManager<DebugLevel>("") {}
     SettingsReader *getSettingsReader() {
         return DebugSettingsManager<DebugLevel>::readerImpl.get();
     }
diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp
similarity index 91%
rename from unit_tests/os_interface/debug_settings_manager_tests.cpp
rename to core/unit_tests/debug_settings/debug_settings_manager_tests.cpp
index e6135ba23a..f442aab5cf 100644
--- a/unit_tests/os_interface/debug_settings_manager_tests.cpp
+++ b/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp
@@ -5,18 +5,13 @@
  *
  */
 
+#include "core/memory_manager/graphics_allocation.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "core/utilities/debug_file_reader.h"
-#include "runtime/os_interface/ocl_reg_path.h"
-#include "unit_tests/fixtures/buffer_fixture.h"
-#include "unit_tests/fixtures/image_fixture.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_context.h"
-#include "unit_tests/mocks/mock_kernel.h"
-#include "unit_tests/mocks/mock_mdi.h"
-#include "unit_tests/mocks/mock_program.h"
-#include "unit_tests/os_interface/debug_settings_manager_fixture.h"
+#include "test.h"
+
+#include "debug_settings_manager_fixture.h"
 
 #include <cstdio>
 #include <memory>
@@ -102,16 +97,16 @@ TEST(DebugSettingsManager, givenStringDebugVariableWhenLongValueExeedingSmallStr
 
 TEST(DebugSettingsManager, givenNullAsReaderImplInDebugManagerWhenSettingReaderImplThenItsSetProperly) {
     FullyDisabledTestDebugManager debugManager;
-    auto readerImpl = SettingsReader::create(oclRegPath);
+    auto readerImpl = SettingsReader::create("");
     debugManager.setReaderImpl(readerImpl);
     EXPECT_EQ(readerImpl, debugManager.getReaderImpl());
 }
 TEST(DebugSettingsManager, givenReaderImplInDebugManagerWhenSettingDifferentReaderImplThenItsSetProperly) {
     FullyDisabledTestDebugManager debugManager;
-    auto readerImpl = SettingsReader::create(oclRegPath);
+    auto readerImpl = SettingsReader::create("");
     debugManager.setReaderImpl(readerImpl);
 
-    auto readerImpl2 = SettingsReader::create(oclRegPath);
+    auto readerImpl2 = SettingsReader::create("");
     debugManager.setReaderImpl(readerImpl2);
     EXPECT_EQ(readerImpl2, debugManager.getReaderImpl());
 }
diff --git a/core/unit_tests/helpers/debug_manager_state_restore.h b/core/unit_tests/helpers/debug_manager_state_restore.h
index f8d32fc4f0..50d4339a39 100644
--- a/core/unit_tests/helpers/debug_manager_state_restore.h
+++ b/core/unit_tests/helpers/debug_manager_state_restore.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/utilities/debug_settings_reader.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 using namespace NEO;
 
diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp
index 1915e842b3..a2a0e32fad 100644
--- a/offline_compiler/offline_compiler.cpp
+++ b/offline_compiler/offline_compiler.cpp
@@ -7,6 +7,7 @@
 
 #include "offline_compiler.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/elf/writer.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/file_io.h"
@@ -14,7 +15,6 @@
 #include "core/helpers/string.h"
 #include "core/os_interface/os_library.h"
 #include "runtime/helpers/validators.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
 #include "runtime/platform/extensions.h"
 
diff --git a/offline_compiler/offline_compiler_helper.cpp b/offline_compiler/offline_compiler_helper.cpp
index 76e9e9ac08..42f05d9c8b 100644
--- a/offline_compiler/offline_compiler_helper.cpp
+++ b/offline_compiler/offline_compiler_helper.cpp
@@ -5,19 +5,19 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
 #include "core/utilities/debug_settings_reader_creator.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 
 template <DebugFunctionalityLevel DebugLevel>
-DebugSettingsManager<DebugLevel>::DebugSettingsManager() {
+DebugSettingsManager<DebugLevel>::DebugSettingsManager(const char *registryPath) {
 }
 
 template <DebugFunctionalityLevel DebugLevel>
 DebugSettingsManager<DebugLevel>::~DebugSettingsManager() = default;
 
 // Global Debug Settings Manager
-DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager;
+DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager("");
 } // namespace NEO
diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp
index 00d983e6c7..e99afdb704 100644
--- a/runtime/api/api.cpp
+++ b/runtime/api/api.cpp
@@ -7,6 +7,7 @@
 
 #include "api.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_info.h"
@@ -36,7 +37,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/mem_obj/pipe.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"
 #include "runtime/sampler/sampler.h"
diff --git a/runtime/aub/aub_center.cpp b/runtime/aub/aub_center.cpp
index cf3f38ad17..44b197b7e2 100644
--- a/runtime/aub/aub_center.cpp
+++ b/runtime/aub/aub_center.cpp
@@ -7,11 +7,11 @@
 
 #include "runtime/aub/aub_center.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "third_party/aub_stream/headers/aub_manager.h"
 #include "third_party/aub_stream/headers/aubstream.h"
diff --git a/runtime/aub/aub_helper.cpp b/runtime/aub/aub_helper.cpp
index 90a4dc8e58..819d9063a3 100644
--- a/runtime/aub/aub_helper.cpp
+++ b/runtime/aub/aub_helper.cpp
@@ -7,9 +7,9 @@
 
 #include "runtime/aub/aub_helper.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/basic_math.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 
diff --git a/runtime/aub/aub_helper_add_mmio.cpp b/runtime/aub/aub_helper_add_mmio.cpp
index f3711f15a0..5a87f80aee 100644
--- a/runtime/aub/aub_helper_add_mmio.cpp
+++ b/runtime/aub/aub_helper_add_mmio.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/aub/aub_helper.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "third_party/aub_stream/headers/aubstream.h"
 
diff --git a/runtime/aub_mem_dump/aub_alloc_dump.h b/runtime/aub_mem_dump/aub_alloc_dump.h
index 1a36fcc78d..2bc3446fc1 100644
--- a/runtime/aub_mem_dump/aub_alloc_dump.h
+++ b/runtime/aub_mem_dump/aub_alloc_dump.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/options.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 using namespace NEO;
 
diff --git a/runtime/aub_mem_dump/aub_mem_dump.cpp b/runtime/aub_mem_dump/aub_mem_dump.cpp
index 0ae072f700..7cf9b06260 100644
--- a/runtime/aub_mem_dump/aub_mem_dump.cpp
+++ b/runtime/aub_mem_dump/aub_mem_dump.cpp
@@ -7,10 +7,10 @@
 
 #include "aub_mem_dump.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_helper.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace AubMemDump {
 
diff --git a/runtime/built_ins/built_ins_storage.cpp b/runtime/built_ins/built_ins_storage.cpp
index 96352b8ee7..be2326c381 100644
--- a/runtime/built_ins/built_ins_storage.cpp
+++ b/runtime/built_ins/built_ins_storage.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "os_inc.h"
 
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
index c5d03db3fe..237c8bbc40 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
@@ -27,7 +28,6 @@
 #include "runtime/helpers/neo_driver_version.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
 #include "driver_version.h"
diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl
index 339edc6243..c3576b770b 100644
--- a/runtime/command_stream/command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/command_stream_receiver_hw_base.inl
@@ -7,6 +7,7 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
@@ -28,7 +29,6 @@
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/utilities/tag_allocator.h"
 
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
index e6bac301b4..155220b403 100644
--- a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
+++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
@@ -14,7 +15,6 @@
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/memory_manager/address_mapper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
 #include "third_party/aub_stream/headers/aub_manager.h"
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index 8529169f95..253f68b98c 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
@@ -22,7 +23,6 @@
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 
 #include <cstring>
diff --git a/runtime/command_stream/tbx_stream.cpp b/runtime/command_stream/tbx_stream.cpp
index 197ab71bab..19b3ec2564 100644
--- a/runtime/command_stream/tbx_stream.cpp
+++ b/runtime/command_stream/tbx_stream.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/tbx/tbx_sockets.h"
 
 namespace NEO {
diff --git a/runtime/compiler_interface/patchtokens_decoder.cpp b/runtime/compiler_interface/patchtokens_decoder.cpp
index 5bfa13e41d..0423e6f517 100644
--- a/runtime/compiler_interface/patchtokens_decoder.cpp
+++ b/runtime/compiler_interface/patchtokens_decoder.cpp
@@ -7,10 +7,10 @@
 
 #include "patchtokens_decoder.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hash.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <algorithm>
 
diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp
index 38f1c9e96f..a9a14f07e7 100644
--- a/runtime/context/context.cpp
+++ b/runtime/context/context.cpp
@@ -8,6 +8,7 @@
 #include "runtime/context/context.h"
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/unified_memory_manager.h"
@@ -22,7 +23,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/deferred_deleter.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/sharing.h"
 #include "runtime/sharings/sharing_factory.h"
diff --git a/runtime/context/context.h b/runtime/context/context.h
index 7ab078f25a..e8f7f9d947 100644
--- a/runtime/context/context.h
+++ b/runtime/context/context.h
@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/context/context_type.h"
 #include "runtime/context/driver_diagnostics.h"
 #include "runtime/device/device_vector.h"
 #include "runtime/helpers/base_object.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <vector>
 
diff --git a/runtime/core_files.cmake b/runtime/core_files.cmake
index 11ac7e0125..8095bcd678 100644
--- a/runtime/core_files.cmake
+++ b/runtime/core_files.cmake
@@ -10,6 +10,7 @@ append_sources_from_properties(NEO_CORE_SOURCES
   NEO_CORE_COMMAND_CONTAINER
   NEO_CORE_COMMAND_STREAM
   NEO_CORE_COMMANDS
+  NEO_CORE_DEBUG_SETTINGS
   NEO_CORE_EXECUTION_ENVIRONMENT
   NEO_CORE_GMM_HELPER
   NEO_CORE_HELPERS
diff --git a/runtime/device/root_device.cpp b/runtime/device/root_device.cpp
index c6380a16bd..783f2c8f2d 100644
--- a/runtime/device/root_device.cpp
+++ b/runtime/device/root_device.cpp
@@ -7,9 +7,9 @@
 
 #include "runtime/device/root_device.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/device/sub_device.h"
 #include "runtime/helpers/device_helpers.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 RootDevice::RootDevice(ExecutionEnvironment *executionEnvironment, uint32_t rootDeviceIndex) : Device(executionEnvironment), rootDeviceIndex(rootDeviceIndex) {}
diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt
index 1fead9e91d..ad06560ab7 100644
--- a/runtime/dll/CMakeLists.txt
+++ b/runtime/dll/CMakeLists.txt
@@ -15,6 +15,7 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/options_dll.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
diff --git a/runtime/dll/debug_manager.cpp b/runtime/dll/debug_manager.cpp
new file mode 100644
index 0000000000..9b39b9b1cd
--- /dev/null
+++ b/runtime/dll/debug_manager.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/debug_settings/debug_settings_manager.h"
+#include "runtime/os_interface/ocl_reg_path.h"
+
+using namespace std;
+
+namespace NEO {
+DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager(oclRegPath);
+}
diff --git a/runtime/dll/linux/drm_neo_create.cpp b/runtime/dll/linux/drm_neo_create.cpp
index 40749b881b..b0640dc83c 100644
--- a/runtime/dll/linux/drm_neo_create.cpp
+++ b/runtime/dll/linux/drm_neo_create.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/drm_null_device.h"
 
diff --git a/runtime/dll/windows/create_wddm_memory_manager.cpp b/runtime/dll/windows/create_wddm_memory_manager.cpp
index 8b2fe4c1d7..b66151b6d8 100644
--- a/runtime/dll/windows/create_wddm_memory_manager.cpp
+++ b/runtime/dll/windows/create_wddm_memory_manager.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
diff --git a/runtime/dll/windows/environment_variables.cpp b/runtime/dll/windows/environment_variables.cpp
index 90c4093840..1d2e4f1fb4 100644
--- a/runtime/dll/windows/environment_variables.cpp
+++ b/runtime/dll/windows/environment_variables.cpp
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/windows/environment_variables.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 
 #include <Windows.h>
 
diff --git a/runtime/gen11/command_stream_receiver_hw_gen11.cpp b/runtime/gen11/command_stream_receiver_hw_gen11.cpp
index b537828c74..7977467738 100644
--- a/runtime/gen11/command_stream_receiver_hw_gen11.cpp
+++ b/runtime/gen11/command_stream_receiver_hw_gen11.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/gen11/reg_configs.h"
 #include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 typedef ICLFamily Family;
diff --git a/runtime/gen11/hardware_commands_helper_gen11.cpp b/runtime/gen11/hardware_commands_helper_gen11.cpp
index 9b30b57112..dbc64b17aa 100644
--- a/runtime/gen11/hardware_commands_helper_gen11.cpp
+++ b/runtime/gen11/hardware_commands_helper_gen11.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gen11/hw_cmds.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/hardware_commands_helper.inl"
 #include "runtime/helpers/hardware_commands_helper_base.inl"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 
diff --git a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp
index ddb780fc26..4e3e58b4c0 100644
--- a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp
+++ b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/hw_info_config.inl"
 #include "runtime/os_interface/hw_info_config_bdw_plus.inl"
diff --git a/runtime/helpers/device_helpers.cpp b/runtime/helpers/device_helpers.cpp
index f6250f35dc..dbd6edfaf3 100644
--- a/runtime/helpers/device_helpers.cpp
+++ b/runtime/helpers/device_helpers.cpp
@@ -7,8 +7,8 @@
 
 #include "runtime/helpers/device_helpers.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 void DeviceHelper::getExtraDeviceInfo(const HardwareInfo &hwInfo, cl_device_info paramName, cl_uint &param, const void *&src, size_t &size, size_t &retSize) {}
diff --git a/runtime/helpers/hardware_commands_helper.inl b/runtime/helpers/hardware_commands_helper.inl
index 694e14779f..1f1a91639b 100644
--- a/runtime/helpers/hardware_commands_helper.inl
+++ b/runtime/helpers/hardware_commands_helper.inl
@@ -6,6 +6,7 @@
  */
 
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/address_patch.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
@@ -16,7 +17,6 @@
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/program/block_kernel_manager.h"
 
 #include <cstring>
diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp
index f12025cbd8..5047ebc12b 100644
--- a/runtime/kernel/kernel.cpp
+++ b/runtime/kernel/kernel.cpp
@@ -7,6 +7,7 @@
 
 #include "runtime/kernel/kernel.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
@@ -36,7 +37,6 @@
 #include "runtime/mem_obj/pipe.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/block_kernel_manager.h"
 #include "runtime/program/kernel_info.h"
diff --git a/runtime/kernel/kernel.h b/runtime/kernel/kernel.h
index de70fec19d..7d83ec2a53 100644
--- a/runtime/kernel/kernel.h
+++ b/runtime/kernel/kernel.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/address_patch.h"
 #include "core/helpers/preamble.h"
 #include "core/unified_memory/unified_memory.h"
@@ -17,7 +18,6 @@
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/program/program.h"
 
diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp
index 8d6ee74ef1..0f7760989f 100644
--- a/runtime/mem_obj/buffer.cpp
+++ b/runtime/mem_obj/buffer.cpp
@@ -7,6 +7,7 @@
 
 #include "runtime/mem_obj/buffer.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/hw_helper.h"
@@ -25,7 +26,6 @@
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {
 
diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp
index 8b0684909b..e3e47354e1 100644
--- a/runtime/mem_obj/image.cpp
+++ b/runtime/mem_obj/image.cpp
@@ -8,6 +8,7 @@
 #include "runtime/mem_obj/image.h"
 
 #include "common/compiler_support.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_helper.h"
@@ -27,7 +28,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "igfxfmid.h"
 
diff --git a/runtime/mem_obj/mem_obj.h b/runtime/mem_obj/mem_obj.h
index 7f9444446f..d0457cd6e7 100644
--- a/runtime/mem_obj/mem_obj.h
+++ b/runtime/mem_obj/mem_obj.h
@@ -6,12 +6,12 @@
  */
 
 #pragma once
+#include "core/debug_settings/debug_settings_manager.h"
 #include "public/cl_ext_private.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/mem_obj/map_operations_handler.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/sharings/sharing.h"
 
 #include "memory_properties_flags.h"
diff --git a/runtime/os_interface/CMakeLists.txt b/runtime/os_interface/CMakeLists.txt
index db6b339db1..a4b8013a72 100644
--- a/runtime/os_interface/CMakeLists.txt
+++ b/runtime/os_interface/CMakeLists.txt
@@ -6,11 +6,6 @@
 
 set(RUNTIME_SRCS_OS_INTERFACE_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_variables_base.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/debug_variables.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/translate_debug_settings.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.h
diff --git a/runtime/os_interface/definitions/debug_variables.inl b/runtime/os_interface/definitions/debug_variables.inl
deleted file mode 100644
index 4477478fdc..0000000000
--- a/runtime/os_interface/definitions/debug_variables.inl
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "runtime/os_interface/debug_variables_base.inl"
diff --git a/runtime/os_interface/device_factory.cpp b/runtime/os_interface/device_factory.cpp
index 5b580de0a2..1070e869ba 100644
--- a/runtime/os_interface/device_factory.cpp
+++ b/runtime/os_interface/device_factory.cpp
@@ -5,13 +5,13 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/hw_info_config.h"
 
 namespace NEO {
diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp
index a94cba9ec3..afa05de4d8 100644
--- a/runtime/os_interface/linux/hw_info_config.cpp
+++ b/runtime/os_interface/linux/hw_info_config.cpp
@@ -8,12 +8,12 @@
 #include "runtime/os_interface/hw_info_config.h"
 
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/utilities/cpu_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"
 #include "runtime/os_interface/linux/os_interface.h"
 
diff --git a/runtime/os_interface/windows/device_factory_win.cpp b/runtime/os_interface/windows/device_factory_win.cpp
index 69fac6b53a..fac0727613 100644
--- a/runtime/os_interface/windows/device_factory_win.cpp
+++ b/runtime/os_interface/windows/device_factory_win.cpp
@@ -7,8 +7,8 @@
 
 #ifdef _WIN32
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
diff --git a/runtime/os_interface/windows/hw_info_config.cpp b/runtime/os_interface/windows/hw_info_config.cpp
index 57a87176db..27d8289378 100644
--- a/runtime/os_interface/windows/hw_info_config.cpp
+++ b/runtime/os_interface/windows/hw_info_config.cpp
@@ -8,11 +8,11 @@
 #include "runtime/os_interface/hw_info_config.h"
 
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/hw_info.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "instrumentation.h"
 
diff --git a/runtime/os_interface/windows/wddm_residency_controller.cpp b/runtime/os_interface/windows/wddm_residency_controller.cpp
index 4d94376116..2c05bbead6 100644
--- a/runtime/os_interface/windows/wddm_residency_controller.cpp
+++ b/runtime/os_interface/windows/wddm_residency_controller.cpp
@@ -7,8 +7,8 @@
 
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/utilities/spinlock.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
diff --git a/runtime/platform/platform.cpp b/runtime/platform/platform.cpp
index 628d596490..6bec6feb61 100644
--- a/runtime/platform/platform.cpp
+++ b/runtime/platform/platform.cpp
@@ -8,6 +8,7 @@
 #include "platform.h"
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/debug_helpers.h"
@@ -22,7 +23,6 @@
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/extensions.h"
diff --git a/runtime/program/create.inl b/runtime/program/create.inl
index 0cb6d2e3ae..c32a650689 100644
--- a/runtime/program/create.inl
+++ b/runtime/program/create.inl
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/string_helpers.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/program/program.h"
 
 #include "compiler_options.h"
diff --git a/runtime/sampler/sampler_tgllp_plus.inl b/runtime/sampler/sampler_tgllp_plus.inl
index e23d72fb7e..08e666e97d 100644
--- a/runtime/sampler/sampler_tgllp_plus.inl
+++ b/runtime/sampler/sampler_tgllp_plus.inl
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/sampler/sampler.h"
 #include "runtime/sampler/sampler.inl"
 
diff --git a/runtime/sharings/gl/win_enable_gl.cpp b/runtime/sharings/gl/win_enable_gl.cpp
index bd5bd15c4e..408fc18061 100644
--- a/runtime/sharings/gl/win_enable_gl.cpp
+++ b/runtime/sharings/gl/win_enable_gl.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/context/context.h"
 #include "runtime/context/context.inl"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/sharings/gl/cl_gl_api_intel.h"
 #include "runtime/sharings/gl/enable_gl.h"
 #include "runtime/sharings/gl/gl_sharing.h"
diff --git a/runtime/sharings/sharing_factory.cpp b/runtime/sharings/sharing_factory.cpp
index 8bd293b016..61bed5c674 100644
--- a/runtime/sharings/sharing_factory.cpp
+++ b/runtime/sharings/sharing_factory.cpp
@@ -7,7 +7,7 @@
 
 #include "sharing_factory.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/platform/extensions.h"
 
 namespace NEO {
diff --git a/runtime/sharings/unified/enable_unified.cpp b/runtime/sharings/unified/enable_unified.cpp
index 95135b800b..8d0291f221 100644
--- a/runtime/sharings/unified/enable_unified.cpp
+++ b/runtime/sharings/unified/enable_unified.cpp
@@ -7,9 +7,9 @@
 
 #include "runtime/sharings/unified/enable_unified.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/context/context.h"
 #include "runtime/context/context.inl"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/sharings/sharing_factory.h"
 #include "runtime/sharings/sharing_factory.inl"
 #include "runtime/sharings/unified/unified_sharing.h"
diff --git a/runtime/sharings/va/va_sharing_functions.cpp b/runtime/sharings/va/va_sharing_functions.cpp
index f02997664b..bfe900bb51 100644
--- a/runtime/sharings/va/va_sharing_functions.cpp
+++ b/runtime/sharings/va/va_sharing_functions.cpp
@@ -7,7 +7,7 @@
 
 #include "va_sharing_functions.h"
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/sharings/va/va_surface.h"
 
 #include <dlfcn.h>
diff --git a/runtime/utilities/logger.cpp b/runtime/utilities/logger.cpp
index 230bd652f8..f4328a8ca0 100644
--- a/runtime/utilities/logger.cpp
+++ b/runtime/utilities/logger.cpp
@@ -7,12 +7,12 @@
 
 #include "runtime/utilities/logger.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include <memory>
 #include <string>
diff --git a/runtime/utilities/logger.h b/runtime/utilities/logger.h
index ca2ede8acf..99d6254bdc 100644
--- a/runtime/utilities/logger.h
+++ b/runtime/utilities/logger.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 
 namespace NEO {
 template <DebugFunctionalityLevel DebugLevel>
diff --git a/unit_tests/api/cl_get_platform_info_tests.inl b/unit_tests/api/cl_get_platform_info_tests.inl
index 42fb9c4f90..a4d137caad 100644
--- a/unit_tests/api/cl_get_platform_info_tests.inl
+++ b/unit_tests/api/cl_get_platform_info_tests.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/options.h"
 #include "runtime/device/device.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 
diff --git a/unit_tests/aub/aub_center_tests.cpp b/unit_tests/aub/aub_center_tests.cpp
index 19afd90fc8..db4eff0b62 100644
--- a/unit_tests/aub/aub_center_tests.cpp
+++ b/unit_tests/aub/aub_center_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/mocks/mock_aub_center.h"
 #include "unit_tests/mocks/mock_aub_manager.h"
 
diff --git a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp
index ae7c523bc9..6bb743e3be 100644
--- a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp
+++ b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/helpers/variable_backup.h"
 #include "unit_tests/mocks/mock_aub_center.h"
 
diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp
index 299f7f8411..128de91bb4 100644
--- a/unit_tests/built_ins/built_in_tests.cpp
+++ b/unit_tests/built_ins/built_in_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/hash.h"
@@ -18,7 +19,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/helpers/dispatch_info_builder.h"
 #include "runtime/kernel/kernel.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/context_fixture.h"
diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp
index 5d6f3308df..fbc7fec229 100644
--- a/unit_tests/command_queue/enqueue_svm_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -14,7 +15,6 @@
 #include "runtime/event/user_event.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h"
diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
index 17471fb913..bb0d170fbd 100644
--- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
+++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/preamble.h"
@@ -22,7 +23,6 @@
 #include "runtime/event/user_event.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp
index 87305df2c0..fff7e57ce3 100644
--- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp
+++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/preamble.h"
@@ -27,7 +28,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 #include "test.h"
 #include "unit_tests/fixtures/built_in_fixture.h"
diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/unit_tests/command_stream/tbx_command_stream_tests.cpp
index 1e4babf545..827c3f8599 100644
--- a/unit_tests/command_stream/tbx_command_stream_tests.cpp
+++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -15,7 +16,6 @@
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/memory_banks.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
diff --git a/unit_tests/core_unit_tests_files.cmake b/unit_tests/core_unit_tests_files.cmake
index 800e3a5eb3..3e98cfa533 100644
--- a/unit_tests/core_unit_tests_files.cmake
+++ b/unit_tests/core_unit_tests_files.cmake
@@ -8,6 +8,7 @@ target_sources(igdrcl_tests PRIVATE ${NEO_SOURCE_DIR}/unit_tests/core_unit_tests
 
 append_sources_from_properties(NEO_CORE_UNIT_TESTS_SOURCES
   NEO_CORE_COMMAND_CONTAINER_TESTS
+  NEO_CORE_DEBUG_SETTINGS_TESTS
   NEO_CORE_INDIRECT_HEAP_TESTS
 )
 
diff --git a/unit_tests/device/device_caps_tests.cpp b/unit_tests/device/device_caps_tests.cpp
index a7f3b883c8..2b7805ebde 100644
--- a/unit_tests/device/device_caps_tests.cpp
+++ b/unit_tests/device/device_caps_tests.cpp
@@ -601,7 +601,7 @@ TEST_F(DeviceGetCapsTest, givenEnableAdvancedVmeSetToFalseAndDeviceSupportsVmeWh
 }
 
 TEST_F(DeviceGetCapsTest, byDefaultVmeIsTurnedOn) {
-    DebugSettingsManager<DebugFunctionalityLevel::RegKeys> freshDebugSettingsManager;
+    DebugSettingsManager<DebugFunctionalityLevel::RegKeys> freshDebugSettingsManager("");
     EXPECT_TRUE(freshDebugSettingsManager.flags.EnableIntelVme.get());
 }
 
diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/unit_tests/device/gl/device_caps_gl_tests.cpp
index 38ddeb1ebc..adb2c9ee92 100644
--- a/unit_tests/device/gl/device_caps_gl_tests.cpp
+++ b/unit_tests/device/gl/device_caps_gl_tests.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 
diff --git a/unit_tests/gen12lp/sampler_tests_gen12lp.inl b/unit_tests/gen12lp/sampler_tests_gen12lp.inl
index 840ad08116..3aa1daab50 100644
--- a/unit_tests/gen12lp/sampler_tests_gen12lp.inl
+++ b/unit_tests/gen12lp/sampler_tests_gen12lp.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/sampler/sampler.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
diff --git a/unit_tests/helpers/debug_helpers_tests.cpp b/unit_tests/helpers/debug_helpers_tests.cpp
index 56da9bb8c7..92fcdcf9eb 100644
--- a/unit_tests/helpers/debug_helpers_tests.cpp
+++ b/unit_tests/helpers/debug_helpers_tests.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/debug_helpers.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp
index 9cc95cc904..77e5054939 100644
--- a/unit_tests/kernel/kernel_tests.cpp
+++ b/unit_tests/kernel/kernel_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
@@ -21,7 +22,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt
index 3d7538f265..92e608fd58 100644
--- a/unit_tests/libult/CMakeLists.txt
+++ b/unit_tests/libult/CMakeLists.txt
@@ -32,6 +32,7 @@ set(IGDRCL_SRCS_LIB_ULT
   ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
   ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.h
   ${NEO_SOURCE_DIR}/unit_tests/libult/create_tbx_sockets.cpp
+  ${NEO_SOURCE_DIR}/unit_tests/libult/debug_manager.cpp
   ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger.cpp
   ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.cpp
   ${NEO_SOURCE_DIR}/unit_tests/libult/source_level_debugger_library.h
diff --git a/unit_tests/libult/debug_manager.cpp b/unit_tests/libult/debug_manager.cpp
new file mode 100644
index 0000000000..9b39b9b1cd
--- /dev/null
+++ b/unit_tests/libult/debug_manager.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "core/debug_settings/debug_settings_manager.h"
+#include "runtime/os_interface/ocl_reg_path.h"
+
+using namespace std;
+
+namespace NEO {
+DebugSettingsManager<globalDebugFunctionalityLevel> DebugManager(oclRegPath);
+}
diff --git a/unit_tests/linux/CMakeLists.txt b/unit_tests/linux/CMakeLists.txt
index 0e57ddcf43..fe20d8afa0 100644
--- a/unit_tests/linux/CMakeLists.txt
+++ b/unit_tests/linux/CMakeLists.txt
@@ -22,7 +22,6 @@ set(IGDRCL_SRCS_linux_dll_tests
   ${CMAKE_CURRENT_SOURCE_DIR}/drm_wrap.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
-  ${NEO_SOURCE_DIR}/runtime/os_interface/debug_settings_manager.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/allocator_helper.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp
   ${NEO_SOURCE_DIR}/runtime/dll/linux/options_linux.cpp
diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp
index 580f637078..78ab5c2a97 100644
--- a/unit_tests/main.cpp
+++ b/unit_tests/main.cpp
@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/memory_leak_listener.h"
 #include "core/utilities/debug_settings_reader.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/hw_info_config.h"
 #include "runtime/os_interface/ocl_reg_path.h"
 #include "unit_tests/custom_event_listener.h"
diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_tests.cpp
index 519de4ba7a..bf1d631c76 100644
--- a/unit_tests/mem_obj/get_mem_object_info_tests.cpp
+++ b/unit_tests/mem_obj/get_mem_object_info_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/platform_fixture.h"
diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp
index 76e48665f0..066608afee 100644
--- a/unit_tests/offline_compiler/offline_compiler_tests.cpp
+++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp
@@ -7,11 +7,11 @@
 
 #include "offline_compiler_tests.h"
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/mocks/mock_compilers.h"
 
 #include "compiler_options.h"
diff --git a/unit_tests/os_interface/CMakeLists.txt b/unit_tests/os_interface/CMakeLists.txt
index 7bb2aa0b74..14d2555824 100644
--- a/unit_tests/os_interface/CMakeLists.txt
+++ b/unit_tests/os_interface/CMakeLists.txt
@@ -6,8 +6,6 @@
 
 set(IGDRCL_SRCS_tests_os_interface_base
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_manager_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.h
diff --git a/unit_tests/os_interface/linux/file_logger_linux_tests.cpp b/unit_tests/os_interface/linux/file_logger_linux_tests.cpp
index 46a8f7bf76..047e4a93c5 100644
--- a/unit_tests/os_interface/linux/file_logger_linux_tests.cpp
+++ b/unit_tests/os_interface/linux/file_logger_linux_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/debug_settings_manager.h"
+#include "core/debug_settings/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/mocks/linux/mock_drm_allocation.h"
 #include "unit_tests/utilities/file_logger_tests.h"
diff --git a/unit_tests/os_interface/windows/file_logger_win_tests.cpp b/unit_tests/os_interface/windows/file_logger_win_tests.cpp
index 30767837f3..61ddda4b86 100644
--- a/unit_tests/os_interface/windows/file_logger_win_tests.cpp
+++ b/unit_tests/os_interface/windows/file_logger_win_tests.cpp
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "runtime/gmm_helper/gmm.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "test.h"
 #include "unit_tests/os_interface/windows/mock_wddm_allocation.h"
 #include "unit_tests/utilities/file_logger_tests.h"
diff --git a/unit_tests/utilities/debug_settings_reader_tests.cpp b/unit_tests/utilities/debug_settings_reader_tests.cpp
index c5512382e1..acdd4cd884 100644
--- a/unit_tests/utilities/debug_settings_reader_tests.cpp
+++ b/unit_tests/utilities/debug_settings_reader_tests.cpp
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/file_io.h"
 #include "core/utilities/debug_settings_reader.h"
-#include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/ocl_reg_path.h"
 #include "test.h"