diff --git a/src/board/system76/addw1/board.c b/src/board/system76/addw1/board.c
index 4f6e0bf..61de57f 100644
--- a/src/board/system76/addw1/board.c
+++ b/src/board/system76/addw1/board.c
@@ -1,10 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/kbc.h>
 #include <board/power.h>
diff --git a/src/board/system76/addw2/board.c b/src/board/system76/addw2/board.c
index 57918f5..0234d9a 100644
--- a/src/board/system76/addw2/board.c
+++ b/src/board/system76/addw2/board.c
@@ -1,13 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/kbc.h>
-#include <board/peci.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/bonw14/board.c b/src/board/system76/bonw14/board.c
index b0ec734..ed2921c 100644
--- a/src/board/system76/bonw14/board.c
+++ b/src/board/system76/bonw14/board.c
@@ -1,18 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);
diff --git a/src/board/system76/darp5/board.c b/src/board/system76/darp5/board.c
index b6f5bf1..de66e2b 100644
--- a/src/board/system76/darp5/board.c
+++ b/src/board/system76/darp5/board.c
@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
 #include <board/board.h>
 #include <board/gpio.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);
diff --git a/src/board/system76/darp7/board.c b/src/board/system76/darp7/board.c
index 50f1306..8491dc4 100644
--- a/src/board/system76/darp7/board.c
+++ b/src/board/system76/darp7/board.c
@@ -4,12 +4,9 @@
 #include <board/espi.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     espi_init();
 
diff --git a/src/board/system76/galp3-c/board.c b/src/board/system76/galp3-c/board.c
index b6f5bf1..de66e2b 100644
--- a/src/board/system76/galp3-c/board.c
+++ b/src/board/system76/galp3-c/board.c
@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
 #include <board/board.h>
 #include <board/gpio.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);
diff --git a/src/board/system76/galp5/board.c b/src/board/system76/galp5/board.c
index f0ccfed..c610934 100644
--- a/src/board/system76/galp5/board.c
+++ b/src/board/system76/galp5/board.c
@@ -2,7 +2,6 @@
 
 #include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/espi.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
@@ -10,8 +9,6 @@
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     espi_init();
 
diff --git a/src/board/system76/gaze15/board.c b/src/board/system76/gaze15/board.c
index 62db970..d9614e1 100644
--- a/src/board/system76/gaze15/board.c
+++ b/src/board/system76/gaze15/board.c
@@ -1,18 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow backlight to be turned on
     gpio_set(&BKL_EN, true);
diff --git a/src/board/system76/lemp10/board.c b/src/board/system76/lemp10/board.c
index a136681..2d7893a 100644
--- a/src/board/system76/lemp10/board.c
+++ b/src/board/system76/lemp10/board.c
@@ -4,12 +4,9 @@
 #include <board/espi.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     espi_init();
 
diff --git a/src/board/system76/oryp5/board.c b/src/board/system76/oryp5/board.c
index 710bffe..aaf0596 100644
--- a/src/board/system76/oryp5/board.c
+++ b/src/board/system76/oryp5/board.c
@@ -1,17 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
 #include <board/power.h>
 #include <common/debug.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);
diff --git a/src/board/system76/oryp6/board.c b/src/board/system76/oryp6/board.c
index b0ec734..ed2921c 100644
--- a/src/board/system76/oryp6/board.c
+++ b/src/board/system76/oryp6/board.c
@@ -1,18 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);
diff --git a/src/board/system76/oryp7/board.c b/src/board/system76/oryp7/board.c
index 8caaed9..05ac1d8 100644
--- a/src/board/system76/oryp7/board.c
+++ b/src/board/system76/oryp7/board.c
@@ -1,18 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <arch/time.h>
-#include <board/battery.h>
 #include <board/board.h>
-#include <board/dgpu.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
-extern uint8_t main_cycle;
-
 void board_init(void) {
     // Allow CPU to boot
     gpio_set(&SB_KBCRST_N, true);