60 files changed, 123 insertions(+), 70 deletions(-)

M keyboards/25keys/cassette42/common/oled_helper.c
M keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
M keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h
M keyboards/annepro2/annepro2_ble.h
M keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
M keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
M keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
M keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
M keyboards/clueboard/2x1800/2021/max7219.c
M keyboards/clueboard/2x1800/2021/max7219.h
M keyboards/converter/usb_usb/custom_matrix.cpp
M keyboards/converter/xt_usb/xt.h
M keyboards/duck/duck_led/duck_led.c
M keyboards/duck/jetfire/indicator_leds.c
M keyboards/duck/jetfire/indicator_leds.h
M keyboards/fallacy/indicators.h
M keyboards/handwired/d48/taphold.c
M keyboards/handwired/d48/taphold.h
R keyboards/handwired/dactyl_minidox/{3x5_3.c => dactyl_minidox.c}
M keyboards/handwired/dygma/raise/leds.c
M keyboards/handwired/dygma/raise/leds.h
M keyboards/handwired/lagrange/transport.c
M keyboards/handwired/promethium/keymaps/default/keymap.c
R keyboards/horrortroll/nyx/rev1/{nyx.c => rev1.c}
M keyboards/hotdox/left.c
M keyboards/hotdox/left.h
M keyboards/idobao/id61/keymaps/idobao/specialk.c
M keyboards/idobao/id61/keymaps/idobao/specialk.h
M keyboards/input_club/k_type/i2c_master.c
M keyboards/kagizaraya/chidori/board.c
M keyboards/keyboardio/model01/leds.c
M keyboards/keyboardio/model01/leds.h
M keyboards/matrix/m20add/rgb_ring.c
M keyboards/miiiw/common/shift_register.c
M keyboards/miiiw/common/shift_register.h
R keyboards/mntre_v3/{mntre.c => mntre_v3.c}
M keyboards/molecule/adns.c
M keyboards/molecule/adns.h
M keyboards/nullbitsco/common/bitc_led.h
M keyboards/nullbitsco/common/remote_kb.c
M keyboards/nullbitsco/common/remote_kb.h
M keyboards/nullbitsco/nibble/big_led.h
M keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c
M keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h
M keyboards/rocketboard_16/keycode_lookup.c
M keyboards/rocketboard_16/keycode_lookup.h
M keyboards/sirius/unigo66/custom_matrix.cpp
M keyboards/stront/keymaps/hid/hid_display.h
M keyboards/wilba_tech/via_test.c
M keyboards/wilba_tech/wt_mono_backlight.c
M keyboards/wilba_tech/wt_mono_backlight.h
M keyboards/wilba_tech/wt_rgb_backlight.c
M keyboards/wilba_tech/wt_rgb_backlight.h
M keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
M keyboards/work_louder/rgb_functions.c
M keyboards/work_louder/rgb_functions.h
M keyboards/yushakobo/navpad/navpad_prefs.c
M keyboards/yushakobo/navpad/navpad_prefs.h
M keyboards/yushakobo/quick17/quick17_prefs.h
M keyboards/yushakobo/quick17/rgb_matrix_kb.inc

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

@@ 14,8 14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include QMK_KEYBOARD_H
 #include "pimoroni_trackball.h"
 #include "i2c_master.h"
+#include "action.h"
+#include "timer.h"
+#include "print.h"
 
 static uint8_t scrolling      = 0;
 static int16_t x_offset       = 0;

@@ 16,8 16,10 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "pointing_device.h"
+#include "report.h"
 
 #ifndef TRACKBALL_ADDRESS
 #    define TRACKBALL_ADDRESS (0x0A << 1)

@@ 17,7 17,6 @@
 #pragma once
 
 #include "annepro2.h"
-#include "quantum.h"
 
 void annepro2_ble_bootload(void);
 void annepro2_ble_startup(void);

@@ 4,6 4,9 @@
 #include "satisfaction_core.h"
 #include "print.h"
 #include "debug.h"
+#include "matrix.h"
+#include "quantum.h"
+#include "encoder.h"
 
 #include <ch.h>
 #include <hal.h>

@@ 3,7 3,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "via.h" // only for EEPROM address
 #include "satisfaction_keycodes.h"

@@ 2,6 2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "satisfaction_core.h"
+#include "backlight.h"
 #include "eeprom.h"
 
 void pre_encoder_mode_change(void){

@@ 2,6 2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "satisfaction_core.h"
+#include "action_layer.h"
+#include "action_util.h"
+#include "timer.h"
+#include "matrix.h"
+#include "led.h"
+#include "host.h"
+#include "oled_driver.h"
+#include "progmem.h"
 #include <stdio.h>
 
 void draw_default(void);

@@ 40,6 40,10 @@
  */
 
 #include "max7219.h"
+#include "spi_master.h"
+#include "debug.h"
+#include "gpio.h"
+#include "wait.h"
 #include "font.h"
 
 // Datastructures

@@ 26,8 26,10 @@
  *    OTHER DEALINGS IN THE SOFTWARE.
  */
 #pragma once
-#include "quantum.h"
-#include "spi_master.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 // Set defaults if they're not set
 #ifndef MAX7219_LOAD

@@ 35,10 35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
-extern "C" {
-#include "quantum.h"
-}
-
 /* KEY CODE to Matrix
  *
  * HID keycode(1 byte):

@@ 38,7 38,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 #define XT_DATA_IN()               \
     do {                           \

@@ 1,6 1,5 @@
-#include <avr/io.h>
 #include "duck_led.h"
-#include "quantum.h"
+#include "wait.h"
 
 void show(void) {
   wait_us((RES / 1000UL) + 1);

@@ 12,13 12,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 "indicator_leds.h"
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <stdbool.h>
 #include <util/delay.h>
-#include <stdint.h>
-#include "indicator_leds.h"
-#include "quantum.h"
 
 #define LED_T1H  900
 #define LED_T1L  600

@@ 1,5 1,7 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "duck_led/duck_led.h"
 
 void backlight_init_ports(void);

@@ 15,8 15,7 @@
  */
 #pragma once
 
-#include "quantum.h"
-
+#include <stdbool.h>
 
 void init_fallacy_leds(void);
 void update_fallacy_leds(void);

@@ 1,4 1,7 @@
 #include "taphold.h"
+#include "action_layer.h"
+#include "keyboard.h"
+#include "timer.h"
 
 bool taphold_process(uint16_t keycode, keyrecord_t *record) {
     for (int i = 0; i < taphold_config_size; i++) {

@@ 1,6 1,8 @@
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 typedef enum taphold_mode_t {
     TAPHOLD_LAYER,

@@ 14,15 14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "leds.h"
+#include <string.h>
 #include "i2c_master.h"
 #include "led_tables.h"
 #include "rgb_matrix.h"
-#include <string.h>
+#include "wait.h"
 #include "raise.h"
 #include "wire-protocol-constants.h"
 #include "print.h"
-#include "leds.h"
 
 // Color order of LEDs is Green, Red, Blue.
 typedef struct PACKED {

@@ 16,8 16,7 @@
 
 #pragma once
 
-#include "quantum.h"
-#include "rgb_matrix.h"
+#include <stdint.h>
 
 extern const uint8_t led_map[RGB_MATRIX_LED_COUNT];
 

@@ 14,9 14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <spi_master.h>
-
-#include "quantum.h"
+#include "spi_master.h"
 #include "split_util.h"
 #include "transport.h"
 #include "timer.h"

@@ 22,7 22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #include "eeconfig.h"
 #include "process_unicode.h"
-#include "quantum.h"
 #ifdef RGBSPS_ENABLE
 #include "rgbsps.h"
 #include "rgbtheme.h"

@@ 1,5 1,6 @@
 #include "action.h"
 #include "left.h"
+#include "print.h"
 #include "wait.h"
 
 bool i2c_initialized = false;

@@ 1,9 1,7 @@
 #pragma once
 
-#include "quantum.h"
 #include <stdint.h>
 #include "i2c_master.h"
-#include <util/delay.h>
 
 #define MCP23017
 #define MCP23017_A0 0


@@ 43,8 41,6 @@ void left_scan(void);
 uint8_t left_read_cols(void);
 uint8_t left_get_col(uint8_t col);
 
-matrix_row_t left_read_row(void);
-
 void left_unselect_rows(void);
 void left_select_row(uint8_t row);
 

@@ 2,6 2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "specialk.h"
+#include "keycodes.h"
+#include "action_layer.h"
+#include "action_util.h"
 
 bool delkey_registered = false;
 uint32_t __keycode_raised = 0;

@@ 5,8 5,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "util.h"
-#include "quantum.h"
+#include "action.h"
 
 bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr);
 bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record);

@@ 27,10 27,11 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-
-#include "quantum.h"
 #include "i2c_master.h"
+#include "gpio.h"
+#include "chibios_config.h"
 #include <string.h>
+#include <ch.h>
 #include <hal.h>
 
 static uint8_t i2c_address;

@@ 19,7 19,6 @@
 #include "print.h"
 #include "debug.h"
 #include "matrix.h"
-#include "quantum.h"
 #include "board.h"
 #include "i2c_master.h"
 

@@ 13,7 13,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 "quantum.h"
+
+#include "leds.h"
 #include "i2c_master.h"
 #include "led_tables.h"
 #include "rgb_matrix.h"

@@ 15,8 15,7 @@
  */
 #pragma once
 
-#include "quantum.h"
-#include "rgb_matrix.h"
+#include <stdint.h>
 
 void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
 void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);

@@ 18,9 18,13 @@
 
 #include "rgb_ring.h"
 
+#include <stdint.h>
+#include <stdbool.h>
 #include <string.h>
 #include "quantum.h"
 #include "rgblight.h"
+#include "timer.h"
+#include "action.h"
 #include "drivers/led/issi/is31fl3731.h"
 #include "i2c_master.h"
 

@@ 14,8 14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "shift_register.h"
+#include <string.h>
 
 static void shift_out(void);
 

@@ 16,6 16,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include "gpio.h"
 
 #ifndef GPIOH_BASE

@@ 16,7 16,7 @@
 #include "spi_master.h"
 #include "adns.h"
 #include "debug.h"
-#include "quantum.h"
+#include "wait.h"
 #include "pointing_device.h"
 #include "adns9800_srom_A6.h"
 

@@ 15,6 15,8 @@
  */
 #pragma once
 
+#include <stdint.h>
+
 void adns_begin(void);
 
 void adns_end(void);

@@ 15,7 15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 #define LED_ON          2
 #define LED_DIM         1

@@ 27,7 27,10 @@ This will require a new communication protocol, as the current one is limited.
 */
 
 #include "remote_kb.h"
+#include "quantum.h"
 #include "uart.h"
+#include "wait.h"
+#include "debug.h"
 
 uint8_t
  msg[UART_MSG_LEN],

@@ 15,7 15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "action.h"
 
 #define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz
 

@@ 15,7 15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 /* Optional big LED pins */
 #define BIG_LED_R_PIN D7

@@ 13,8 13,15 @@
  * 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 "oled_display.h"
+#include "keycodes.h"
+#include "progmem.h"
+#include "host.h"
+#include "timer.h"
+#include "wpm.h"
+#include "rgblight.h"
+#include "oled_driver.h"
 
 static const char PROGMEM oled_mode_messages[5][15] = {
     "",

@@ 15,6 15,8 @@
  */
 #pragma once
 
+#include <stdint.h>
+
 typedef enum {
     OLED_MODE_IDLE = 0,
     OLED_MODE_VOLUME_UP = 1,

@@ 15,8 15,11 @@
  */
 
 #include "keycode_lookup.h"
+#include "quantum_keycodes.h"
+#include "keymap_us.h"
 #include "print.h"
 #include "via.h"
+#include "util.h"
 
 #define num_keycodes ARRAY_SIZE(lookup_table)
 static char UNKNOWN_KEYCODE[] = "UNKNOWN";


@@ 289,7 292,7 @@ lookup_table_t lookup_table[333] =
  {"KC_QUES", KC_QUES},
  {"QK_BOOT", QK_BOOT},
  {"DB_TOGG", DB_TOGG},
- {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},
+ {"NK_TOGG", NK_TOGG},
  {"QK_GESC", QK_GESC},
  {"AU_ON", AU_ON},
  {"AU_OFF", AU_OFF},

@@ 16,7 16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
 
 typedef struct
 {

@@ 35,10 35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
-extern "C" {
-#include "quantum.h"
-}
-
 /* KEY CODE to Matrix
  *
  * HID keycode(1 byte):

@@ 1,7 1,8 @@
 // Copyright 2023 zzeneg (@zzeneg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 typedef enum {
     _QWERTY = 0,

@@ 14,7 14,6 @@
 // - add `#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 128` to config.h
 //   (or change to match CHANNELS*VALUES*2)
 
-#include "quantum.h"
 #include "via.h"
 
 #ifdef VIA_ENABLE

@@ 14,16 14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "wt_mono_backlight.h"
 #include "wt_rgb_backlight_api.h" // reuse these for now
 #include "wt_rgb_backlight_keycodes.h" // reuse these for now
 
+#include <stdlib.h>
 #include <avr/interrupt.h>
 #include "i2c_master.h"
-
+#include "host.h"
 #include "progmem.h"
-#include "quantum/color.h"
 #include "eeprom.h"
 
 #include "via.h" // uses EEPROM address, lighting value IDs

@@ 19,6 19,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "action.h"
 #include "quantum/color.h"
 
 typedef struct PACKED

@@ 40,19 40,15 @@
 #error wt_rgb_backlight.c compiled without setting configuration symbol
 #endif
 
-#ifndef MAX
-    #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-
-#ifndef MIN
-    #define MIN(a,b) ((a) < (b)? (a): (b))
-#endif
-
-#include "quantum.h"
 #include "wt_rgb_backlight.h"
 #include "wt_rgb_backlight_api.h"
 #include "wt_rgb_backlight_keycodes.h"
 
+#include <stdlib.h>
+#include "quantum.h"
+#include "host.h"
+#include "util.h"
+
 #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA)
 #include <avr/interrupt.h>
 #include "i2c_master.h"

@@ 23,6 23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "action.h"
 #include "quantum/color.h"
 
 typedef struct PACKED

@@ 15,6 15,8 @@
  */
 #pragma once
 
+#include "keycodes.h"
+
 enum wt_rgb_backlight_keycodes {
     BR_INC = QK_KB_0, // brightness increase
     BR_DEC,             // brightness decrease

@@ 15,6 15,11 @@
  */
 
 #include "rgb_functions.h"
+#include <stdint.h>
+#include "quantum.h"
+#include "action.h"
+#include "rgblight.h"
+#include "rgb_matrix.h"
 
 #ifdef RGBLIGHT_ENABLE
 #undef WS2812_DI_PIN

@@ 16,7 16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include "keycodes.h"
 
 #ifndef VIA_ENABLE
 #    ifndef RGB_MATRIX_TOGGLE

@@ 15,6 15,11 @@
  */
 
 #include "navpad_prefs.h"
+#include "quantum.h"
+#include "action.h"
+#include "action_layer.h"
+#include "rgblight.h"
+#include "led.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }

@@ 16,7 16,7 @@
 
 #pragma once
 
-#include "quantum.h"
+#include "keycodes.h"
 
 enum custom_keycodes { 
   TAP_00 = QK_KB_0

@@ 16,7 16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "color.h"
 
 enum layer_names {
     _CONTROL,

@@ 3,6 3,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 #include "quick17_prefs.h"
+#include "quantum.h"
 
 #define LED_LAYOUT(\
     L00, L01, L02, L03, L04, L05, \