diff --git a/opencl/test/unit_test/aub/aub_helper_tests.inl b/opencl/test/unit_test/aub/aub_helper_tests.inl
index b80af79a5b..9099eedd9f 100644
--- a/opencl/test/unit_test/aub/aub_helper_tests.inl
+++ b/opencl/test/unit_test/aub/aub_helper_tests.inl
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/aub/aub_helper.h"
diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp
index 2a1825c3e3..391eba606c 100644
--- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp
+++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp
@@ -13,6 +13,7 @@
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp
index 36bc6915a4..90d9bc2346 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp
+++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp
@@ -11,6 +11,8 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
+
 namespace NEO {
 
 GraphicsAllocation *AUBFixture::createHostPtrAllocationFromSvmPtr(void *svmPtr, size_t size) {
diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp
index af45c66a17..b5ab718594 100644
--- a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp
@@ -16,6 +16,7 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp
index ceaac8060b..9c2064c282 100644
--- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp
@@ -25,6 +25,7 @@
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp
index 6a5b6dd583..9dba068cea 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp
@@ -12,6 +12,7 @@
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp
index 4746ae8e5f..4a0c87b9f4 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp
@@ -16,6 +16,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "test.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 faa1668ca4..9c791c09ad 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
@@ -9,6 +9,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp
index 5a9a0faf45..400983d926 100644
--- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp
@@ -9,6 +9,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "test.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 1c055d67e6..2e76cd602e 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
@@ -9,6 +9,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp
index 859bfbe597..5b39a21e8a 100644
--- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp
@@ -20,6 +20,8 @@
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp
index 5d0531d738..e8fea8b766 100644
--- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp
@@ -9,6 +9,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 #include "reg_configs_common.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp
index c1c857d053..c1c3167b11 100644
--- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp
@@ -9,6 +9,7 @@
 #include "opencl/source/event/event.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp
index 5a451fd36a..05e673a79e 100644
--- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/test/unit_test/fixtures/two_walker_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp
index ba8a25a06f..910fcf4372 100644
--- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp
@@ -16,6 +16,8 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp
index 20e93435dd..f956c4e004 100644
--- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp
@@ -10,6 +10,7 @@
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp
index cacda70c22..b13ba41a10 100644
--- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp
@@ -12,6 +12,7 @@
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "test.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 64823af235..2d45dd5035 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
@@ -12,6 +12,7 @@
 #include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "test.h"
diff --git a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp
index 1271748636..e8ca140d97 100644
--- a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp
@@ -20,6 +20,7 @@
 #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp
index 7499e656b1..1011513e3f 100644
--- a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp
@@ -9,6 +9,7 @@
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
index 900761029a..23f8abb110 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
@@ -14,6 +14,7 @@
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp
index 154a0b4b8b..14929ef449 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp
@@ -38,6 +38,7 @@
 #include "opencl/test/unit_test/helpers/raii_hw_helper.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp
index c6330e945e..7be8aa1860 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp
@@ -27,6 +27,7 @@
 #include "opencl/test/unit_test/gen_common/matchers.h"
 #include "opencl/test/unit_test/helpers/raii_hw_helper.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h
index e1a17ddf69..abdf957210 100644
--- a/opencl/test/unit_test/command_stream/compute_mode_tests.h
+++ b/opencl/test/unit_test/command_stream/compute_mode_tests.h
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_helper.h"
 
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
index e2b8595315..003cbd8cc5 100644
--- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
+++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp
@@ -24,6 +24,7 @@
 #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
 #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h"
diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
index 2114506fad..7a8cd65f79 100644
--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/helpers/hw_helper_tests.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp
index 4acee45d7e..104b31e6dd 100644
--- a/opencl/test/unit_test/device/sub_device_tests.cpp
+++ b/opencl/test/unit_test/device/sub_device_tests.cpp
@@ -6,9 +6,11 @@
  */
 
 #include "shared/source/device/sub_device.h"
+#include "shared/source/os_interface/os_context.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 
+#include "opencl/source/device/cl_device.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp
index 96b91a5a17..6c387b9ef5 100644
--- a/opencl/test/unit_test/event/event_tests.cpp
+++ b/opencl/test/unit_test/event/event_tests.cpp
@@ -17,6 +17,7 @@
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
@@ -34,6 +35,8 @@
 #include <memory>
 #include <type_traits>
 
+using namespace NEO;
+
 TEST(Event, GivenEventWhenCheckingTraitThenEventIsNotCopyable) {
     EXPECT_FALSE(std::is_move_constructible<Event>::value);
     EXPECT_FALSE(std::is_copy_constructible<Event>::value);
diff --git a/opencl/test/unit_test/event/user_events_tests.cpp b/opencl/test/unit_test/event/user_events_tests.cpp
index c02920bd59..55326a6844 100644
--- a/opencl/test/unit_test/event/user_events_tests.cpp
+++ b/opencl/test/unit_test/event/user_events_tests.cpp
@@ -11,10 +11,14 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_event.h"
 
 #include "event_fixture.h"
 
+using namespace NEO;
+
 TEST(UserEvent, GivenUserEventWhenGettingEventCommandTypeThenClCommandUserIsReturned) {
     UserEvent uEvent;
     size_t retSize;
@@ -168,10 +172,10 @@ TEST_F(MockEventTests, GivenBlockedUserEventWhenEnqueueingNdRangeWithoutReturnEv
     auto taskCountAfter = csr.peekTaskCount();
 
     //queue should be in blocked state at this moment, task level should be inherited from user event
-    EXPECT_EQ(NEO::CompletionStamp::levelNotReady, pCmdQ->taskLevel);
+    EXPECT_EQ(CompletionStamp::levelNotReady, pCmdQ->taskLevel);
 
     //queue should be in blocked state at this moment, task count should be inherited from user event
-    EXPECT_EQ(NEO::CompletionStamp::levelNotReady, pCmdQ->taskCount);
+    EXPECT_EQ(CompletionStamp::levelNotReady, pCmdQ->taskCount);
 
     //queue should be in blocked state
     EXPECT_EQ(pCmdQ->isQueueBlocked(), true);
@@ -201,10 +205,10 @@ TEST_F(MockEventTests, GivenBlockedUserEventWhenEnqueueingNdRangeWithReturnEvent
     auto taskCountAfter = csr.peekTaskCount();
 
     //queue should be in blocked state at this moment, task level should be inherited from user event
-    EXPECT_EQ(NEO::CompletionStamp::levelNotReady, pCmdQ->taskLevel);
+    EXPECT_EQ(CompletionStamp::levelNotReady, pCmdQ->taskLevel);
 
     //queue should be in blocked state at this moment, task count should be inherited from user event
-    EXPECT_EQ(NEO::CompletionStamp::levelNotReady, pCmdQ->taskCount);
+    EXPECT_EQ(CompletionStamp::levelNotReady, pCmdQ->taskCount);
 
     //queue should be in blocked state
     EXPECT_EQ(pCmdQ->isQueueBlocked(), true);
@@ -220,7 +224,7 @@ TEST_F(MockEventTests, GivenBlockedUserEventWhenEnqueueingNdRangeWithReturnEvent
 
     //and if normal event inherited status from user event
     Event *returnEvent = castToObject<Event>(retEvent);
-    EXPECT_EQ(returnEvent->taskLevel, NEO::CompletionStamp::levelNotReady);
+    EXPECT_EQ(returnEvent->taskLevel, CompletionStamp::levelNotReady);
 
     EXPECT_EQ(CL_SUCCESS, retVal);
 
diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp
index a496fb3f9d..e364801319 100644
--- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp
+++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp
@@ -19,6 +19,7 @@
 #include "shared/test/unit_test/utilities/destructor_counted.h"
 
 #include "opencl/source/aub/aub_center.h"
+#include "opencl/source/device/cl_device.h"
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
diff --git a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
index 6c6fe0b971..7fad849622 100644
--- a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
+++ b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
@@ -21,6 +21,7 @@
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
 #include "opencl/test/unit_test/helpers/gtest_helpers.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 #include "opencl/test/unit_test/mocks/mock_event.h"
diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp
index d2b872c81e..a427e79e98 100644
--- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp
+++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp
@@ -7,6 +7,7 @@
 
 #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h"
 
+#include "opencl/source/device/cl_device.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp
index cf8973b665..2544c83b2b 100644
--- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp
+++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp
@@ -14,10 +14,12 @@
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
+using namespace NEO;
+
 KernelImageArgTest::~KernelImageArgTest() = default;
 
 void KernelImageArgTest::SetUp() {
-    pKernelInfo = std::make_unique<NEO::KernelInfo>();
+    pKernelInfo = std::make_unique<KernelInfo>();
     KernelArgPatchInfo kernelArgPatchInfo;
     kernelHeader.reset(new iOpenCL::SKernelBinaryHeaderCommon{});
 
@@ -55,21 +57,21 @@ void KernelImageArgTest::SetUp() {
     pKernelInfo->kernelArgInfo[0].isImage = true;
 
     DeviceFixture::SetUp();
-    program = std::make_unique<NEO::MockProgram>(*pDevice->getExecutionEnvironment());
-    pKernel.reset(new NEO::MockKernel(program.get(), *pKernelInfo, *pClDevice));
+    program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
+    pKernel.reset(new MockKernel(program.get(), *pKernelInfo, *pClDevice));
     ASSERT_EQ(CL_SUCCESS, pKernel->initialize());
 
-    pKernel->setKernelArgHandler(0, &NEO::Kernel::setArgImage);
-    pKernel->setKernelArgHandler(1, &NEO::Kernel::setArgImage);
-    pKernel->setKernelArgHandler(2, &NEO::Kernel::setArgImmediate);
-    pKernel->setKernelArgHandler(3, &NEO::Kernel::setArgImage);
-    pKernel->setKernelArgHandler(4, &NEO::Kernel::setArgImage);
+    pKernel->setKernelArgHandler(0, &Kernel::setArgImage);
+    pKernel->setKernelArgHandler(1, &Kernel::setArgImage);
+    pKernel->setKernelArgHandler(2, &Kernel::setArgImmediate);
+    pKernel->setKernelArgHandler(3, &Kernel::setArgImage);
+    pKernel->setKernelArgHandler(4, &Kernel::setArgImage);
 
     uint32_t crossThreadData[0x44] = {};
     crossThreadData[0x20 / sizeof(uint32_t)] = 0x12344321;
     pKernel->setCrossThreadData(crossThreadData, sizeof(crossThreadData));
 
-    context.reset(new NEO::MockContext(pClDevice));
+    context.reset(new MockContext(pClDevice));
     image.reset(Image2dHelper<>::create(context.get()));
     pKernel->setContext(context.get());
     ASSERT_NE(nullptr, image);
diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp
index 26ad80c68b..a07cd6b568 100644
--- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp
+++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp
@@ -11,6 +11,7 @@
 
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"
 
diff --git a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp
index cb9217231a..2dc2b57254 100644
--- a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp
+++ b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp
@@ -9,6 +9,7 @@
 #include "shared/source/helpers/preamble.h"
 
 #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp
index 07fb4b91f4..fff99c3c6b 100644
--- a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp
+++ b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp
index 17e517c6c0..14027782ef 100644
--- a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp
+++ b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/helpers/preamble.h"
 
 #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp
index fcfde2ceb9..e0bf516976 100644
--- a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp
+++ b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp
@@ -11,6 +11,8 @@
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"
 
+using namespace NEO;
+
 using InterfaceDescriptorDataTests = ::testing::Test;
 
 HWCMDTEST_F(IGFX_GEN8_CORE, InterfaceDescriptorDataTests, givenVariousValuesWhenCallingSetBarrierEnableThenCorrectValueIsSet) {
diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
index c87dc2bf31..36348a1673 100644
--- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/source/os_interface/os_context.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
@@ -21,6 +22,7 @@
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp
index 6ef8e758ec..6295aa1ee2 100644
--- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp
@@ -10,6 +10,7 @@
 #include "opencl/source/helpers/memory_properties_flags_helpers.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/test/unit_test/fixtures/kernel_arg_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
diff --git a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp
index a602b7e27a..faa592dfb6 100644
--- a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp
@@ -17,6 +17,7 @@
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/gen_common/matchers.h"
 #include "opencl/test/unit_test/helpers/gtest_helpers.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp
index 69bc5c453e..03094e3942 100644
--- a/opencl/test/unit_test/kernel/kernel_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_tests.cpp
@@ -30,6 +30,7 @@
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/helpers/gtest_helpers.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp
index 0a13f7f7ed..54dfcaea38 100644
--- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp
+++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/os_context.h"
 
+#include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"
diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp
index a95cad0a3d..ed5c034342 100644
--- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp
@@ -32,6 +32,7 @@
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp
index 18b10568e6..9646d9676a 100644
--- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp
@@ -18,6 +18,7 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp
index 8a1814bf0e..dce93665b7 100644
--- a/opencl/test/unit_test/mem_obj/image_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/image_tests.cpp
@@ -23,6 +23,7 @@
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp
index 0aff1b42d5..d6741dc210 100644
--- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp
@@ -14,6 +14,7 @@
 #include "opencl/source/mem_obj/mem_obj.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
diff --git a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp
index b9dd4bfe06..0efb7aaf95 100644
--- a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp
@@ -16,6 +16,7 @@
 #include "opencl/source/mem_obj/mem_obj.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h"
 #include "opencl/test/unit_test/mocks/mock_device.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 67684ff713..26b5167d41 100644
--- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
@@ -32,6 +32,7 @@
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h"
diff --git a/opencl/test/unit_test/mocks/mock_cl_device.cpp b/opencl/test/unit_test/mocks/mock_cl_device.cpp
index 99cab56590..972464f869 100644
--- a/opencl/test/unit_test/mocks/mock_cl_device.cpp
+++ b/opencl/test/unit_test/mocks/mock_cl_device.cpp
@@ -7,15 +7,7 @@
 
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 
-#include "shared/source/command_stream/preemption.h"
-#include "shared/source/os_interface/driver_info.h"
-#include "shared/source/os_interface/os_context.h"
-
 #include "opencl/test/unit_test/mocks/mock_device.h"
-#include "opencl/test/unit_test/mocks/mock_execution_environment.h"
-#include "opencl/test/unit_test/mocks/mock_memory_manager.h"
-#include "opencl/test/unit_test/mocks/mock_ostime.h"
-#include "opencl/test/unit_test/tests_configuration.h"
 
 using namespace NEO;
 
diff --git a/opencl/test/unit_test/mocks/mock_cl_device.h b/opencl/test/unit_test/mocks/mock_cl_device.h
index 38bb827ccf..c4b4676247 100644
--- a/opencl/test/unit_test/mocks/mock_cl_device.h
+++ b/opencl/test/unit_test/mocks/mock_cl_device.h
@@ -6,21 +6,17 @@
  */
 
 #pragma once
-#include "shared/source/device/root_device.h"
-#include "shared/source/device/sub_device.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/test/unit_test/helpers/default_hw_info.h"
 
 #include "opencl/source/device/cl_device.h"
-#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
-#include "opencl/test/unit_test/helpers/variable_backup.h"
-#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
-#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 namespace NEO {
-class OSTime;
 class FailMemoryManager;
+class OSTime;
+class SubDevice;
+template <typename GfxFamily>
+class UltCommandStreamReceiver;
+struct HardwareInfo;
 
 extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex);
 
diff --git a/opencl/test/unit_test/mocks/mock_device.cpp b/opencl/test/unit_test/mocks/mock_device.cpp
index a0fb84f8cc..3ea8d98d7e 100644
--- a/opencl/test/unit_test/mocks/mock_device.cpp
+++ b/opencl/test/unit_test/mocks/mock_device.cpp
@@ -7,8 +7,8 @@
 
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/preemption.h"
-#include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_context.h"
 
 #include "opencl/test/unit_test/mocks/mock_execution_environment.h"
diff --git a/opencl/test/unit_test/mocks/mock_device.h b/opencl/test/unit_test/mocks/mock_device.h
index 6cbc7e0a33..9310accb81 100644
--- a/opencl/test/unit_test/mocks/mock_device.h
+++ b/opencl/test/unit_test/mocks/mock_device.h
@@ -6,20 +6,22 @@
  */
 
 #pragma once
+
+#include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/root_device.h"
 #include "shared/source/device/sub_device.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/test/unit_test/helpers/default_hw_info.h"
+#include "shared/source/memory_manager/memory_manager.h"
 
-#include "opencl/source/device/cl_device.h"
 #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
-#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
-#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 
 namespace NEO {
+class CommandStreamReceiver;
+class DriverInfo;
 class OSTime;
-class FailMemoryManager;
+
+template <typename GfxFamily>
+class UltCommandStreamReceiver;
 
 extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex);
 
diff --git a/opencl/test/unit_test/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h
index 66950bfc5a..2f9f2271f5 100644
--- a/opencl/test/unit_test/mocks/mock_gmm.h
+++ b/opencl/test/unit_test/mocks/mock_gmm.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/memory_manager/memory_manager.h"
 
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/mem_obj/image.h"
diff --git a/opencl/test/unit_test/mocks/mock_image.h b/opencl/test/unit_test/mocks/mock_image.h
index 107ca56b0e..b6e857dfa2 100644
--- a/opencl/test/unit_test/mocks/mock_image.h
+++ b/opencl/test/unit_test/mocks/mock_image.h
@@ -10,21 +10,25 @@
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
 
-struct MockImageBase : public NEO::Image {
+#include "memory_properties_flags.h"
+
+namespace NEO {
+
+struct MockImageBase : public Image {
     using Image::graphicsAllocation;
     using Image::imageDesc;
 
     MockImageBase() : Image(
                           nullptr, MemoryPropertiesFlags(), cl_mem_flags{}, 0, 0, nullptr, cl_image_format{},
-                          cl_image_desc{}, false, new NEO::MockGraphicsAllocation(nullptr, 0), false,
-                          0, 0, NEO::ClSurfaceFormatInfo{}, nullptr) {
+                          cl_image_desc{}, false, new MockGraphicsAllocation(nullptr, 0), false,
+                          0, 0, ClSurfaceFormatInfo{}, nullptr) {
     }
     ~MockImageBase() override {
         delete this->graphicsAllocation;
     }
 
-    NEO::MockGraphicsAllocation *getAllocation() {
-        return static_cast<NEO::MockGraphicsAllocation *>(graphicsAllocation);
+    MockGraphicsAllocation *getAllocation() {
+        return static_cast<MockGraphicsAllocation *>(graphicsAllocation);
     }
 
     void setImageArg(void *memory, bool isMediaBlockImage, uint32_t mipLevel) override {}
@@ -34,3 +38,5 @@ struct MockImageBase : public NEO::Image {
     void transformImage2dArrayTo3d(void *memory) override {}
     void transformImage3dTo2dArray(void *memory) override {}
 };
+
+} // namespace NEO
diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
index 68c412298a..8407f78e34 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
@@ -27,6 +27,7 @@
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
 #include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h"
diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
index 90c843c013..1b2b153e99 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
@@ -34,6 +34,7 @@
 #include "opencl/source/os_interface/linux/drm_command_stream.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_gfx_partition.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
diff --git a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h
index 66cc7f4f00..9cd0d6c23d 100644
--- a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h
+++ b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h
@@ -9,6 +9,7 @@
 #include "shared/source/memory_manager/deferred_deleter.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
 
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 
diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp
index 89dfa1165c..e93818c283 100644
--- a/opencl/test/unit_test/platform/platform_tests.cpp
+++ b/opencl/test/unit_test/platform/platform_tests.cpp
@@ -11,6 +11,7 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 
+#include "opencl/source/device/cl_device.h"
 #include "opencl/source/platform/extensions.h"
 #include "opencl/source/sharings/sharing_factory.h"
 #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp
index a5f6d3e369..ee805ba114 100644
--- a/opencl/test/unit_test/program/program_tests.cpp
+++ b/opencl/test/unit_test/program/program_tests.cpp
@@ -34,6 +34,7 @@
 #include "opencl/test/unit_test/global_environment.h"
 #include "opencl/test/unit_test/helpers/kernel_binary_helper.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
+#include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.h b/opencl/test/unit_test/scheduler/scheduler_source_tests.h
index 07af66d538..276e79c7ec 100644
--- a/opencl/test/unit_test/scheduler/scheduler_source_tests.h
+++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.h
@@ -11,17 +11,19 @@
 
 #include "gtest/gtest.h"
 
+namespace NEO {
+
 class SchedulerSourceTest : public testing::Test {
   public:
     void SetUp() override {
-        pDevice = new MockClDevice{NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(nullptr)};
+        pDevice = new MockClDevice{MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr)};
     }
     void TearDown() override {
         delete pDevice;
     }
 
-    NEO::MockClDevice *pDevice;
-    NEO::MockContext context;
+    MockClDevice *pDevice;
+    MockContext context;
 
     template <typename GfxFamily>
     void givenDeviceQueueThenNumberOfEnqueuesEqualsNumberOfEnqueuesInSchedulerKernelCodeTest();
@@ -30,3 +32,5 @@ class SchedulerSourceTest : public testing::Test {
     template <typename GfxFamily>
     void givenDeviceQueueWhenSlbDummyCommandsAreBuildThenSizeUsedIsCorrectTest();
 };
+
+} // namespace NEO
diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp
index 610372285a..cd9a95598c 100644
--- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp
+++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/get_info.h"
 
+#include "opencl/source/device/cl_device.h"
 #include "opencl/source/helpers/gmm_types_converter.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sharings/gl/gl_texture.h"
diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp
index a7903a5696..4829340a2d 100644
--- a/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp
+++ b/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp
@@ -9,6 +9,8 @@
 #include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h"
 #include "opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h"
 
+using namespace NEO;
+
 using UnifiedSharingBufferTestsWithMemoryManager = UnifiedSharingFixture<true, true>;
 using UnifiedSharingBufferTestsWithInvalidMemoryManager = UnifiedSharingFixture<true, false>;
 
diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp
index c0a856c639..3d0849c78d 100644
--- a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp
+++ b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp
@@ -14,6 +14,8 @@
 #include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h"
 #include "opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h"
 
+using namespace NEO;
+
 using UnifiedSharingImageTestsWithMemoryManager = UnifiedSharingFixture<true, true>;
 using UnifiedSharingImageTestsWithInvalidMemoryManager = UnifiedSharingFixture<true, false>;
 
diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp
index 9f35a89bc2..79a2930675 100644
--- a/shared/source/execution_environment/execution_environment.cpp
+++ b/shared/source/execution_environment/execution_environment.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_environment.h"
 
 #include "opencl/source/memory_manager/os_agnostic_memory_manager.h"
diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
index 72fb96a35c..0a4db9f7fd 100644
--- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/compiler_interface.inl"
 #include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/hw_cmds.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
diff --git a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp
index 164533dd00..47c90b8560 100644
--- a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp
+++ b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp
@@ -10,10 +10,10 @@
 
 #include "test.h"
 
-using BlitterDispatcheTest = Test<DispatcherFixture>;
-
 using namespace NEO;
 
+using BlitterDispatcheTest = Test<DispatcherFixture>;
+
 HWTEST_F(BlitterDispatcheTest, givenBlitterWhenAskingForPreemptionCmdSizeThenReturnZero) {
     BlitterDispatcher<FamilyType> blitterDispatcher;
     EXPECT_EQ(0u, blitterDispatcher.getSizePreemption());
diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp
index c28004f53d..2f34aa8d13 100644
--- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp
+++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp
@@ -10,6 +10,8 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/memory_constants.h"
 
+using namespace NEO;
+
 void DispatcherFixture::SetUp() {
     DeviceFixture::SetUp();
 
diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h
index fd568ad60c..ae2e14e6c1 100644
--- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h
+++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h
@@ -9,6 +9,8 @@
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 
+namespace NEO {
+
 class DispatcherFixture : public DeviceFixture {
   public:
     void SetUp();
@@ -17,3 +19,5 @@ class DispatcherFixture : public DeviceFixture {
     NEO::LinearStream cmdBuffer;
     void *bufferAllocation;
 };
+
+} // namespace NEO
diff --git a/shared/test/unit_test/encoders/test_encode_states.cpp b/shared/test/unit_test/encoders/test_encode_states.cpp
index 9e4bcf63da..7d365cd2d8 100644
--- a/shared/test/unit_test/encoders/test_encode_states.cpp
+++ b/shared/test/unit_test/encoders/test_encode_states.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
@@ -161,4 +162,4 @@ HWTEST_F(CommandEncodeStatesTest, givenAnUnalignedDstPtrThenCorrectAlignedPtrAnd
     NEO::EncodeSurfaceState<FamilyType>::getSshAlignedPointer(ptr, offset);
     EXPECT_TRUE((ptr & (NEO::EncodeSurfaceState<FamilyType>::getSurfaceBaseAddressAlignment() - 1)) == 0x0u);
     EXPECT_NE(0u, offset);
-}
\ No newline at end of file
+}
diff --git a/shared/test/unit_test/fixtures/command_container_fixture.h b/shared/test/unit_test/fixtures/command_container_fixture.h
index 227916556a..07efb3b084 100644
--- a/shared/test/unit_test/fixtures/command_container_fixture.h
+++ b/shared/test/unit_test/fixtures/command_container_fixture.h
@@ -11,6 +11,8 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "test.h"
 
+namespace NEO {
+
 class CommandEncodeStatesFixture : public DeviceFixture {
   public:
     class MyMockCommandContainer : public CommandContainer {
@@ -28,4 +30,6 @@ class CommandEncodeStatesFixture : public DeviceFixture {
         DeviceFixture::TearDown();
     }
     std::unique_ptr<MyMockCommandContainer> cmdContainer;
-};
\ No newline at end of file
+};
+
+} // namespace NEO
diff --git a/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp b/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp
index 242d859185..30f155657b 100644
--- a/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp
@@ -7,6 +7,8 @@
 
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
+using namespace NEO;
+
 using ImageSurfaceStateTestsGen11 = ImageSurfaceStateTests;
 
 GEN11TEST_F(ImageSurfaceStateTestsGen11, givenGmmWithMediaCompressedWhenSetFlagsForMediaCompressionThenAuxiliarySurfaceNoneIsSet) {
diff --git a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp
index 2c265a18c3..c3602209a8 100644
--- a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp
@@ -7,6 +7,8 @@
 
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
+using namespace NEO;
+
 using ImageSurfaceStateTestsGen12LP = ImageSurfaceStateTests;
 
 GEN12LPTEST_F(ImageSurfaceStateTestsGen12LP, givenGmmWithMediaCompressedWhenSetFlagsForMediaCompressionThenAuxiliarySurfaceNoneIsSetAndMemoryCompressionEnable) {
diff --git a/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp b/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp
index ad496b5e6e..be19188b79 100644
--- a/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp
+++ b/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp
@@ -7,6 +7,8 @@
 
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
+using namespace NEO;
+
 using ImageSurfaceStateTestsGen8 = ImageSurfaceStateTests;
 
 GEN8TEST_F(ImageSurfaceStateTestsGen8, givenGmmWithMediaCompressedWhenSetFlagsForMediaCompressionThenAuxiliarySurfaceNoneIsSet) {
diff --git a/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp b/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp
index 4122a6f5ef..00e501d8ed 100644
--- a/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp
@@ -7,6 +7,8 @@
 
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
+using namespace NEO;
+
 using ImageSurfaceStateTestsGen9 = ImageSurfaceStateTests;
 
 GEN9TEST_F(ImageSurfaceStateTestsGen9, givenGmmWithMediaCompressedWhenSetFlagsForMediaCompressionThenAuxiliarySurfaceNoneIsSet) {
diff --git a/shared/test/unit_test/image/image_surface_state_fixture.h b/shared/test/unit_test/image/image_surface_state_fixture.h
index aded3e533c..f655899bcd 100644
--- a/shared/test/unit_test/image/image_surface_state_fixture.h
+++ b/shared/test/unit_test/image/image_surface_state_fixture.h
@@ -25,6 +25,8 @@
 
 #include <memory>
 
+namespace NEO {
+
 class ImageSurfaceStateTests : public DeviceFixture,
                                public testing::Test {
   public:
@@ -41,4 +43,6 @@ class ImageSurfaceStateTests : public DeviceFixture,
     MockGmm mockGmm;
     GmmHelper *gmmHelper = nullptr;
     NEO::ImageInfo imageInfo;
-};
\ No newline at end of file
+};
+
+} // namespace NEO
diff --git a/shared/test/unit_test/image/image_surface_state_tests.cpp b/shared/test/unit_test/image/image_surface_state_tests.cpp
index c686d8e844..d2cf9e1c50 100644
--- a/shared/test/unit_test/image/image_surface_state_tests.cpp
+++ b/shared/test/unit_test/image/image_surface_state_tests.cpp
@@ -7,6 +7,8 @@
 
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
 
+using namespace NEO;
+
 HWTEST_F(ImageSurfaceStateTests, givenImageInfoWhenSetImageSurfaceStateThenProperFieldsAreSet) {
     auto size = sizeof(typename FamilyType::RENDER_SURFACE_STATE);
     auto surfaceState = std::make_unique<char[]>(size);
diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp
index ed2e351b33..9d4f628d5a 100644
--- a/shared/test/unit_test/preemption/preemption_tests.cpp
+++ b/shared/test/unit_test/preemption/preemption_tests.cpp
@@ -14,6 +14,7 @@
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
diff --git a/shared/test/unit_test/program/program_initialization_tests.cpp b/shared/test/unit_test/program/program_initialization_tests.cpp
index d35b5cbaad..16371556b5 100644
--- a/shared/test/unit_test/program/program_initialization_tests.cpp
+++ b/shared/test/unit_test/program/program_initialization_tests.cpp
@@ -18,6 +18,8 @@
 
 #include <cstdint>
 
+using namespace NEO;
+
 TEST(AllocateGlobalSurfaceTest, GivenSvmAllocsManagerWhenGlobalsAreNotExportedThenMemoryIsAllocatedAsNonSvmAllocation) {
     auto &device = *(new MockDevice);
     MockClDevice clDevice{&device};