diff --git a/src/mainboard/google/glados/acpi/chromeos.asl b/src/mainboard/google/glados/acpi/chromeos.asl
index b8cef5ea91..6b16dbcbbd 100644
--- a/src/mainboard/google/glados/acpi/chromeos.asl
+++ b/src/mainboard/google/glados/acpi/chromeos.asl
@@ -17,7 +17,7 @@
  * Foundation, Inc.
  */
 
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 
 Name (OIPG, Package () {
 	/* No physical recovery GPIO. */
diff --git a/src/mainboard/google/glados/acpi/ec.asl b/src/mainboard/google/glados/acpi/ec.asl
index 33a7471a8c..d69ebe2d01 100644
--- a/src/mainboard/google/glados/acpi/ec.asl
+++ b/src/mainboard/google/glados/acpi/ec.asl
@@ -18,8 +18,8 @@
  */
 
 /* mainboard configuration */
-#include <mainboard/google/glados/ec.h>
-#include <mainboard/google/glados/gpio.h>
+#include "../ec.h"
+#include "../gpio.h"
 
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl
index efa7dddcf4..0184a6a6cf 100644
--- a/src/mainboard/google/glados/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/acpi/mainboard.asl
@@ -17,7 +17,7 @@
  * Foundation, Inc.
  */
 
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 
 #define BOARD_TOUCHPAD_I2C_ADDR			0x15
 #define BOARD_TOUCHPAD_IRQ			TOUCHPAD_INT_L
@@ -67,7 +67,7 @@ Scope (\_SB.PCI0.I2C0)
 		Name (_UID, 1)
 		Name (_S0W, 4)
 
-		Name (_CRS, ResourceTemplate()
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
 				BOARD_TOUCHSCREEN_I2C_ADDR,
@@ -99,7 +99,7 @@ Scope (\_SB.PCI0.I2C1)
 		Name (_UID, 1)
 		Name (_S0W, 4)
 
-		Name (_CRS, ResourceTemplate()
+		Name (_CRS, ResourceTemplate ()
 		{
 			I2cSerialBus (
 				BOARD_TOUCHPAD_I2C_ADDR,
diff --git a/src/mainboard/google/glados/acpi/superio.asl b/src/mainboard/google/glados/acpi/superio.asl
index 932fef7430..822821e9df 100644
--- a/src/mainboard/google/glados/acpi/superio.asl
+++ b/src/mainboard/google/glados/acpi/superio.asl
@@ -18,7 +18,7 @@
  */
 
 /* mainboard configuration */
-#include <mainboard/google/glados/ec.h>
+#include "../ec.h"
 
 #define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index dba1cbbb7f..7d428089ee 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -28,8 +28,8 @@
 #include <string.h>
 #include <ec/google/chromeec/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <mainboard/google/glados/gpio.h>
 
+#include "gpio.h"
 #include "ec.h"
 
 #if ENV_RAMSTAGE
diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c
index ad05b31ddf..fc9cb53b39 100644
--- a/src/mainboard/google/glados/spd/spd.c
+++ b/src/mainboard/google/glados/spd/spd.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <soc/pei_data.h>
 #include <soc/romstage.h>
-#include <mainboard/google/glados/gpio.h>
+#include "../gpio.h"
 #include "spd.h"
 
 static void mainboard_print_spd_info(uint8_t spd[])