diff --git a/src/mainboard/system76/gaze14/dsdt.asl b/src/mainboard/system76/gaze14/dsdt.asl
index ccbe190caf..6c1e61d10a 100644
--- a/src/mainboard/system76/gaze14/dsdt.asl
+++ b/src/mainboard/system76/gaze14/dsdt.asl
@@ -4,7 +4,7 @@
 DefinitionBlock(
 	"dsdt.aml",
 	"DSDT",
-	0x02,		// DSDT revision: ACPI v2.0 and up
+	ACPI_DSDT_REV_2,
 	OEM_ID,
 	ACPI_TABLE_CREATOR,
 	0x20110725	// OEM revision
diff --git a/src/mainboard/system76/kbl-u/dsdt.asl b/src/mainboard/system76/kbl-u/dsdt.asl
index 452b600f97..3b0248154c 100644
--- a/src/mainboard/system76/kbl-u/dsdt.asl
+++ b/src/mainboard/system76/kbl-u/dsdt.asl
@@ -4,7 +4,7 @@
 DefinitionBlock(
 	"dsdt.aml",
 	"DSDT",
-	0x02,		// DSDT revision: ACPI v2.0 and up
+	ACPI_DSDT_REV_2,
 	OEM_ID,
 	ACPI_TABLE_CREATOR,
 	0x20110725	// OEM revision
diff --git a/src/mainboard/system76/thelio-b1/dsdt.asl b/src/mainboard/system76/thelio-b1/dsdt.asl
index 6b16989093..aa7d8c72c5 100644
--- a/src/mainboard/system76/thelio-b1/dsdt.asl
+++ b/src/mainboard/system76/thelio-b1/dsdt.asl
@@ -1,51 +1,29 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2019 System76
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
 DefinitionBlock(
 	"dsdt.aml",
 	"DSDT",
-	0x02,		// DSDT revision: ACPI v2.0 and up
+	ACPI_DSDT_REV_2,
 	OEM_ID,
 	ACPI_TABLE_CREATOR,
 	0x20110725	// OEM revision
 )
 {
-	// Some generic macros
-	#include <soc/intel/cannonlake/acpi/platform.asl>
-
-	// global NVS and variables
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
-
-	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
 
-	Scope (\_SB) {
-		Device (PCI0)
-		{
-			#include <soc/intel/cannonlake/acpi/northbridge.asl>
-			#include <soc/intel/cannonlake/acpi/southbridge.asl>
-		}
+	Device (\_SB.PCI0)
+	{
+		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+		#include <soc/intel/cannonlake/acpi/southbridge.asl>
 	}
 
-	// Chipset specific sleep states
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Scope (\_SB.PCI0.LPCB)
 	{
-		/* ACPI code for EC SuperIO functions */
 		#include <drivers/pc80/pc/ps2_controller.asl>
 	}
 }