diff --git a/src/board/system76/addw2/board.c b/src/board/system76/addw2/board.c
index 02d6eacf6..6348c8efb 100644
--- a/src/board/system76/addw2/board.c
+++ b/src/board/system76/addw2/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/kbc.h>
 #include <common/debug.h>
diff --git a/src/board/system76/addw3/board.c b/src/board/system76/addw3/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/addw3/board.c
+++ b/src/board/system76/addw3/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/addw4/board.c b/src/board/system76/addw4/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/addw4/board.c
+++ b/src/board/system76/addw4/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.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 1933e2336..baade2bc2 100644
--- a/src/board/system76/bonw14/board.c
+++ b/src/board/system76/bonw14/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk
index 4f304ad79..bdd68a95a 100644
--- a/src/board/system76/common/common.mk
+++ b/src/board/system76/common/common.mk
@@ -4,10 +4,8 @@ board-common-y += acpi.c
 board-common-y += battery.c
 board-common-y += config.c
 board-common-$(CONFIG_HAVE_DGPU) += dgpu.c
-board-common-y += ecpm.c
 board-common-$(CONFIG_BUS_ESPI) += espi.c
 board-common-y += fan.c
-board-common-y += gctrl.c
 board-common-y += kbc.c
 board-common-y += kbscan.c
 board-common-y += keymap.c
diff --git a/src/board/system76/common/ecpm.c b/src/board/system76/common/ecpm.c
deleted file mode 100644
index 48b8a565a..000000000
--- a/src/board/system76/common/ecpm.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include <board/ecpm.h>
-#include <common/macro.h>
-
-void ecpm_init(void) {
-    // Clock gate EGPC, CIR, and SWUC
-    CGCTRL2 |= BIT(6) | BIT(5) | BIT(4);
-    // Clock gate UART, SSPI, and DBGR
-    CGCTRL3 |= BIT(2) | BIT(1) | BIT(0);
-    // Clock gate CEC
-    CGCTRL4 |= BIT(0);
-}
diff --git a/src/board/system76/common/espi.c b/src/board/system76/common/espi.c
index 010d4a6b8..0a28d55d5 100644
--- a/src/board/system76/common/espi.c
+++ b/src/board/system76/common/espi.c
@@ -7,7 +7,6 @@
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/ecpm.h>
-#include <ec/gctrl.h>
 #include <ec/gpio.h>
 
 #include <8051.h>
diff --git a/src/board/system76/common/gctrl.c b/src/board/system76/common/gctrl.c
deleted file mode 100644
index da196cea0..000000000
--- a/src/board/system76/common/gctrl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include <board/gctrl.h>
-
-void gctrl_init(void) {
-    // Set I2EC as R/W
-    SPCTRL1 |= 0x03;
-    // Set PNPCFG base address
-    BADRSEL = 0;
-}
diff --git a/src/board/system76/common/include/board/ecpm.h b/src/board/system76/common/include/board/ecpm.h
deleted file mode 100644
index fc267194f..000000000
--- a/src/board/system76/common/include/board/ecpm.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#ifndef _BOARD_ECPM_H
-#define _BOARD_ECPM_H
-
-#include <ec/ecpm.h>
-
-void ecpm_init(void);
-
-#endif // _BOARD_ECPM_H
diff --git a/src/board/system76/common/include/board/gctrl.h b/src/board/system76/common/include/board/gctrl.h
deleted file mode 100644
index d3ea4a193..000000000
--- a/src/board/system76/common/include/board/gctrl.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#ifndef _BOARD_GCTRL_H
-#define _BOARD_GCTRL_H
-
-#include <ec/gctrl.h>
-
-void gctrl_init(void);
-
-#endif // _BOARD_GCTRL_H
diff --git a/src/board/system76/common/main.c b/src/board/system76/common/main.c
index 4d79566ce..f87934412 100644
--- a/src/board/system76/common/main.c
+++ b/src/board/system76/common/main.c
@@ -1,18 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <8051.h>
 #include <stdio.h>
 
-#include <arch/arch.h>
-#include <arch/delay.h>
 #include <arch/time.h>
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/dgpu.h>
-#include <board/ecpm.h>
 #include <board/fan.h>
 #include <board/gpio.h>
-#include <board/gctrl.h>
 #include <board/kbc.h>
 #include <board/kbled.h>
 #include <board/kbscan.h>
