diff --git a/src/soc/amd/picasso/bootblock.c b/src/soc/amd/picasso/bootblock.c
index dd4ef3c12a..9e88ceaec4 100644
--- a/src/soc/amd/picasso/bootblock.c
+++ b/src/soc/amd/picasso/bootblock.c
@@ -1,13 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <stdint.h>
+#include <amdblocks/amd_pci_mmconf.h>
 #include <amdblocks/cpu.h>
 #include <bootblock_common.h>
 #include <console/console.h>
+#include <cpu/cpu.h>
 #include <cpu/x86/tsc.h>
 #include <soc/psp_transfer.h>
 #include <soc/southbridge.h>
-#include <amdblocks/amd_pci_mmconf.h>
+#include <stdint.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {
diff --git a/src/soc/amd/picasso/graphics.c b/src/soc/amd/picasso/graphics.c
index 047559cbf3..298e177881 100644
--- a/src/soc/amd/picasso/graphics.c
+++ b/src/soc/amd/picasso/graphics.c
@@ -4,6 +4,7 @@
 #include <device/pci_rom.h>
 #include <soc/cpu.h>
 #include <soc/soc_util.h>
+#include <stdint.h>
 
 void map_oprom_vendev_rev(u32 *vendev, u8 *rev)
 {
diff --git a/src/soc/amd/picasso/pcie_gpp.c b/src/soc/amd/picasso/pcie_gpp.c
index c46135f55b..aab37f4757 100644
--- a/src/soc/amd/picasso/pcie_gpp.c
+++ b/src/soc/amd/picasso/pcie_gpp.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <amdblocks/amd_pci_util.h>
+#include <commonlib/bsd/helpers.h>
 #include <soc/pci_devs.h>
+#include <stddef.h>
 
 /* See AMD PPR 55570 - IOAPIC Initialization for the table that AGESA sets up */
 const struct pci_routing_info pci_routing_table[] = {
diff --git a/src/soc/amd/picasso/smu.c b/src/soc/amd/picasso/smu.c
index 1496957117..076baaaded 100644
--- a/src/soc/amd/picasso/smu.c
+++ b/src/soc/amd/picasso/smu.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
 #include <amdblocks/smu.h>
+#include <console/console.h>
 #include <soc/smu.h>
 
 /*