14 files changed, 0 insertions, 14 deletions
diff --git a/src/mainboard/google/dedede/variants/haboki/gpio.c b/src/mainboard/google/dedede/variants/haboki/gpio.c
index 12286c6756..ab13dba430 100644
--- a/src/mainboard/google/dedede/variants/haboki/gpio.c
+++ b/src/mainboard/google/dedede/variants/haboki/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <fw_config.h>
 #include <ec/google/chromeec/ec.h>
 
diff --git a/src/mainboard/google/guybrush/variants/dewatt/gpio.c b/src/mainboard/google/guybrush/variants/dewatt/gpio.c
index 94e7272d2c..1d796c51e8 100644
--- a/src/mainboard/google/guybrush/variants/dewatt/gpio.c
+++ b/src/mainboard/google/guybrush/variants/dewatt/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/herobrine/board.h b/src/mainboard/google/herobrine/board.h
index d336bce0ad..0e06cd9305 100644
--- a/src/mainboard/google/herobrine/board.h
+++ b/src/mainboard/google/herobrine/board.h
@@ -4,7 +4,6 @@
 #define _COREBOOT_SRC_MAINBOARD_GOOGLE_HEROBRINE_BOARD_H_
 
 #include <assert.h>
-#include <boardid.h>
 #include <gpio.h>
 
 
diff --git a/src/mainboard/google/herobrine/mainboard.c b/src/mainboard/google/herobrine/mainboard.c
index c8af6865e7..0901ff0cc3 100644
--- a/src/mainboard/google/herobrine/mainboard.c
+++ b/src/mainboard/google/herobrine/mainboard.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "board.h"
-#include <boardid.h>
 #include <bootblock_common.h>
 #include <device/device.h>
 #include <device/mmio.h>
diff --git a/src/mainboard/google/octopus/variants/bloog/variant.c b/src/mainboard/google/octopus/variants/bloog/variant.c
index 28f2ce8f54..498c5c4e23 100644
--- a/src/mainboard/google/octopus/variants/bloog/variant.c
+++ b/src/mainboard/google/octopus/variants/bloog/variant.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <boardid.h>
 #include <ec/google/chromeec/ec.h>
 #include <sar.h>
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 11fe9b5eec..f5ba83a933 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index aa98a90423..a5a16df23f 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <boardid.h>
 #include <sar.h>
 #include <baseboard/variants.h>
 #include <gpio.h>
diff --git a/src/mainboard/google/octopus/variants/dood/gpio.c b/src/mainboard/google/octopus/variants/dood/gpio.c
index dfb88d8791..639e9ca54d 100644
--- a/src/mainboard/google/octopus/variants/dood/gpio.c
+++ b/src/mainboard/google/octopus/variants/dood/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/foob/gpio.c b/src/mainboard/google/octopus/variants/foob/gpio.c
index 3e059c8725..1cc044e45e 100644
--- a/src/mainboard/google/octopus/variants/foob/gpio.c
+++ b/src/mainboard/google/octopus/variants/foob/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index c285a883f2..dad442bc45 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -2,7 +2,6 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
-#include <boardid.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <variant/sku.h>
diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c
index 5a0f8e62df..abff81b5fd 100644
--- a/src/mainboard/google/octopus/variants/garg/variant.c
+++ b/src/mainboard/google/octopus/variants/garg/variant.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <boardid.h>
 #include <ec/google/chromeec/ec.h>
 #include <drivers/intel/gma/opregion.h>
 #include <baseboard/variants.h>
diff --git a/src/mainboard/google/veyron/board.h b/src/mainboard/google/veyron/board.h
index 10c36df851..a2b9e2f7c9 100644
--- a/src/mainboard/google/veyron/board.h
+++ b/src/mainboard/google/veyron/board.h
@@ -3,7 +3,6 @@
 #ifndef __MAINBOARD_GOOGLE_VEYRON_BOARD_H
 #define __MAINBOARD_GOOGLE_VEYRON_BOARD_H
 
-#include <boardid.h>
 #include <gpio.h>
 
 #define GPIO_BACKLIGHT	GPIO(7, A, 2)
diff --git a/src/mainboard/google/veyron_mickey/board.h b/src/mainboard/google/veyron_mickey/board.h
index bed6177446..b7d7118b17 100644
--- a/src/mainboard/google/veyron_mickey/board.h
+++ b/src/mainboard/google/veyron_mickey/board.h
@@ -3,7 +3,6 @@
 #ifndef __MAINBOARD_GOOGLE_VEYRON_MICKEY_BOARD_H
 #define __MAINBOARD_GOOGLE_VEYRON_MICKEY_BOARD_H
 
-#include <boardid.h>
 #include <gpio.h>
 
 #define GPIO_RESET	GPIO(0, B, 5)
diff --git a/src/mainboard/google/veyron_rialto/board.h b/src/mainboard/google/veyron_rialto/board.h
index 5bd16568ea..af3966c9e2 100644
--- a/src/mainboard/google/veyron_rialto/board.h
+++ b/src/mainboard/google/veyron_rialto/board.h
@@ -3,7 +3,6 @@
 #ifndef __MAINBOARD_GOOGLE_VEYRON_RIALTO_BOARD_H
 #define __MAINBOARD_GOOGLE_VEYRON_RIALTO_BOARD_H
 
-#include <boardid.h>
 #include <gpio.h>
 
 #define GPIO_RESET	GPIO(0, B, 5)