diff --git a/src/mainboard/system76/cfl-h/dsdt.asl b/src/mainboard/system76/cfl-h/dsdt.asl
index ccdf5856a5..66a98c9d95 100644
--- a/src/mainboard/system76/cfl-h/dsdt.asl
+++ b/src/mainboard/system76/cfl-h/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/system76/cml-u/dsdt.asl b/src/mainboard/system76/cml-u/dsdt.asl
index ccdf5856a5..66a98c9d95 100644
--- a/src/mainboard/system76/cml-u/dsdt.asl
+++ b/src/mainboard/system76/cml-u/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/system76/thelio-b1/dsdt.asl b/src/mainboard/system76/thelio-b1/dsdt.asl
index d37c726c51..ee48035100 100644
--- a/src/mainboard/system76/thelio-b1/dsdt.asl
+++ b/src/mainboard/system76/thelio-b1/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/system76/whl-u/dsdt.asl b/src/mainboard/system76/whl-u/dsdt.asl
index ccdf5856a5..66a98c9d95 100644
--- a/src/mainboard/system76/whl-u/dsdt.asl
+++ b/src/mainboard/system76/whl-u/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>