diff --git a/src/northbridge/intel/broadwell/acpi.c b/src/northbridge/intel/broadwell/acpi.c
index 691bcdec31..453c77a235 100644
--- a/src/northbridge/intel/broadwell/acpi.c
+++ b/src/northbridge/intel/broadwell/acpi.c
@@ -1,13 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <soc/acpi.h>
-#include <soc/device_nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
 #include <types.h>
@@ -87,8 +85,3 @@ unsigned long northbridge_write_acpi_tables(const struct device *const dev,
 
 	return current;
 }
-
-size_t size_of_dnvs(void)
-{
-	return sizeof(struct device_nvs);
-}
diff --git a/src/southbridge/intel/wildcatpoint/Makefile.mk b/src/southbridge/intel/wildcatpoint/Makefile.mk
index ec54db4632..59f48805ce 100644
--- a/src/southbridge/intel/wildcatpoint/Makefile.mk
+++ b/src/southbridge/intel/wildcatpoint/Makefile.mk
@@ -4,6 +4,7 @@ ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_WILDCATPOINT),y)
 
 bootblock-y += bootblock.c
 
+ramstage-y += acpi.c
 ramstage-y += adsp.c
 romstage-y += early_pch.c
 ramstage-$(CONFIG_ELOG) += elog.c
diff --git a/src/southbridge/intel/wildcatpoint/acpi.c b/src/southbridge/intel/wildcatpoint/acpi.c
new file mode 100644
index 0000000000..091bb50319
--- /dev/null
+++ b/src/southbridge/intel/wildcatpoint/acpi.c
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <acpi/acpi_gnvs.h>
+#include <soc/device_nvs.h>
+#include <types.h>
+
+size_t size_of_dnvs(void)
+{
+	return sizeof(struct device_nvs);
+}