diff --git a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp
index 0a0d2fd140..11a1744774 100644
--- a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp
+++ b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp
@@ -11,6 +11,8 @@
 
 #include "level_zero/core/source/device/device_imp.h"
 
+#include <fcntl.h>
+
 namespace L0 {
 
 const std::string iafDirectoryLegacy = "iaf.";
diff --git a/level_zero/core/source/image/image_hw.h b/level_zero/core/source/image/image_hw.h
index 64d4841e9d..6322a8b2d9 100644
--- a/level_zero/core/source/image/image_hw.h
+++ b/level_zero/core/source/image/image_hw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,10 +7,7 @@
 
 #pragma once
 
-#include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/helpers/surface_format_info.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
 
 #include "level_zero/core/source/image/image_imp.h"
 
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
index a3693dce94..4247b53c6b 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp
@@ -9,6 +9,8 @@
 
 #include "sysman/linux/os_sysman_imp.h"
 
+#include <cmath>
+
 namespace L0 {
 
 const bool LinuxFrequencyImp::canControl = true; // canControl is true on i915 (GEN9 Hardcode)
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
index 5c16b4020d..245615b2cb 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp
@@ -10,6 +10,8 @@
 #include "igfxfmid.h"
 #include "sysman/linux/os_sysman_imp.h"
 
+#include <cmath>
+
 namespace L0 {
 
 const bool LinuxFrequencyImp::canControl = true; // canControl is true on i915 (GEN9 Hardcode)
diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp
index 0ff8a90ff8..6b848de66d 100644
--- a/opencl/source/program/program.cpp
+++ b/opencl/source/program/program.cpp
@@ -19,7 +19,6 @@
 #include "shared/source/helpers/api_specific_config.h"
 #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/string.h"
 #include "shared/source/memory_manager/memory_manager.h"
diff --git a/opencl/source/program/program.h b/opencl/source/program/program.h
index 927cb2a3d4..9b81cae065 100644
--- a/opencl/source/program/program.h
+++ b/opencl/source/program/program.h
@@ -21,7 +21,7 @@
 #include "cif/builtins/memory/buffer/buffer.h"
 #include "patch_list.h"
 
-#include <list>
+#include <functional>
 #include <string>
 #include <vector>
 
diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
index 788bc12547..a3c319485f 100644
--- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
+++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
@@ -11,7 +11,6 @@
 #include "shared/test/common/device_binary_format/elf/elf_tests_data.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
-#include "shared/test/common/helpers/kernel_binary_helper.h"
 #include "shared/test/common/helpers/kernel_filename_helper.h"
 #include "shared/test/common/libult/global_environment.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
@@ -28,8 +27,8 @@
 #include "opencl/test/unit_test/program/program_tests.h"
 
 #include "gtest/gtest.h"
+#include "program_debug_data.h"
 
-#include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw.h b/shared/source/command_stream/aub_command_stream_receiver_hw.h
index 94318437a4..c35980a50a 100644
--- a/shared/source/command_stream/aub_command_stream_receiver_hw.h
+++ b/shared/source/command_stream/aub_command_stream_receiver_hw.h
@@ -11,10 +11,10 @@
 #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h"
 #include "shared/source/command_stream/submission_status.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/array_count.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/source/memory_manager/page_table.h"
 #include "shared/source/memory_manager/physical_address_allocator.h"
+#include "shared/source/memory_manager/residency_container.h"
 #include "shared/source/utilities/spinlock.h"
 
 #include "aub_mapper.h"
diff --git a/shared/source/command_stream/command_stream_receiver_simulated_hw.h b/shared/source/command_stream/command_stream_receiver_simulated_hw.h
index 09433475cc..4a200597ed 100644
--- a/shared/source/command_stream/command_stream_receiver_simulated_hw.h
+++ b/shared/source/command_stream/command_stream_receiver_simulated_hw.h
@@ -7,21 +7,12 @@
 
 #pragma once
 #include "shared/source/aub/aub_helper.h"
-#include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h"
 #include "shared/source/gmm_helper/cache_settings_helper.h"
-#include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hardware_context_controller.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/memory_manager/memory_banks.h"
-#include "shared/source/memory_manager/memory_pool.h"
 #include "shared/source/memory_manager/physical_address_allocator.h"
-#include "shared/source/os_interface/os_context.h"
 
 #include "third_party/aub_stream/headers/allocation_params.h"
-#include "third_party/aub_stream/headers/aub_manager.h"
-#include "third_party/aub_stream/headers/hardware_context.h"
 
 namespace NEO {
 class GraphicsAllocation;
diff --git a/shared/source/command_stream/submissions_aggregator.h b/shared/source/command_stream/submissions_aggregator.h
index ad2befbb12..ec451dfaa2 100644
--- a/shared/source/command_stream/submissions_aggregator.h
+++ b/shared/source/command_stream/submissions_aggregator.h
@@ -9,7 +9,6 @@
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/pipe_control_args.h"
-#include "shared/source/memory_manager/residency_container.h"
 #include "shared/source/utilities/idlist.h"
 #include "shared/source/utilities/stackvec.h"
 
diff --git a/shared/source/device_binary_format/elf/elf_encoder.cpp b/shared/source/device_binary_format/elf/elf_encoder.cpp
index 28dab304a3..b231cf7c73 100644
--- a/shared/source/device_binary_format/elf/elf_encoder.cpp
+++ b/shared/source/device_binary_format/elf/elf_encoder.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 
-#include "shared/source/utilities/range.h"
+#include "shared/source/helpers/aligned_memory.h"
 
 #include <algorithm>
 
diff --git a/shared/source/device_binary_format/elf/elf_encoder.h b/shared/source/device_binary_format/elf/elf_encoder.h
index 724e189c2d..a58ca2c631 100644
--- a/shared/source/device_binary_format/elf/elf_encoder.h
+++ b/shared/source/device_binary_format/elf/elf_encoder.h
@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/device_binary_format/elf/elf.h"
-#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 #include "shared/source/utilities/stackvec.h"
diff --git a/shared/source/device_binary_format/patchtokens_decoder.h b/shared/source/device_binary_format/patchtokens_decoder.h
index b5f0802259..870a3bd471 100644
--- a/shared/source/device_binary_format/patchtokens_decoder.h
+++ b/shared/source/device_binary_format/patchtokens_decoder.h
@@ -15,7 +15,6 @@
 #include "patch_g7.h"
 #include "patch_list.h"
 #include "patch_shared.h"
-#include "program_debug_data.h"
 
 #include <cstdint>
 
diff --git a/shared/source/direct_submission/direct_submission_hw.h b/shared/source/direct_submission/direct_submission_hw.h
index bdcb513f07..a6d3437ab2 100644
--- a/shared/source/direct_submission/direct_submission_hw.h
+++ b/shared/source/direct_submission/direct_submission_hw.h
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/hw_helper.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <memory>
 
diff --git a/shared/source/helpers/blit_commands_helper.h b/shared/source/helpers/blit_commands_helper.h
index 77c7dbd5ad..97b94196a2 100644
--- a/shared/source/helpers/blit_commands_helper.h
+++ b/shared/source/helpers/blit_commands_helper.h
@@ -12,7 +12,6 @@
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/vec.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <cstdint>
 #include <functional>
diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h
index 339ab46138..d5e7d24a2f 100644
--- a/shared/source/helpers/hw_helper.h
+++ b/shared/source/helpers/hw_helper.h
@@ -13,7 +13,6 @@
 #include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/options.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include "igfxfmid.h"
 #include "sku_info.h"
diff --git a/shared/source/kernel/kernel_arg_descriptor.h b/shared/source/kernel/kernel_arg_descriptor.h
index 6e8f06aa35..74f74c8998 100644
--- a/shared/source/kernel/kernel_arg_descriptor.h
+++ b/shared/source/kernel/kernel_arg_descriptor.h
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/kernel/kernel_arg_metadata.h"
 #include "shared/source/utilities/arrayref.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <limits>
 
diff --git a/shared/source/memory_manager/graphics_allocation.h b/shared/source/memory_manager/graphics_allocation.h
index a7e3560750..12f44ff920 100644
--- a/shared/source/memory_manager/graphics_allocation.h
+++ b/shared/source/memory_manager/graphics_allocation.h
@@ -16,7 +16,6 @@
 #include "shared/source/memory_manager/memory_pool.h"
 #include "shared/source/memory_manager/residency.h"
 #include "shared/source/utilities/idlist.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include <atomic>
 #include <cstddef>
diff --git a/shared/source/os_interface/linux/drm_buffer_object.cpp b/shared/source/os_interface/linux/drm_buffer_object.cpp
index a18027e121..c81d318149 100644
--- a/shared/source/os_interface/linux/drm_buffer_object.cpp
+++ b/shared/source/os_interface/linux/drm_buffer_object.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
 
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
diff --git a/shared/source/os_interface/linux/drm_buffer_object.h b/shared/source/os_interface/linux/drm_buffer_object.h
index 1f4da81042..1ebc0f02f0 100644
--- a/shared/source/os_interface/linux/drm_buffer_object.h
+++ b/shared/source/os_interface/linux/drm_buffer_object.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/memory_manager/definitions/engine_limits.h"
diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp
index bcebde80a2..fb5a4bba42 100644
--- a/shared/source/os_interface/linux/drm_neo.cpp
+++ b/shared/source/os_interface/linux/drm_neo.cpp
@@ -36,10 +36,12 @@
 #include "shared/source/os_interface/linux/system_info.h"
 #include "shared/source/os_interface/os_environment.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/utilities/api_intercept.h"
 #include "shared/source/utilities/directory.h"
 
 #include <cstdio>
 #include <cstring>
+#include <fcntl.h>
 #include <map>
 
 namespace NEO {
diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h
index 0826e2d8aa..5b3e784e70 100644
--- a/shared/source/os_interface/linux/drm_neo.h
+++ b/shared/source/os_interface/linux/drm_neo.h
@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/memory_manager/definitions/engine_limits.h"
 #include "shared/source/os_interface/driver_info.h"
@@ -17,16 +16,11 @@
 #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/api_intercept.h"
-#include "shared/source/utilities/stackvec.h"
 
 #include "engine_node.h"
 #include "igfxfmid.h"
 
 #include <array>
-#include <atomic>
-#include <cerrno>
-#include <fcntl.h>
 #include <limits>
 #include <memory>
 #include <mutex>
diff --git a/shared/source/os_interface/linux/ioctl_helper.cpp b/shared/source/os_interface/linux/ioctl_helper.cpp
index 3cd3e15dbd..6961153ed9 100644
--- a/shared/source/os_interface/linux/ioctl_helper.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper.cpp
@@ -17,6 +17,7 @@
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 
+#include <fcntl.h>
 #include <sstream>
 
 namespace NEO {
diff --git a/shared/source/os_interface/linux/ioctl_helper_prelim.cpp b/shared/source/os_interface/linux/ioctl_helper_prelim.cpp
index cab1264c6e..63022677ed 100644
--- a/shared/source/os_interface/linux/ioctl_helper_prelim.cpp
+++ b/shared/source/os_interface/linux/ioctl_helper_prelim.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <cerrno>
 #include <cstring>
+#include <fcntl.h>
 #include <iostream>
 #include <new>
 #include <sys/ioctl.h>
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 5d6d7749e1..189493e91a 100644
--- a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
+++ b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/helpers/debug_helpers.h"
-#include "shared/source/os_interface/windows/wddm/wddm_defs.h"
 #include "shared/source/utilities/io_functions.h"
 
 #include <chrono>
diff --git a/shared/source/os_interface/windows/wddm_memory_operations_handler.cpp b/shared/source/os_interface/windows/wddm_memory_operations_handler.cpp
index 065d41adf5..5e46cd55c2 100644
--- a/shared/source/os_interface/windows/wddm_memory_operations_handler.cpp
+++ b/shared/source/os_interface/windows/wddm_memory_operations_handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,7 +11,6 @@
 #include "shared/source/memory_manager/host_ptr_defines.h"
 #include "shared/source/os_interface/windows/wddm_allocation.h"
 #include "shared/source/os_interface/windows/wddm_residency_allocations_container.h"
-#include "shared/source/utilities/stackvec.h"
 
 namespace NEO {
 
diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h
index 6d35ff38f8..5da9bd7ebc 100644
--- a/shared/test/common/libult/linux/drm_mock.h
+++ b/shared/test/common/libult/linux/drm_mock.h
@@ -16,6 +16,7 @@
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 
 #include <cstdio>
+#include <fcntl.h>
 #include <fstream>
 #include <limits.h>
 #include <map>
diff --git a/shared/test/common/mocks/mock_elf.h b/shared/test/common/mocks/mock_elf.h
index 52c1c81446..742b5dfafa 100644
--- a/shared/test/common/mocks/mock_elf.h
+++ b/shared/test/common/mocks/mock_elf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,8 @@
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 
+#include <unordered_map>
+
 template <NEO::Elf::ELF_IDENTIFIER_CLASS NumBits = NEO::Elf::EI_CLASS_64>
 struct MockElf : public NEO::Elf::Elf<NumBits> {
     using BaseClass = NEO::Elf::Elf<NumBits>;
diff --git a/shared/test/unit_test/device_binary_format/elf/elf_encoder_tests.cpp b/shared/test/unit_test/device_binary_format/elf/elf_encoder_tests.cpp
index 4fb242bc34..43549db637 100644
--- a/shared/test/unit_test/device_binary_format/elf/elf_encoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/elf/elf_encoder_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
+#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/utilities/range.h"
 #include "shared/test/common/test_macros/test.h"
 
diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp
index 16c069fa6f..8d7badcb19 100644
--- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/memory_manager/compression_selector.h"
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/linux/allocator_helper.h"
-#include "shared/test/common/fixtures/memory_allocator_multi_device_fixture.h"
 #include "shared/test/common/libult/linux/drm_mock_helper.h"
 #include "shared/test/common/libult/linux/drm_mock_prelim_context.h"
 #include "shared/test/common/libult/linux/drm_query_mock.h"
diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
index 3aa5988488..01feef9a38 100644
--- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/built_ins/sip.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
diff --git a/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp
index 5321b68a48..6bb337d666 100644
--- a/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
index 64a0fdab39..a1cfe589cc 100644
--- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
+++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp
@@ -17,6 +17,8 @@
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include <fcntl.h>
+
 using namespace NEO;
 
 extern std::vector<uint8_t> getRegionInfo(const std::vector<MemoryRegion> &inputRegions);