diff --git a/core/helpers/aligned_memory.h b/core/helpers/aligned_memory.h
index 14bb5c90b4..9eb21de9e8 100644
--- a/core/helpers/aligned_memory.h
+++ b/core/helpers/aligned_memory.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include <algorithm>
diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt
index 526e51c402..b8a0bd39f3 100644
--- a/core/memory_manager/CMakeLists.txt
+++ b/core/memory_manager/CMakeLists.txt
@@ -7,6 +7,9 @@
 set(NEO_CORE_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_handler.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_status.h
 )
diff --git a/runtime/memory_manager/gfx_partition.cpp b/core/memory_manager/gfx_partition.cpp
similarity index 99%
rename from runtime/memory_manager/gfx_partition.cpp
rename to core/memory_manager/gfx_partition.cpp
index 9d1f913ded..f8d098e7d9 100644
--- a/runtime/memory_manager/gfx_partition.cpp
+++ b/core/memory_manager/gfx_partition.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/gfx_partition.h"
+#include "core/memory_manager/gfx_partition.h"
 
 #include "core/helpers/aligned_memory.h"
 
diff --git a/runtime/memory_manager/gfx_partition.h b/core/memory_manager/gfx_partition.h
similarity index 94%
rename from runtime/memory_manager/gfx_partition.h
rename to core/memory_manager/gfx_partition.h
index dd7ebb1011..0fb816b298 100644
--- a/runtime/memory_manager/gfx_partition.h
+++ b/core/memory_manager/gfx_partition.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "runtime/memory_manager/memory_constants.h"
-#include "runtime/os_interface/os_memory.h"
-#include "runtime/utilities/heap_allocator.h"
+#include "core/memory_manager/memory_constants.h"
+#include "core/os_interface/os_memory.h"
+#include "core/utilities/heap_allocator.h"
 
 #include <array>
 
diff --git a/runtime/memory_manager/memory_constants.h b/core/memory_manager/memory_constants.h
similarity index 100%
rename from runtime/memory_manager/memory_constants.h
rename to core/memory_manager/memory_constants.h
diff --git a/core/os_interface/CMakeLists.txt b/core/os_interface/CMakeLists.txt
index 6c805c8474..92c2ae0237 100644
--- a/core/os_interface/CMakeLists.txt
+++ b/core/os_interface/CMakeLists.txt
@@ -4,11 +4,12 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(NEO_CORE_OS_INTERFACE_AUB
+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_memory.h
 )
 
-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_AUB ${NEO_CORE_OS_INTERFACE_AUB})
+set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE ${NEO_CORE_OS_INTERFACE})
 add_subdirectories()
diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt
index 0464eca3ae..e59b0d3ff2 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_memory_linux.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.h
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
diff --git a/runtime/os_interface/linux/os_memory_linux.cpp b/core/os_interface/linux/os_memory_linux.cpp
similarity index 93%
rename from runtime/os_interface/linux/os_memory_linux.cpp
rename to core/os_interface/linux/os_memory_linux.cpp
index 015a34b9c6..de4066659c 100644
--- a/runtime/os_interface/linux/os_memory_linux.cpp
+++ b/core/os_interface/linux/os_memory_linux.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/linux/os_memory_linux.h"
+#include "core/os_interface/linux/os_memory_linux.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/linux/os_memory_linux.h b/core/os_interface/linux/os_memory_linux.h
similarity index 92%
rename from runtime/os_interface/linux/os_memory_linux.h
rename to core/os_interface/linux/os_memory_linux.h
index 4f74221d35..519b262503 100644
--- a/runtime/os_interface/linux/os_memory_linux.h
+++ b/core/os_interface/linux/os_memory_linux.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_memory.h"
+#include "core/os_interface/os_memory.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
diff --git a/runtime/os_interface/os_memory.h b/core/os_interface/os_memory.h
similarity index 100%
rename from runtime/os_interface/os_memory.h
rename to core/os_interface/os_memory.h
diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt
index 0f008998fb..fa504d5369 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_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_memory_win.cpp b/core/os_interface/windows/os_memory_win.cpp
similarity index 94%
rename from runtime/os_interface/windows/os_memory_win.cpp
rename to core/os_interface/windows/os_memory_win.cpp
index e6bc345698..a7281b206c 100644
--- a/runtime/os_interface/windows/os_memory_win.cpp
+++ b/core/os_interface/windows/os_memory_win.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/windows/os_memory_win.h"
+#include "core/os_interface/windows/os_memory_win.h"
 
 namespace NEO {
 
diff --git a/runtime/os_interface/windows/os_memory_win.h b/core/os_interface/windows/os_memory_win.h
similarity index 92%
rename from runtime/os_interface/windows/os_memory_win.h
rename to core/os_interface/windows/os_memory_win.h
index 843d549915..b997444fe6 100644
--- a/runtime/os_interface/windows/os_memory_win.h
+++ b/core/os_interface/windows/os_memory_win.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_memory.h"
+#include "core/os_interface/os_memory.h"
 
 #include <windows.h>
 
diff --git a/core/utilities/CMakeLists.txt b/core/utilities/CMakeLists.txt
index b1ae72c6f3..becb3b4d30 100644
--- a/core/utilities/CMakeLists.txt
+++ b/core/utilities/CMakeLists.txt
@@ -13,6 +13,8 @@ set(NEO_CORE_UTILITIES
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h
 )
 
diff --git a/runtime/utilities/heap_allocator.cpp b/core/utilities/heap_allocator.cpp
similarity index 82%
rename from runtime/utilities/heap_allocator.cpp
rename to core/utilities/heap_allocator.cpp
index f28bbea9cc..5e5b7393b2 100644
--- a/runtime/utilities/heap_allocator.cpp
+++ b/core/utilities/heap_allocator.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/utilities/heap_allocator.h"
+#include "core/utilities/heap_allocator.h"
 
 namespace NEO {
 
diff --git a/runtime/utilities/heap_allocator.h b/core/utilities/heap_allocator.h
similarity index 100%
rename from runtime/utilities/heap_allocator.h
rename to core/utilities/heap_allocator.h
diff --git a/runtime/aub_mem_dump/aub_mem_dump.inl b/runtime/aub_mem_dump/aub_mem_dump.inl
index d6131b7108..0b92dce6f5 100644
--- a/runtime/aub_mem_dump/aub_mem_dump.inl
+++ b/runtime/aub_mem_dump/aub_mem_dump.inl
@@ -6,9 +6,9 @@
  */
 
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "aub_mem_dump.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 ac6737292d..5d4e49ca4c 100644
--- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -8,6 +8,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.inl"
@@ -22,7 +23,6 @@
 #include "runtime/helpers/neo_driver_version.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_banks.h"
-#include "runtime/memory_manager/memory_constants.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"
diff --git a/runtime/command_stream/csr_definitions.h b/runtime/command_stream/csr_definitions.h
index 3a9710b4ff..c06096295a 100644
--- a/runtime/command_stream/csr_definitions.h
+++ b/runtime/command_stream/csr_definitions.h
@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/kernel/grf_config.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include <limits>
 
diff --git a/runtime/command_stream/experimental_command_buffer.cpp b/runtime/command_stream/experimental_command_buffer.cpp
index bf105ef0da..886336e369 100644
--- a/runtime/command_stream/experimental_command_buffer.cpp
+++ b/runtime/command_stream/experimental_command_buffer.cpp
@@ -8,9 +8,9 @@
 #include "runtime/command_stream/experimental_command_buffer.h"
 
 #include "core/command_stream/linear_stream.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 #include <cstring>
diff --git a/runtime/command_stream/scratch_space_controller_base.cpp b/runtime/command_stream/scratch_space_controller_base.cpp
index bffc2dce2b..c654cac971 100644
--- a/runtime/command_stream/scratch_space_controller_base.cpp
+++ b/runtime/command_stream/scratch_space_controller_base.cpp
@@ -8,12 +8,12 @@
 #include "runtime/command_stream/scratch_space_controller_base.h"
 
 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 namespace NEO {
diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
index bd2c1a6c46..29389fd007 100644
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl
@@ -7,6 +7,7 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
@@ -18,7 +19,6 @@
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_banks.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
diff --git a/runtime/dll/windows/os_interface.cpp b/runtime/dll/windows/os_interface.cpp
index feed77d352..d173c22d13 100644
--- a/runtime/dll/windows/os_interface.cpp
+++ b/runtime/dll/windows/os_interface.cpp
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/windows/os_interface.h"
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 namespace NEO {
 
 bool OSInterface::osEnableLocalMemory = true && is64bit;
diff --git a/runtime/execution_environment/execution_environment.h b/runtime/execution_environment/execution_environment.h
index 4816db0986..4456f10143 100644
--- a/runtime/execution_environment/execution_environment.h
+++ b/runtime/execution_environment/execution_environment.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/utilities/reference_tracked_object.h"
 
diff --git a/runtime/gen11/aub_mapper.h b/runtime/gen11/aub_mapper.h
index 42e5fde3dd..a3639c98a4 100644
--- a/runtime/gen11/aub_mapper.h
+++ b/runtime/gen11/aub_mapper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/gen_common/aub_mapper_base.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 
diff --git a/runtime/gen11/hw_info_ehl.inl b/runtime/gen11/hw_info_ehl.inl
index 48a074b50f..39ff055ae6 100644
--- a/runtime/gen11/hw_info_ehl.inl
+++ b/runtime/gen11/hw_info_ehl.inl
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_cmds_ehl.h"
diff --git a/runtime/gen11/hw_info_icllp.inl b/runtime/gen11/hw_info_icllp.inl
index 2643ef759a..341ab04bdd 100644
--- a/runtime/gen11/hw_info_icllp.inl
+++ b/runtime/gen11/hw_info_icllp.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen11/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_icllp.h"
diff --git a/runtime/gen11/hw_info_lkf.inl b/runtime/gen11/hw_info_lkf.inl
index f8a4c3334d..0eda4636b4 100644
--- a/runtime/gen11/hw_info_lkf.inl
+++ b/runtime/gen11/hw_info_lkf.inl
@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_cmds_lkf.h"
diff --git a/runtime/gen8/aub_mapper.h b/runtime/gen8/aub_mapper.h
index 0046cd30a4..bcdae8fcf8 100644
--- a/runtime/gen8/aub_mapper.h
+++ b/runtime/gen8/aub_mapper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/gen_common/aub_mapper_base.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 
diff --git a/runtime/gen8/hw_helper_gen8.cpp b/runtime/gen8/hw_helper_gen8.cpp
index 7fd3938db9..7673207e31 100644
--- a/runtime/gen8/hw_helper_gen8.cpp
+++ b/runtime/gen8/hw_helper_gen8.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub/aub_helper_bdw_plus.inl"
 #include "runtime/helpers/flat_batch_buffer_helper_hw.inl"
 #include "runtime/helpers/hw_helper_bdw_plus.inl"
-#include "runtime/memory_manager/memory_constants.h"
 
 namespace NEO {
 typedef BDWFamily Family;
diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl
index 3c14464c5e..5d30ddf0a7 100644
--- a/runtime/gen8/hw_info_bdw.inl
+++ b/runtime/gen8/hw_info_bdw.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen8/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info.h"
diff --git a/runtime/gen9/aub_mapper.h b/runtime/gen9/aub_mapper.h
index 2847194ef8..07d5e97bea 100644
--- a/runtime/gen9/aub_mapper.h
+++ b/runtime/gen9/aub_mapper.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/gen_common/aub_mapper_base.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 
diff --git a/runtime/gen9/hw_info_bxt.inl b/runtime/gen9/hw_info_bxt.inl
index 3dc63b6839..507ce3e20a 100644
--- a/runtime/gen9/hw_info_bxt.inl
+++ b/runtime/gen9/hw_info_bxt.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen9/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_bxt.h"
diff --git a/runtime/gen9/hw_info_cfl.inl b/runtime/gen9/hw_info_cfl.inl
index 5879a53617..a322813ffc 100644
--- a/runtime/gen9/hw_info_cfl.inl
+++ b/runtime/gen9/hw_info_cfl.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen9/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_cfl.h"
diff --git a/runtime/gen9/hw_info_glk.inl b/runtime/gen9/hw_info_glk.inl
index 47a7069579..cafbaf04db 100644
--- a/runtime/gen9/hw_info_glk.inl
+++ b/runtime/gen9/hw_info_glk.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen9/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_glk.h"
diff --git a/runtime/gen9/hw_info_kbl.inl b/runtime/gen9/hw_info_kbl.inl
index 8c3fa581d3..ebd16dfaaf 100644
--- a/runtime/gen9/hw_info_kbl.inl
+++ b/runtime/gen9/hw_info_kbl.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen9/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_kbl.h"
diff --git a/runtime/gen9/hw_info_skl.inl b/runtime/gen9/hw_info_skl.inl
index 34f09f78cb..5db4afc97a 100644
--- a/runtime/gen9/hw_info_skl.inl
+++ b/runtime/gen9/hw_info_skl.inl
@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_services.h"
 #include "runtime/gen9/hw_cmds.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "engine_node.h"
 #include "hw_info_skl.h"
diff --git a/runtime/helpers/blit_commands_helper.h b/runtime/helpers/blit_commands_helper.h
index 0651c0947a..14ee842389 100644
--- a/runtime/helpers/blit_commands_helper.h
+++ b/runtime/helpers/blit_commands_helper.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include <cstdint>
 
diff --git a/runtime/helpers/hardware_context_controller.cpp b/runtime/helpers/hardware_context_controller.cpp
index fc60467609..8825236e61 100644
--- a/runtime/helpers/hardware_context_controller.cpp
+++ b/runtime/helpers/hardware_context_controller.cpp
@@ -7,8 +7,8 @@
 
 #include "runtime/helpers/hardware_context_controller.h"
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/os_context.h"
 
 using namespace NEO;
diff --git a/runtime/helpers/hw_helper_base.inl b/runtime/helpers/hw_helper_base.inl
index c4706b5255..b7679c538c 100644
--- a/runtime/helpers/hw_helper_base.inl
+++ b/runtime/helpers/hw_helper_base.inl
@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -14,7 +15,6 @@
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/memory_manager/graphics_allocation.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/os_interface.h"
 
 namespace NEO {
diff --git a/runtime/helpers/state_base_address_base.inl b/runtime/helpers/state_base_address_base.inl
index 2512dde9e6..c740344ae9 100644
--- a/runtime/helpers/state_base_address_base.inl
+++ b/runtime/helpers/state_base_address_base.inl
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/state_base_address.h"
 #include "runtime/indirect_heap/indirect_heap.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "hw_cmds.h"
 
diff --git a/runtime/indirect_heap/indirect_heap.h b/runtime/indirect_heap/indirect_heap.h
index 093ca4d9df..6f3154a879 100644
--- a/runtime/indirect_heap/indirect_heap.h
+++ b/runtime/indirect_heap/indirect_heap.h
@@ -10,8 +10,8 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/graphics_allocation.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 namespace NEO {
 class GraphicsAllocation;
diff --git a/runtime/mem_obj/buffer.h b/runtime/mem_obj/buffer.h
index 84cea96ae7..a0aa2bd4f8 100644
--- a/runtime/mem_obj/buffer.h
+++ b/runtime/mem_obj/buffer.h
@@ -7,10 +7,10 @@
 
 #pragma once
 #include "core/helpers/basic_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "public/cl_ext_private.h"
 #include "runtime/context/context_type.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include "igfxfmid.h"
 #include "memory_properties_flags.h"
diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt
index 5afc795473..65a9479b23 100644
--- a/runtime/memory_manager/CMakeLists.txt
+++ b/runtime/memory_manager/CMakeLists.txt
@@ -19,8 +19,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_limits.h
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.h
   ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/graphics_allocation.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/graphics_allocation_extra.cpp
@@ -32,7 +30,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h
   ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_banks.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_manager_banks_count.cpp
diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h
index 6b849f2057..d3ac15eab4 100644
--- a/runtime/memory_manager/graphics_allocation.h
+++ b/runtime/memory_manager/graphics_allocation.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/host_ptr_defines.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/memory_pool.h"
 #include "runtime/utilities/idlist.h"
 
diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h
index b967270748..e5df8b20d6 100644
--- a/runtime/memory_manager/memory_manager.h
+++ b/runtime/memory_manager/memory_manager.h
@@ -9,11 +9,11 @@
 #include "common/helpers/bit_helpers.h"
 #include "core/command_stream/preemption_mode.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/gfx_partition.h"
 #include "core/page_fault_manager/cpu_page_fault_manager.h"
 #include "public/cl_ext_private.h"
 #include "runtime/helpers/engine_control.h"
 #include "runtime/memory_manager/allocation_properties.h"
-#include "runtime/memory_manager/gfx_partition.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/host_ptr_defines.h"
 #include "runtime/memory_manager/local_memory_usage.h"
diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp
index 6f4741a150..0a924d8dc4 100644
--- a/runtime/memory_manager/os_agnostic_memory_manager.cpp
+++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp
@@ -10,6 +10,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
+#include "core/os_interface/os_memory.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
@@ -18,7 +19,6 @@
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
-#include "runtime/os_interface/os_memory.h"
 
 #include <cassert>
 
diff --git a/runtime/memory_manager/physical_address_allocator.h b/runtime/memory_manager/physical_address_allocator.h
index db10b75b28..d8d3d9f064 100644
--- a/runtime/memory_manager/physical_address_allocator.h
+++ b/runtime/memory_manager/physical_address_allocator.h
@@ -7,9 +7,9 @@
 
 #pragma once
 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/memory_banks.h"
-#include "runtime/memory_manager/memory_constants.h"
 
 #include <atomic>
 #include <mutex>
diff --git a/runtime/os_interface/CMakeLists.txt b/runtime/os_interface/CMakeLists.txt
index 5f6a44f994..201a97050d 100644
--- a/runtime/os_interface/CMakeLists.txt
+++ b/runtime/os_interface/CMakeLists.txt
@@ -23,7 +23,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
   ${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_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_thread.h
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/os_time.h
@@ -32,8 +31,8 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/print.h
 )
 
-get_property(NEO_CORE_OS_INTERFACE_AUB GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_AUB)
-list(APPEND RUNTIME_SRCS_OS_INTERFACE_BASE ${NEO_CORE_OS_INTERFACE_AUB})
+get_property(NEO_CORE_OS_INTERFACE GLOBAL PROPERTY NEO_CORE_OS_INTERFACE)
+list(APPEND RUNTIME_SRCS_OS_INTERFACE_BASE ${NEO_CORE_OS_INTERFACE})
 
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_BASE})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_BASE ${RUNTIME_SRCS_OS_INTERFACE_BASE})
diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt
index 7e95fd719f..3731bbd50e 100644
--- a/runtime/os_interface/linux/CMakeLists.txt
+++ b/runtime/os_interface/linux/CMakeLists.txt
@@ -44,8 +44,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${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_memory_linux.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_linux.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/linux/drm_neo.cpp b/runtime/os_interface/linux/drm_neo.cpp
index 31deb68b61..dd1366ee24 100644
--- a/runtime/os_interface/linux/drm_neo.cpp
+++ b/runtime/os_interface/linux/drm_neo.cpp
@@ -7,7 +7,7 @@
 
 #include "drm_neo.h"
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/os_interface/os_inc_base.h"
 #include "runtime/utilities/directory.h"
 
diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp
index fb32c1efec..78e8f00f4a 100644
--- a/runtime/os_interface/linux/hw_info_config.cpp
+++ b/runtime/os_interface/linux/hw_info_config.cpp
@@ -7,12 +7,12 @@
 
 #include "runtime/os_interface/hw_info_config.h"
 
+#include "core/memory_manager/memory_constants.h"
 #include "core/utilities/cpu_info.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/memory_manager/memory_constants.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/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
index ee314eaabd..c9b4c03311 100644
--- a/runtime/os_interface/windows/CMakeLists.txt
+++ b/runtime/os_interface/windows/CMakeLists.txt
@@ -35,8 +35,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${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_memory_win.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.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/hw_info_config.cpp b/runtime/os_interface/windows/hw_info_config.cpp
index 004c360377..0129a228cc 100644
--- a/runtime/os_interface/windows/hw_info_config.cpp
+++ b/runtime/os_interface/windows/hw_info_config.cpp
@@ -7,11 +7,11 @@
 
 #include "runtime/os_interface/hw_info_config.h"
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/gen_common/hw_cmds.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include "instrumentation.h"
diff --git a/runtime/os_interface/windows/wddm/wddm.h b/runtime/os_interface/windows/wddm/wddm.h
index 5be16b1a7e..7e706d992a 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/memory_manager/gfx_partition.h"
 #include "core/utilities/spinlock.h"
 #include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/memory_manager/gfx_partition.h"
 #include "runtime/os_interface/os_context.h"
 
 #include "sku_info.h"
diff --git a/runtime/os_interface/windows/wddm/wddm_interface.cpp b/runtime/os_interface/windows/wddm/wddm_interface.cpp
index 868649873b..75d15fba43 100644
--- a/runtime/os_interface/windows/wddm/wddm_interface.cpp
+++ b/runtime/os_interface/windows/wddm/wddm_interface.cpp
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/windows/wddm/wddm_interface.h"
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt
index f15c29f534..2d4c0b8452 100644
--- a/runtime/utilities/CMakeLists.txt
+++ b/runtime/utilities/CMakeLists.txt
@@ -9,8 +9,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h
   ${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h
   ${CMAKE_CURRENT_SOURCE_DIR}/directory.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/iflist.h
   ${CMAKE_CURRENT_SOURCE_DIR}/idlist.h
   ${CMAKE_CURRENT_SOURCE_DIR}/numeric.h
diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp
index 97590565bb..d97784cc48 100644
--- a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp
+++ b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h"
 #include "unit_tests/gen_common/gen_commands_common_validation.h"
diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp
index eeb44f6a35..ade2e851c6 100644
--- a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp
+++ b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h"
 #include "unit_tests/fixtures/buffer_enqueue_fixture.h"
diff --git a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
index 637eb6da63..eebe5f815f 100644
--- a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
+++ b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/windows/windows_wrapper.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/memory_manager/graphics_allocation.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/sharings/gl/gl_buffer.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
diff --git a/unit_tests/command_stream/experimental_command_buffer_tests.cpp b/unit_tests/command_stream/experimental_command_buffer_tests.cpp
index cc6c2e0ab7..18ac218c88 100644
--- a/unit_tests/command_stream/experimental_command_buffer_tests.cpp
+++ b/unit_tests/command_stream/experimental_command_buffer_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h"
diff --git a/unit_tests/gen8/hw_helper_tests_gen8.cpp b/unit_tests/gen8/hw_helper_tests_gen8.cpp
index f00380bd3f..bce19469c2 100644
--- a/unit_tests/gen8/hw_helper_tests_gen8.cpp
+++ b/unit_tests/gen8/hw_helper_tests_gen8.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 #include "unit_tests/helpers/get_gpgpu_engines_tests.inl"
 #include "unit_tests/helpers/hw_helper_tests.h"
 
diff --git a/unit_tests/gen_common/gen_commands_common_validation.h b/unit_tests/gen_common/gen_commands_common_validation.h
index 49f3ad0302..d45180baf2 100644
--- a/unit_tests/gen_common/gen_commands_common_validation.h
+++ b/unit_tests/gen_common/gen_commands_common_validation.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/indirect_heap/indirect_heap.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 #include "unit_tests/helpers/unit_test_helper.h"
 
diff --git a/unit_tests/igdrcl_tests_pch.h b/unit_tests/igdrcl_tests_pch.h
index 0c410fbdfb..efbb94b05a 100644
--- a/unit_tests/igdrcl_tests_pch.h
+++ b/unit_tests/igdrcl_tests_pch.h
@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/abort.h"
@@ -13,7 +14,6 @@
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/kmd_notify_properties.h"
-#include "runtime/memory_manager/memory_constants.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/os_interface.cpp b/unit_tests/libult/os_interface.cpp
index 17695550dc..0416ebb777 100644
--- a/unit_tests/libult/os_interface.cpp
+++ b/unit_tests/libult/os_interface.cpp
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/os_interface.h"
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 
 namespace NEO {
 
diff --git a/unit_tests/mem_obj/sub_buffer_tests.cpp b/unit_tests/mem_obj/sub_buffer_tests.cpp
index 766fe970f7..4a7c718f5c 100644
--- a/unit_tests/mem_obj/sub_buffer_tests.cpp
+++ b/unit_tests/mem_obj/sub_buffer_tests.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_context.h"
diff --git a/unit_tests/memory_manager/gfx_partition_tests.cpp b/unit_tests/memory_manager/gfx_partition_tests.cpp
index 6f8685a984..4f2b5107fd 100644
--- a/unit_tests/memory_manager/gfx_partition_tests.cpp
+++ b/unit_tests/memory_manager/gfx_partition_tests.cpp
@@ -8,7 +8,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/os_interface/os_memory.h"
+#include "core/os_interface/os_memory.h"
 #include "unit_tests/mocks/mock_gfx_partition.h"
 
 #include "gtest/gtest.h"
diff --git a/unit_tests/memory_manager/host_ptr_manager_tests.cpp b/unit_tests/memory_manager/host_ptr_manager_tests.cpp
index c1ce81f5c9..83c68e9eee 100644
--- a/unit_tests/memory_manager/host_ptr_manager_tests.cpp
+++ b/unit_tests/memory_manager/host_ptr_manager_tests.cpp
@@ -7,8 +7,8 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_manager_fixture.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp
index 83a5324a48..3b145ae799 100644
--- a/unit_tests/memory_manager/memory_manager_tests.cpp
+++ b/unit_tests/memory_manager/memory_manager_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/event/event.h"
@@ -14,7 +15,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
diff --git a/unit_tests/mock_gdi/mock_gdi.cpp b/unit_tests/mock_gdi/mock_gdi.cpp
index 545268d6f6..01a28b9284 100644
--- a/unit_tests/mock_gdi/mock_gdi.cpp
+++ b/unit_tests/mock_gdi/mock_gdi.cpp
@@ -7,7 +7,7 @@
 
 #include "mock_gdi.h"
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 
 ADAPTER_INFO gAdapterInfo = {0};
 D3DDDI_MAPGPUVIRTUALADDRESS gLastCallMapGpuVaArg = {0};
diff --git a/unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp b/unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp
index f1e3676eb0..5be4f6aae2 100644
--- a/unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp
+++ b/unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 
 #include "mock_gdi.h"
 
diff --git a/unit_tests/mocks/mock_gfx_partition.h b/unit_tests/mocks/mock_gfx_partition.h
index 43426d2324..b216e17719 100644
--- a/unit_tests/mocks/mock_gfx_partition.h
+++ b/unit_tests/mocks/mock_gfx_partition.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/gfx_partition.h"
+#include "core/memory_manager/gfx_partition.h"
 
 #include "gmock/gmock.h"
 
diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp
index f9aed554a7..07c890bfd4 100644
--- a/unit_tests/os_interface/device_factory_tests.cpp
+++ b/unit_tests/os_interface/device_factory_tests.cpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.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/memory_manager/memory_constants.h"
 #include "runtime/os_interface/device_factory.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/os_interface/os_library.h"
diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
index 804b3fc6f5..704f090cac 100644
--- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
@@ -10,6 +10,7 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/command_stream/preemption.h"
@@ -18,7 +19,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/os_interface/linux/drm_allocation.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"
diff --git a/unit_tests/os_interface/linux/drm_mock.h b/unit_tests/os_interface/linux/drm_mock.h
index 665a4a6cfc..e71db789d7 100644
--- a/unit_tests/os_interface/linux/drm_mock.h
+++ b/unit_tests/os_interface/linux/drm_mock.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/os_interface/linux/drm_neo.h"
 
 #include "drm/i915_drm.h"
diff --git a/unit_tests/os_interface/linux/drm_os_memory_tests.cpp b/unit_tests/os_interface/linux/drm_os_memory_tests.cpp
index debb613d4e..860e93987f 100644
--- a/unit_tests/os_interface/linux/drm_os_memory_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_os_memory_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/linux/os_memory_linux.h"
+#include "core/os_interface/linux/os_memory_linux.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/unit_tests/os_interface/os_memory_tests.cpp b/unit_tests/os_interface/os_memory_tests.cpp
index aab8351247..1018fecbf0 100644
--- a/unit_tests/os_interface/os_memory_tests.cpp
+++ b/unit_tests/os_interface/os_memory_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/os_memory.h"
+#include "core/os_interface/os_memory.h"
 
 #include "gtest/gtest.h"
 
diff --git a/unit_tests/os_interface/windows/ult_dxgi_factory.h b/unit_tests/os_interface/windows/ult_dxgi_factory.h
index 97848aa983..b4a9747d2c 100644
--- a/unit_tests/os_interface/windows/ult_dxgi_factory.h
+++ b/unit_tests/os_interface/windows/ult_dxgi_factory.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 
 #include <cwchar>
 #include <dxgi.h>
diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp
index bb8f4ace47..e63502f56d 100644
--- a/unit_tests/os_interface/windows/wddm23_tests.cpp
+++ b/unit_tests/os_interface/windows/wddm23_tests.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/helpers/hw_helper.h"
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/gdi_interface.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
diff --git a/unit_tests/utilities/heap_allocator_tests.cpp b/unit_tests/utilities/heap_allocator_tests.cpp
index 90789d682e..2fb14ca6fb 100644
--- a/unit_tests/utilities/heap_allocator_tests.cpp
+++ b/unit_tests/utilities/heap_allocator_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/utilities/heap_allocator.h"
+#include "core/utilities/heap_allocator.h"
 #include "test.h"
 
 #include "gtest/gtest.h"
diff --git a/unit_tests/windows/os_interface_tests.cpp b/unit_tests/windows/os_interface_tests.cpp
index 12f194de8a..aae5ffa2be 100644
--- a/unit_tests/windows/os_interface_tests.cpp
+++ b/unit_tests/windows/os_interface_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/memory_manager/memory_constants.h"
+#include "core/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "test.h"