diff --git a/level_zero/api/core/ze_barrier_api_entrypoints.h b/level_zero/api/core/ze_barrier_api_entrypoints.h
index c85ecc64ff..446d3c25af 100644
--- a/level_zero/api/core/ze_barrier_api_entrypoints.h
+++ b/level_zero/api/core/ze_barrier_api_entrypoints.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_api.h>
 
 namespace L0 {
@@ -73,4 +74,4 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeDeviceSystemBarrier(
     return L0::zeDeviceSystemBarrier(
         hDevice);
 }
-}
\ No newline at end of file
+}
diff --git a/level_zero/api/core/ze_core_loader.cpp b/level_zero/api/core/ze_core_loader.cpp
index dfad4cee62..ab7417957e 100644
--- a/level_zero/api/core/ze_core_loader.cpp
+++ b/level_zero/api/core/ze_core_loader.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/experimental/source/tracing/tracing_imp.h"
 #include "level_zero/source/inc/ze_intel_gpu.h"
 #include <level_zero/ze_api.h>
diff --git a/level_zero/api/core/ze_module_api_entrypoints.h b/level_zero/api/core/ze_module_api_entrypoints.h
index c118f87d32..0f30a39195 100644
--- a/level_zero/api/core/ze_module_api_entrypoints.h
+++ b/level_zero/api/core/ze_module_api_entrypoints.h
@@ -6,7 +6,9 @@
  */
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include <level_zero/ze_api.h>
 
 #pragma once
diff --git a/level_zero/api/sysman/zes_sysman_api_entrypoints.h b/level_zero/api/sysman/zes_sysman_api_entrypoints.h
index 34e7f391e7..4011f514bc 100644
--- a/level_zero/api/sysman/zes_sysman_api_entrypoints.h
+++ b/level_zero/api/sysman/zes_sysman_api_entrypoints.h
@@ -5,9 +5,10 @@
  *
  */
 
-#include "sysman/sysman.h"
-
 #pragma once
