From a14c03b96e75212d042621f4c68ccbecb7ee9901 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Apr 2024 14:48:21 +1100 Subject: [PATCH] Remove more unnecessary `quantum.h` includes (#23402) --- keyboards/bastardkb/charybdis/3x5/3x5.c | 2 +- keyboards/bastardkb/charybdis/3x6/3x6.c | 2 +- keyboards/bastardkb/charybdis/4x6/4x6.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 2 +- keyboards/bastardkb/dilemma/4x6_4/4x6_4.c | 2 +- keyboards/cipulot/common/ec_board.c | 2 +- keyboards/crkbd/lib/host_led_state_reader.c | 3 ++- keyboards/crkbd/lib/keylogger.c | 3 ++- keyboards/crkbd/lib/layer_state_reader.c | 2 +- keyboards/crkbd/lib/logo_reader.c | 2 -- keyboards/crkbd/lib/mode_icon_reader.c | 1 - keyboards/crkbd/lib/rgb_state_reader.c | 2 +- keyboards/crkbd/lib/timelogger.c | 2 +- keyboards/doio/kb16/lib/bongocat/bongocat.c | 9 +++++++-- keyboards/doio/kb16/lib/layer_status/layer_status.c | 4 +++- keyboards/doio/kb16/lib/logo.c | 3 ++- keyboards/durgod/dgk6x/galaxy/galaxy.c | 2 +- keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c | 2 +- keyboards/durgod/dgk6x/hades_iso/hades_iso.c | 2 +- keyboards/durgod/dgk6x/venus/venus.c | 2 +- keyboards/gboards/engine/engine.h | 5 ++++- keyboards/gboards/g/engine.h | 5 ++++- keyboards/gopolar/gg86/lib/logo.c | 3 ++- keyboards/handwired/dygma/raise/ansi/ansi.c | 2 +- keyboards/handwired/dygma/raise/iso/iso.c | 2 +- .../handwired/tractyl_manuform/5x6_right/f411/f411.c | 2 +- keyboards/helix/rev3_5rows/rev3_5rows.c | 2 +- keyboards/horrortroll/handwired_k552/lib/bongocat.c | 9 +++++++-- keyboards/horrortroll/handwired_k552/lib/galaxy.c | 4 +++- keyboards/horrortroll/handwired_k552/lib/logo.c | 4 +++- keyboards/horrortroll/lemon40/lib/bongocat.c | 9 +++++++-- keyboards/hotdox/hotdox.c | 2 -- keyboards/kbdfans/odin75/lib/bongocat.c | 8 +++++++- keyboards/keyboardio/model01/model01.c | 4 ++-- keyboards/lily58/lib/layer_state_reader.c | 2 +- keyboards/marksard/rhymestone/common/oled_helper.c | 4 +++- keyboards/marksard/treadstone48/common/oled_helper.c | 4 +++- keyboards/monstargear/xo87/solderable/solderable.c | 1 - keyboards/palette1202/lib/oled_helper.c | 2 +- keyboards/rgbkb/sol/rev1/rev1.c | 2 +- keyboards/rgbkb/sol/rev2/rev2.c | 2 +- keyboards/satt/comet46/lib/host_led_state_reader.c | 3 ++- keyboards/satt/comet46/lib/modifier_state_reader.c | 2 +- keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 3 +-- keyboards/terrazzo/terrazzo.c | 4 ---- keyboards/tzarc/djinn/djinn.c | 6 ++---- keyboards/tzarc/djinn/djinn_portscan_matrix.c | 3 --- keyboards/tzarc/djinn/djinn_split_sync.c | 2 -- keyboards/tzarc/djinn/djinn_usbpd.c | 2 -- keyboards/v60_type_r/v60_type_r.c | 2 -- keyboards/v60_type_r/v60_type_r.h | 2 -- keyboards/viktus/minne_topre/ec.c | 2 +- keyboards/viktus/osav2_numpad_topre/ec.c | 2 +- keyboards/viktus/osav2_topre/ec.c | 2 +- keyboards/viktus/styrka_topre/ec.c | 2 +- keyboards/vinhcatba/uncertainty/bongo.c | 7 +++++++ keyboards/vinhcatba/uncertainty/bongo.h | 2 ++ keyboards/vinhcatba/uncertainty/uncertainty.c | 3 +-- keyboards/yosino58/lib/layer_state_reader.c | 2 +- keyboards/yosino58/lib/rgb_state_reader.c | 1 - 60 files changed, 103 insertions(+), 78 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c index 082dbbc3bd..6e8e3bef10 100644 --- a/keyboards/bastardkb/charybdis/3x5/3x5.c +++ b/keyboards/bastardkb/charybdis/3x5/3x5.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c index a6c7ce07d6..d2c0a39815 100644 --- a/keyboards/bastardkb/charybdis/3x6/3x6.c +++ b/keyboards/bastardkb/charybdis/3x6/3x6.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c index c7856c12bb..ff1bbea470 100644 --- a/keyboards/bastardkb/charybdis/4x6/4x6.c +++ b/keyboards/bastardkb/charybdis/4x6/4x6.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0a5ba15181..3decc51e84 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c index c80ccbc8eb..49b24fbd04 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c +++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef SWAP_HANDS_ENABLE const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c index 2225d6da63..d9ba197589 100644 --- a/keyboards/cipulot/common/ec_board.c +++ b/keyboards/cipulot/common/ec_board.c @@ -15,7 +15,7 @@ */ #include "ec_switch_matrix.h" -#include "quantum.h" +#include "keyboard.h" void eeconfig_init_kb(void) { // Default values diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c index 2593ac5f8b..8602134f69 100644 --- a/keyboards/crkbd/lib/host_led_state_reader.c +++ b/keyboards/crkbd/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[24]; diff --git a/keyboards/crkbd/lib/keylogger.c b/keyboards/crkbd/lib/keylogger.c index 9adb55d6ee..84d2f8913d 100644 --- a/keyboards/crkbd/lib/keylogger.c +++ b/keyboards/crkbd/lib/keylogger.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include +#include "action.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c index 7dd1702485..f1030cae09 100644 --- a/keyboards/crkbd/lib/layer_state_reader.c +++ b/keyboards/crkbd/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" #include +#include "action_layer.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/logo_reader.c b/keyboards/crkbd/lib/logo_reader.c index 4a710bb250..039a538cc5 100644 --- a/keyboards/crkbd/lib/logo_reader.c +++ b/keyboards/crkbd/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "quantum.h" - const char *read_logo(void) { static char logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, diff --git a/keyboards/crkbd/lib/mode_icon_reader.c b/keyboards/crkbd/lib/mode_icon_reader.c index 02a63ec1c6..9dadd6ac86 100644 --- a/keyboards/crkbd/lib/mode_icon_reader.c +++ b/keyboards/crkbd/lib/mode_icon_reader.c @@ -1,5 +1,4 @@ #include -#include "quantum.h" char mode_icon[24]; diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c index a255cd662d..8ba0cda8df 100644 --- a/keyboards/crkbd/lib/rgb_state_reader.c +++ b/keyboards/crkbd/lib/rgb_state_reader.c @@ -1,7 +1,7 @@ #ifdef RGBLIGHT_ENABLE #include -#include "quantum.h" +#include "rgblight.h" extern rgblight_config_t rgblight_config; char rbf_info_str[24]; diff --git a/keyboards/crkbd/lib/timelogger.c b/keyboards/crkbd/lib/timelogger.c index bce9d99a4b..83fe9706dd 100644 --- a/keyboards/crkbd/lib/timelogger.c +++ b/keyboards/crkbd/lib/timelogger.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "timer.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c index 12ca8694c1..c90df38aec 100644 --- a/keyboards/doio/kb16/lib/bongocat/bongocat.c +++ b/keyboards/doio/kb16/lib/bongocat/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.c b/keyboards/doio/kb16/lib/layer_status/layer_status.c index 657ac86ff2..d9ba20bd8c 100644 --- a/keyboards/doio/kb16/lib/layer_status/layer_status.c +++ b/keyboards/doio/kb16/lib/layer_status/layer_status.c @@ -15,7 +15,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "action_layer.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/doio/kb16/lib/logo.c b/keyboards/doio/kb16/lib/logo.c index 7a52b479ff..ade4b954e0 100644 --- a/keyboards/doio/kb16/lib/logo.c +++ b/keyboards/doio/kb16/lib/logo.c @@ -15,7 +15,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c index 1cf2d71255..5d08163109 100644 --- a/keyboards/durgod/dgk6x/galaxy/galaxy.c +++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c index e984c36d91..d092310814 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c +++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c index 5ccc60e841..dcd821803e 100644 --- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c +++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c index 9bde901374..5433266e3b 100644 --- a/keyboards/durgod/dgk6x/venus/venus.c +++ b/keyboards/durgod/dgk6x/venus/venus.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 005dd730b8..a28777f4f2 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Maximum values for combos diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index a78ddc96ff..2b62165c51 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Set defaults diff --git a/keyboards/gopolar/gg86/lib/logo.c b/keyboards/gopolar/gg86/lib/logo.c index 3db3acdac1..8a8b97c4b7 100644 --- a/keyboards/gopolar/gg86/lib/logo.c +++ b/keyboards/gopolar/gg86/lib/logo.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c index c9e0cb288c..67b84c3bc8 100644 --- a/keyboards/handwired/dygma/raise/ansi/ansi.c +++ b/keyboards/handwired/dygma/raise/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c index 48ba85bf90..9643af7b8c 100644 --- a/keyboards/handwired/dygma/raise/iso/iso.c +++ b/keyboards/handwired/dygma/raise/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index a0c3ee0f4e..24263fa832 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "tractyl_manuform.h" void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 921558e80d..28fa314a7b 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "rev3_5rows.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c index 6510223b22..70699ff3cd 100644 --- a/keyboards/horrortroll/handwired_k552/lib/bongocat.c +++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here # define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ # define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 -# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c index 04885b8085..6578295c6f 100644 --- a/keyboards/horrortroll/handwired_k552/lib/galaxy.c +++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "galaxy.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c index 3931fdf455..f3ae2f8a06 100644 --- a/keyboards/horrortroll/handwired_k552/lib/logo.c +++ b/keyboards/horrortroll/handwired_k552/lib/logo.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "logo.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.c b/keyboards/horrortroll/lemon40/lib/bongocat.c index 12ca8694c1..c90df38aec 100644 --- a/keyboards/horrortroll/lemon40/lib/bongocat.c +++ b/keyboards/horrortroll/lemon40/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c index 00af9efb1e..4e86ec6d18 100644 --- a/keyboards/hotdox/hotdox.c +++ b/keyboards/hotdox/hotdox.c @@ -1,6 +1,4 @@ #include "hotdox.h" -#include "backlight.h" -#include "quantum.h" extern inline void ergodox_board_led_on(void); extern inline void ergodox_right_led_1_on(void); diff --git a/keyboards/kbdfans/odin75/lib/bongocat.c b/keyboards/kbdfans/odin75/lib/bongocat.c index 05be2173d1..9c7a5dc1fc 100644 --- a/keyboards/kbdfans/odin75/lib/bongocat.c +++ b/keyboards/kbdfans/odin75/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c index 3644f04516..33198423de 100644 --- a/keyboards/keyboardio/model01/model01.c +++ b/keyboards/keyboardio/model01/model01.c @@ -13,10 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + +#include "model01.h" #include "i2c_master.h" #include -#include "model01.h" void matrix_init_kb(void) { /* the bootloader can leave LEDs on, so */ diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c index 69b4613093..fb74825ef9 100644 --- a/keyboards/lily58/lib/layer_state_reader.c +++ b/keyboards/lily58/lib/layer_state_reader.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c index 613798c941..4a0ca72e89 100644 --- a/keyboards/marksard/rhymestone/common/oled_helper.c +++ b/keyboards/marksard/rhymestone/common/oled_helper.c @@ -1,9 +1,11 @@ #include "oled_helper.h" -#include "quantum.h" +#include "host.h" +#include "progmem.h" #include #include #ifdef OLED_ENABLE +#include "oled_driver.h" void render_logo(void) { diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c index e9a8cf564a..66124abe12 100644 --- a/keyboards/marksard/treadstone48/common/oled_helper.c +++ b/keyboards/marksard/treadstone48/common/oled_helper.c @@ -1,5 +1,7 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" +#include "host.h" +#include "rgblight.h" #include #include diff --git a/keyboards/monstargear/xo87/solderable/solderable.c b/keyboards/monstargear/xo87/solderable/solderable.c index f1fc65ea01..cb4da24a3a 100644 --- a/keyboards/monstargear/xo87/solderable/solderable.c +++ b/keyboards/monstargear/xo87/solderable/solderable.c @@ -15,7 +15,6 @@ */ #include "solderable.h" -#include "quantum.h" #define noLed {255,255} diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c index 38608e5a6c..9e46da921d 100644 --- a/keyboards/palette1202/lib/oled_helper.c +++ b/keyboards/palette1202/lib/oled_helper.c @@ -1,5 +1,5 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" #include #include diff --git a/keyboards/rgbkb/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c index 21b4503ab9..f5997bac00 100644 --- a/keyboards/rgbkb/sol/rev1/rev1.c +++ b/keyboards/rgbkb/sol/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c index e00c485609..cd2c9f9645 100644 --- a/keyboards/rgbkb/sol/rev2/rev2.c +++ b/keyboards/rgbkb/sol/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c index e9910e0141..54be419579 100644 --- a/keyboards/satt/comet46/lib/host_led_state_reader.c +++ b/keyboards/satt/comet46/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[22]; diff --git a/keyboards/satt/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c index c85c83b1de..856b8d8a68 100644 --- a/keyboards/satt/comet46/lib/modifier_state_reader.c +++ b/keyboards/satt/comet46/lib/modifier_state_reader.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "action_util.h" char modifier_state_str[22]; diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index d1c2d85ac8..9c474695a1 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -15,8 +15,7 @@ */ #include "ec_switch_matrix.h" - -#include "quantum.h" +#include #include "analog.h" #include "print.h" diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c index 53b0bd4c51..34aa7c4324 100644 --- a/keyboards/terrazzo/terrazzo.c +++ b/keyboards/terrazzo/terrazzo.c @@ -17,10 +17,6 @@ #include "terrazzo.h" #ifdef LED_MATRIX_ENABLE - #include - #include "print.h" - #include "quantum.h" - const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 17e5833ee9..8d6e2ec92e 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -1,12 +1,10 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" -#include #include "djinn.h" +#include +#include #include "serial.h" #include "split_util.h" -#include "qp.h" painter_device_t lcd; diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index ac81ad18c1..63f480be27 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -1,8 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include -#include "quantum.h" #include "djinn.h" #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15 diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c index 8b10e88b4b..3a2a8a4ff3 100644 --- a/keyboards/tzarc/djinn/djinn_split_sync.c +++ b/keyboards/tzarc/djinn/djinn_split_sync.c @@ -1,7 +1,5 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "transactions.h" #include "split_util.h" #include "djinn.h" diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c index 7a56f92b8e..e4e75f20d8 100644 --- a/keyboards/tzarc/djinn/djinn_usbpd.c +++ b/keyboards/tzarc/djinn/djinn_usbpd.c @@ -1,7 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "djinn.h" const char* usbpd_str(usbpd_allowance_t allowance) { diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c index b266472e64..540c5ec6ec 100644 --- a/keyboards/v60_type_r/v60_type_r.c +++ b/keyboards/v60_type_r/v60_type_r.c @@ -15,8 +15,6 @@ */ #include "v60_type_r.h" -#include "quantum.h" - // if we've got an RGB underglow! #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h index 1a7098fc41..ae2381a951 100644 --- a/keyboards/v60_type_r/v60_type_r.h +++ b/keyboards/v60_type_r/v60_type_r.h @@ -19,8 +19,6 @@ #ifdef RGBLIGHT_ENABLE -#include "rgblight.h" - void rgb_init(void); void set_rgb_color(uint8_t pin, uint8_t value, uint8_t timer_value); diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c index 569c878582..edd5f9a31d 100644 --- a/keyboards/viktus/minne_topre/ec.c +++ b/keyboards/viktus/minne_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c index e4f59c3b6b..93e698412a 100644 --- a/keyboards/viktus/osav2_numpad_topre/ec.c +++ b/keyboards/viktus/osav2_numpad_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c index 076ffc0ba8..13d9fde654 100644 --- a/keyboards/viktus/osav2_topre/ec.c +++ b/keyboards/viktus/osav2_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c index c9980461af..078723f691 100644 --- a/keyboards/viktus/styrka_topre/ec.c +++ b/keyboards/viktus/styrka_topre/ec.c @@ -15,8 +15,8 @@ */ #include "ec.h" +#include -#include "quantum.h" #include "analog.h" //#include "debug.h" diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c index 707955ee88..773a882f50 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.c +++ b/keyboards/vinhcatba/uncertainty/bongo.c @@ -1,7 +1,14 @@ // Copyright 2022 Parker Levin (@pedker) // SPDX-License-Identifier: GPL-2.0-or-later +#include "bongo.h" +#include #include "quantum.h" +#include "matrix.h" +#include "oled_driver.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" #define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms #define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h index d1cecbc619..c4bb1ed675 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.h +++ b/keyboards/vinhcatba/uncertainty/bongo.h @@ -3,4 +3,6 @@ #pragma once +#include + void draw_bongo(bool minimal); diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c index 19e5a5cfd5..c569f07a3b 100644 --- a/keyboards/vinhcatba/uncertainty/uncertainty.c +++ b/keyboards/vinhcatba/uncertainty/uncertainty.c @@ -1,8 +1,7 @@ // Copyright 2023 Vinh Le (@vinhcatba) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include "quantum.h" +#include "uncertainty.h" #ifdef OLED_ENABLE #include "bongo.h" diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c index f9cd934568..5f48c1f426 100644 --- a/keyboards/yosino58/lib/layer_state_reader.c +++ b/keyboards/yosino58/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c index daa008d849..3d74fb45e4 100644 --- a/keyboards/yosino58/lib/rgb_state_reader.c +++ b/keyboards/yosino58/lib/rgb_state_reader.c @@ -1,6 +1,5 @@ #ifdef RGBLIGHT_ENABLE -#include "quantum.h" #include extern rgblight_config_t rgblight_config;