diff --git a/src/arch/arm/armv7/mmu.c b/src/arch/arm/armv7/mmu.c
index ce9d3fd9d8..b3133a08b7 100644
--- a/src/arch/arm/armv7/mmu.c
+++ b/src/arch/arm/armv7/mmu.c
@@ -29,6 +29,7 @@
  */
 
 #include <assert.h>
+#include <commonlib/helpers.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <symbols.h>
diff --git a/src/arch/arm/cpu.c b/src/arch/arm/cpu.c
index 93d5675f35..87fc6b17cc 100644
--- a/src/arch/arm/cpu.c
+++ b/src/arch/arm/cpu.c
@@ -29,6 +29,7 @@
  */
 #include <stdlib.h>
 #include <arch/cpu.h>
+#include <commonlib/helpers.h>
 
 /* Return the CPU struct which is at the high memory address of the stack.
  */
diff --git a/src/arch/arm64/fit_payload.c b/src/arch/arm64/fit_payload.c
index fd1bae171a..46bea23053 100644
--- a/src/arch/arm64/fit_payload.c
+++ b/src/arch/arm64/fit_payload.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <commonlib/compression.h>
 #include <commonlib/cbfs_serialized.h>
+#include <commonlib/helpers.h>
 #include <lib.h>
 #include <fit.h>
 #include <endian.h>
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 71fc4e208f..80923e3edd 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -44,6 +44,7 @@
 #include <arch/acpigen.h>
 #include <device/pci.h>
 #include <cbmem.h>
+#include <commonlib/helpers.h>
 #include <cpu/x86/lapic_def.h>
 #include <cpu/cpu.h>
 #include <cbfs.h>
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 4c573033da..049fb12e75 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -18,6 +18,7 @@
 #include <arch/acpi.h>
 #include <arch/cpu.h>
 #include <cbmem.h>
+#include <commonlib/helpers.h>
 #include <fallback.h>
 #include <timestamp.h>
 #include <program_loading.h>
diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c
index d3ad01e1df..81756ff568 100644
--- a/src/arch/x86/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -16,6 +16,7 @@
 #include <types.h>
 #include <string.h>
 #include <cbmem.h>
+#include <commonlib/helpers.h>
 #include <console/console.h>
 #include <cpu/x86/gdt.h>
 
diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h
index b3042c34d2..a69c230596 100644
--- a/src/arch/x86/include/arch/early_variables.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -17,6 +17,7 @@
 #define ARCH_EARLY_VARIABLES_H
 
 #include <arch/symbols.h>
+#include <commonlib/helpers.h>
 #include <stdlib.h>
 
 #if ENV_CACHE_AS_RAM && !CONFIG(NO_CAR_GLOBAL_MIGRATION)
diff --git a/src/arch/x86/pirq_routing.c b/src/arch/x86/pirq_routing.c
index 70df201c99..15d7411b3f 100644
--- a/src/arch/x86/pirq_routing.c
+++ b/src/arch/x86/pirq_routing.c
@@ -16,6 +16,7 @@
  */
 #include <console/console.h>
 #include <arch/pirq_routing.h>
+#include <commonlib/helpers.h>
 #include <string.h>
 #include <device/pci.h>
 
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index be090217ae..2f5c3a643e 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -30,6 +30,7 @@
 #include <memory_info.h>
 #include <spd.h>
 #include <cbmem.h>
+#include <commonlib/helpers.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <device/pci.h>
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 3cc385b530..0baa58eb2b 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -23,6 +23,7 @@
 #include <arch/pirq_routing.h>
 #include <arch/smp/mpspec.h>
 #include <arch/acpi.h>
+#include <commonlib/helpers.h>
 #include <string.h>
 #include <cbmem.h>
 #include <smbios.h>