diff --git a/level_zero/tools/source/debug/eu_thread.h b/level_zero/tools/source/debug/eu_thread.h
index 64f60da1e1..3a5f14adc0 100644
--- a/level_zero/tools/source/debug/eu_thread.h
+++ b/level_zero/tools/source/debug/eu_thread.h
@@ -15,7 +15,6 @@
 #include <atomic>
 #include <limits>
 #include <sstream>
-#include <string>
 
 namespace L0 {
 
diff --git a/opencl/source/cl_device/cl_device.h b/opencl/source/cl_device/cl_device.h
index cf7ecbfb90..cbcf0a8d3f 100644
--- a/opencl/source/cl_device/cl_device.h
+++ b/opencl/source/cl_device/cl_device.h
@@ -18,6 +18,7 @@
 #include "aubstream/engine_node.h"
 #include "igfxfmid.h"
 
+#include <mutex>
 #include <vector>
 
 namespace NEO {
diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index 55e7ab989c..861d372cf2 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -5,15 +5,11 @@
  *
  */
 
-#include "shared/source/compiler_interface/oclc_extensions.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
-#include "shared/source/device/device_info.h"
-#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/driver_info.h"
-#include "shared/source/os_interface/hw_info_config.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
@@ -21,8 +17,8 @@
 
 #include "driver_version.h"
 
+#include <iterator>
 #include <sstream>
-#include <string>
 
 namespace NEO {
 extern const char *familyName[];
diff --git a/opencl/source/helpers/base_object.h b/opencl/source/helpers/base_object.h
index 1d1db9aa8a..11357c1e5f 100644
--- a/opencl/source/helpers/base_object.h
+++ b/opencl/source/helpers/base_object.h
@@ -12,11 +12,9 @@
 
 #include "opencl/source/api/dispatch.h"
 
-#include "CL/cl.h"
+#include <CL/cl_platform.h>
 
-#include <atomic>
 #include <condition_variable>
-#include <mutex>
 #include <thread>
 
 namespace NEO {
diff --git a/opencl/source/os_interface/windows/d3d10_11_sharing_functions.cpp b/opencl/source/os_interface/windows/d3d10_11_sharing_functions.cpp
index b395a56a5d..8c287e1542 100644
--- a/opencl/source/os_interface/windows/d3d10_11_sharing_functions.cpp
+++ b/opencl/source/os_interface/windows/d3d10_11_sharing_functions.cpp
@@ -8,10 +8,11 @@
 #include "shared/source/helpers/array_count.h"
 
 #include "opencl/source/context/context.inl"
-#include "opencl/source/os_interface/windows/d3d_sharing_functions.h"
 #include "opencl/source/sharings/d3d/d3d_sharing.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
+#include "DXGI1_2.h"
+
 using namespace NEO;
 
 template class D3DSharingFunctions<D3DTypesHelper::D3D10>;
diff --git a/opencl/source/os_interface/windows/d3d_sharing_functions.h b/opencl/source/os_interface/windows/d3d_sharing_functions.h
index f7116a3d2f..cd6bd68186 100644
--- a/opencl/source/os_interface/windows/d3d_sharing_functions.h
+++ b/opencl/source/os_interface/windows/d3d_sharing_functions.h
@@ -9,9 +9,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 
 #include "opencl/source/api/dispatch.h"
-#include "opencl/source/sharings/sharing.h"
-
-#include "DXGI1_2.h"
 
 #include <map>
 #include <vector>
diff --git a/opencl/source/platform/platform.h b/opencl/source/platform/platform.h
index 3bdc66a48c..8d1b20a5e6 100644
--- a/opencl/source/platform/platform.h
+++ b/opencl/source/platform/platform.h
@@ -14,6 +14,7 @@
 
 #include "platform_info.h"
 
+#include <mutex>
 #include <vector>
 
 namespace NEO {
diff --git a/opencl/source/sharings/d3d/d3d_sharing.h b/opencl/source/sharings/d3d/d3d_sharing.h
index 0ffbc420dc..7102c7ebba 100644
--- a/opencl/source/sharings/d3d/d3d_sharing.h
+++ b/opencl/source/sharings/d3d/d3d_sharing.h
@@ -6,6 +6,8 @@
  */
 
 #pragma once
+#include "opencl/source/sharings/sharing.h"
+
 #include "d3d_sharing_functions.h"
 
 #include <mutex>
diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
index 010a8298b2..26fabd71b9 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
@@ -5,29 +5,13 @@
  *
  */
 
-#include "shared/source/execution_environment/execution_environment.h"
-#include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
-#include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/os_library.h"
-#include "shared/source/os_interface/os_time.h"
 #include "shared/source/os_interface/windows/driver_info_windows.h"
-#include "shared/source/os_interface/windows/os_context_win.h"
-#include "shared/source/os_interface/windows/os_environment_win.h"
-#include "shared/source/os_interface/windows/sys_calls.h"
-#include "shared/source/os_interface/windows/wddm/wddm_interface.h"
-#include "shared/source/os_interface/windows/wddm_allocation.h"
 #include "shared/source/os_interface/windows/wddm_engine_mapper.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/source/utilities/debug_settings_reader.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/variable_backup.h"
-#include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_gfx_partition.h"
-#include "shared/test/common/mocks/mock_gmm_resource_info.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_wddm_residency_logger.h"
@@ -36,13 +20,9 @@
 
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
 
-#include "gtest/gtest.h"
 #include "mock_gmm_memory.h"
 
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <memory>
+#include <dxgi.h>
 
 namespace NEO {
 namespace SysCalls {
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 7186cb68a1..ff3447452f 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -20,21 +20,13 @@
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/helpers/compiler_options_parser.h"
 #include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/validators.h"
 
-#include "cif/helpers/error.h"
-#include "igfxfmid.h"
-#include "ocl_igc_interface/fcl_ocl_device_ctx.h"
-#include "ocl_igc_interface/igc_ocl_device_ctx.h"
-#include "ocl_igc_interface/platform_helper.h"
 #include "platforms.h"
 
-#include <algorithm>
 #include <iomanip>
+#include <iterator>
 #include <list>
 
 #ifdef _WIN32
diff --git a/shared/source/compiler_interface/compiler_interface.inl b/shared/source/compiler_interface/compiler_interface.inl
index 8c413d7b8c..55a51632bf 100644
--- a/shared/source/compiler_interface/compiler_interface.inl
+++ b/shared/source/compiler_interface/compiler_interface.inl
@@ -9,16 +9,13 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/validators.h"
-#include "shared/source/os_interface/os_library.h"
 
-#include "cif/builtins/memory/buffer/buffer.h"
-#include "cif/common/cif.h"
 #include "cif/import/library_api.h"
 #include "ocl_igc_interface/ocl_translation_output.h"
 
 namespace NEO {
 using CIFBuffer = CIF::Builtins::BufferSimple;
-
+class OsLibrary;
 template <typename TranslationCtx>
 inline CIF::RAII::UPtr_t<IGC::OclTranslationOutputTagOCL> translate(TranslationCtx *tCtx, CIFBuffer *src, CIFBuffer *options,
                                                                     CIFBuffer *internalOptions) {
diff --git a/shared/source/gen12lp/hw_cmds_base.h b/shared/source/gen12lp/hw_cmds_base.h
index 3a38513952..660d9a12f2 100644
--- a/shared/source/gen12lp/hw_cmds_base.h
+++ b/shared/source/gen12lp/hw_cmds_base.h
@@ -10,10 +10,6 @@
 #include "shared/source/gen12lp/hw_info.h"
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "igfxfmid.h"
-
-#include <type_traits>
-
 template <class T>
 struct CmdParse;
 
diff --git a/shared/source/helpers/aligned_memory.h b/shared/source/helpers/aligned_memory.h
index 881216b1f5..2c58123539 100644
--- a/shared/source/helpers/aligned_memory.h
+++ b/shared/source/helpers/aligned_memory.h
@@ -11,12 +11,7 @@
 #include "shared/source/utilities/logger.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <cstdint>
 #include <functional>
-#include <memory>
-#include <new>
-#include <type_traits>
 
 #ifdef _MSC_VER
 #define ALIGNAS(x) __declspec(align(x))
diff --git a/shared/source/kernel/kernel_arg_descriptor.h b/shared/source/kernel/kernel_arg_descriptor.h
index 603f2c13f6..802cda422b 100644
--- a/shared/source/kernel/kernel_arg_descriptor.h
+++ b/shared/source/kernel/kernel_arg_descriptor.h
@@ -11,8 +11,6 @@
 #include "shared/source/kernel/kernel_arg_metadata.h"
 #include "shared/source/utilities/arrayref.h"
 
-#include <limits>
-
 namespace NEO {
 
 using CrossThreadDataOffset = uint16_t;
diff --git a/shared/source/memory_manager/graphics_allocation.h b/shared/source/memory_manager/graphics_allocation.h
index 874e62ad64..ad82d663c0 100644
--- a/shared/source/memory_manager/graphics_allocation.h
+++ b/shared/source/memory_manager/graphics_allocation.h
@@ -18,11 +18,6 @@
 #include "shared/source/memory_manager/residency.h"
 #include "shared/source/utilities/idlist.h"
 
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-
 namespace NEO {
 
 using osHandle = unsigned int;
diff --git a/shared/source/os_interface/os_interface.h b/shared/source/os_interface/os_interface.h
index 1d195d10d1..ad5ecb2950 100644
--- a/shared/source/os_interface/os_interface.h
+++ b/shared/source/os_interface/os_interface.h
@@ -12,10 +12,7 @@
 #include "shared/source/helpers/topology_map.h"
 #include "shared/source/os_interface/driver_info.h"
 
-#include <cstdint>
-#include <limits>
 #include <memory>
-#include <vector>
 
 namespace NEO {
 class ExecutionEnvironment;
diff --git a/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp b/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp
index 96bbb7bdd5..045b467038 100644
--- a/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp
+++ b/shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp
@@ -14,6 +14,7 @@
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
+#include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/allocator_helper.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
diff --git a/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp b/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp
index 925c6ec1d8..00dd00a5df 100644
--- a/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp
+++ b/shared/source/os_interface/windows/wddm/configure_device_address_space_wddm.cpp
@@ -1,17 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#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/gmm.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/gmm_helper/page_table_mngr.h"
-#include "shared/source/gmm_helper/resource_info.h"
+#include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"
diff --git a/shared/source/os_interface/windows/wddm/max_mem_alloc_size_drm_or_wddm.cpp b/shared/source/os_interface/windows/wddm/max_mem_alloc_size_drm_or_wddm.cpp
index 6aa3a2da85..28d2e9de82 100644
--- a/shared/source/os_interface/windows/wddm/max_mem_alloc_size_drm_or_wddm.cpp
+++ b/shared/source/os_interface/windows/wddm/max_mem_alloc_size_drm_or_wddm.cpp
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 namespace NEO {
diff --git a/shared/source/os_interface/windows/wddm/wddm.h b/shared/source/os_interface/windows/wddm/wddm.h
index 9ae1b3abef..2aba5fc363 100644
--- a/shared/source/os_interface/windows/wddm/wddm.h
+++ b/shared/source/os_interface/windows/wddm/wddm.h
@@ -6,30 +6,21 @@
  */
 
 #pragma once
-
-#include "shared/source/command_stream/preemption_mode.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/helpers/topology_map.h"
-#include "shared/source/memory_manager/gfx_partition.h"
-#include "shared/source/os_interface/driver_info.h"
-#include "shared/source/os_interface/os_context.h"
-#include "shared/source/os_interface/os_interface.h"
-#include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
 #include "shared/source/os_interface/windows/hw_device_id.h"
 #include "shared/source/os_interface/windows/wddm/wddm_defs.h"
-#include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
 
 #include "sku_info.h"
 
-#include <cstdint>
-#include <limits>
-#include <memory>
+#include <atomic>
 
 struct _SYSTEM_INFO;
 typedef struct _SYSTEM_INFO SYSTEM_INFO;
 
 namespace NEO {
+class WddmResidencyLogger;
+enum PreemptionMode : uint32_t;
+struct OSMemory;
+class GfxPartition;
 class Gdi;
 class Gmm;
 class GmmMemory;
diff --git a/shared/source/os_interface/windows/wddm/wddm_interface.cpp b/shared/source/os_interface/windows/wddm/wddm_interface.cpp
index 6119252e8e..ae0edb27f9 100644
--- a/shared/source/os_interface/windows/wddm/wddm_interface.cpp
+++ b/shared/source/os_interface/windows/wddm/wddm_interface.cpp
@@ -7,12 +7,11 @@
 
 #include "shared/source/os_interface/windows/wddm/wddm_interface.h"
 
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #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_translator.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
-#include "shared/source/os_interface/windows/windows_wrapper.h"
 
 using namespace NEO;
 
diff --git a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
index 189493e91a..0374117099 100644
--- a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
+++ b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/os_interface/windows/windows_wrapper.h"
 #include "shared/source/utilities/io_functions.h"
 
 #include <chrono>
@@ -22,7 +23,7 @@ constexpr bool wddmResidencyLoggingAvailable = false;
 
 class WddmResidencyLogger {
   public:
-    WddmResidencyLogger(D3DKMT_HANDLE device, VOID *fenceValueCpuVirtualAddress) {
+    WddmResidencyLogger(unsigned int device, void *fenceValueCpuVirtualAddress) {
         std::stringstream id;
         id << std::hex;
         id << "device-0x" << device << "_"
diff --git a/shared/source/utilities/idlist.h b/shared/source/utilities/idlist.h
index 0e8e6bf962..b0e7660699 100644
--- a/shared/source/utilities/idlist.h
+++ b/shared/source/utilities/idlist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,9 +10,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 
 #include <atomic>
-#include <memory>
 #include <thread>
-#include <type_traits>
 
 namespace NEO {
 
diff --git a/shared/source/utilities/reference_tracked_object.h b/shared/source/utilities/reference_tracked_object.h
index 71c5970d53..6a27d25773 100644
--- a/shared/source/utilities/reference_tracked_object.h
+++ b/shared/source/utilities/reference_tracked_object.h
@@ -10,7 +10,6 @@
 
 #include <atomic>
 #include <memory>
-#include <type_traits>
 
 namespace NEO {
 
diff --git a/shared/source/utilities/stackvec.h b/shared/source/utilities/stackvec.h
index fefa6b8d01..b63922ac62 100644
--- a/shared/source/utilities/stackvec.h
+++ b/shared/source/utilities/stackvec.h
@@ -10,11 +10,8 @@
 #include "shared/source/helpers/debug_helpers.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <iterator>
+#include <cstdint>
 #include <limits>
-#include <type_traits>
-#include <utility>
 #include <vector>
 
 template <size_t OnStackCapacity>
diff --git a/shared/source/xe_hp_core/hw_cmds_base.h b/shared/source/xe_hp_core/hw_cmds_base.h
index ec3b65ad3d..9307b5bda9 100644
--- a/shared/source/xe_hp_core/hw_cmds_base.h
+++ b/shared/source/xe_hp_core/hw_cmds_base.h
@@ -10,10 +10,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/xe_hp_core/hw_info.h"
 
-#include "igfxfmid.h"
-
-#include <type_traits>
-
 template <class T>
 struct CmdParse;
 
diff --git a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
index 32fb112064..e8ff83884c 100644
--- a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
+++ b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
@@ -11,10 +11,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/xe_hpc_core/hw_info.h"
 
-#include "igfxfmid.h"
-
-#include <type_traits>
-
 template <class T>
 struct CmdParse;
 
diff --git a/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp
index e90d2efba7..4df0eb8ab4 100644
--- a/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp
+++ b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "shared/test/common/os_interface/windows/ult_dxcore_factory.h"
 
+#include "shared/source/helpers/constants.h"
+
 namespace NEO {
 
 HRESULT WINAPI ULTDXCoreCreateAdapterFactory(REFIID riid, void **ppFactory) {
diff --git a/shared/test/common/os_interface/windows/ult_dxcore_factory.h b/shared/test/common/os_interface/windows/ult_dxcore_factory.h
index 0bd2428977..fefa82529e 100644
--- a/shared/test/common/os_interface/windows/ult_dxcore_factory.h
+++ b/shared/test/common/os_interface/windows/ult_dxcore_factory.h
@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/windows/dxgi_wrapper.h"
 
-#include <cwchar>
-#include <dxcore.h>
+#include "dxcore_interface.h"
+
+#include <vector>
 
 namespace NEO {
 constexpr auto error = 1;
diff --git a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
index 82a25ddb99..a0f577ccea 100644
--- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
+++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
@@ -6,16 +6,11 @@
  */
 
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
-#include "shared/source/direct_submission/windows/wddm_direct_submission.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
-#include "shared/source/os_interface/windows/os_context_win.h"
-#include "shared/source/os_interface/windows/wddm/wddm.h"
+#include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/helpers/engine_descriptor_helper.h"
-#include "shared/test/common/helpers/ult_hw_config.h"
-#include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"
diff --git a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
index dd32a8d565..56e536e9c3 100644
--- a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
@@ -5,48 +5,31 @@
  *
  */
 
-#include "shared/source/command_stream/aub_command_stream_receiver.h"
-#include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "shared/source/command_stream/device_command_stream.h"
-#include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
-#include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
-#include "shared/source/direct_submission/windows/wddm_direct_submission.h"
-#include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
-#include "shared/source/memory_manager/memory_manager.h"
-#include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/sys_calls_common.h"
 #include "shared/source/os_interface/windows/os_context_win.h"
+#include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.h"
-#include "shared/source/os_interface/windows/wddm_memory_manager.h"
 #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h"
-#include "shared/source/os_interface/windows/wddm_residency_controller.h"
 #include "shared/test/common/fixtures/device_fixture.h"
-#include "shared/test/common/fixtures/memory_management_fixture.h"
 #include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/batch_buffer_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/execution_environment_helper.h"
-#include "shared/test/common/mocks/mock_builtins.h"
-#include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/mocks/mock_submissions_aggregator.h"
-#include "shared/test/common/mocks/mock_wddm_interface23.h"
+#include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/mocks/windows/mock_gdi_interface.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
-#include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"
 
-#include "hw_cmds.h"
-
 using namespace NEO;
 using namespace ::testing;