diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index c51bd69872..821de5f5ec 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -8,8 +8,6 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 
-extern const unsigned char AmlCode[];
-
 void acpi_create_gnvs(struct global_nvs *gnvs)
 {
 	acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index f6947a20b8..300e8f6278 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
-#include <intelblocks/acpi.h>
-#include <soc/acpi.h>
-
-extern const unsigned char AmlCode[];
 
 void acpi_create_gnvs(struct global_nvs *gnvs)
 {
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index c51bd69872..a251d22546 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -2,14 +2,8 @@
 
 #include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
-#include <device/device.h>
-
-#include <intelblocks/acpi.h>
-#include <soc/acpi.h>
 #include <soc/nvs.h>
 
-extern const unsigned char AmlCode[];
-
 void acpi_create_gnvs(struct global_nvs *gnvs)
 {
 	acpi_init_gnvs(gnvs);