10 files changed, 11 insertions, 35 deletions
diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 84c54c9e2e..39740ac3d3 100644
--- a/keyboards/gboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "butterstick.h"
 #include "mousekey.h"
 #include "keymap_steno.h"
 #include "wait.h"
diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h
index 5b2da811d8..005dd730b8 100644
--- a/keyboards/gboards/engine/engine.h
+++ b/keyboards/gboards/engine/engine.h
@@ -11,13 +11,11 @@
 */
 
 #pragma once
-#include QMK_KEYBOARD_H
+
+#include "quantum.h"
 #include <string.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
 
 // Maximum values for combos
 #define COMBO_END 0x00
diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..daeba1e0a6 100644
--- a/keyboards/gboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 1bab5e8981..63d4c4f5f3 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -17,15 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include QMK_KEYBOARD_H
+#include "ergotaco.h"
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h
index e166ba37d2..a78ddc96ff 100644
--- a/keyboards/gboards/g/engine.h
+++ b/keyboards/gboards/g/engine.h
@@ -12,16 +12,10 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <string.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "config_engine.h"
-#include <avr/pgmspace.h>
-#include "wait.h"
-#ifdef MOUSEKEY_ENABLE
-#    include "mousekey.h"
-#endif
 
 // Set defaults
 #ifndef IN_CHORD_MASK
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..dd95b593f1 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 5ac696fd31..b66b1a194c 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -17,16 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "keymap_steno.h"
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 05d518efac..b5aa79893e 100644
--- a/keyboards/gboards/georgi/sten.h
+++ b/keyboards/gboards/georgi/sten.h
@@ -6,7 +6,7 @@
 // Amen.
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 #include "mousekey.h"
 #include "keymap_steno.h"
 #include "wait.h"
diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index ba359f8145..da2a3007a8 100644
--- a/keyboards/gboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "gergo.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index c352be24e1..8a6b38bf73 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -17,16 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
 #include "debounce.h"
-#include QMK_KEYBOARD_H
+#include "gergo.h"
 
 #ifdef BALLER
 #include <avr/interrupt.h>