diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.h b/level_zero/core/source/cmdqueue/cmdqueue_hw.h
index df25053032..9dddfff518 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_hw.h
+++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "shared/source/helpers/hw_info.h"
+
 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
 namespace NEO {
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_imp.h b/level_zero/core/source/cmdqueue/cmdqueue_imp.h
index 4d41408c3d..84a94dc5b7 100644
--- a/level_zero/core/source/cmdqueue/cmdqueue_imp.h
+++ b/level_zero/core/source/cmdqueue/cmdqueue_imp.h
@@ -10,6 +10,7 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/submission_status.h"
 #include "shared/source/command_stream/wait_status.h"
+#include "shared/source/helpers/completion_stamp.h"
 
 #include "level_zero/core/source/cmdqueue/cmdqueue.h"
 
diff --git a/level_zero/core/source/fence/fence.cpp b/level_zero/core/source/fence/fence.cpp
index 98b520e89d..46c793aa96 100644
--- a/level_zero/core/source/fence/fence.cpp
+++ b/level_zero/core/source/fence/fence.cpp
@@ -8,9 +8,8 @@
 #include "level_zero/core/source/fence/fence.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/string.h"
-#include "shared/source/memory_manager/memory_manager.h"
+
+#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 
 namespace L0 {
 
diff --git a/level_zero/core/source/fence/fence.h b/level_zero/core/source/fence/fence.h
index dd2139cfac..9ac34370f5 100644
--- a/level_zero/core/source/fence/fence.h
+++ b/level_zero/core/source/fence/fence.h
@@ -7,10 +7,6 @@
 
 #pragma once
 
-#include "shared/source/command_stream/csr_definitions.h"
-
-#include "level_zero/core/source/cmdqueue/cmdqueue.h"
-#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
 #include <level_zero/ze_api.h>
 
 #include <chrono>
@@ -20,6 +16,8 @@ struct _ze_fence_handle_t {};
 
 namespace L0 {
 
+struct CommandQueueImp;
+
 struct Fence : _ze_fence_handle_t {
     static Fence *create(CommandQueueImp *cmdQueue, const ze_fence_desc_t *desc);
     virtual ~Fence() = default;
diff --git a/shared/source/command_stream/csr_definitions.h b/shared/source/command_stream/csr_definitions.h
index c6113b5770..77015400cf 100644
--- a/shared/source/command_stream/csr_definitions.h
+++ b/shared/source/command_stream/csr_definitions.h
@@ -6,13 +6,14 @@
  */
 
 #pragma once
+
 #include "shared/source/command_stream/csr_deps.h"
 #include "shared/source/command_stream/csr_properties_flags.h"
 #include "shared/source/command_stream/memory_compression_state.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/queue_throttle.h"
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipeline_select_args.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/kernel/kernel_execution_type.h"
diff --git a/shared/source/helpers/cache_flush_xehp_and_later.inl b/shared/source/helpers/cache_flush_xehp_and_later.inl
index 1177e91e60..d9e0517d79 100644
--- a/shared/source/helpers/cache_flush_xehp_and_later.inl
+++ b/shared/source/helpers/cache_flush_xehp_and_later.inl
@@ -11,6 +11,8 @@
 
 namespace NEO {
 
+struct HardwareInfo;
+
 template <typename GfxFamily>
 inline size_t getSizeNeededToFlushGpuCache(const Range<L3Range> &ranges, bool usePostSync) {
     size_t size = sizeof(typename GfxFamily::L3_CONTROL) * (ranges.size() / maxFlushSubrangeCount + 1);
diff --git a/shared/source/helpers/flat_batch_buffer_helper.h b/shared/source/helpers/flat_batch_buffer_helper.h
index 98e73d5761..34cb9e231d 100644
--- a/shared/source/helpers/flat_batch_buffer_helper.h
+++ b/shared/source/helpers/flat_batch_buffer_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,6 +18,7 @@ namespace NEO {
 enum class DispatchMode;
 class MemoryManager;
 class ExecutionEnvironment;
+struct HardwareInfo;
 
 class FlatBatchBufferHelper {
   public: