summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/action_layer.h1
-rw-r--r--quantum/midi/qmk_midi.c4
-rw-r--r--quantum/process_keycode/process_audio.h4
-rw-r--r--quantum/process_keycode/process_auto_shift.c169
-rw-r--r--quantum/process_keycode/process_auto_shift.h6
-rw-r--r--quantum/process_keycode/process_autocorrect.c4
-rw-r--r--quantum/process_keycode/process_autocorrect.h4
-rw-r--r--quantum/process_keycode/process_backlight.h4
-rw-r--r--quantum/process_keycode/process_caps_word.c8
-rw-r--r--quantum/process_keycode/process_caps_word.h5
-rw-r--r--quantum/process_keycode/process_clicky.h4
-rw-r--r--quantum/process_keycode/process_combo.c11
-rw-r--r--quantum/process_keycode/process_combo.h6
-rw-r--r--quantum/process_keycode/process_dynamic_macro.c9
-rw-r--r--quantum/process_keycode/process_dynamic_macro.h4
-rw-r--r--quantum/process_keycode/process_dynamic_tapping_term.c4
-rw-r--r--quantum/process_keycode/process_dynamic_tapping_term.h1
-rw-r--r--quantum/process_keycode/process_grave_esc.c3
-rw-r--r--quantum/process_keycode/process_grave_esc.h4
-rw-r--r--quantum/process_keycode/process_haptic.h1
-rw-r--r--quantum/process_keycode/process_joystick.h3
-rw-r--r--quantum/process_keycode/process_key_lock.h4
-rw-r--r--quantum/process_keycode/process_key_override.c6
-rw-r--r--quantum/process_keycode/process_key_override.h3
-rw-r--r--quantum/process_keycode/process_leader.c1
-rw-r--r--quantum/process_keycode/process_leader.h4
-rw-r--r--quantum/process_keycode/process_magic.c5
-rw-r--r--quantum/process_keycode/process_magic.h4
-rw-r--r--quantum/process_keycode/process_midi.c26
-rw-r--r--quantum/process_keycode/process_midi.h5
-rw-r--r--quantum/process_keycode/process_music.c2
-rw-r--r--quantum/process_keycode/process_music.h4
-rw-r--r--quantum/process_keycode/process_programmable_button.h3
-rw-r--r--quantum/process_keycode/process_repeat_key.c4
-rw-r--r--quantum/process_keycode/process_repeat_key.h4
-rw-r--r--quantum/process_keycode/process_rgb.c8
-rw-r--r--quantum/process_keycode/process_rgb.h4
-rw-r--r--quantum/process_keycode/process_secure.h1
-rw-r--r--quantum/process_keycode/process_sequencer.h4
-rw-r--r--quantum/process_keycode/process_space_cadet.c2
-rw-r--r--quantum/process_keycode/process_space_cadet.h4
-rw-r--r--quantum/process_keycode/process_steno.c1
-rw-r--r--quantum/process_keycode/process_steno.h4
-rw-r--r--quantum/process_keycode/process_tap_dance.c7
-rw-r--r--quantum/process_keycode/process_tap_dance.h43
-rw-r--r--quantum/process_keycode/process_tri_layer.h2
46 files changed, 258 insertions, 156 deletions
diff --git a/quantum/action_layer.h b/quantum/action_layer.h
index ff783bb3e7..a2410d49a5 100644
--- a/quantum/action_layer.h
+++ b/quantum/action_layer.h
@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include "keyboard.h"
#include "action.h"
+#include "bitwise.h"
#ifdef DYNAMIC_KEYMAP_ENABLE
# ifndef DYNAMIC_KEYMAP_LAYER_COUNT
diff --git a/quantum/midi/qmk_midi.c b/quantum/midi/qmk_midi.c
index f6a5d92281..688259784c 100644
--- a/quantum/midi/qmk_midi.c
+++ b/quantum/midi/qmk_midi.c
@@ -5,6 +5,10 @@
#include "usb_descriptor.h"
#include "process_midi.h"
+#ifdef AUDIO_ENABLE
+# include "audio.h"
+#endif
+
/*******************************************************************************
* MIDI
******************************************************************************/
diff --git a/quantum/process_keycode/process_audio.h b/quantum/process_keycode/process_audio.h
index 42cfab4af2..c80136f2c2 100644
--- a/quantum/process_keycode/process_audio.h
+++ b/quantum/process_keycode/process_audio.h
@@ -1,5 +1,9 @@
#pragma once
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
float compute_freq_for_midi_note(uint8_t note);
bool process_audio(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 63e893fc18..9b78214e43 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -14,27 +14,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef AUTO_SHIFT_ENABLE
-
-# include <stdbool.h>
-# include "process_auto_shift.h"
-
-# ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
-# define AUTO_SHIFT_STARTUP_STATE true /* enabled */
-# else
-# define AUTO_SHIFT_STARTUP_STATE false /* disabled */
-# endif
+#include "process_auto_shift.h"
+#include "quantum.h"
+#include "action_util.h"
+#include "timer.h"
+#include "keycodes.h"
+
+#ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
+# define AUTO_SHIFT_STARTUP_STATE true /* enabled */
+#else
+# define AUTO_SHIFT_STARTUP_STATE false /* disabled */
+#endif
// Stores the last Auto Shift key's up or down time, for evaluation or keyrepeat.
static uint16_t autoshift_time = 0;
-# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Stores the last key's up or down time, to replace autoshift_time so that Tap Hold times are accurate.
static uint16_t retroshift_time = 0;
// Stores a possibly Retro Shift key's up or down time, as retroshift_time needs
// to be set before the Retro Shift key is evaluated if it is interrupted by an
// Auto Shifted key.
static uint16_t last_retroshift_time;
-# endif
+#endif
static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT;
static uint16_t autoshift_lastkey = KC_NO;
static keyrecord_t autoshift_lastrecord;
@@ -68,23 +69,23 @@ __attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyreco
/** \brief Called on physical press, returns whether is Auto Shift key */
__attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
-# ifndef NO_AUTO_SHIFT_ALPHA
+#ifndef NO_AUTO_SHIFT_ALPHA
case AUTO_SHIFT_ALPHA:
-# endif
-# ifndef NO_AUTO_SHIFT_NUMERIC
+#endif
+#ifndef NO_AUTO_SHIFT_NUMERIC
case AUTO_SHIFT_NUMERIC:
-# endif
-# ifndef NO_AUTO_SHIFT_SPECIAL
-# ifndef NO_AUTO_SHIFT_TAB
+#endif
+#ifndef NO_AUTO_SHIFT_SPECIAL
+# ifndef NO_AUTO_SHIFT_TAB
case KC_TAB:
-# endif
-# ifndef NO_AUTO_SHIFT_SYMBOLS
+# endif
+# ifndef NO_AUTO_SHIFT_SYMBOLS
case AUTO_SHIFT_SYMBOLS:
-# endif
# endif
-# ifdef AUTO_SHIFT_ENTER
+#endif
+#ifdef AUTO_SHIFT_ENTER
case KC_ENT:
-# endif
+#endif
return true;
}
return get_custom_auto_shifted_key(keycode, record);
@@ -130,9 +131,9 @@ bool get_autoshift_shift_state(uint16_t keycode) {
/** \brief Restores the shift key if it was cancelled by Auto Shift */
static void autoshift_flush_shift(void) {
autoshift_flags.holding_shift = false;
-# ifdef CAPS_WORD_ENABLE
+#ifdef CAPS_WORD_ENABLE
if (!is_caps_word_on())
-# endif // CAPS_WORD_ENABLE
+#endif // CAPS_WORD_ENABLE
{
del_weak_mods(MOD_BIT(KC_LSFT));
}
@@ -154,26 +155,26 @@ static void autoshift_flush_shift(void) {
static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record) {
// clang-format off
if ((get_mods()
-# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
| get_oneshot_mods()
-# endif
+#endif
) & (~MOD_BIT(KC_LSFT))
) {
// clang-format on
// Prevents keyrepeating unshifted value of key after using it in a key combo.
autoshift_lastkey = KC_NO;
-# ifndef AUTO_SHIFT_MODIFIERS
+#ifndef AUTO_SHIFT_MODIFIERS
// We can't return true here anymore because custom unshifted values are
// possible and there's no good way to tell whether the press returned
// true upon release.
set_autoshift_shift_state(keycode, false);
autoshift_press_user(keycode, false, record);
-# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT)));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-# endif
- return false;
# endif
+ return false;
+#endif
}
// Store record to be sent to user functions if there's no release record then.
@@ -181,19 +182,19 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
autoshift_lastrecord.event.pressed = false;
autoshift_lastrecord.event.time = 0;
// clang-format off
-# if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)
+#if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)
if (keycode == autoshift_lastkey &&
-# ifdef AUTO_SHIFT_REPEAT_PER_KEY
+# ifdef AUTO_SHIFT_REPEAT_PER_KEY
get_auto_shift_repeat(autoshift_lastkey, record) &&
-# endif
-# if !defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY)
+# endif
+# if !defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY)
(
!autoshift_flags.lastshifted
-# ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
+# ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
|| get_auto_shift_no_auto_repeat(autoshift_lastkey, record)
-# endif
- ) &&
# endif
+ ) &&
+# endif
TIMER_DIFF_16(now, autoshift_time) < GET_TAPPING_TERM(autoshift_lastkey, record)
) {
// clang-format on
@@ -210,23 +211,23 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
return false;
}
-# endif
+#endif
// Use physical shift state of press event to be more like normal typing.
-# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
autoshift_flags.lastshifted = (get_mods() | get_oneshot_mods()) & MOD_BIT(KC_LSFT);
set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT)));
-# else
+#else
autoshift_flags.lastshifted = get_mods() & MOD_BIT(KC_LSFT);
-# endif
+#endif
// Record the keycode so we can simulate it later.
autoshift_lastkey = keycode;
autoshift_time = now;
autoshift_flags.in_progress = true;
-# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+#if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-# endif
+#endif
return false;
}
@@ -247,11 +248,11 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
autoshift_flags.lastshifted =
autoshift_flags.lastshifted
|| TIMER_DIFF_16(now, autoshift_time) >=
-# ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
+#ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
get_autoshift_timeout(autoshift_lastkey, record)
-# else
+#else
autoshift_timeout
-# endif
+#endif
;
// clang-format on
set_autoshift_shift_state(autoshift_lastkey, autoshift_flags.lastshifted);
@@ -266,23 +267,23 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
// clang-format off
-# if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY))
+#if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY))
if (matrix_trigger
-# ifdef AUTO_SHIFT_REPEAT_PER_KEY
+# ifdef AUTO_SHIFT_REPEAT_PER_KEY
&& get_auto_shift_repeat(autoshift_lastkey, record)
-# endif
-# ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
+# endif
+# ifdef AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY
&& !get_auto_shift_no_auto_repeat(autoshift_lastkey, record)
-# endif
+# endif
) {
// Prevents release.
return;
}
-# endif
+#endif
// clang-format on
-# if TAP_CODE_DELAY > 0
+#if TAP_CODE_DELAY > 0
wait_ms(TAP_CODE_DELAY);
-# endif
+#endif
autoshift_release_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
autoshift_flush_shift();
@@ -310,11 +311,11 @@ void autoshift_matrix_scan(void) {
if (autoshift_flags.in_progress) {
const uint16_t now = timer_read();
if (TIMER_DIFF_16(now, autoshift_time) >=
-# ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
+#ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
get_autoshift_timeout(autoshift_lastkey, &autoshift_lastrecord)
-# else
+#else
autoshift_timeout
-# endif
+#endif
) {
autoshift_end(autoshift_lastkey, now, true, &autoshift_lastrecord);
}
@@ -335,18 +336,18 @@ void autoshift_disable(void) {
autoshift_flush_shift();
}
-# ifndef AUTO_SHIFT_NO_SETUP
+#ifndef AUTO_SHIFT_NO_SETUP
void autoshift_timer_report(void) {
-# ifdef SEND_STRING_ENABLE
+# ifdef SEND_STRING_ENABLE
const char *autoshift_timeout_str = get_u16_str(autoshift_timeout, ' ');
// Skip padding spaces
while (*autoshift_timeout_str == ' ') {
autoshift_timeout_str++;
}
send_string(autoshift_timeout_str);
-# endif
-}
# endif
+}
+#endif
bool get_autoshift_state(void) {
return autoshift_flags.enabled;
@@ -368,11 +369,11 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
// https://github.com/qmk/qmk_firmware/pull/9826#issuecomment-733559550
// clang-format off
const uint16_t now =
-# if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING)
+#if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING)
timer_read()
-# else
+#else
(record->event.pressed) ? retroshift_time : timer_read()
-# endif
+#endif
;
// clang-format on
@@ -393,7 +394,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
autoshift_disable();
break;
-# ifndef AUTO_SHIFT_NO_SETUP
+#ifndef AUTO_SHIFT_NO_SETUP
case AS_UP:
autoshift_timeout += 5;
break;
@@ -403,27 +404,27 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
case AS_RPT:
autoshift_timer_report();
break;
-# endif
+#endif
}
// If Retro Shift is disabled, possible custom actions shouldn't happen.
// clang-format off
-# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
-# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record);
-# else
+# else
const bool is_hold_on_interrupt = false;
-# endif
-# endif
+# endif
+#endif
if (IS_RETRO(keycode)
-# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Not tapped or #defines mean that rolls should use hold action.
&& (
record->tap.count == 0
-# ifdef RETRO_TAPPING_PER_KEY
+# ifdef RETRO_TAPPING_PER_KEY
|| !get_retro_tapping(keycode, record)
-# endif
- || (record->tap.interrupted && is_hold_on_interrupt))
# endif
+ || (record->tap.interrupted && is_hold_on_interrupt))
+#endif
) {
// clang-format on
autoshift_lastkey = KC_NO;
@@ -439,21 +440,21 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
// tap.count gets set to 0 in process_action
// clang-format off
else if (IS_RETRO(keycode)
-# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
&& (
record->tap.count == 0
-# ifdef RETRO_TAPPING_PER_KEY
+# ifdef RETRO_TAPPING_PER_KEY
|| !get_retro_tapping(keycode, record)
-# endif
- )
# endif
+ )
+#endif
) {
// Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set.
-# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+#ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) {
autoshift_end(KC_NO, now, false, &autoshift_lastrecord);
}
-# endif
+#endif
// clang-format on
return true;
}
@@ -479,7 +480,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
return true;
}
-# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
+#if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Called to record time before possible delays by action_tapping_process.
void retroshift_poll_time(keyevent_t *event) {
last_retroshift_time = retroshift_time;
@@ -493,6 +494,4 @@ void retroshift_swap_times(void) {
last_retroshift_time = temp;
}
}
-# endif
-
#endif
diff --git a/quantum/process_keycode/process_auto_shift.h b/quantum/process_keycode/process_auto_shift.h
index 780177d2ff..885a47b533 100644
--- a/quantum/process_keycode/process_auto_shift.h
+++ b/quantum/process_keycode/process_auto_shift.h
@@ -16,7 +16,11 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "keyboard.h"
+#include "keycodes.h"
#ifndef AUTO_SHIFT_TIMEOUT
# define AUTO_SHIFT_TIMEOUT 175
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index cc1f19e4f9..edc47718f3 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -6,7 +6,11 @@
#include "process_autocorrect.h"
#include <string.h>
+#include "keycodes.h"
+#include "quantum_keycodes.h"
#include "keycode_config.h"
+#include "send_string.h"
+#include "action_util.h"
#if __has_include("autocorrect_data.h")
# include "autocorrect_data.h"
diff --git a/quantum/process_keycode/process_autocorrect.h b/quantum/process_keycode/process_autocorrect.h
index 9cc7d46a8b..ea77d6f56f 100644
--- a/quantum/process_keycode/process_autocorrect.h
+++ b/quantum/process_keycode/process_autocorrect.h
@@ -6,7 +6,9 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
bool process_autocorrect(uint16_t keycode, keyrecord_t *record);
bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);
diff --git a/quantum/process_keycode/process_backlight.h b/quantum/process_keycode/process_backlight.h
index 7fe887ae67..e926833e79 100644
--- a/quantum/process_keycode/process_backlight.h
+++ b/quantum/process_keycode/process_backlight.h
@@ -16,6 +16,8 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
bool process_backlight(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c
index d4382680bf..1088c8f76c 100644
--- a/quantum/process_keycode/process_caps_word.c
+++ b/quantum/process_keycode/process_caps_word.c
@@ -13,6 +13,14 @@
// limitations under the License.
#include "process_caps_word.h"
+#include "process_auto_shift.h"
+#include "caps_word.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
+#include "modifiers.h"
+#include "timer.h"
+#include "action_tapping.h"
+#include "action_util.h"
#ifdef CAPS_WORD_INVERT_ON_SHIFT
static uint8_t held_mods = 0;
diff --git a/quantum/process_keycode/process_caps_word.h b/quantum/process_keycode/process_caps_word.h
index f215bbc3a3..f5eb140d32 100644
--- a/quantum/process_keycode/process_caps_word.h
+++ b/quantum/process_keycode/process_caps_word.h
@@ -14,8 +14,9 @@
#pragma once
-#include "quantum.h"
-#include "caps_word.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
/**
* @brief Process handler for Caps Word feature.
diff --git a/quantum/process_keycode/process_clicky.h b/quantum/process_keycode/process_clicky.h
index 67b6463c5d..dfdba14131 100644
--- a/quantum/process_keycode/process_clicky.h
+++ b/quantum/process_keycode/process_clicky.h
@@ -1,5 +1,9 @@
#pragma once
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
void clicky_play(void);
bool process_clicky(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index bbee560be9..0d4f4f3dba 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -14,11 +14,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "keymap_common.h"
-#include "print.h"
#include "process_combo.h"
+#include <stddef.h>
+#include "process_auto_shift.h"
+#include "caps_word.h"
+#include "timer.h"
+#include "keyboard.h"
+#include "keymap_common.h"
+#include "action_layer.h"
#include "action_tapping.h"
-#include "action.h"
+#include "action_util.h"
#include "keymap_introspection.h"
__attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index bba5d5ee63..f1d534236e 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -16,9 +16,11 @@
#pragma once
-#include "progmem.h"
-#include "quantum.h"
#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+#include "keycodes.h"
+#include "quantum_keycodes.h"
#ifdef EXTRA_SHORT_COMBOS
# define MAX_COMBO_LENGTH 6
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index a022949d3d..5e4a6fa308 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -17,6 +17,15 @@
/* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
#include "process_dynamic_macro.h"
+#include <stddef.h>
+#include "action_layer.h"
+#include "keycodes.h"
+#include "debug.h"
+#include "wait.h"
+
+#ifdef BACKLIGHT_ENABLE
+# include "backlight.h"
+#endif
// default feedback method
void dynamic_macro_led_blink(void) {
diff --git a/quantum/process_keycode/process_dynamic_macro.h b/quantum/process_keycode/process_dynamic_macro.h
index 9841254af4..2f10733cae 100644
--- a/quantum/process_keycode/process_dynamic_macro.h
+++ b/quantum/process_keycode/process_dynamic_macro.h
@@ -18,7 +18,9 @@
/* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
/* May be overridden with a custom value. Be aware that the effective
* macro length is half of this value: each keypress is recorded twice
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.c b/quantum/process_keycode/process_dynamic_tapping_term.c
index 146b9fccd7..cf52626e42 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.c
+++ b/quantum/process_keycode/process_dynamic_tapping_term.c
@@ -14,8 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
#include "process_dynamic_tapping_term.h"
+#include "quantum.h"
+#include "keycodes.h"
+#include "send_string.h"
#ifndef DYNAMIC_TAPPING_TERM_INCREMENT
# define DYNAMIC_TAPPING_TERM_INCREMENT 5
diff --git a/quantum/process_keycode/process_dynamic_tapping_term.h b/quantum/process_keycode/process_dynamic_tapping_term.h
index 85e83ee73b..fee29e18df 100644
--- a/quantum/process_keycode/process_dynamic_tapping_term.h
+++ b/quantum/process_keycode/process_dynamic_tapping_term.h
@@ -16,6 +16,7 @@
#pragma once
+#include <stdint.h>
#include <stdbool.h>
#include "action.h"
diff --git a/quantum/process_keycode/process_grave_esc.c b/quantum/process_keycode/process_grave_esc.c
index ddf027391d..d786f57a80 100644
--- a/quantum/process_keycode/process_grave_esc.c
+++ b/quantum/process_keycode/process_grave_esc.c
@@ -14,6 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "process_grave_esc.h"
+#include "keycodes.h"
+#include "modifiers.h"
+#include "action_util.h"
/* true if the last press of QK_GRAVE_ESCAPE was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
* Used to ensure that the correct keycode is released if the key is released.
diff --git a/quantum/process_keycode/process_grave_esc.h b/quantum/process_keycode/process_grave_esc.h
index bbf4483763..358ff3