Cleanup includes 40

Cleaned up files:
shared/source/os_interface/linux/drm_neo.h
shared/source/os_interface/windows/wddm/um_km_data_translator.h

Related-To: NEO-5548
Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/utilities/directory.h"
 

level_zero/core/source/fabric/linux/fabric_device_iaf.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/pci_path.h"
 #include "shared/source/os_interface/os_interface.h"
 

level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/mock_compilers.h"

level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

level_zero/tools/source/debug/linux/prelim/drm_helper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,8 @@
 #include "level_zero/tools/source/debug/linux/prelim/drm_helper.h"
 
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/engine_info.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 
 #include "level_zero/core/source/device/device.h"
 

level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/sys_calls.h"

level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
 #include "level_zero/core/source/driver/driver_handle.h"

level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "level_zero/tools/test/unit_tests/sources/debug/linux/debug_session_fixtures_linux.h"
 
+#include "shared/source/os_interface/linux/engine_info.h"
+
 namespace L0 {
 namespace ult {
 

level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp

@@ -13,6 +13,7 @@
 
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"

level_zero/tools/test/unit_tests/sources/debug/linux/tile_debug_session_linux_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/test.h"
 

level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/compiler_interface/compiler_cache.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/sys_calls.h"

level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/test_zes_ecc.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/os_interface/driver_info.h"
+
 #include "level_zero/tools/test/unit_tests/sources/sysman/ecc/linux/mock_ecc.h"
 
 extern bool sysmanUltsEnable;

level_zero/tools/test/unit_tests/sources/sysman/scheduler/linux/mock_sysfs_scheduler_prelim.h

@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 

opencl/test/unit_test/windows/os_interface_tests.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"

shared/source/direct_submission/linux/drm_direct_submission.inl

@@ -14,6 +14,7 @@
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/utilities/wait_util.h"
 

shared/source/os_interface/linux/clos_cache.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/os_interface/linux/clos_cache.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 

shared/source/os_interface/linux/device_time_drm.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/os_interface.h"
 
 #include <time.h>

shared/source/os_interface/linux/drm_debug.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 
 #include <cinttypes>
 #include <string>

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -37,6 +37,7 @@
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
 

shared/source/os_interface/linux/drm_neo.cpp

@@ -30,8 +30,10 @@
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/hw_device_id.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/linux/os_inc.h"
 #include "shared/source/os_interface/linux/pci_path.h"

shared/source/os_interface/linux/drm_neo.h

@@ -7,17 +7,14 @@
 
 #pragma once
 #include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/common_types.h"
+#include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/memory_manager/definitions/engine_limits.h"
-#include "shared/source/os_interface/driver_info.h"
-#include "shared/source/os_interface/linux/cache_info.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
-#include "shared/source/os_interface/linux/engine_info.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/linux/hw_device_id.h"
-#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/utilities/stackvec.h"
 
-#include "aubstream/engine_node.h"
 #include "igfxfmid.h"
 
 #include <array>
@@ -32,17 +29,26 @@
 
 struct GT_SYSTEM_INFO;
 
+namespace aub_stream {
+enum EngineType : uint32_t;
+}
+
 namespace NEO {
 constexpr uint32_t contextPrivateParamBoost = 0x80000000;
 
 enum class AllocationType;
+enum class CachePolicy : uint32_t;
+enum class CacheRegion : uint16_t;
 enum class SubmissionStatus : uint32_t;
 
 class BufferObject;
 class DeviceFactory;
+class MemoryInfo;
 class OsContext;
 class OsContextLinux;
 class Gmm;
+struct CacheInfo;
+struct EngineInfo;
 struct HardwareInfo;
 struct RootDeviceEnvironment;
 struct SystemInfo;

shared/source/os_interface/linux/os_context_linux.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/os_interface.h"
 

shared/source/os_interface/windows/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2022 Intel Corporation
+# Copyright (C) 2019-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -100,6 +100,7 @@ set(NEO_CORE_OS_INTERFACE_WDDM
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_${DRIVER_MODEL}.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_temp_storage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/um_km_data_translator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wddm/create_um_km_data_translator.cpp

shared/source/os_interface/windows/driver_info_windows.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,8 @@
 #include "shared/source/os_interface/windows/sys_calls.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
+#include <algorithm>
+
 std::string getCurrentLibraryPath() {
     std::string returnValue;
     WCHAR pathW[MAX_PATH];

shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,6 +20,7 @@
 #include "shared/source/os_interface/linux/allocator_helper.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/source/os_interface/windows/gfx_escape_wrapper.h"
+#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 #include "gmm_memory.h"

shared/source/os_interface/windows/wddm/create_um_km_data_translator.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/os_inc_base.h"
@@ -20,6 +21,7 @@
 
 #include <codecvt>
 #include <locale>
+#include <vector>
 
 namespace NEO {
 

shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/utilities/stackvec.h"
+
+namespace NEO {
+
+template <size_t StaticSize>
+struct UmKmDataTempStorageBase {
+    UmKmDataTempStorageBase() = default;
+    UmKmDataTempStorageBase(size_t dynSize) {
+        this->resize(dynSize);
+    }
+
+    void *data() {
+        return storage.data();
+    }
+
+    void resize(size_t dynSize) {
+        auto oldSize = storage.size() * sizeof(uint64_t);
+        storage.resize((dynSize + sizeof(uint64_t) - 1) / sizeof(uint64_t));
+        requestedSize = dynSize;
+        memset(reinterpret_cast<char *>(data()) + oldSize, 0, storage.size() * sizeof(uint64_t) - oldSize);
+    }
+
+    size_t size() const {
+        return requestedSize;
+    }
+
+  protected:
+    static constexpr size_t staticSizeQwordsCount = (StaticSize + sizeof(uint64_t) - 1) / sizeof(uint64_t);
+    StackVec<uint64_t, staticSizeQwordsCount> storage;
+    size_t requestedSize = 0U;
+};
+
+template <typename SrcT, size_t OverestimateMul = 2, typename BaseT = UmKmDataTempStorageBase<sizeof(SrcT) * OverestimateMul>>
+struct UmKmDataTempStorage : BaseT {
+    using BaseT::BaseT;
+};
+
+} // namespace NEO

shared/source/os_interface/windows/wddm/um_km_data_translator.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h"
 
+#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
 #include "shared/source/helpers/string.h"
 
 namespace NEO {
@@ -47,4 +48,8 @@ bool UmKmDataTranslator::translateGmmGfxPartitioningFromInternalRepresentation(G
     return (0 == memcpy_s(&dst, sizeof(GMM_GFX_PARTITIONING), src, srcSize));
 }
 
+std::unique_ptr<GmmHandleAllocator> UmKmDataTranslator::createGmmHandleAllocator() {
+    return {};
+}
+
 } // namespace NEO

shared/source/os_interface/windows/wddm/um_km_data_translator.h

@@ -1,15 +1,13 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-
-#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/os_interface/windows/sharedata_wrapper.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <memory>
 
@@ -41,47 +39,12 @@ class UmKmDataTranslator {
         return isEnabled;
     }
 
-    virtual std::unique_ptr<GmmHandleAllocator> createGmmHandleAllocator() {
-        return {};
-    }
+    virtual std::unique_ptr<GmmHandleAllocator> createGmmHandleAllocator();
 
   protected:
     bool isEnabled = false;
 };
 
-template <size_t StaticSize>
-struct UmKmDataTempStorageBase {
-    UmKmDataTempStorageBase() = default;
-    UmKmDataTempStorageBase(size_t dynSize) {
-        this->resize(dynSize);
-    }
-
-    void *data() {
-        return storage.data();
-    }
-
-    void resize(size_t dynSize) {
-        auto oldSize = storage.size() * sizeof(uint64_t);
-        storage.resize((dynSize + sizeof(uint64_t) - 1) / sizeof(uint64_t));
-        requestedSize = dynSize;
-        memset(reinterpret_cast<char *>(data()) + oldSize, 0, storage.size() * sizeof(uint64_t) - oldSize);
-    }
-
-    size_t size() const {
-        return requestedSize;
-    }
-
-  protected:
-    static constexpr size_t staticSizeQwordsCount = (StaticSize + sizeof(uint64_t) - 1) / sizeof(uint64_t);
-    StackVec<uint64_t, staticSizeQwordsCount> storage;
-    size_t requestedSize = 0U;
-};
-
-template <typename SrcT, size_t OverestimateMul = 2, typename BaseT = UmKmDataTempStorageBase<sizeof(SrcT) * OverestimateMul>>
-struct UmKmDataTempStorage : BaseT {
-    using BaseT::BaseT;
-};
-
 std::unique_ptr<UmKmDataTranslator> createUmKmDataTranslator(const Gdi &gdi, D3DKMT_HANDLE adapter);
 
 } // namespace NEO

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
+#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
@@ -33,6 +34,7 @@
 #include "shared/source/os_interface/windows/os_environment_win.h"
 #include "shared/source/os_interface/windows/sharedata_wrapper.h"
 #include "shared/source/os_interface/windows/wddm/adapter_factory.h"
+#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h"
 #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h"
 #include "shared/source/os_interface/windows/wddm/wddm_interface.h"
 #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"

shared/source/os_interface/windows/wddm/wddm_interface.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/source/os_interface/windows/os_context_win.h"
+#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 using namespace NEO;

shared/test/common/libult/linux/drm_mock_engine.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/os_interface/linux/drm_mock_device_blob.h"
 

shared/test/common/os_interface/linux/drm_memory_manager_fixture.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/memory_manager/allocation_properties.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"

shared/test/unit_test/os_interface/linux/drm_bind_tests.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/libult/linux/drm_mock.h"

shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"

shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"

shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 

shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/linux/drm_mock_helper.h"

shared/test/unit_test/os_interface/linux/drm_pci_speed_info_tests.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/string.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"

shared/test/unit_test/os_interface/linux/drm_query_topology_prelim_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"

shared/test/unit_test/os_interface/linux/drm_tests.cpp

@@ -9,7 +9,9 @@
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/linux/i915.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/linux/os_inc.h"
 #include "shared/source/os_interface/os_interface.h"

shared/test/unit_test/os_interface/linux/drm_with_prelim_tests.cpp

@@ -6,8 +6,10 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"

shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp

@@ -5,7 +5,8 @@
  *
  */
 
-#include "shared/source/os_interface/linux/ioctl_helper.h"
+#include "shared/source/os_interface/linux/engine_info.h"
+#include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"

shared/test/unit_test/os_interface/windows/um_km_data_translator_tests.cpp

@@ -1,12 +1,14 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/client_context/gmm_handle_allocator.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
+#include "shared/source/os_interface/windows/wddm/um_km_data_temp_storage.h"
 #include "shared/source/os_interface/windows/wddm/um_km_data_translator.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"