diff --git a/src/soc/intel/alderlake/crashlog.c b/src/soc/intel/alderlake/crashlog.c
index 7bfa70baeb..b47d5644f9 100644
--- a/src/soc/intel/alderlake/crashlog.c
+++ b/src/soc/intel/alderlake/crashlog.c
@@ -1,12 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
-#include <intelblocks/crashlog.h>
-#include <string.h>
-#include <soc/crashlog.h>
 #include <arch/bert_storage.h>
+#include <console/console.h>
+#include <device/pci_ops.h>
+#include <intelblocks/crashlog.h>
+#include <intelblocks/pmc_ipc.h>
+#include <soc/crashlog.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
+#include <string.h>
 
 /* global crashLog info */
 static bool m_pmc_crashLog_support;
diff --git a/src/soc/intel/common/block/crashlog/crashlog.c b/src/soc/intel/common/block/crashlog/crashlog.c
index 2bdf2cc2eb..5949264690 100644
--- a/src/soc/intel/common/block/crashlog/crashlog.c
+++ b/src/soc/intel/common/block/crashlog/crashlog.c
@@ -1,9 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
 #include <cbmem.h>
+#include <console/console.h>
 #include <delay.h>
+#include <device/mmio.h>
 #include <intelblocks/crashlog.h>
+#include <intelblocks/pmc_ipc.h>
 #include <string.h>
 
 int __weak cl_get_cpu_record_size(void)
diff --git a/src/soc/intel/common/block/include/intelblocks/crashlog.h b/src/soc/intel/common/block/include/intelblocks/crashlog.h
index 17d415e127..07dd5a2db0 100644
--- a/src/soc/intel/common/block/include/intelblocks/crashlog.h
+++ b/src/soc/intel/common/block/include/intelblocks/crashlog.h
@@ -3,12 +3,7 @@
 #ifndef SOC_INTEL_COMMON_BLOCK_CRASHLOG_H
 #define SOC_INTEL_COMMON_BLOCK_CRASHLOG_H
 
-#include <console/console.h>
-#include <device/pci_ops.h>
-#include <device/pci_def.h>
-#include <device/mmio.h>
 #include <fsp/util.h>
-#include <intelblocks/pmc_ipc.h>
 #include <types.h>
 
 /* PMC  CrashLog Command */