@@ -57,16 +52,13 @@ uint8_t main_cycle = 0;
 
 void init(void) {
     // Must happen first
-    arch_init();
     ec_init();
-    gctrl_init();
     gpio_init();
 
     // Can happen in any order
 #if CONFIG_HAVE_DGPU
     dgpu_init();
 #endif
-    ecpm_init();
     kbc_init();
     kbled_init();
 #ifdef PARALLEL_DEBUG
diff --git a/src/board/system76/darp7/board.c b/src/board/system76/darp7/board.c
index f5766427d..0b20585b2 100644
--- a/src/board/system76/darp7/board.c
+++ b/src/board/system76/darp7/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/galp5/board.c b/src/board/system76/galp5/board.c
index e8ea6816b..c487a0dc5 100644
--- a/src/board/system76/galp5/board.c
+++ b/src/board/system76/galp5/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze15/board.c b/src/board/system76/gaze15/board.c
index 981a5e7dc..91e108963 100644
--- a/src/board/system76/gaze15/board.c
+++ b/src/board/system76/gaze15/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze16-3050/board.c b/src/board/system76/gaze16-3050/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/gaze16-3050/board.c
+++ b/src/board/system76/gaze16-3050/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze16-3060/board.c b/src/board/system76/gaze16-3060/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/gaze16-3060/board.c
+++ b/src/board/system76/gaze16-3060/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze17-3050/board.c b/src/board/system76/gaze17-3050/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/gaze17-3050/board.c
+++ b/src/board/system76/gaze17-3050/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze17-3060/board.c b/src/board/system76/gaze17-3060/board.c
index 36214afcd..20573c9d5 100644
--- a/src/board/system76/gaze17-3060/board.c
+++ b/src/board/system76/gaze17-3060/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/lemp10/board.c b/src/board/system76/lemp10/board.c
index 85496a3b0..aac794122 100644
--- a/src/board/system76/lemp10/board.c
+++ b/src/board/system76/lemp10/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp6/board.c b/src/board/system76/oryp6/board.c
index 1933e2336..baade2bc2 100644
--- a/src/board/system76/oryp6/board.c
+++ b/src/board/system76/oryp6/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp7/board.c b/src/board/system76/oryp7/board.c
index 1933e2336..baade2bc2 100644
--- a/src/board/system76/oryp7/board.c
+++ b/src/board/system76/oryp7/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp8/board.c b/src/board/system76/oryp8/board.c
index 6e7b52874..819c0b446 100644
--- a/src/board/system76/oryp8/board.c
+++ b/src/board/system76/oryp8/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/ec/ite/ec.c b/src/ec/ite/ec.c
index 4553e97b4..9870378ab 100644
--- a/src/ec/ite/ec.c
+++ b/src/ec/ite/ec.c
@@ -1,21 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <ec/ec.h>
+#include <arch/arch.h>
+#include <ec/ecpm.h>
 #include <ec/gctrl.h>
 #include <common/debug.h>
 #include <common/macro.h>
 
-void ec_init(void) {
-#if CONFIG_EC_ITE_IT8587E
-    RSTS = (0b10U << 6) | BIT(2);
-#else
-    RSTS = (0b01U << 6) | BIT(2);
-
-    // Enable POST codes
-    SPCTRL1 |= BIT(7) | BIT(6) | BIT(3);
-#endif
-}
-
 void ec_read_post_codes(void) {
 #if CONFIG_EC_ITE_IT5570E || CONFIG_EC_ITE_IT5571E
     while (P80H81HS & 1) {
@@ -27,3 +18,35 @@ void ec_read_post_codes(void) {
     }
 #endif
 }
+
+static void gctrl_init(void) {
+    // Set I2EC as R/W
+    SPCTRL1 |= 0x03;
+    // Set PNPCFG base address
+    BADRSEL = 0;
+}
+
+static void ecpm_init(void) {
+    // Clock gate EGPC, CIR, and SWUC
+    CGCTRL2 |= BIT(6) | BIT(5) | BIT(4);
+    // Clock gate UART, SSPI, and DBGR
+    CGCTRL3 |= BIT(2) | BIT(1) | BIT(0);
+    // Clock gate CEC
+    CGCTRL4 |= BIT(0);
+}
+
+void ec_init(void) {
+    arch_init();
+
+#if CONFIG_EC_ITE_IT8587E
+    RSTS = (0b10U << 6) | BIT(2);
+#else
+    RSTS = (0b01U << 6) | BIT(2);
+
+    // Enable POST codes
+    SPCTRL1 |= BIT(7) | BIT(6) | BIT(3);
+#endif
+
+    gctrl_init();
+    ecpm_init();
+}