diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c10a0f475..263b31d0d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -746,6 +746,7 @@ endif()
 # Please keep alphabetical order
 include_directories(${IGDRCL_SOURCE_DIR})
 include_directories(${IGDRCL_BUILD_DIR})
+include_directories(${IGDRCL_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 include_directories(${IGDRCL_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
 include_directories(${IGDRCL_SOURCE_DIR}/runtime/built_ins/builtinops${BRANCH_DIR_SUFFIX})
 include_directories(${IGDRCL_SOURCE_DIR}/runtime/command_stream/definitions${BRANCH_DIR_SUFFIX})
diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt
index b8a0bd39f3..e03a1d40c1 100644
--- a/core/memory_manager/CMakeLists.txt
+++ b/core/memory_manager/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 set(NEO_CORE_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_limits.h
   ${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.h
diff --git a/runtime/memory_manager/definitions/engine_limits.h b/core/memory_manager/definitions/engine_limits.h
similarity index 100%
rename from runtime/memory_manager/definitions/engine_limits.h
rename to core/memory_manager/definitions/engine_limits.h
diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt
index 65a9479b23..33ef9a743f 100644
--- a/runtime/memory_manager/CMakeLists.txt
+++ b/runtime/memory_manager/CMakeLists.txt
@@ -16,7 +16,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
   ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion.h
   ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.h
-  ${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}/graphics_allocation.cpp
diff --git a/runtime/memory_manager/residency.cpp b/runtime/memory_manager/residency.cpp
index 0adf11bf3c..b7e40512aa 100644
--- a/runtime/memory_manager/residency.cpp
+++ b/runtime/memory_manager/residency.cpp
@@ -7,8 +7,6 @@
 
 #include "runtime/memory_manager/residency.h"
 
-#include "runtime/os_interface/os_context.h"
-
 using namespace NEO;
 
 void ResidencyData::updateCompletionData(uint64_t newFenceValue, uint32_t contextId) {