diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl
index 9505158f3c..eebeeeacee 100644
--- a/src/mainboard/google/auron/dsdt.asl
+++ b/src/mainboard/google/auron/dsdt.asl
@@ -11,7 +11,7 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
-	#include <northbridge/intel/broadwell/acpi/platform.asl>
+	#include <southbridge/intel/wildcatpoint/acpi/platform.asl>
 
 	// Thermal handler
 	#include "acpi/thermal.asl"
diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl
index 8e76080411..62c8b58fe6 100644
--- a/src/mainboard/google/jecht/dsdt.asl
+++ b/src/mainboard/google/jecht/dsdt.asl
@@ -19,7 +19,7 @@ DefinitionBlock(
 
 	// global NVS and variables
 	#include <southbridge/intel/wildcatpoint/acpi/globalnvs.asl>
-	#include <northbridge/intel/broadwell/acpi/device_nvs.asl>
+	#include <southbridge/intel/wildcatpoint/acpi/device_nvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/hp/elitebook_820_g2/dsdt.asl b/src/mainboard/hp/elitebook_820_g2/dsdt.asl
index bb744911a3..95012ce708 100644
--- a/src/mainboard/hp/elitebook_820_g2/dsdt.asl
+++ b/src/mainboard/hp/elitebook_820_g2/dsdt.asl
@@ -18,7 +18,7 @@ DefinitionBlock(
 	#include <soc/intel/common/acpi/acpi_wake_source.asl>
 
 	#include <southbridge/intel/wildcatpoint/acpi/globalnvs.asl>
-	#include <northbridge/intel/broadwell/acpi/device_nvs.asl>
+	#include <southbridge/intel/wildcatpoint/acpi/device_nvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl
index efa50eb92d..764d442d5f 100644
--- a/src/mainboard/intel/wtm2/dsdt.asl
+++ b/src/mainboard/intel/wtm2/dsdt.asl
@@ -19,7 +19,7 @@ DefinitionBlock(
 
 	// global NVS and variables
 	#include <southbridge/intel/wildcatpoint/acpi/globalnvs.asl>
-	#include <northbridge/intel/broadwell/acpi/device_nvs.asl>
+	#include <southbridge/intel/wildcatpoint/acpi/device_nvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/purism/librem_bdw/dsdt.asl b/src/mainboard/purism/librem_bdw/dsdt.asl
index 7439e941de..18719a8f1e 100644
--- a/src/mainboard/purism/librem_bdw/dsdt.asl
+++ b/src/mainboard/purism/librem_bdw/dsdt.asl
@@ -11,7 +11,7 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
-	#include <northbridge/intel/broadwell/acpi/platform.asl>
+	#include <southbridge/intel/wildcatpoint/acpi/platform.asl>
 	#include <southbridge/intel/wildcatpoint/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 
diff --git a/src/northbridge/intel/broadwell/acpi/device_nvs.asl b/src/southbridge/intel/wildcatpoint/acpi/device_nvs.asl
similarity index 100%
rename from src/northbridge/intel/broadwell/acpi/device_nvs.asl
rename to src/southbridge/intel/wildcatpoint/acpi/device_nvs.asl
diff --git a/src/northbridge/intel/broadwell/acpi/platform.asl b/src/southbridge/intel/wildcatpoint/acpi/platform.asl
similarity index 90%
rename from src/northbridge/intel/broadwell/acpi/platform.asl
rename to src/southbridge/intel/wildcatpoint/acpi/platform.asl
index 3a57f995d1..af60f5cee7 100644
--- a/src/northbridge/intel/broadwell/acpi/platform.asl
+++ b/src/southbridge/intel/wildcatpoint/acpi/platform.asl
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <northbridge/intel/broadwell/acpi/device_nvs.asl>
+#include <southbridge/intel/wildcatpoint/acpi/device_nvs.asl>
 #include <southbridge/intel/common/acpi/platform.asl>
 
 /*
diff --git a/src/northbridge/intel/broadwell/include/soc/device_nvs.h b/src/southbridge/intel/wildcatpoint/include/soc/device_nvs.h
similarity index 100%
rename from src/northbridge/intel/broadwell/include/soc/device_nvs.h
rename to src/southbridge/intel/wildcatpoint/include/soc/device_nvs.h