+#include "level_zero/core/source/driver/driver_handle.h"
+
+#include "sysman/sysman.h"
 
 namespace L0 {
 ze_result_t zesDeviceGetProperties(
diff --git a/level_zero/api/tools/ze_tools_loader.cpp b/level_zero/api/tools/ze_tools_loader.cpp
index 0c141d24e3..b79bde106b 100644
--- a/level_zero/api/tools/ze_tools_loader.cpp
+++ b/level_zero/api/tools/ze_tools_loader.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "level_zero/api/driver_experimental/tracing/zet_tracing.h"
+#include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/source/inc/ze_intel_gpu.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/ze_ddi.h>
diff --git a/level_zero/api/tools/zet_module_api_entrypoints.h b/level_zero/api/tools/zet_module_api_entrypoints.h
index a569b32e45..c333ee632c 100644
--- a/level_zero/api/tools/zet_module_api_entrypoints.h
+++ b/level_zero/api/tools/zet_module_api_entrypoints.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
 #include <level_zero/zet_api.h>
 
diff --git a/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp
index 589785fdd4..cb1574328b 100644
--- a/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp
+++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp
@@ -9,6 +9,8 @@
 
 #include "shared/source/built_ins/built_ins.h"
 
+#include "level_zero/core/source/kernel/kernel.h"
+
 namespace NEO {
 const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) {
     return nullptr;
@@ -17,6 +19,15 @@ const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) {
 
 namespace L0 {
 
+BuiltinFunctionsLibImpl::BuiltinData::~BuiltinData() {
+    func.reset();
+    module.reset();
+}
+BuiltinFunctionsLibImpl::BuiltinData::BuiltinData() = default;
+BuiltinFunctionsLibImpl::BuiltinData::BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker) {
+    module = std::move(mod);
+    func = std::move(ker);
+}
 std::unique_lock<BuiltinFunctionsLib::MutexType> BuiltinFunctionsLib::obtainUniqueOwnership() {
     return std::unique_lock<BuiltinFunctionsLib::MutexType>(this->ownershipMutex);
 }
diff --git a/level_zero/core/source/builtin/builtin_functions_lib_impl.h b/level_zero/core/source/builtin/builtin_functions_lib_impl.h
index c14f058054..65d6978a38 100644
--- a/level_zero/core/source/builtin/builtin_functions_lib_impl.h
+++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.h
@@ -42,15 +42,9 @@ struct BuiltinFunctionsLibImpl : BuiltinFunctionsLib {
     NEO::BuiltIns *builtInsLib;
 };
 struct BuiltinFunctionsLibImpl::BuiltinData {
-    MOCKABLE_VIRTUAL ~BuiltinData() {
-        func.reset();
-        module.reset();
-    }
-    BuiltinData() = default;
-    BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker) {
-        module = std::move(mod);
-        func = std::move(ker);
-    }
+    MOCKABLE_VIRTUAL ~BuiltinData();
+    BuiltinData();
+    BuiltinData(std::unique_ptr<L0::Module> &&mod, std::unique_ptr<L0::Kernel> &&ker);
 
     std::unique_ptr<Module> module;
     std::unique_ptr<Kernel> func;
diff --git a/level_zero/core/source/cmdlist/cmdlist.cpp b/level_zero/core/source/cmdlist/cmdlist.cpp
index b6732454ef..0a33d972a2 100644
--- a/level_zero/core/source/cmdlist/cmdlist.cpp
+++ b/level_zero/core/source/cmdlist/cmdlist.cpp
@@ -14,9 +14,11 @@
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/event/event.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h
index 13f11c8ad5..64c3b9ea6c 100644
--- a/level_zero/core/source/cmdlist/cmdlist.h
+++ b/level_zero/core/source/cmdlist/cmdlist.h
@@ -8,24 +8,23 @@
 #pragma once
 
 #include "shared/source/command_container/cmdcontainer.h"
-#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/stream_properties.h"
-#include "shared/source/command_stream/thread_arbitration_policy.h"
+#include "shared/source/unified_memory/unified_memory.h"
 
-#include "level_zero/core/source/cmdqueue/cmdqueue.h"
-#include "level_zero/core/source/device/device.h"
-#include "level_zero/core/source/kernel/kernel.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
+#include <map>
 #include <vector>
 
 struct _ze_command_list_handle_t {};
 
 namespace L0 {
+struct Device;
 struct EventPool;
 struct Event;
 struct Kernel;
+struct CommandQueue;
 
 struct CmdListKernelLaunchParams {
     bool isIndirect = false;
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h
index 02ec5c70e3..db0502ffb2 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw.h
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.h
@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/helpers/pipe_control_args.h"
+#include "shared/source/helpers/vec.h"
+#include "shared/source/kernel/kernel_arg_descriptor.h"
 
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl
index 61b0d4e820..bbc62b4697 100644
--- a/level_zero/core/source/cmdlist/cmdlist_hw.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl
@@ -26,6 +26,7 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memadvise_flags.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 #include "shared/source/program/sync_buffer_handler.h"
@@ -33,10 +34,13 @@
 #include "shared/source/utilities/software_tags_manager.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
+#include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
 
 #include <algorithm>
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
index a547c0bba0..bbe5761e31 100644
--- a/level_zero/core/source/cmdlist/cmdlist_imp.cpp
+++ b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/metrics/metric.h"
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.h b/level_zero/core/source/cmdlist/cmdlist_imp.h
index c2ae4df116..26818bfc8f 100644
--- a/level_zero/core/source/cmdlist/cmdlist_imp.h
+++ b/level_zero/core/source/cmdlist/cmdlist_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #pragma once
 
 #include "level_zero/core/source/cmdlist/cmdlist.h"
-#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
-#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/cmdqueue/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp
index 68a28aba4b..1c80b97b66 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue.cpp
+++ b/level_zero/core/source/cmdqueue/cmdqueue.cpp
@@ -18,6 +18,7 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
+#include "level_zero/core/source/kernel/kernel.h"
 
 #include "igfxfmid.h"
 
diff --git a/level_zero/core/source/cmdqueue/cmdqueue.h b/level_zero/core/source/cmdqueue/cmdqueue.h
index 2369977dd2..a171e8e7e4 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue.h
+++ b/level_zero/core/source/cmdqueue/cmdqueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/device/device.h"
+#include "shared/source/command_stream/preemption_mode.h"
+
 #include <level_zero/ze_api.h>
 
 #include <atomic>
@@ -19,6 +20,7 @@ class CommandStreamReceiver;
 }
 
 namespace L0 {
+struct Device;
 
 struct CommandQueue : _ze_command_queue_handle_t {
     template <typename Type>
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.h b/level_zero/core/source/cmdqueue/cmdqueue_hw.h
index 5f0d222a89..e6d2d33c53 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_hw.h
+++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.h
@@ -6,16 +6,12 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/command_stream/scratch_space_controller.h"
-#include "shared/source/command_stream/submissions_aggregator.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/memory_manager/residency_container.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
-#include "igfxfmid.h"
+namespace NEO {
+class ScratchSpaceController;
+}
 
 namespace L0 {
 
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
index c2801a72db..5d45534036 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
@@ -14,6 +14,7 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/command_stream/submission_status.h"
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/command_stream/wait_status.h"
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_imp.h b/level_zero/core/source/cmdqueue/cmdqueue_imp.h
index beb2954068..00ec9e6dae 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_imp.h
+++ b/level_zero/core/source/cmdqueue/cmdqueue_imp.h
@@ -7,12 +7,9 @@
 
 #pragma once
 
-#include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/submission_status.h"
-#include "shared/source/command_stream/submissions_aggregator.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/indirect_heap/indirect_heap.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
index 676d8150bb..cae30d7a1a 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"
diff --git a/level_zero/core/source/context/context.h b/level_zero/core/source/context/context.h
index 678e7b10d5..f0cca70f35 100644
--- a/level_zero/core/source/context/context.h
+++ b/level_zero/core/source/context/context.h
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "level_zero/core/source/driver/driver_handle.h"
+#include "shared/source/unified_memory/unified_memory.h"
+
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
@@ -15,6 +16,10 @@ struct _ze_context_handle_t {
     virtual ~_ze_context_handle_t() = default;
 };
 
+namespace NEO {
+class Device;
+}
+
 namespace L0 {
 struct DriverHandle;
 struct Image;
diff --git a/level_zero/core/source/context/context_imp.cpp b/level_zero/core/source/context/context_imp.cpp
index 61cdadaac8..107b35a316 100644
--- a/level_zero/core/source/context/context_imp.cpp
+++ b/level_zero/core/source/context/context_imp.cpp
@@ -19,6 +19,7 @@
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/memory/memory_operations_helper.h"
+#include "level_zero/core/source/module/module.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/context/context_imp.h b/level_zero/core/source/context/context_imp.h
index a407000118..b5ae74b1c3 100644
--- a/level_zero/core/source/context/context_imp.h
+++ b/level_zero/core/source/context/context_imp.h
@@ -7,13 +7,17 @@
 
 #pragma once
 
-#include "shared/source/os_interface/os_interface.h"
+#include "shared/source/helpers/common_types.h"
+#include "shared/source/utilities/stackvec.h"
 
 #include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/driver/driver_handle_imp.h"
+
+#include <map>
 
 namespace L0 {
 struct StructuresLookupTable;
+struct DriverHandleImp;
+struct Device;
 
 struct ContextImp : Context {
     ContextImp(DriverHandle *driverHandle);
diff --git a/level_zero/core/source/context/context_imp_drm/context_imp.cpp b/level_zero/core/source/context/context_imp_drm/context_imp.cpp
index 3691f9877b..72803e833d 100644
--- a/level_zero/core/source/context/context_imp_drm/context_imp.cpp
+++ b/level_zero/core/source/context/context_imp_drm/context_imp.cpp
@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -21,4 +23,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     return this->driverHandle->importFdHandle(hDevice, flags, handle, nullptr);
 }
 
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/core/source/context/context_imp_drm_or_wddm/context_imp.cpp b/level_zero/core/source/context/context_imp_drm_or_wddm/context_imp.cpp
index 2343d810a4..64a769da6b 100644
--- a/level_zero/core/source/context/context_imp_drm_or_wddm/context_imp.cpp
+++ b/level_zero/core/source/context/context_imp_drm_or_wddm/context_imp.cpp
@@ -7,6 +7,9 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -40,4 +43,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     }
 }
 
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/core/source/context/context_imp_wddm/context_imp.cpp b/level_zero/core/source/context/context_imp_wddm/context_imp.cpp
index 206952ba7b..161d5de864 100644
--- a/level_zero/core/source/context/context_imp_wddm/context_imp.cpp
+++ b/level_zero/core/source/context/context_imp_wddm/context_imp.cpp
@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/context/context_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle_imp.h"
+
 namespace L0 {
 
 bool ContextImp::isShareableMemory(const void *exportDesc, bool exportableMemory, NEO::Device *neoDevice) {
@@ -21,4 +23,4 @@ void *ContextImp::getMemHandlePtr(ze_device_handle_t hDevice, uint64_t handle, z
     return this->driverHandle->importNTHandle(hDevice, reinterpret_cast<void *>(handle));
 }
 
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/core/source/device/device.h b/level_zero/core/source/device/device.h
index 65422bc68c..a0fb70d801 100644
--- a/level_zero/core/source/device/device.h
+++ b/level_zero/core/source/device/device.h
@@ -7,16 +7,7 @@
 
 #pragma once
 
-#include "shared/source/command_stream/preemption_mode.h"
-#include "shared/source/device/device.h"
-#include "shared/source/helpers/hw_helper.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_interface.h"
-
 #include "level_zero/core/source/debugger/debugger_l0.h"
-#include "level_zero/core/source/driver/driver.h"
-#include "level_zero/core/source/driver/driver_handle.h"
-#include "level_zero/core/source/module/module.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zet_api.h>
 
diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp
index ddc63206da..9b666a6f3b 100644
--- a/level_zero/core/source/device/device_imp.cpp
+++ b/level_zero/core/source/device/device_imp.cpp
@@ -41,6 +41,7 @@
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/source/image/image.h"
 #include "level_zero/core/source/module/module.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include "level_zero/core/source/printf_handler/printf_handler.h"
 #include "level_zero/core/source/sampler/sampler.h"
 #include "level_zero/tools/source/debug/debug_session.h"
diff --git a/level_zero/core/source/device/device_imp.h b/level_zero/core/source/device/device_imp.h
index a4c4f02ab3..8129f002db 100644
--- a/level_zero/core/source/device/device_imp.h
+++ b/level_zero/core/source/device/device_imp.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/helpers/topology_map.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 
 #include "level_zero/core/source/device/device.h"
 
diff --git a/level_zero/core/source/driver/driver_handle.h b/level_zero/core/source/driver/driver_handle.h
index a2b5ad5847..e94b336e96 100644
--- a/level_zero/core/source/driver/driver_handle.h
+++ b/level_zero/core/source/driver/driver_handle.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,17 +7,23 @@
 
 #pragma once
 
-#include "shared/source/memory_manager/unified_memory_manager.h"
-
-#include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/device/device.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
+#include <memory>
+#include <vector>
 struct _ze_driver_handle_t {
     virtual ~_ze_driver_handle_t() = default;
 };
 
+namespace NEO {
+class Device;
+class MemoryManager;
+class SVMAllocsManager;
+class GraphicsAllocation;
+struct SvmAllocationData;
+} // namespace NEO
+
 namespace L0 {
 struct Device;
 struct L0EnvVariables;
diff --git a/level_zero/core/source/driver/driver_handle_imp.cpp b/level_zero/core/source/driver/driver_handle_imp.cpp
index a6eae5f710..076de610f8 100644
--- a/level_zero/core/source/driver/driver_handle_imp.cpp
+++ b/level_zero/core/source/driver/driver_handle_imp.cpp
@@ -11,6 +11,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/os_library.h"
 
 #include "level_zero/core/source/context/context_imp.h"
diff --git a/level_zero/core/source/driver/driver_handle_imp.h b/level_zero/core/source/driver/driver_handle_imp.h
index 2fb9fca82b..eb2a631bf4 100644
--- a/level_zero/core/source/driver/driver_handle_imp.h
+++ b/level_zero/core/source/driver/driver_handle_imp.h
@@ -7,10 +7,14 @@
 
 #pragma once
 
+#include "shared/source/memory_manager/graphics_allocation.h"
+
 #include "level_zero/api/extensions/public/ze_exp_ext.h"
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/get_extension_function_lookup_map.h"
 
+#include <map>
+
 namespace L0 {
 class HostPointerManager;
 
diff --git a/level_zero/core/source/gen11/cmdlist_gen11.inl b/level_zero/core/source/gen11/cmdlist_gen11.inl
index 7b53b95caf..8f77d9fc23 100644
--- a/level_zero/core/source/gen11/cmdlist_gen11.inl
+++ b/level_zero/core/source/gen11/cmdlist_gen11.inl
@@ -8,6 +8,7 @@
 #include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/gen9/cmdlist_gen9.inl b/level_zero/core/source/gen9/cmdlist_gen9.inl
index 4ad1c07b48..8d1e1f783d 100644
--- a/level_zero/core/source/gen9/cmdlist_gen9.inl
+++ b/level_zero/core/source/gen9/cmdlist_gen9.inl
@@ -12,6 +12,7 @@
 #include "shared/source/helpers/pipe_control_args.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 template <GFXCORE_FAMILY gfxCoreFamily>
diff --git a/level_zero/core/source/kernel/kernel_hw.h b/level_zero/core/source/kernel/kernel_hw.h
index 8899b93733..63586d171a 100644
--- a/level_zero/core/source/kernel/kernel_hw.h
+++ b/level_zero/core/source/kernel/kernel_hw.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/device/device.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
@@ -15,7 +16,10 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/kernel/implicit_args.h"
+#include "shared/source/memory_manager/unified_memory_manager.h"
 
+#include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/core/source/module/module.h"
 
diff --git a/level_zero/core/source/module/module.h b/level_zero/core/source/module/module.h
index 11b0a438c0..a137a973d7 100644
--- a/level_zero/core/source/module/module.h
+++ b/level_zero/core/source/module/module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include "level_zero/core/source/context/context.h"
-#include "level_zero/core/source/kernel/kernel.h"
-#include "level_zero/core/source/module/module_build_log.h"
 #include <level_zero/ze_api.h>
 
 #include <set>
@@ -19,6 +16,8 @@ struct _ze_module_handle_t {};
 
 namespace L0 {
 struct Device;
+struct ModuleBuildLog;
+struct KernelImmutableData;
 
 enum class ModuleType {
     Builtin,
diff --git a/level_zero/core/source/module/module_build_log.cpp b/level_zero/core/source/module/module_build_log.cpp
index 19e1d9bb9b..51fc7cf914 100644
--- a/level_zero/core/source/module/module_build_log.cpp
+++ b/level_zero/core/source/module/module_build_log.cpp
@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "level_zero/core/source/module/module_build_log.h"
+
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 
 #include "level_zero/core/source/module/module.h"
 
 #include <memory>
+#include <string>
 
 namespace L0 {
 
diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp
index 355d963e3d..ce9e65029a 100644
--- a/level_zero/core/source/module/module_imp.cpp
+++ b/level_zero/core/source/module/module_imp.cpp
@@ -30,6 +30,7 @@
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
 #include "level_zero/core/source/device/device.h"
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module_build_log.h"
 
@@ -1102,6 +1103,15 @@ bool ModuleImp::populateHostGlobalSymbolsMap(std::unordered_map<std::string, std
     return retVal;
 }
 
+ze_result_t ModuleImp::destroy() {
+    auto tempHandle = debugModuleHandle;
+    auto tempDevice = device;
+    delete this;
+    if (tempDevice->getL0Debugger() && tempHandle != 0) {
+        tempDevice->getL0Debugger()->removeZebinModule(tempHandle);
+    }
+    return ZE_RESULT_SUCCESS;
+}
 void ModuleImp::registerElfInDebuggerL0() {
     if (device->getL0Debugger() == nullptr) {
         return;
diff --git a/level_zero/core/source/module/module_imp.h b/level_zero/core/source/module/module_imp.h
index 1ad3927b6a..1719593808 100644
--- a/level_zero/core/source/module/module_imp.h
+++ b/level_zero/core/source/module/module_imp.h
@@ -10,13 +10,9 @@
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/compiler_interface/linker.h"
 #include "shared/source/program/program_info.h"
-#include "shared/source/utilities/const_stringref.h"
 
-#include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/module/module.h"
 
-#include "igfxfmid.h"
-
 #include <list>
 #include <memory>
 #include <string>
@@ -85,15 +81,7 @@ struct ModuleImp : public Module {
 
     ~ModuleImp() override;
 
-    ze_result_t destroy() override {
-        auto tempHandle = debugModuleHandle;
-        auto tempDevice = device;
-        delete this;
-        if (tempDevice->getL0Debugger() && tempHandle != 0) {
-            tempDevice->getL0Debugger()->removeZebinModule(tempHandle);
-        }
-        return ZE_RESULT_SUCCESS;
-    }
+    ze_result_t destroy() override;
 
     ze_result_t createKernel(const ze_kernel_desc_t *desc,
                              ze_kernel_handle_t *phFunction) override;
diff --git a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp
index 9f2e2c384a..2b7b96cdb3 100644
--- a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp
+++ b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp
@@ -7,7 +7,9 @@
 
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/aub_tests/fixtures/aub_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 
diff --git a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp
index cafe070675..6e844cb98b 100644
--- a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp
+++ b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp
@@ -14,6 +14,7 @@
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/aub_tests/fixtures/aub_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
diff --git a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp
index 433058481e..9e4c3f788c 100644
--- a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp
+++ b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp
@@ -12,6 +12,7 @@
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/aub_tests/fixtures/aub_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 
diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp
index f1fdec71b1..9a9fcf021b 100644
--- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp
+++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp
@@ -19,6 +19,7 @@
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/aub_tests/fixtures/aub_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
diff --git a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
index 50f117deca..100f1aa166 100644
--- a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
+++ b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp
@@ -12,6 +12,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/unit_test/tests_configuration.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
index e03a20ede2..8dba3f2e4b 100644
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
@@ -13,6 +13,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 
 #include "level_zero/core/source/context/context_imp.h"
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 
 class MockPageFaultManager;
diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
index 181d41a9b4..cb0f14cdaf 100644
--- a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
@@ -10,6 +10,7 @@
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_device.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
diff --git a/level_zero/core/test/unit_tests/mocks/mock_driver_handle.h b/level_zero/core/test/unit_tests/mocks/mock_driver_handle.h
index 55243ea2b2..a35fef219e 100644
--- a/level_zero/core/test/unit_tests/mocks/mock_driver_handle.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_driver_handle.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
diff --git a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp
index e9e39fee6e..75dcd1d240 100644
--- a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp
+++ b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp
@@ -13,6 +13,7 @@
 
 #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h"
 #include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/core/source/kernel/kernel.h"
 #include "level_zero/core/source/module/module.h"
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp
index 26fee38fec..4858e8f125 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp
@@ -9,6 +9,7 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/test.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 #include "level_zero/core/source/image/image_hw.h"
 #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
index 544e961e89..8e140d8943 100644
--- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
index 22eabfba09..8da712cd79 100644
--- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/preemption.h"
+#include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/utilities/software_tags_manager.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp
index f799c97fe4..74016e35d1 100644
--- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp
@@ -13,6 +13,7 @@
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/image/image.h"
diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
index 19a69cb1e2..dd668c38b9 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
@@ -26,6 +26,7 @@
 
 #include "level_zero/core/source/context/context.h"
 #include "level_zero/core/source/kernel/kernel_imp.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h"
diff --git a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
index 40172b37a0..e158c3473f 100644
--- a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
+++ b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
@@ -11,9 +11,10 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/image/image.h"
+#include "level_zero/core/source/kernel/kernel.h"
+#include "level_zero/core/source/module/module_build_log.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_module.h"
-
 namespace L0 {
 namespace ult {
 
diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp
index 0c6ba11594..b7795b3e4e 100644
--- a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp
+++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp
@@ -11,6 +11,7 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_imp.h"
+#include "level_zero/core/source/cmdqueue/cmdqueue.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 
diff --git a/level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h b/level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h
index 81371b6711..f35d928f20 100644
--- a/level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h
+++ b/level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h
@@ -10,6 +10,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "level_zero/core/source/device/device.h"
+#include <level_zero/zes_api.h>
 
 #ifdef IGSC_PRESENT
 #include "igsc_lib.h"
diff --git a/level_zero/tools/source/sysman/linux/pmu/pmu_imp.cpp b/level_zero/tools/source/sysman/linux/pmu/pmu_imp.cpp
index 7f3fc41313..1b01833a31 100644
--- a/level_zero/tools/source/sysman/linux/pmu/pmu_imp.cpp
+++ b/level_zero/tools/source/sysman/linux/pmu/pmu_imp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,8 @@
 
 #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle.h"
+
 namespace L0 {
 
 const std::string PmuInterfaceImp::deviceDir("device");
@@ -97,4 +99,4 @@ PmuInterface *PmuInterface::create(LinuxSysmanImp *pLinuxSysmanImp) {
     return pPmuInterfaceImp;
 }
 
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
index 13223a995d..911290275e 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/os_interface/linux/memory_info.h"
 
+#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
 
 #include "sysman/linux/os_sysman_imp.h"
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
index 9ade7e6b4c..c3b7b91a1b 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/os_interface/linux/system_info.h"
 
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
 #include "drm/intel_hwconfig_types.h"
diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
index 795d48330f..dd7f097f3a 100644
--- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
+++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/utilities/directory.h"
 
+#include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/linux/fs_access.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
index 480fcca1db..6157c83ab7 100644
--- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
+++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.cpp
@@ -7,6 +7,8 @@
 
 #include "sysman/pci/windows/os_pci_imp.h"
 
+#include "level_zero/core/source/driver/driver_handle.h"
+
 namespace L0 {
 
 ze_result_t WddmPciImp::getProperties(zes_pci_properties_t *properties) {