diff --git a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
index 23a6feb645..cac2b1b5df 100644
--- a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
+++ b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 
diff --git a/opencl/source/mem_obj/image.h b/opencl/source/mem_obj/image.h
index 6e75baba00..bb5f2cc39f 100644
--- a/opencl/source/mem_obj/image.h
+++ b/opencl/source/mem_obj/image.h
@@ -1,20 +1,16 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/string.h"
-#include "shared/source/image/image_surface_state.h"
-
-#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/surface_formats.h"
-#include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 
 namespace NEO {
+struct HardwareInfo;
 class Image;
 struct KernelInfo;
 struct SurfaceFormatInfo;
diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl
index a04db3c2f8..3db21a136a 100644
--- a/opencl/source/mem_obj/image.inl
+++ b/opencl/source/mem_obj/image.inl
@@ -18,6 +18,7 @@
 
 #include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/surface_formats.h"
+#include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 
 #include "image_ext.inl"
diff --git a/opencl/source/platform/platform.cpp b/opencl/source/platform/platform.cpp
index b919c4ee67..7355ded8a6 100644
--- a/opencl/source/platform/platform.cpp
+++ b/opencl/source/platform/platform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,6 +22,7 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
 #include "CL/cl_ext.h"
diff --git a/opencl/source/platform/platform.h b/opencl/source/platform/platform.h
index 8d1b20a5e6..35de9d4778 100644
--- a/opencl/source/platform/platform.h
+++ b/opencl/source/platform/platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,11 +12,11 @@
 #include "opencl/source/cl_device/cl_device_vector.h"
 #include "opencl/source/helpers/base_object.h"
 
-#include "platform_info.h"
-
 #include <mutex>
 #include <vector>
 
+struct PlatformInfo;
+
 namespace NEO {
 
 class CompilerInterface;
diff --git a/opencl/source/sharings/va/cl_va_api.cpp b/opencl/source/sharings/va/cl_va_api.cpp
index 37e706d50d..86163ebc3e 100644
--- a/opencl/source/sharings/va/cl_va_api.cpp
+++ b/opencl/source/sharings/va/cl_va_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,7 @@
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/sharings/va/va_device.h"
 #include "opencl/source/sharings/va/va_sharing.h"
diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl
index d566a5c790..d7b703ad88 100644
--- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/helpers/basic_math.h"
+
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
 
diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
index 3509ca968a..9c26cdb56c 100644
--- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/cl_device/cl_device.h"
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
index 2d60a3238b..3f51927119 100644
--- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
+++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/aligned_memory.h"
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/local_work_size.h"
 #include "shared/source/kernel/implicit_args.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp
index 61aa4f6544..ce148d4ad5 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/basic_math.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp
index e4bd891ea6..0dbf7d6b44 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/basic_math.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp
index ee5ca186a7..845a61911e 100644
--- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/migration_sync_data.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp
index 008ddf4d0e..4439b74711 100644
--- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/wait_status.h"
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/migration_sync_data.h"
diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp
index 4a7f930dbf..d5a8c9213a 100644
--- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp
+++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/local_work_size.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
diff --git a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp
index 6545b124a8..7a5fb8e83b 100644
--- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp
+++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl
index cc42b63709..8e13d594c0 100644
--- a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl
@@ -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/test/common/test_macros/test.h"
 
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp
index a4ddc62147..a4ab6d77b7 100644
--- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp
+++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp
index 0909f2351e..3106a8100f 100644
--- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp
+++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.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/test/common/test_macros/test.h"
 
 #include "opencl/source/cl_device/cl_device.h"
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/helpers/cl_helper_tests.cpp b/opencl/test/unit_test/helpers/cl_helper_tests.cpp
index fbbfb54365..c09187716c 100644
--- a/opencl/test/unit_test/helpers/cl_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/cl_helper_tests.cpp
@@ -16,6 +16,7 @@
 
 #include "opencl/source/helpers/cl_helper.h"
 #include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp
index d28f5fb8ac..53159c28d0 100644
--- a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp
+++ b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/gmm_helper/resource_info.h"
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/mem_obj/image.h"
diff --git a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
index dbe7e9bbfc..02e28b35fc 100644
--- a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
@@ -18,6 +18,7 @@
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp
index bd17e0054d..53b8f6cbbf 100644
--- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,6 +14,7 @@
 
 #include "opencl/source/cl_device/cl_device_get_cap.inl"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
+#include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
diff --git a/opencl/test/unit_test/mem_obj/pipe_tests.cpp b/opencl/test/unit_test/mem_obj/pipe_tests.cpp
index eb7f9b445d..3a140c1742 100644
--- a/opencl/test/unit_test/mem_obj/pipe_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/pipe_tests.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
 #include "shared/test/common/test_macros/test.h"
 
diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
index 138762c652..c0979f37be 100644
--- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/helpers/cache_policy.h"
 #include "shared/source/helpers/constants.h"
diff --git a/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp b/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp
index 1de5ba7bec..900c275a50 100644
--- a/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/memory_manager/migration_sync_data.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
index 0ce9187782..e6293d330c 100644
--- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
diff --git a/opencl/test/unit_test/mt_tests/helpers/mt_helpers_tests.cpp b/opencl/test/unit_test/mt_tests/helpers/mt_helpers_tests.cpp
index 64a4af3bb5..da922c126f 100644
--- a/opencl/test/unit_test/mt_tests/helpers/mt_helpers_tests.cpp
+++ b/opencl/test/unit_test/mt_tests/helpers/mt_helpers_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,8 @@
 
 #include "gtest/gtest.h"
 
+#include <thread>
+
 TEST(MtTestInterlockedMaxFixture, givenCurrentPagingFenceValueWhenValueChangedThenValueIsSet) {
     std::atomic<uint64_t> currentPagingFenceValue;
     std::atomic<int> testCount;
diff --git a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp
index 38c0379acb..aa1237c734 100644
--- a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.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/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 
 #include "hw_cmds_xe_hpc_core_base.h"
diff --git a/opencl/test/unit_test/xe_hpg_core/mtl/test_cl_device_caps_mtl.cpp b/opencl/test/unit_test/xe_hpg_core/mtl/test_cl_device_caps_mtl.cpp
index 4dc2690d09..d11dfc4ccd 100644
--- a/opencl/test/unit_test/xe_hpg_core/mtl/test_cl_device_caps_mtl.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/mtl/test_cl_device_caps_mtl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
+#include "opencl/source/platform/platform_info.h"
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
diff --git a/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp
index baa1179b2d..5b1eb7be4d 100644
--- a/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp
@@ -1,12 +1,14 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #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/resource_info.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
diff --git a/shared/source/command_stream/preemption.cpp b/shared/source/command_stream/preemption.cpp
index 7d55c27948..c6599c98cf 100644
--- a/shared/source/command_stream/preemption.cpp
+++ b/shared/source/command_stream/preemption.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "shared/source/command_stream/preemption.h"
 
+#include "shared/source/command_stream/linear_stream.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
diff --git a/shared/source/command_stream/preemption.h b/shared/source/command_stream/preemption.h
index 1971e4d0e3..6678690052 100644
--- a/shared/source/command_stream/preemption.h
+++ b/shared/source/command_stream/preemption.h
@@ -1,18 +1,19 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/command_stream/linear_stream.h"
-#include "shared/source/command_stream/preemption_mode.h"
-
-#include "sku_info.h"
+#include <cstddef>
+#include <cstdint>
 
 namespace NEO {
+class LinearStream;
+enum PreemptionMode : uint32_t;
+struct HardwareInfo;
+struct RootDeviceEnvironment;
 class Device;
 class GraphicsAllocation;
 struct KernelDescriptor;
diff --git a/shared/source/command_stream/preemption.inl b/shared/source/command_stream/preemption.inl
index b0f16d4960..2611fadcee 100644
--- a/shared/source/command_stream/preemption.inl
+++ b/shared/source/command_stream/preemption.inl
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/built_ins/sip.h"
+#include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_helper.h"
diff --git a/shared/source/gen11/command_encoder_gen11.cpp b/shared/source/gen11/command_encoder_gen11.cpp
index 99964ae1ed..bcb38a01a8 100644
--- a/shared/source/gen11/command_encoder_gen11.cpp
+++ b/shared/source/gen11/command_encoder_gen11.cpp
@@ -18,6 +18,8 @@ using Family = NEO::Gen11Family;
 #include "shared/source/command_container/encode_compute_mode_bdw_and_later.inl"
 #include "shared/source/command_container/image_surface_state/compression_params_bdw_and_later.inl"
 
+#include "stream_properties.inl"
+
 namespace NEO {
 
 template <>
diff --git a/shared/source/gen11/preamble_gen11.cpp b/shared/source/gen11/preamble_gen11.cpp
index 75aa320a9a..8bd1cd7d07 100644
--- a/shared/source/gen11/preamble_gen11.cpp
+++ b/shared/source/gen11/preamble_gen11.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/command_stream/csr_definitions.h"
 #include "shared/source/gen11/hw_cmds_base.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
diff --git a/shared/source/gen8/preamble_gen8.cpp b/shared/source/gen8/preamble_gen8.cpp
index 525cc7f86a..0bfb162cf1 100644
--- a/shared/source/gen8/preamble_gen8.cpp
+++ b/shared/source/gen8/preamble_gen8.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/gen8/hw_cmds_base.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
diff --git a/shared/source/gen9/command_encoder_gen9.cpp b/shared/source/gen9/command_encoder_gen9.cpp
index df57c00adc..b90a337dea 100644
--- a/shared/source/gen9/command_encoder_gen9.cpp
+++ b/shared/source/gen9/command_encoder_gen9.cpp
@@ -16,6 +16,8 @@ using Family = NEO::Gen9Family;
 #include "shared/source/command_container/encode_compute_mode_bdw_and_later.inl"
 #include "shared/source/command_container/image_surface_state/compression_params_bdw_and_later.inl"
 
+#include "stream_properties.inl"
+
 namespace NEO {
 template <>
 void EncodeSurfaceState<Family>::setAuxParamsForMCSCCS(R_SURFACE_STATE *surfaceState) {
diff --git a/shared/source/gen9/preamble_gen9.cpp b/shared/source/gen9/preamble_gen9.cpp
index 585bc3ea0d..926a6ba856 100644
--- a/shared/source/gen9/preamble_gen9.cpp
+++ b/shared/source/gen9/preamble_gen9.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/gen9/hw_cmds_base.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
diff --git a/shared/source/helpers/mt_helpers.h b/shared/source/helpers/mt_helpers.h
index 49ed7fe268..b709f01f93 100644
--- a/shared/source/helpers/mt_helpers.h
+++ b/shared/source/helpers/mt_helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <atomic>
-#include <thread>
 
 namespace NEO {
 namespace MultiThreadHelpers {
diff --git a/shared/source/helpers/preamble_xehp_and_later.inl b/shared/source/helpers/preamble_xehp_and_later.inl
index 966686207d..e0580a55f1 100644
--- a/shared/source/helpers/preamble_xehp_and_later.inl
+++ b/shared/source/helpers/preamble_xehp_and_later.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_base.inl"
 
diff --git a/shared/source/memory_manager/unified_memory_manager.h b/shared/source/memory_manager/unified_memory_manager.h
index fa7276f990..5000860422 100644
--- a/shared/source/memory_manager/unified_memory_manager.h
+++ b/shared/source/memory_manager/unified_memory_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,6 @@
 #include <cstdint>
 #include <map>
 #include <mutex>
-#include <set>
 #include <shared_mutex>
 
 namespace NEO {
diff --git a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
index a3ebbd9749..cc4fd7f59f 100644
--- a/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
+++ b/shared/test/unit_test/gen12lp/dg1/linux/hw_info_config_tests_dg1.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_dg1.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"