diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 8800699a85..1c4148a7d9 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,7 +1,9 @@
+#include "oled_helper.h"
+#include "quantum.h"
+#include <stdio.h>
+#include <string.h>
+
 #ifdef OLED_ENABLE
-#    include QMK_KEYBOARD_H
-#    include <stdio.h>
-#    include <string.h>
 
 void render_logo(void) {
     static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0};
diff --git a/keyboards/3w6/rev1/matrix.c b/keyboards/3w6/rev1/matrix.c
index ae2f96bfa1..8bb6c77aaa 100644
--- a/keyboards/3w6/rev1/matrix.c
+++ b/keyboards/3w6/rev1/matrix.c
@@ -24,7 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t tca9555_status;
diff --git a/keyboards/3w6/rev2/matrix.c b/keyboards/3w6/rev2/matrix.c
index c47c24e1dc..49cb09a9f8 100644
--- a/keyboards/3w6/rev2/matrix.c
+++ b/keyboards/3w6/rev2/matrix.c
@@ -24,7 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t tca9555_status;
diff --git a/keyboards/adm42/rev4/rev4.c b/keyboards/adm42/rev4/rev4.c
index 2e22004f96..623b5cb5a3 100644
--- a/keyboards/adm42/rev4/rev4.c
+++ b/keyboards/adm42/rev4/rev4.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 led_config_t g_led_config = {
     {
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
index 83d591eb0a..964d56bdfb 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
+++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/mk0_avr_extra.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static void render_logo(void) {
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 4226dfa52c..016b562254 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "uart.h"
 #include "timer.h"
 
@@ -134,14 +136,14 @@ uint8_t rts_reset(void) {
     if (firstread) {
         writePinLow(RTS_PIN);
     } 
-     _delay_ms(10);
+     wait_ms(10);
     writePinHigh(RTS_PIN);
     
 
 /* the future is Arm 
     if (!palReadPad(RTS_PIN_IOPRT))
   {
-    _delay_ms(10);
+    wait_ms(10);
     palSetPadMode(RTS_PINn_IOPORT, PinDirectionOutput_PUSHPULL);
     palSetPad(RTS_PORT, RTS_PIN);
   }
@@ -150,13 +152,13 @@ uint8_t rts_reset(void) {
     palSetPadMode(RTS_PIN_RTS_PORT, PinDirectionOutput_PUSHPULL);
     palSetPad(RTS_PORT, RTS_PIN);
     palClearPad(RTS_PORT, RTS_PIN);
-    _delay_ms(10);
+    wait_ms(10);
     palSetPad(RTS_PORT, RTS_PIN);
   }
 */
 
 
- _delay_ms(5);  
+ wait_ms(5);  
  //print("rts\n");
  return 1;
 }
@@ -222,7 +224,7 @@ uint8_t handspring_handshake(void) {
 
 uint8_t handspring_reset(void) {
     writePinLow(VCC_PIN);
-    _delay_ms(5);
+    wait_ms(5);
     writePinHigh(VCC_PIN);
 
     if ( handspring_handshake() ) {
@@ -257,7 +259,7 @@ void matrix_init(void)
         last_activity = timer_read();
     } else { 
         print("failed handshake");
-        _delay_ms(1000);
+        wait_ms(1000);
         //BUG /should/ power cycle or toggle RTS & reset, but this usually works. 
     }
 
@@ -271,7 +273,7 @@ void matrix_init(void)
         last_activity = timer_read();
     } else { 
         print("failed handshake");
-        _delay_ms(1000);
+        wait_ms(1000);
         //BUG /should/ power cycle or toggle RTS & reset, but this usually works. 
     }
 
diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c
deleted file mode 100644
index b15f9dc9bd..0000000000
--- a/keyboards/converter/sun_usb/command_extra.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "uart.h"
-
-bool sun_bell = false;
-bool sun_click = false;
-
-
-bool command_extra(uint8_t code)
-{
-    switch (code) {
-        case KC_H:
-        case KC_SLASH: /* ? */
-            print("\n\n----- Sun converter Help -----\n");
-            print("Home:        Toggle Bell\n");
-            print("End:         Toggle Click\n");
-            print("PgUp:        LED all On\n");
-            print("PgDown:      LED all Off\n");
-            print("Insert:      Layout\n");
-            print("Delete:      Reset\n");
-            return false;
-        case KC_DEL:
-            print("Reset\n");
-            uart_write(0x01);
-            break;
-        case KC_HOME:
-	    sun_bell = !sun_bell;
-	    if (sun_bell) {
-                print("Bell On\n");
-	        uart_write(0x02);
-	    } else {
-	        print("Bell Off\n");
-	        uart_write(0x03);
-	    }
-            break;
-        case KC_END:
-	    sun_click = !sun_click;
-	    if (sun_click) {
-	        print("Click On\n");
-		uart_write(0x0A);
-	    } else {
-	        print("Click Off\n");
-                uart_write(0x0B);
-	    }
-	    break;
-        case KC_PGUP:
-            print("LED all on\n");
-            uart_write(0x0E);
-            uart_write(0xFF);
-            break;
-        case KC_PGDN:
-            print("LED all off\n");
-            uart_write(0x0E);
-            uart_write(0x00);
-            break;
-        case KC_INSERT:
-            print("layout\n");
-            uart_write(0x0F);
-            break;
-        default:
-            xprintf("Unknown extra command: %02X\n", code);
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c
index f8d183fd48..493825bac8 100644
--- a/keyboards/converter/sun_usb/led.c
+++ b/keyboards/converter/sun_usb/led.c
@@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "led.h"
+#include "print.h"
 #include "uart.h"
 
 void led_set(uint8_t usb_led)
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 9f22eca1eb..bf1d5f807f 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -15,7 +15,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "host.h"
+#include "led.h"
+#include "debug.h"
+#include "wait.h"
 #include "uart.h"
 
 /*
@@ -86,9 +90,9 @@ void matrix_init(void)
     /*     print("."); */
     /*     while (uart_read()); */
     /*     uart_write(0x01); */
-    /*     _delay_ms(500); */
+    /*     wait_ms(500); */
     /*     if (uart_read() == 0xFF) { */
-    /*         _delay_ms(500); */
+    /*         wait_ms(500); */
     /*         if (uart_read() == 0x04) */
     /*             break; */
     /*     } */
@@ -112,7 +116,7 @@ uint8_t matrix_scan(void)
     switch (code) {
         case 0xFF:  // reset success: FF 04
             print("reset: ");
-            _delay_ms(500);
+            wait_ms(500);
             code = uart_read();
             xprintf("%02X\n", code);
             if (code == 0x04) {
@@ -122,12 +126,12 @@ uint8_t matrix_scan(void)
             return 0;
         case 0xFE:  // layout: FE <layout>
             print("layout: ");
-            _delay_ms(500);
+            wait_ms(500);
             xprintf("%02X\n", uart_read());
             return 0;
         case 0x7E:  // reset fail: 7E 01
             print("reset fail: ");
-            _delay_ms(500);
+            wait_ms(500);
             xprintf("%02X\n", uart_read());
             return 0;
         case 0x7F:
diff --git a/keyboards/converter/xmk/xmk.c b/keyboards/converter/xmk/xmk.c
index a0426e95dc..e0df96fc2d 100644
--- a/keyboards/converter/xmk/xmk.c
+++ b/keyboards/converter/xmk/xmk.c
@@ -3,7 +3,7 @@
 
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #if defined (XMK_DEBUG)
 void keyboard_post_init_kb(void) {
diff --git a/keyboards/converter/xmk/xmk_matrix.c b/keyboards/converter/xmk/xmk_matrix.c
index 7327ad5cfe..41eca9fe46 100644
--- a/keyboards/converter/xmk/xmk_matrix.c
+++ b/keyboards/converter/xmk/xmk_matrix.c
@@ -4,6 +4,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "xmk_matrix.h"
+#include "matrix.h"
+#include "debug.h"
 
 bool xmk_changed = false;
 matrix_row_t xmk_rows[MATRIX_ROWS];
diff --git a/keyboards/converter/xmk/xmk_matrix.h b/keyboards/converter/xmk/xmk_matrix.h
index 45514dea04..2a988253f9 100644
--- a/keyboards/converter/xmk/xmk_matrix.h
+++ b/keyboards/converter/xmk/xmk_matrix.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include <stdbool.h>
+#include <stdint.h>
 
 void xmk_matrix_key(bool press, uint8_t key);
diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c
index 601fd71958..7dd1702485 100644
--- a/keyboards/crkbd/lib/layer_state_reader.c
+++ b/keyboards/crkbd/lib/layer_state_reader.c
@@ -1,7 +1,5 @@
-
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
-#include "crkbd.h"
 
 // in the future, should use (1U<<_LAYER_NAME) instead, but needs to be moved to keymap,c
 #define L_BASE 0
diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c
index e0efe2e528..3d74fb45e4 100644
--- a/keyboards/crkbd/lib/rgb_state_reader.c
+++ b/keyboards/crkbd/lib/rgb_state_reader.c
@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/cxt_studio/cxt_studio.c b/keyboards/cxt_studio/cxt_studio.c
index 2e7622ff91..2b36905340 100644
--- a/keyboards/cxt_studio/cxt_studio.c
+++ b/keyboards/cxt_studio/cxt_studio.c
@@ -1,7 +1,7 @@
 // Copyright 2023 Colin Kinloch (@ColinKinloch)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 static uint8_t anim = 0;
 
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 8419b40f41..2a919506dc 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -1,5 +1,5 @@
+#include "ergodox_stm32.h"
 #include "i2c_master.h"
-#include QMK_KEYBOARD_H
 
 extern inline void ergodox_board_led_1_on(void);
 extern inline void ergodox_board_led_2_on(void);
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 2046e39c1f..3eb35cd7bb 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -1,13 +1,10 @@
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
 #include <string.h>
-#include <hal.h>
 #include "timer.h"
 #include "wait.h"
-#include "print.h"
-#include "matrix.h"
+#include "debug.h"
 #include "i2c_master.h"
-#include QMK_KEYBOARD_H
+#include "ergodox_stm32.h"
 
 #ifndef DEBOUNCE
 #define DEBOUNCE 10
diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c
index f5c3ec08c7..6ea605600d 100644
--- a/keyboards/fc980c/matrix.c
+++ b/keyboards/fc980c/matrix.c
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "led.h"
 #include "avr/timer_avr.h"
-// #include QMK_KEYBOARD_H
-
 
 // Timer resolution check
 #if (1000000/TIMER_RAW_FREQ > 20)
diff --git a/keyboards/ferris/0_1/matrix.c b/keyboards/ferris/0_1/matrix.c
index 0dfb150b6c..154a275d7a 100644
--- a/keyboards/ferris/0_1/matrix.c
+++ b/keyboards/ferris/0_1/matrix.c
@@ -23,7 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t mcp23017_status;
diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c
index ff0e66d65c..af4b045eb8 100644
--- a/keyboards/ferris/0_2/matrix.c
+++ b/keyboards/ferris/0_2/matrix.c
@@ -23,9 +23,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
-#include <print.h>
 
 extern i2c_status_t mcp23017_status;
 #define MCP23017_I2C_TIMEOUT 1000
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>
diff --git a/keyboards/gl516/xr63gl/xr63gl.c b/keyboards/gl516/xr63gl/xr63gl.c
index 4817f07a92..b2aa43c456 100644
--- a/keyboards/gl516/xr63gl/xr63gl.c
+++ b/keyboards/gl516/xr63gl/xr63gl.c
@@ -1,7 +1,7 @@
 // Copyright 2022 gachiham (@gachiham)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[MATRIX_ROWS] = {
     0b1111111111111110,
diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c
index c61e4c7626..4981e703e4 100644
--- a/keyboards/hardwareabstraction/handwire/handwire.c
+++ b/keyboards/hardwareabstraction/handwire/handwire.c
@@ -1,7 +1,8 @@
 // Copyright 2022 Andy Tsai (@atsai)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
+
 static uint16_t buzzer_timer = 0;
 static uint8_t buzzer_dwell = 15;
 static uint8_t buzzer_dwell_change = 1;
diff --git a/keyboards/hotdox76v2/hotdox76v2.c b/keyboards/hotdox76v2/hotdox76v2.c
index 1465e96138..57ed81b128 100644
--- a/keyboards/hotdox76v2/hotdox76v2.c
+++ b/keyboards/hotdox76v2/hotdox76v2.c
@@ -2,7 +2,7 @@
 // Copyright 2022 Drashna Jael're (@Drashna Jael're)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "hotdox76v2.h"
 #include <string.h>
 #include <transactions.h>
 #include "oled_font_lib/logo2.h"
diff --git a/keyboards/ingrained/matrix.c b/keyboards/ingrained/matrix.c
index 0dfb150b6c..154a275d7a 100644
--- a/keyboards/ingrained/matrix.c
+++ b/keyboards/ingrained/matrix.c
@@ -23,7 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * to repeating that information all over the place.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
+#include "debug.h"
+#include "wait.h"
 #include "i2c_master.h"
 
 extern i2c_status_t mcp23017_status;
diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index fbe1bdb77f..b8f0d4ae13 100644
--- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "ergodox_infinity.h"
 #include <ch.h>
 #include <hal.h>
 #include <string.h>
diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c
index e484d74db8..7aa0ef9d77 100644
--- a/keyboards/kc60se/kc60se.c
+++ b/keyboards/kc60se/kc60se.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "kc60se.h"
 
 void matrix_init_kb(void){
     setPinOutput(B2);
diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c
index a6250966f3..9c7fc3ace5 100644
--- a/keyboards/keychron/common/keychron_common.c
+++ b/keyboards/keychron/common/keychron_common.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "keychron_common.h"
+#include "sync_timer.h"
 
 bool is_siri_active = false;
 uint32_t siri_timer = 0;
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
index 5e56a828c8..648a5d3371 100644
--- a/keyboards/keychron/common/keychron_common.h
+++ b/keyboards/keychron/common/keychron_common.h
@@ -16,10 +16,14 @@
 
 #pragma once
 
-#include "stdint.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
 #ifdef VIA_ENABLE
 #    include "via.h"
 #endif
+
 #include "quantum_keycodes.h"
 
 enum custom_keycodes {
diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c
index 68516c8df2..ffc2c4e2c6 100644
--- a/keyboards/lily58/lib/layer_state_reader.c
+++ b/keyboards/lily58/lib/layer_state_reader.c
@@ -1,5 +1,4 @@
-
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
 
 #define L_BASE 0
diff --git a/keyboards/lily58/lib/rgb_state_reader.c b/keyboards/lily58/lib/rgb_state_reader.c
index e0efe2e528..3d74fb45e4 100644
--- a/keyboards/lily58/lib/rgb_state_reader.c
+++ b/keyboards/lily58/lib/rgb_state_reader.c
@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c
index 354c1fb896..613798c941 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.c
+++ b/keyboards/marksard/rhymestone/common/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 void render_logo(void) {
 
   static const char PROGMEM logo_buf[]={
diff --git a/keyboards/marksard/rhymestone/common/oled_helper.h b/keyboards/marksard/rhymestone/common/oled_helper.h
index dc9a938f6c..34bacc6a89 100644
--- a/keyboards/marksard/rhymestone/common/oled_helper.h
+++ b/keyboards/marksard/rhymestone/common/oled_helper.h
@@ -1,3 +1,6 @@
+#include <stdint.h>
+#include "action.h"
+
 #ifdef OLED_ENABLE
 
 void render_logo(void);
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index 68adbe83a8..c3c8f23cbc 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 void render_logo(void) {
 
   const char logo_buf[]={
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h
index 56c2a5b236..82c1feba4a 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.h
+++ b/keyboards/marksard/treadstone48/common/oled_helper.h
@@ -1,5 +1,8 @@
 #ifdef OLED_ENABLE
 
+#include <stdint.h>
+#include "action.h"
+
 void render_logo(void);
 void update_key_status(uint16_t keycode, keyrecord_t *record);
 void render_key_status(void);
diff --git a/keyboards/mk65/mk65.c b/keyboards/mk65/mk65.c
index 8afb0ac415..b05174eacd 100644
--- a/keyboards/mk65/mk65.c
+++ b/keyboards/mk65/mk65.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index 21beee232c..3bd3e639c9 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -16,7 +16,7 @@
  * EEPROM management code from ../cannonkeys/stm32f072/keyboard.c
  */
 
-#include QMK_KEYBOARD_H
+#include "mxss.h"
 #include "eeprom.h"
 #include "action_layer.h"
 #include "rgblight.h"
diff --git a/keyboards/nack/nack.c b/keyboards/nack/nack.c
index 8433e551c4..8f91ee3757 100644
--- a/keyboards/nack/nack.c
+++ b/keyboards/nack/nack.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "nack.h"
 
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
diff --git a/keyboards/nullbitsco/nibble/nibble.c b/keyboards/nullbitsco/nibble/nibble.c
index 8f462080f0..388d546a7e 100644
--- a/keyboards/nullbitsco/nibble/nibble.c
+++ b/keyboards/nullbitsco/nibble/nibble.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include QMK_KEYBOARD_H
+#include "nibble.h"
 
 // Use Bit-C LED to show CAPS LOCK status
 void led_update_ports(led_t led_state) {
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index fdfffaa933..356c580342 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
+#include "tidbit.h"
 
 typedef struct PACKED {
     uint8_t r;
diff --git a/keyboards/omnikeyish/dynamic_macro.c b/keyboards/omnikeyish/dynamic_macro.c
index 9dd0340099..b990a09a13 100644
--- a/keyboards/omnikeyish/dynamic_macro.c
+++ b/keyboards/omnikeyish/dynamic_macro.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "omnikeyish.h"
 #include <string.h>
 
 dynamic_macro_t dynamic_macros[DYNAMIC_MACRO_COUNT];
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c
index 5fb3cc7539..38608e5a6c 100644
--- a/keyboards/palette1202/lib/oled_helper.c
+++ b/keyboards/palette1202/lib/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
 #include <stdio.h>
 #include <string.h>
 
+#ifdef OLED_ENABLE
+
 // returns character cord of the logo by line number
 char *read_logo(int row) {
   static char logoLines[][18] = {
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 275c02214e..e2dada4a15 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "mouse.h"
 
 #ifndef OPT_DEBOUNCE
 #    define OPT_DEBOUNCE 5  // (ms) 			Time between scroll events
diff --git a/keyboards/rubi/lib/oled.c b/keyboards/rubi/lib/oled.c
index 9534cdd9b7..9297cddf0e 100644
--- a/keyboards/rubi/lib/oled.c
+++ b/keyboards/rubi/lib/oled.c
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
-#include "./lib/oled.h"
+#include "oled.h"
+#include "rubi.h"
 
 bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
     return process_record_user(keycode, record);
diff --git a/keyboards/rubi/lib/oled.h b/keyboards/rubi/lib/oled.h
index 1737541c96..8af48c667b 100644
--- a/keyboards/rubi/lib/oled.h
+++ b/keyboards/rubi/lib/oled.h
@@ -17,6 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+#include "progmem.h"
+
 #define OLED_FRAME_TIMEOUT (1000 / 30)  // 30 fps
 #define OLED_LOGO_TIMEOUT 3000          // 3 sec
 
diff --git a/keyboards/rura66/rev1/oled_display.c b/keyboards/rura66/rev1/oled_display.c
index 137fd188c7..d2e3422bf9 100644
--- a/keyboards/rura66/rev1/oled_display.c
+++ b/keyboards/rura66/rev1/oled_display.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "rev1.h"
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
diff --git a/keyboards/splitkb/aurora/corne/rev1/rev1.c b/keyboards/splitkb/aurora/corne/rev1/rev1.c
index 1fdbbf93f1..31ea13fb53 100644
--- a/keyboards/splitkb/aurora/corne/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/corne/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/aurora/lily58/rev1/rev1.c b/keyboards/splitkb/aurora/lily58/rev1/rev1.c
index d6f0a1153b..34de643c1d 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/lily58/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rev1.c b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
index 43c2d12a67..a6b1a6796d 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/rev1.c
+++ b/keyboards/splitkb/aurora/sweep/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 // clang-format off
diff --git a/keyboards/teleport/native/ansi/ansi.c b/keyboards/teleport/native/ansi/ansi.c
index 8b243d8a07..9c4ea99f40 100644
--- a/keyboards/teleport/native/ansi/ansi.c
+++ b/keyboards/teleport/native/ansi/ansi.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/teleport/native/iso/iso.c b/keyboards/teleport/native/iso/iso.c
index f3bfbfb3a1..5acbffe8f9 100644
--- a/keyboards/teleport/native/iso/iso.c
+++ b/keyboards/teleport/native/iso/iso.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/torn/bongocat.c b/keyboards/torn/bongocat.c
index 9d6d9a85f5..8ca5e512f8 100644
--- a/keyboards/torn/bongocat.c
+++ b/keyboards/torn/bongocat.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include QMK_KEYBOARD_H
+#include "torn.h"
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/torn/matrix.c b/keyboards/torn/matrix.c
index dd7fa1e2e1..b674f21d57 100644
--- a/keyboards/torn/matrix.c
+++ b/keyboards/torn/matrix.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "matrix.h"
 #include "mcp23018.h"
 
 #define SPLIT_MATRIX_COLS (MATRIX_COLS / 2)
diff --git a/keyboards/torn/mcp23018.c b/keyboards/torn/mcp23018.c
index c180f1dae5..12c4f9bc7f 100644
--- a/keyboards/torn/mcp23018.c
+++ b/keyboards/torn/mcp23018.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "i2c_master.h"
 #include "mcp23018.h"
 
diff --git a/keyboards/torn/mcp23018.h b/keyboards/torn/mcp23018.h
index 17ecaa5a7c..af5dbc7b25 100644
--- a/keyboards/torn/mcp23018.h
+++ b/keyboards/torn/mcp23018.h
@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #define IODIRA 0x00
 #define IODIRB 0x01
 #define GPPUA 0x0C
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index c9863f2285..f321308ac5 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -1,6 +1,5 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
 #include <hal.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/keyboards/tzarc/ghoul/ghoul.c b/keyboards/tzarc/ghoul/ghoul.c
index aceb24764b..a97399110c 100644
--- a/keyboards/tzarc/ghoul/ghoul.c
+++ b/keyboards/tzarc/ghoul/ghoul.c
@@ -1,6 +1,6 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-3.0-or-later
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include "analog.h"
 #include "spi_master.h"
 
diff --git a/keyboards/work_louder/micro/matrix.c b/keyboards/work_louder/micro/matrix.c
index d2ae16ad9c..743c788662 100644
--- a/keyboards/work_louder/micro/matrix.c
+++ b/keyboards/work_louder/micro/matrix.c
@@ -4,16 +4,13 @@
 /*
  * scan matrix
  */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
+#include "matrix.h"
+#include <string.h>
+#include "atomic_util.h"
 #include "wait.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "matrix.h"
 #include "debounce.h"
-#include QMK_KEYBOARD_H
 
 /* matrix state(1:on, 0:off) */
 extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c
index 42bc2db529..d845a62250 100644
--- a/keyboards/work_louder/micro/micro.c
+++ b/keyboards/work_louder/micro/micro.c
@@ -1,7 +1,7 @@
 // Copyright 2022 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "micro.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 // clang-format off
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index d0cb93ccbc..cde435134a 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
 #include "rgb_functions.h"
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c
index 2dec336b86..f9cd934568 100644
--- a/keyboards/yosino58/lib/layer_state_reader.c
+++ b/keyboards/yosino58/lib/layer_state_reader.c
@@ -1,5 +1,5 @@
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
 
 #define L_BASE 0
diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c
index e0efe2e528..daa008d849 100644
--- a/keyboards/yosino58/lib/rgb_state_reader.c
+++ b/keyboards/yosino58/lib/rgb_state_reader.c
@@ -1,6 +1,6 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
index fd2a7b0789..1ffd441674 100644
--- a/keyboards/yushakobo/navpad/navpad_prefs.c
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "navpad_prefs.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
diff --git a/keyboards/yushakobo/quick17/quick17_prefs.c b/keyboards/yushakobo/quick17/quick17_prefs.c
index 1a546f4e35..bf58f67411 100644
--- a/keyboards/yushakobo/quick17/quick17_prefs.c
+++ b/keyboards/yushakobo/quick17/quick17_prefs.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quick17_prefs.h"
 
 bool _INPUT_JP;
 
diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h
index 4d81d163b9..a6096f0f26 100644
--- a/keyboards/yushakobo/quick17/quick17_prefs.h
+++ b/keyboards/yushakobo/quick17/quick17_prefs.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "quantum.h"
+
 enum layer_names {
     _CONTROL,
     _EDIT1,