diff --git a/shared/source/os_interface/linux/drm_query.cpp b/shared/source/os_interface/linux/drm_query.cpp
index 779215f283..714be72418 100644
--- a/shared/source/os_interface/linux/drm_query.cpp
+++ b/shared/source/os_interface/linux/drm_query.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/os_interface/linux/cache_info_impl.h"
 #include "shared/source/os_interface/linux/drm_engine_mapper.h"
 #include "shared/source/os_interface/linux/engine_info_impl.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
@@ -33,12 +32,6 @@ std::string getIoctlParamStringRemaining(int param) {
 }
 } // namespace IoctlHelper
 
-bool Drm::querySystemInfo() {
-    return false;
-}
-
-void Drm::setupSystemInfo(HardwareInfo *hwInfo, SystemInfo *sysInfo) {}
-
 bool Drm::queryEngineInfo(bool isSysmanEnabled) {
     auto length = 0;
     auto dataQuery = this->query(DRM_I915_QUERY_ENGINE_INFO, DrmQueryItemFlags::empty, length);
@@ -58,32 +51,6 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au
     return DrmEngineMapper::engineNodeMap(engineType);
 }
 
-int Drm::bindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
-    return 0;
-}
-
-int Drm::unbindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
-    return 0;
-}
-
-void Drm::waitForBind(uint32_t vmHandleId) {
-}
-
-int Drm::waitUserFence(uint32_t ctx, uint64_t address, uint64_t value, ValueWidth dataWidth, int64_t timeout, uint16_t flags) {
-    return 0;
-}
-
-bool Drm::isVmBindAvailable() {
-    return this->bindAvailable;
-}
-
-void Drm::appendDrmContextFlags(drm_i915_gem_context_create_ext &gcc, bool isSpecialContextRequested) {
-}
-
-void Drm::setupCacheInfo(const HardwareInfo &hwInfo) {
-    this->cacheInfo.reset(new CacheInfoImpl());
-}
-
 int Drm::createDrmVirtualMemory(uint32_t &drmVmId) {
     drm_i915_gem_vm_control ctl = {};
     auto ret = SysCalls::ioctl(getFileDescriptor(), DRM_IOCTL_I915_GEM_VM_CREATE, &ctl);
diff --git a/shared/source/os_interface/linux/drm_query_dg1.cpp b/shared/source/os_interface/linux/drm_query_dg1.cpp
index f21a522f7e..f0a4c607d3 100644
--- a/shared/source/os_interface/linux/drm_query_dg1.cpp
+++ b/shared/source/os_interface/linux/drm_query_dg1.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/os_interface/linux/cache_info_impl.h"
 #include "shared/source/os_interface/linux/drm_engine_mapper.h"
 #include "shared/source/os_interface/linux/engine_info_impl.h"
 #include "shared/source/os_interface/linux/memory_info_impl.h"
@@ -35,12 +34,6 @@ std::string getIoctlParamStringRemaining(int param) {
 }
 } // namespace IoctlHelper
 
-bool Drm::querySystemInfo() {
-    return false;
-}
-
-void Drm::setupSystemInfo(HardwareInfo *hwInfo, SystemInfo *sysInfo) {}
-
 bool Drm::queryEngineInfo(bool isSysmanEnabled) {
     auto length = 0;
     auto dataQuery = this->query(DRM_I915_QUERY_ENGINE_INFO, DrmQueryItemFlags::empty, length);
@@ -67,32 +60,6 @@ unsigned int Drm::bindDrmContext(uint32_t drmContextId, uint32_t deviceIndex, au
     return DrmEngineMapper::engineNodeMap(engineType);
 }
 
-int Drm::bindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
-    return 0;
-}
-
-int Drm::unbindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
-    return 0;
-}
-
-void Drm::waitForBind(uint32_t vmHandleId) {
-}
-
-int Drm::waitUserFence(uint32_t ctx, uint64_t address, uint64_t value, ValueWidth dataWidth, int64_t timeout, uint16_t flags) {
-    return 0;
-}
-
-bool Drm::isVmBindAvailable() {
-    return this->bindAvailable;
-}
-
-void Drm::appendDrmContextFlags(drm_i915_gem_context_create_ext &gcc, bool isSpecialContextRequested) {
-}
-
-void Drm::setupCacheInfo(const HardwareInfo &hwInfo) {
-    this->cacheInfo.reset(new CacheInfoImpl());
-}
-
 int Drm::createDrmVirtualMemory(uint32_t &drmVmId) {
     drm_i915_gem_vm_control ctl = {};
     auto ret = SysCalls::ioctl(getFileDescriptor(), DRM_IOCTL_I915_GEM_VM_CREATE, &ctl);
diff --git a/shared/source/os_interface/linux/drm_query_extended.cpp b/shared/source/os_interface/linux/drm_query_extended.cpp
index 5894e3db7c..900fb4d70b 100644
--- a/shared/source/os_interface/linux/drm_query_extended.cpp
+++ b/shared/source/os_interface/linux/drm_query_extended.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/linux/cache_info_impl.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
 #include "drm_query_flags.h"
@@ -34,4 +35,36 @@ bool Drm::isDebugAttachAvailable() {
     return false;
 }
 
+bool Drm::querySystemInfo() {
+    return false;
+}
+
+void Drm::setupSystemInfo(HardwareInfo *hwInfo, SystemInfo *sysInfo) {}
+
+void Drm::setupCacheInfo(const HardwareInfo &hwInfo) {
+    this->cacheInfo.reset(new CacheInfoImpl());
+}
+
+int Drm::bindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
+    return 0;
+}
+
+int Drm::unbindBufferObject(OsContext *osContext, uint32_t vmHandleId, BufferObject *bo) {
+    return 0;
+}
+
+void Drm::waitForBind(uint32_t vmHandleId) {
+}
+
+int Drm::waitUserFence(uint32_t ctx, uint64_t address, uint64_t value, ValueWidth dataWidth, int64_t timeout, uint16_t flags) {
+    return 0;
+}
+
+bool Drm::isVmBindAvailable() {
+    return this->bindAvailable;
+}
+
+void Drm::appendDrmContextFlags(drm_i915_gem_context_create_ext &gcc, bool isSpecialContextRequested) {
+}
+
 } // namespace NEO