quantum: remove direct quantum.h includes (qmk#21507)

keyboards/boardsource/lulu/lulu.c

@@ -1,6 +1,6 @@
 // Copyright 2022 Cole Smith <[email protected]>
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "encoder.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {

keyboards/input_club/k_type/k_type-rgbdriver.c

@@ -19,8 +19,7 @@
 #include "rgb_matrix.h"
 #include "i2c_master.h"
 #include "is31fl3733-dual.h"
-
-
+#include "gpio.h"
 
 static void init(void) {
  i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);

keyboards/input_club/k_type/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

keyboards/system76/launch_1/rgb_matrix_kb.inc

@@ -22,6 +22,7 @@ RGB_MATRIX_EFFECT(unlocked)
 #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
 #include "dynamic_keymap.h"
+#include "action_layer.h"
 
 static bool active_keys_initialized = false;
 static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};

keyboards/system76/system76_ec.c

@@ -22,6 +22,12 @@
 #include "raw_hid.h"
 #include "rgb_matrix.h"
 #include "version.h"
+#include "keyboard.h"
+#include "eeprom.h"
+#include "matrix.h"
+#include "action_layer.h"
+#include "bootloader.h"
+#include "wait.h"
 
 enum Command {
  CMD_PROBE = 1, // Probe for System76 EC protocol

platforms/avr/drivers/audio_pwm_hardware.c

@@ -15,13 +15,9 @@
  * along with this program. If not, see <http:https://www.gnu.org/licenses/>.
  */
 
-#if defined(__AVR__)
-# include <avr/pgmspace.h>
-# include <avr/interrupt.h>
-# include <avr/io.h>
-#endif
-
 #include "audio.h"
+#include "gpio.h"
+#include <avr/interrupt.h>
 
 extern bool playing_note;
 extern bool playing_melody;

platforms/chibios/drivers/audio_dac_additive.c

@@ -16,8 +16,9 @@
  */
 
 #include "audio.h"
-#include <ch.h>
-#include <hal.h>
+#include "gpio.h"
+#include <math.h>
+#include "util.h"
 
 // Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
 #pragma GCC diagnostic push

platforms/chibios/drivers/audio_dac_basic.c

@@ -16,8 +16,7 @@
  */
 
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 // Need to disable GCC's "tautological-compare" warning for this file, as it causes issues when running `KEEP_INTERMEDIATES=yes`. Corresponding pop at the end of the file.
 #pragma GCC diagnostic push

platforms/chibios/drivers/audio_pwm_hardware.c

@@ -12,8 +12,7 @@
 // function.
 
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 #if !defined(AUDIO_PIN)
 # error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"

platforms/chibios/drivers/audio_pwm_software.c

@@ -25,8 +25,7 @@ this driver uses the chibios-PWM system to produce a square-wave on any given ou
 
  */
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include "gpio.h"
 
 #if !defined(AUDIO_PIN)
 # error "Audio feature enabled, but no pin selected - see docs/feature_audio under the ARM PWM settings"

quantum/audio/audio.c

@@ -583,3 +583,6 @@ uint16_t audio_duration_to_ms(uint16_t duration_bpm) {
 uint16_t audio_ms_to_duration(uint16_t duration_ms) {
  return ((uint32_t)duration_ms * 2 * note_tempo) / 1875;
 }
+
+__attribute__((weak)) void audio_on_user(void) {}
+__attribute__((weak)) void audio_off_user(void) {}

quantum/audio/audio.h

@@ -21,12 +21,6 @@
 #include "musical_notes.h"
 #include "song_list.h"
 #include "voices.h"
-#include "quantum.h"
-#include <math.h>
-
-#if defined(__AVR__)
-# include <avr/io.h>
-#endif
 
 #if defined(AUDIO_DRIVER_PWM)
 # include "audio_pwm.h"
@@ -280,3 +274,6 @@ bool audio_update_state(void);
 #define increase_tempo(t) audio_increase_tempo(t)
 #define decrease_tempo(t) audio_decrease_tempo(t)
 // vibrato functions are not used in any keyboards
+
+void audio_on_user(void);
+void audio_off_user(void);

quantum/audio/muse.c

@@ -1,5 +1,7 @@
 #include "muse.h"
 
+#include <stdbool.h>
+
 enum { MUSE_OFF, MUSE_ON, MUSE_C_1_2, MUSE_C1, MUSE_C2, MUSE_C4, MUSE_C8, MUSE_C3, MUSE_C6, MUSE_B1, MUSE_B2, MUSE_B3, MUSE_B4, MUSE_B5, MUSE_B6, MUSE_B7, MUSE_B8, MUSE_B9, MUSE_B10, MUSE_B11, MUSE_B12, MUSE_B13, MUSE_B14, MUSE_B15, MUSE_B16, MUSE_B17, MUSE_B18, MUSE_B19, MUSE_B20, MUSE_B21, MUSE_B22, MUSE_B23, MUSE_B24, MUSE_B25, MUSE_B26, MUSE_B27, MUSE_B28, MUSE_B29, MUSE_B30, MUSE_B31 };
 
 bool number_of_ones_to_bool[16] = {1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1};

quantum/audio/muse.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "quantum.h"
-#include "process_audio.h"
+#include <stdint.h>
 
 uint8_t muse_clock_pulse(void);

quantum/audio/voices.c

@@ -16,7 +16,9 @@
  */
 #include "voices.h"
 #include "audio.h"
+#include "timer.h"
 #include <stdlib.h>
+#include <math.h>
 
 uint8_t note_timbre = TIMBRE_DEFAULT;
 bool glissando = false;

quantum/bootmagic/bootmagic_lite.c

@@ -13,7 +13,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http:https://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "bootmagic.h"
+#include "matrix.h"
+#include "keyboard.h"
+#include "wait.h"
+#include "eeconfig.h"
+#include "bootloader.h"
 
 /** \brief Reset eeprom
  *

quantum/dynamic_keymap.c

@@ -14,14 +14,16 @@
  * along with this program. If not, see <http:https://www.gnu.org/licenses/>.
  */
 
-#include "keymap_introspection.h" // to get keymaps[][][]
-#include "eeprom.h"
-#include "progmem.h" // to read default from flash
-#include "quantum.h" // for send_string()
 #include "dynamic_keymap.h"
+#include "keymap_introspection.h"
+#include "action.h"
+#include "eeprom.h"
+#include "progmem.h"
+#include "send_string.h"
+#include "keycodes.h"
 
 #ifdef VIA_ENABLE
-# include "via.h" // for VIA_EEPROM_CONFIG_END
+# include "via.h"
 # define DYNAMIC_KEYMAP_EEPROM_START (VIA_EEPROM_CONFIG_END)
 #else
 # define DYNAMIC_KEYMAP_EEPROM_START (EECONFIG_SIZE)

quantum/encoder.c

@@ -16,6 +16,11 @@
  */
 
 #include "encoder.h"
+#include "keyboard.h"
+#include "action.h"
+#include "keycodes.h"
+#include "wait.h"
+
 #ifdef SPLIT_KEYBOARD
 # include "split_util.h"
 #endif

quantum/encoder.h

@@ -17,7 +17,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "gpio.h"
 #include "util.h"
 
 void encoder_init(void);

quantum/encoder/tests/encoder_tests_split_role.cpp

@@ -22,6 +22,7 @@
 
 extern "C" {
 #include "encoder.h"
+#include "keyboard.h"
 #include "encoder/tests/mock_split.h"
 }
 

quantum/keyboard.c

@@ -16,8 +16,8 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 */
 
 #include <stdint.h>
-#include "quantum.h"
 #include "keyboard.h"
+#include "keycode_config.h"
 #include "matrix.h"
 #include "keymap_introspection.h"
 #include "magic.h"
@@ -33,6 +33,12 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #include "sendchar.h"
 #include "eeconfig.h"
 #include "action_layer.h"
+#ifdef AUDIO_ENABLE
+# include "audio.h"
+#endif
+#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+# include "process_music.h"
+#endif
 #ifdef BACKLIGHT_ENABLE
 # include "backlight.h"
 #endif
@@ -54,17 +60,35 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #ifdef ENCODER_ENABLE
 # include "encoder.h"
 #endif
+#ifdef HAPTIC_ENABLE
+# include "haptic.h"
+#endif
+#ifdef AUTO_SHIFT_ENABLE
+# include "process_auto_shift.h"
+#endif
+#ifdef COMBO_ENABLE
+# include "process_combo.h"
+#endif
+#ifdef TAP_DANCE_ENABLE
+# include "process_tap_dance.h"
+#endif
 #ifdef STENO_ENABLE
 # include "process_steno.h"
 #endif
+#ifdef KEY_OVERRIDE_ENABLE
+# include "process_key_override.h"
+#endif
+#ifdef SECURE_ENABLE
+# include "secure.h"
+#endif
 #ifdef POINTING_DEVICE_ENABLE
 # include "pointing_device.h"
 #endif
 #ifdef MIDI_ENABLE
 # include "process_midi.h"
 #endif
 #ifdef JOYSTICK_ENABLE
-# include "process_joystick.h"
+# include "joystick.h"
 #endif
 #ifdef HD44780_ENABLE
 # include "hd44780.h"
@@ -108,6 +132,12 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #ifdef LEADER_ENABLE
 # include "leader.h"
 #endif
+#ifdef UNICODE_COMMON_ENABLE
+# include "unicode.h"
+#endif
+#ifdef WPM_ENABLE
+# include "wpm.h"
+#endif
 
 static uint32_t last_input_modification_time = 0;
 uint32_t last_input_activity_time(void) {

quantum/keyboard.h

@@ -20,6 +20,8 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "timer.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

quantum/keymap_common.c

@@ -22,7 +22,12 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #include "action_layer.h"
 #include "action.h"
 #include "debug.h"
-#include "quantum.h"
+#include "keycode_config.h"
+#include "quantum_keycodes.h"
+
+#ifdef ENCODER_MAP_ENABLE
+# include "encoder.h"
+#endif
 
 #ifdef BACKLIGHT_ENABLE
 # include "backlight.h"

quantum/led_matrix/led_matrix.c

@@ -20,8 +20,13 @@
 #include "led_matrix.h"
 #include "progmem.h"
 #include "eeprom.h"
+#include "eeconfig.h"
+#include "keyboard.h"
+#include "sync_timer.h"
+#include "debug.h"
 #include <string.h>
 #include <math.h>
+#include <stdlib.h>
 #include "led_tables.h"
 
 #include <lib/lib8tion/lib8tion.h>

quantum/led_matrix/led_matrix.h

@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "led_matrix_types.h"
-#include "quantum.h"
+#include "keyboard.h"
 
 #ifdef IS31FL3731
 # include "is31fl3731-simple.h"

quantum/matrix.c

@@ -20,7 +20,8 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "debounce.h"
-#include "quantum.h"
+#include "atomic_util.h"
+
 #ifdef SPLIT_KEYBOARD
 # include "split_common/split_util.h"
 # include "split_common/transactions.h"

quantum/matrix_common.c

@@ -1,9 +1,9 @@
-#include "quantum.h"
 #include "matrix.h"
 #include "debounce.h"
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
+
 #ifdef SPLIT_KEYBOARD
 # include "split_common/split_util.h"
 # include "split_common/transactions.h"

quantum/midi/qmk_midi.c

@@ -7,6 +7,7 @@
 
 #ifdef AUDIO_ENABLE
 # include "audio.h"
+# include <math.h>
 #endif
 
 /*******************************************************************************

quantum/pointing_device/pointing_device_auto_mouse.c

@@ -18,6 +18,9 @@
 #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
 
 # include "pointing_device_auto_mouse.h"
+# include "debug.h"
+# include "action_util.h"
+# include "quantum_keycodes.h"
 
 /* local data structure for tracking auto mouse */
 static auto_mouse_context_t auto_mouse_context = {