diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba7420815c..715387d0da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -724,8 +724,6 @@ include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_
 include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX})
 if(MSVC)
   include_directories(${NEO_SOURCE_DIR}/opencl/source/sharings/gl/windows/include)
-else()
-  include_directories(${NEO_SHARED_DIRECTORY}/os_interface/linux/flags${BRANCH_DIR_SUFFIX})
 endif()
 
 macro(macro_for_each_core_type)
diff --git a/shared/source/os_interface/linux/CMakeLists.txt b/shared/source/os_interface/linux/CMakeLists.txt
index 1617b365fa..523ace60bf 100644
--- a/shared/source/os_interface/linux/CMakeLists.txt
+++ b/shared/source/os_interface/linux/CMakeLists.txt
@@ -57,7 +57,6 @@ set(NEO_CORE_OS_INTERFACE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_strings_prelim.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/engine_info.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/flags${BRANCH_DIR_SUFFIX}drm_query_flags.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/memory_info.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/os_context_linux.cpp
diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp
index 5e689c789a..7654cb9361 100644
--- a/shared/source/os_interface/linux/drm_neo.cpp
+++ b/shared/source/os_interface/linux/drm_neo.cpp
@@ -34,8 +34,6 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/utilities/directory.h"
 
-#include "drm_query_flags.h"
-
 #include <cstdio>
 #include <cstring>
 #include <linux/limits.h>
@@ -1007,7 +1005,7 @@ int Drm::waitUserFence(uint32_t ctxId, uint64_t address, uint64_t value, ValueWi
 
 bool Drm::querySystemInfo() {
     auto request = ioctlHelper->getHwConfigIoctlVal();
-    auto deviceBlobQuery = this->query(request, DrmQueryItemFlags::empty);
+    auto deviceBlobQuery = this->query(request, 0);
     if (deviceBlobQuery.empty()) {
         PRINT_DEBUG_STRING(DebugManager.flags.PrintDebugMessages.get(), stdout, "%s", "INFO: System Info query failed!\n");
         return false;
@@ -1017,7 +1015,7 @@ bool Drm::querySystemInfo() {
 }
 
 std::vector<uint8_t> Drm::getMemoryRegions() {
-    return this->query(ioctlHelper->getMemRegionsIoctlVal(), DrmQueryItemFlags::empty);
+    return this->query(ioctlHelper->getMemRegionsIoctlVal(), 0);
 }
 
 bool Drm::queryMemoryInfo() {
@@ -1031,7 +1029,7 @@ bool Drm::queryMemoryInfo() {
 }
 
 bool Drm::queryEngineInfo(bool isSysmanEnabled) {
-    auto enginesQuery = this->query(ioctlHelper->getEngineInfoIoctlVal(), DrmQueryItemFlags::empty);
+    auto enginesQuery = this->query(ioctlHelper->getEngineInfoIoctlVal(), 0);
     if (enginesQuery.empty()) {
         return false;
     }
@@ -1186,7 +1184,7 @@ bool Drm::queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &topologyD
 
     // fallback to DRM_I915_QUERY_TOPOLOGY_INFO
 
-    auto dataQuery = this->query(DRM_I915_QUERY_TOPOLOGY_INFO, DrmQueryItemFlags::topology);
+    auto dataQuery = this->query(DRM_I915_QUERY_TOPOLOGY_INFO, 0);
     if (dataQuery.empty()) {
         return false;
     }
diff --git a/shared/source/os_interface/linux/flags/drm_query_flags.h b/shared/source/os_interface/linux/flags/drm_query_flags.h
deleted file mode 100644
index f0468c9fe8..0000000000
--- a/shared/source/os_interface/linux/flags/drm_query_flags.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-
-#include <cstdint>
-
-namespace NEO {
-namespace DrmQueryItemFlags {
-constexpr uint32_t empty = 0;
-constexpr uint32_t topology = 0;
-} // namespace DrmQueryItemFlags
-} // namespace NEO