Remove more unnecessary quantum.h includes (#23402)

keyboards/bastardkb/charybdis/3x5/3x5.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE

keyboards/bastardkb/charybdis/3x6/3x6.c

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE

keyboards/bastardkb/charybdis/4x6/4x6.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "charybdis.h"
 
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE

keyboards/bastardkb/dilemma/3x5_3/3x5_3.c

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dilemma.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {

keyboards/bastardkb/dilemma/4x6_4/4x6_4.c

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dilemma.h"
 
 #ifdef SWAP_HANDS_ENABLE
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {

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

keyboards/crkbd/lib/host_led_state_reader.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "led.h"
+#include "host.h"
 
 char host_led_state_str[24];
 

keyboards/crkbd/lib/keylogger.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include <stdint.h>
+#include "action.h"
 
 char keylog_str[24] = {};
 char keylogs_str[21] = {};

keyboards/crkbd/lib/layer_state_reader.c

@@ -1,5 +1,5 @@
-#include "quantum.h"
 #include <stdio.h>
+#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

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,

keyboards/crkbd/lib/mode_icon_reader.c

@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "quantum.h"
 
 char mode_icon[24];
 

keyboards/crkbd/lib/rgb_state_reader.c

@@ -1,7 +1,7 @@
 #ifdef RGBLIGHT_ENABLE
 
 #include <stdio.h>
-#include "quantum.h"
+#include "rgblight.h"
 
 extern rgblight_config_t rgblight_config;
 char rbf_info_str[24];

keyboards/crkbd/lib/timelogger.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "timer.h"
 
 char timelog_str[24] = {};
 int last_time = 0;

keyboards/doio/kb16/lib/bongocat/bongocat.c

@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#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;

keyboards/doio/kb16/lib/layer_status/layer_status.c

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
 

keyboards/doio/kb16/lib/logo.c

@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
 

keyboards/durgod/dgk6x/galaxy/galaxy.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 

keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 

keyboards/durgod/dgk6x/hades_iso/hades_iso.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 

keyboards/durgod/dgk6x/venus/venus.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "dgk6x.h"
 
 #ifdef RGB_MATRIX_ENABLE
 

keyboards/gboards/engine/engine.h

@@ -12,9 +12,12 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include "action.h"
+#include "progmem.h"
 #include "config_engine.h"
 
 // Maximum values for combos

keyboards/gboards/g/engine.h

@@ -12,9 +12,12 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include "action.h"
+#include "progmem.h"
 #include "config_engine.h"
 
 // Set defaults

keyboards/gopolar/gg86/lib/logo.c

@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
 

keyboards/handwired/dygma/raise/ansi/ansi.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "raise.h"
 
 // "led_map" is taken from kaleidoscope
 // LHK = Left Hand Keys

keyboards/handwired/dygma/raise/iso/iso.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "raise.h"
 
 // "led_map" is taken from kaleidoscope
 // LHK = Left Hand Keys

keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "tractyl_manuform.h"
 
 void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
 

keyboards/helix/rev3_5rows/rev3_5rows.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "rev3_5rows.h"
 
 bool is_mac_mode(void) {
     return keymap_config.swap_lalt_lgui == false;

keyboards/horrortroll/handwired_k552/lib/bongocat.c

@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#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;

keyboards/horrortroll/handwired_k552/lib/galaxy.c

@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
 

keyboards/horrortroll/handwired_k552/lib/logo.c

@@ -14,7 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
 

keyboards/horrortroll/lemon40/lib/bongocat.c

@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#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;

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);

keyboards/kbdfans/odin75/lib/bongocat.c

@@ -14,7 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#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

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 <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+
+#include "model01.h"
 #include "i2c_master.h"
 #include <string.h>
-#include "model01.h"
 
 void matrix_init_kb(void) {
   /* the bootloader can leave LEDs on, so */

keyboards/lily58/lib/layer_state_reader.c

@@ -1,4 +1,4 @@
-#include "quantum.h"
+#include "action_layer.h"
 #include <stdio.h>
 
 #define L_BASE 0

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 <stdio.h>
 #include <string.h>
 
 #ifdef OLED_ENABLE
+#include "oled_driver.h"
 
 void render_logo(void) {
 

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 <stdio.h>
 #include <string.h>
 

keyboards/monstargear/xo87/solderable/solderable.c

@@ -15,7 +15,6 @@
  */
 
 #include "solderable.h"
-#include "quantum.h"
 
 #define noLed {255,255}
 

keyboards/palette1202/lib/oled_helper.c

@@ -1,5 +1,5 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "oled_driver.h"
 #include <stdio.h>
 #include <string.h>
 

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 = { {

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 = { {

keyboards/satt/comet46/lib/host_led_state_reader.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "led.h"
+#include "host.h"
 
 char host_led_state_str[22];
 

keyboards/satt/comet46/lib/modifier_state_reader.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "quantum.h"
+#include "action_util.h"
 
 char modifier_state_str[22];
 

keyboards/sekigon/grs_70ec/ec_switch_matrix.c

@@ -15,8 +15,7 @@
  */
 
 #include "ec_switch_matrix.h"
-
+#include <avr/interrupt.h>
-#include "quantum.h"
 #include "analog.h"
 #include "print.h"
 

keyboards/terrazzo/terrazzo.c

@@ -17,10 +17,6 @@
 #include "terrazzo.h"
 
 #ifdef LED_MATRIX_ENABLE
-    #include <math.h>
-    #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

keyboards/tzarc/djinn/djinn.c

@@ -1,12 +1,10 @@
 // Copyright 2018-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include <string.h>
-#include "quantum.h"
-#include <hal_pal.h>
 #include "djinn.h"
+#include <string.h>
+#include <hal_pal.h>
 #include "serial.h"
 #include "split_util.h"
-#include "qp.h"
 
 painter_device_t lcd;
 

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 <ch.h>
-#include <hal.h>
-#include "quantum.h"
 #include "djinn.h"
 
 #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15

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 <string.h>
-#include "quantum.h"
 #include "transactions.h"
 #include "split_util.h"
 #include "djinn.h"

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 <string.h>
-#include "quantum.h"
 #include "djinn.h"
 
 const char* usbpd_str(usbpd_allowance_t allowance) {

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
 

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);
 

keyboards/viktus/minne_topre/ec.c

@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 

keyboards/viktus/osav2_numpad_topre/ec.c

@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 

keyboards/viktus/osav2_topre/ec.c

@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "ec.h"
+#include <avr/interrupt.h>
 #include "analog.h"
 //#include "debug.h"  // needed for debugging
 

keyboards/viktus/styrka_topre/ec.c

@@ -15,8 +15,8 @@
  */
 
 #include "ec.h"
+#include <avr/interrupt.h>
 
-#include "quantum.h"
 #include "analog.h"
 //#include "debug.h"
 

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 <stdlib.h>
 #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

keyboards/vinhcatba/uncertainty/bongo.h

@@ -3,4 +3,6 @@
 
 #pragma once
 
+#include <stdbool.h>
+
 void draw_bongo(bool minimal);

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 "uncertainty.h"
-#include "quantum.h"
 
 #ifdef OLED_ENABLE
 #include "bongo.h"

keyboards/yosino58/lib/layer_state_reader.c

@@ -1,5 +1,5 @@
 
-#include "quantum.h"
+#include "action_layer.h"
 #include <stdio.h>
 
 #define L_BASE 0

keyboards/yosino58/lib/rgb_state_reader.c

@@ -1,6 +1,5 @@
 #ifdef RGBLIGHT_ENABLE
 
-#include "quantum.h"
 #include <stdio.h>
 
 extern rgblight_config_t rgblight_config;