diff --git a/shared/source/debug_settings/debug_settings_manager.h b/shared/source/debug_settings/debug_settings_manager.h
index 40387d21a3..b63cce4b97 100644
--- a/shared/source/debug_settings/debug_settings_manager.h
+++ b/shared/source/debug_settings/debug_settings_manager.h
@@ -7,7 +7,6 @@
 
 #pragma once
 #include <cstdint>
-#include <cstdio>
 #include <memory>
 #include <string>
 
diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp
index 361d9fa2d4..01df12a004 100644
--- a/shared/source/gen11/hw_info_ehl.cpp
+++ b/shared/source/gen11/hw_info_ehl.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen11/hw_cmds_ehl.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp
index c2f0b971a3..6a5f06d5c3 100644
--- a/shared/source/gen11/hw_info_icllp.cpp
+++ b/shared/source/gen11/hw_info_icllp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen11/hw_cmds_icllp.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen11/hw_info_lkf.cpp b/shared/source/gen11/hw_info_lkf.cpp
index 40f94a5c13..482bbc8999 100644
--- a/shared/source/gen11/hw_info_lkf.cpp
+++ b/shared/source/gen11/hw_info_lkf.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen11/hw_cmds_lkf.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp
index ad8e9db100..bdd9cc8e96 100644
--- a/shared/source/gen12lp/hw_info_adln.cpp
+++ b/shared/source/gen12lp/hw_info_adln.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_adln.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp
index 18ad327670..7b4fe1c9b0 100644
--- a/shared/source/gen12lp/hw_info_adlp.cpp
+++ b/shared/source/gen12lp/hw_info_adlp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_adlp.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp
index f324e48600..e0d6be7039 100644
--- a/shared/source/gen12lp/hw_info_adls.cpp
+++ b/shared/source/gen12lp/hw_info_adls.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_adls.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp
index 393ce6c4c6..530e03ce58 100644
--- a/shared/source/gen12lp/hw_info_dg1.cpp
+++ b/shared/source/gen12lp/hw_info_dg1.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_dg1.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp
index 376be1fef8..bf8636060a 100644
--- a/shared/source/gen12lp/hw_info_rkl.cpp
+++ b/shared/source/gen12lp/hw_info_rkl.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_rkl.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp
index b62c68cc60..3d5d2011b8 100644
--- a/shared/source/gen12lp/hw_info_tgllp.cpp
+++ b/shared/source/gen12lp/hw_info_tgllp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen12lp/hw_cmds_tgllp.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp
index 6a62112e31..875146d9bb 100644
--- a/shared/source/gen8/hw_info_bdw.cpp
+++ b/shared/source/gen8/hw_info_bdw.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen8/hw_cmds_bdw.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp
index 96923aada6..5a5fbe8c57 100644
--- a/shared/source/gen9/hw_info_bxt.cpp
+++ b/shared/source/gen9/hw_info_bxt.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen9/hw_cmds_bxt.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp
index 105d2fb226..f2d34ea65b 100644
--- a/shared/source/gen9/hw_info_cfl.cpp
+++ b/shared/source/gen9/hw_info_cfl.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen9/hw_cmds_cfl.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp
index ae14cc94ef..98ce9e9ae5 100644
--- a/shared/source/gen9/hw_info_glk.cpp
+++ b/shared/source/gen9/hw_info_glk.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen9/hw_cmds_glk.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp
index dcacb99886..5454cc3574 100644
--- a/shared/source/gen9/hw_info_kbl.cpp
+++ b/shared/source/gen9/hw_info_kbl.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen9/hw_cmds_kbl.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp
index 84e15672f2..f40c37532c 100644
--- a/shared/source/gen9/hw_info_skl.cpp
+++ b/shared/source/gen9/hw_info_skl.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/gen9/hw_cmds_skl.h"
 #include "shared/source/helpers/constants.h"
 
diff --git a/shared/source/helpers/constants.h b/shared/source/helpers/constants.h
index 77d7265740..69a43d62f6 100644
--- a/shared/source/helpers/constants.h
+++ b/shared/source/helpers/constants.h
@@ -9,7 +9,6 @@
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/definitions/engine_group_types.h"
 
-#include <cstddef>
 #include <cstdint>
 #include <limits>
 
diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h
index 62f8457337..e2b3dfed9c 100644
--- a/shared/source/helpers/hw_info.h
+++ b/shared/source/helpers/hw_info.h
@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/direct_submission/direct_submission_properties.h"
 #include "shared/source/helpers/kmd_notify_properties.h"
 
@@ -14,10 +13,8 @@
 #include "igfxfmid.h"
 #include "sku_info.h"
 
-#include <cstddef>
-#include <string>
-
 namespace NEO {
+enum PreemptionMode : uint32_t;
 
 struct RuntimeCapabilityTable {
     DirectSubmissionProperyEngines directSubmissionEngines;
diff --git a/shared/source/helpers/kmd_notify_properties.cpp b/shared/source/helpers/kmd_notify_properties.cpp
index 9f40133c56..926474d95d 100644
--- a/shared/source/helpers/kmd_notify_properties.cpp
+++ b/shared/source/helpers/kmd_notify_properties.cpp
@@ -7,8 +7,10 @@
 
 #include "shared/source/helpers/kmd_notify_properties.h"
 
+#include "shared/source/command_stream/queue_throttle.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
+#include <chrono>
 #include <cstdint>
 
 using namespace NEO;
diff --git a/shared/source/helpers/kmd_notify_properties.h b/shared/source/helpers/kmd_notify_properties.h
index e1492687e5..e64f3bc84f 100644
--- a/shared/source/helpers/kmd_notify_properties.h
+++ b/shared/source/helpers/kmd_notify_properties.h
@@ -6,15 +6,15 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/queue_throttle.h"
 #include "shared/source/command_stream/wait_status.h"
-#include "shared/source/helpers/completion_stamp.h"
 
 #include <atomic>
-#include <chrono>
 #include <cstdint>
 
 namespace NEO {
+enum QueueThrottle : uint32_t;
+using FlushStamp = uint64_t;
+
 struct KmdNotifyProperties {
     int64_t delayKmdNotifyMicroseconds;
     int64_t delayQuickKmdSleepMicroseconds;
diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp
index e160d6ca2f..167d1e8f35 100644
--- a/shared/source/xe_hpc_core/hw_info_pvc.cpp
+++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/unified_memory/usm_memory_support.h"
diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp
index ceba894a1c..fba39ae34c 100644
--- a/shared/source/xe_hpg_core/hw_info_dg2.cpp
+++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"