diff --git a/level_zero/core/source/cmdqueue/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp
index 8061cca277..94718d8db4 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue.cpp
+++ b/level_zero/core/source/cmdqueue/cmdqueue.cpp
@@ -116,7 +116,7 @@ void CommandQueueImp::CommandBufferManager::initialize(Device *device, size_t si
                                          NEO::GraphicsAllocation::AllocationType::COMMAND_BUFFER,
                                          device->isMultiDeviceCapable(),
                                          false,
-                                         NEO::SubDevice::unspecifiedSubDeviceIndex};
+                                         CommonConstants::allDevicesBitfield};
 
     buffers[BUFFER_ALLOCATION::FIRST] = device->getNEODevice()->getMemoryManager()->allocateGraphicsMemoryWithProperties(properties);
 
diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
index 61c194c7cb..2bed2d4405 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
@@ -3521,6 +3521,6 @@ TEST(DrmMemoryMangerTest, givenMultipleRootDeviceWhenMemoryManagerGetsDrmThenDrm
         EXPECT_EQ(drmFromRootDevice, &drmMemoryManager.getDrm(i));
         EXPECT_EQ(i, drmMemoryManager.getRootDeviceIndex(drmFromRootDevice));
     }
-    EXPECT_EQ(invalidRootDeviceIndex, drmMemoryManager.getRootDeviceIndex(nullptr));
+    EXPECT_EQ(CommonConstants::unspecifiedDeviceIndex, drmMemoryManager.getRootDeviceIndex(nullptr));
 }
 } // namespace NEO
diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt
index 6fa02eb22c..a1bba1b188 100644
--- a/shared/source/CMakeLists.txt
+++ b/shared/source/CMakeLists.txt
@@ -84,6 +84,7 @@ append_sources_from_properties(CORE_SOURCES
     NEO_CORE_INDIRECT_HEAP
     NEO_CORE_KERNEL
     NEO_CORE_MEMORY_MANAGER
+    NEO_CORE_MEMORY_PROPERTIES
     NEO_CORE_OS_INTERFACE
     NEO_CORE_PAGE_FAULT_MANAGER
     NEO_CORE_PROGRAM
diff --git a/shared/source/device/sub_device.h b/shared/source/device/sub_device.h
index 42c601b588..1264f94325 100644
--- a/shared/source/device/sub_device.h
+++ b/shared/source/device/sub_device.h
@@ -12,8 +12,6 @@ namespace NEO {
 class RootDevice;
 class SubDevice : public Device {
   public:
-    constexpr static uint32_t unspecifiedSubDeviceIndex = std::numeric_limits<uint32_t>::max();
-
     SubDevice(ExecutionEnvironment *executionEnvironment, uint32_t subDeviceIndex, RootDevice &rootDevice);
     uint32_t getNumAvailableDevices() const override;
     uint32_t getRootDeviceIndex() const override;
diff --git a/shared/source/memory_manager/memory_constants.h b/shared/source/memory_manager/memory_constants.h
index e2fb797cb3..52354de309 100644
--- a/shared/source/memory_manager/memory_constants.h
+++ b/shared/source/memory_manager/memory_constants.h
@@ -6,6 +6,8 @@
  */
 
 #pragma once
+#include "shared/source/helpers/common_types.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <limits>
@@ -58,3 +60,8 @@ enum class BlitDirection : uint32_t {
     BufferToBuffer
 };
 } // namespace BlitterConstants
+
+namespace CommonConstants {
+constexpr uint32_t unspecifiedDeviceIndex = std::numeric_limits<uint32_t>::max();
+constexpr NEO::DeviceBitfield allDevicesBitfield = maxNBitValue(32);
+} // namespace CommonConstants
diff --git a/shared/source/os_interface/linux/drm_memory_manager.cpp b/shared/source/os_interface/linux/drm_memory_manager.cpp
index 51d6c4b69d..28bfa409fd 100644
--- a/shared/source/os_interface/linux/drm_memory_manager.cpp
+++ b/shared/source/os_interface/linux/drm_memory_manager.cpp
@@ -744,7 +744,7 @@ uint32_t DrmMemoryManager::getRootDeviceIndex(const Drm *drm) {
             return rootDeviceIndex;
         }
     }
-    return std::numeric_limits<uint32_t>::max();
+    return CommonConstants::unspecifiedDeviceIndex;
 }
 
 } // namespace NEO
diff --git a/shared/source/os_interface/linux/drm_memory_manager.h b/shared/source/os_interface/linux/drm_memory_manager.h
index 52e3ce52b5..5105537024 100644
--- a/shared/source/os_interface/linux/drm_memory_manager.h
+++ b/shared/source/os_interface/linux/drm_memory_manager.h
@@ -20,7 +20,6 @@
 namespace NEO {
 class BufferObject;
 class Drm;
-constexpr uint32_t invalidRootDeviceIndex = std::numeric_limits<uint32_t>::max();
 
 class DrmMemoryManager : public MemoryManager {
   public: