Process Kaleidoscope with `iwyu.py`

This is the result of running the `include-what-you-use` wrapper, followed by
the `clang-format` wrapper on the Kaleidoscope codebase.  It is now safe to use
both without needed any manual corrections after the fact, but it's still
necessary to run clang-format after IWYU, because the two differ in the way they
indent comments after header files.

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>

plugins/Kaleidoscope-AutoShift/src/kaleidoscope/plugin/AutoShift.cpp

@@ -21,7 +21,7 @@
 #include "kaleidoscope/KeyEvent.h"         // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"  // for KeyEventTracker
 #include "kaleidoscope/Runtime.h"          // for Runtime, Runtime_
-#include "kaleidoscope/key_defs.h"         // for Key, Key_0, Key_1, Key_A
+#include "kaleidoscope/key_defs.h"         // for Key, Key_0, Key_1, Key_A, Key_F1, Key_F12, Key...
 #include "kaleidoscope/keyswitch_state.h"  // for keyToggledOn, keyIsInjected
 
 // IWYU pragma: no_include "HIDAliases.h"

plugins/Kaleidoscope-AutoShift/src/kaleidoscope/plugin/AutoShiftConfig.cpp

@@ -17,15 +17,14 @@
 
 #include "kaleidoscope/plugin/AutoShift.h"  // IWYU pragma: associated
 
-#include <Arduino.h>                       // for PSTR, strcmp_P, str...
+#include <Arduino.h>                       // for PSTR, strcmp_P, strncmp_P
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint16_t, uint8_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/Base.h"             // for Base<>::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/device/virtual/Virtual.h"  // for VirtualProps::Storage
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/event_handler_result.h"    // for EventHandlerResult
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-CharShift/src/kaleidoscope/plugin/CharShift.cpp

@@ -17,21 +17,20 @@
 
 #include "kaleidoscope/plugin/CharShift.h"
 
-#include <Arduino.h>                   // for F, __FlashS...
+#include <Arduino.h>                   // for F, __FlashStringHelper
-#include <Kaleidoscope-FocusSerial.h>  // for Focus, Focu...
+#include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <Kaleidoscope-Ranges.h>       // for CS_FIRST
+#include <Kaleidoscope-Ranges.h>       // for CS_FIRST, CS_LAST
 
-#include "kaleidoscope/KeyAddrMap.h"                      // for KeyAddrMap<...
+#include "kaleidoscope/KeyAddrMap.h"                      // for KeyAddrMap<>::Iterator, KeyAddrMap
 #include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
 #include "kaleidoscope/KeyMap.h"                          // for KeyMap
-#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys
+#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys, live_keys
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
-#include "kaleidoscope/device/Base.h"                     // for Base<>::HID
+#include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
-#include "kaleidoscope/device/virtual/Virtual.h"          // for VirtualProp...
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
-#include "kaleidoscope/key_defs.h"                        // for Key, Key_NoKey
+#include "kaleidoscope/key_defs.h"                        // for Key, Key_NoKey, Key_LeftShift
 #include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff
-#include "kaleidoscope/progmem_helpers.h"                 // for cloneFromPr...
+#include "kaleidoscope/progmem_helpers.h"                 // for cloneFromProgmem
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.cpp

@@ -17,14 +17,14 @@
 
 #include "kaleidoscope/plugin/Colormap.h"
 
-#include <Arduino.h>                         // for F, PSTR, __FlashStrin...
+#include <Arduino.h>                         // for F, PSTR, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>        // for Focus, FocusSerial
 #include <Kaleidoscope-LED-Palette-Theme.h>  // for LEDPaletteTheme
 #include <stdint.h>                          // for uint8_t, uint16_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 

plugins/Kaleidoscope-Colormap/src/kaleidoscope/plugin/Colormap.h

@@ -17,14 +17,14 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint8_t, uin...
+#include <stdint.h>  // for uint8_t, uint16_t
 
 #include "kaleidoscope/KeyAddr.h"                        // for KeyAddr
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-Cycle/src/kaleidoscope/plugin/Cycle.cpp

@@ -25,9 +25,9 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::E...
-#include "kaleidoscope/key_defs.h"              // for Key, Key_Backspace
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Backspace, CTRL_HELD, GUI_HELD
-#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, IS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, IS_PRESSED, WAS_PRESSED, keyTog...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-CycleTimeReport/src/kaleidoscope/plugin/CycleTimeReport.cpp

@@ -17,12 +17,12 @@
 
 #include "kaleidoscope/plugin/CycleTimeReport.h"
 
-#include <Arduino.h>                   // for micros, F, __FlashStr...
+#include <Arduino.h>                   // for micros, F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <stdint.h>                    // for uint16_t, uint32_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-Devel-ArduinoTrace/src/ArduinoTrace.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <Arduino.h>  // for PROGMEM, F
+#include <Arduino.h>  // for PROGMEM
 #include <stddef.h>   // for size_t
 
 // IWYU pragma: no_include "WString.h"

plugins/Kaleidoscope-Devel-ArduinoTrace/src/Kaleidoscope-Devel-ArduinoTrace.h

@@ -23,7 +23,8 @@
 #endif
 #endif
 
-#include "ArduinoTrace.h"    // for ARDUINOTRACE_INIT
 #include <HardwareSerial.h>  // for DebugStderrSerial, DebugStderr
 
+#include "ArduinoTrace.h"  // for ARDUINOTRACE_INIT
+
 ARDUINOTRACE_INIT(9600)

plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp

@@ -16,21 +16,20 @@
 
 #include "kaleidoscope/plugin/DynamicMacros.h"
 
-#include <Arduino.h>                   // for delay, PSTR, strc...
+#include <Arduino.h>                   // for delay, PSTR, strcmp_P, F, __FlashStri...
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <Kaleidoscope-Ranges.h>       // for DYNAMIC_MACRO_FIRST
+#include <Kaleidoscope-Ranges.h>       // for DYNAMIC_MACRO_FIRST, DYNAMIC_MACRO_LAST
 
 #include "kaleidoscope/KeyAddr.h"                 // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"                // for KeyEvent
 #include "kaleidoscope/Runtime.h"                 // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"           // for VirtualProps::Sto...
+#include "kaleidoscope/device/device.h"           // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/keyswitch_state.h"         // for INJECTED, IS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"         // for INJECTED, IS_PRESSED, WAS_PRESSED
 #include "kaleidoscope/plugin/EEPROM-Settings.h"  // for EEPROMSettings
-
 // This is a special exception to the rule of only including a plugin's
 // top-level header file, because DynamicMacros doesn't depend on the Macros
 // plugin itself; it's just using the same macro step definitions.
-#include "kaleidoscope/plugin/Macros/MacroSteps.h"  // for MACRO_ACTION_END
+#include "kaleidoscope/plugin/Macros/MacroSteps.h"  // for MACRO_ACTION_END, MACRO_ACTION_STEP_E...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.cpp

@@ -17,7 +17,7 @@
 
 #include "kaleidoscope/plugin/DynamicTapDance.h"
 
-#include <Arduino.h>                       // for PSTR, F, __FlashStrin...
+#include <Arduino.h>                       // for PSTR, F, __FlashStringHelper, strcmp_P
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint16_t, uint8_t
@@ -25,11 +25,11 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
 #include "kaleidoscope/keyswitch_state.h"       // for IS_PRESSED, WAS_PRESSED
-#include "kaleidoscope/plugin/TapDance.h"       // for TapDance, TapDance::A...
+#include "kaleidoscope/plugin/TapDance.h"       // for TapDance, TapDance::ActionType, TapDance:...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include <Kaleidoscope-Ranges.h>    // for TD_FIRST, TD_LAST
-#include <Kaleidoscope-TapDance.h>  // for TapDance, TapDance::A...
+#include <Kaleidoscope-TapDance.h>  // for TapDance, TapDance::ActionType
 #include <stdint.h>                 // for uint8_t, uint16_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr

plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/kaleidoscope/plugin/EEPROM-Keymap-Programmer.cpp

@@ -25,10 +25,10 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for Device, Base<>::Storage
+#include "kaleidoscope/device/device.h"         // for Device, Base<>::Storage, VirtualProps::St...
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::E...
-#include "kaleidoscope/key_defs.h"              // for Key, Key_0, Key_1
+#include "kaleidoscope/key_defs.h"              // for Key, Key_0, Key_1, Key_NoKey
-#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn, keyTogg...
+#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn, keyToggledOff
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 
 namespace kaleidoscope {

plugins/Kaleidoscope-EEPROM-Keymap/src/kaleidoscope/plugin/EEPROM-Keymap.cpp

@@ -17,17 +17,17 @@
 
 #include "kaleidoscope/plugin/EEPROM-Keymap.h"
 
-#include <Arduino.h>                       // for PSTR, strcmp_P, F
+#include <Arduino.h>                       // for PSTR, strcmp_P, F, __FlashStringHelper
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint8_t, uint16_t
 
-#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr, MatrixAddr<>::Range
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Device, Base<>::St...
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
-#include "kaleidoscope/layers.h"                // for Layer_, Layer, layer_...
+#include "kaleidoscope/layers.h"                // for Layer_, Layer, layer_count
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings.cpp

@@ -17,15 +17,15 @@
 
 #include "kaleidoscope/plugin/EEPROM-Settings.h"
 
-#include <Arduino.h>                   // for PSTR, strcmp_P, F
+#include <Arduino.h>                   // for PSTR, strcmp_P, F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <stdint.h>                    // for uint16_t, uint8_t
 
 #include "kaleidoscope/Runtime.h"                     // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"               // for VirtualProps::S...
+#include "kaleidoscope/device/device.h"               // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult, EventHandlerRes...
-#include "kaleidoscope/layers.h"                      // for Layer, Layer_
+#include "kaleidoscope/layers.h"                      // for Layer, Layer_, layer_count
-#include "kaleidoscope/plugin/EEPROM-Settings/crc.h"  // for CRCCalculator
+#include "kaleidoscope/plugin/EEPROM-Settings/crc.h"  // for CRCCalculator, CRC_
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-Escape-OneShot/src/kaleidoscope/plugin/Escape-OneShot-Config.cpp

@@ -17,14 +17,14 @@
 
 #include "kaleidoscope/plugin/Escape-OneShot.h"  // IWYU pragma: associated
 
-#include <Arduino.h>                       // for PSTR, F, __FlashStrin...
+#include <Arduino.h>                       // for PSTR, F, __FlashStringHelper, strcmp_P
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint16_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Escape-OneShot/src/kaleidoscope/plugin/Escape-OneShot.cpp

@@ -20,9 +20,9 @@
 #include <Kaleidoscope-OneShot.h>  // for OneShot
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::E...
-#include "kaleidoscope/key_defs.h"              // for Key, Key_Escape, Key_...
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Escape, Key_NoKey
-#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyTog...
+#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyToggledOn
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-FingerPainter/src/kaleidoscope/plugin/FingerPainter.cpp

@@ -17,7 +17,7 @@
 
 #include "kaleidoscope/plugin/FingerPainter.h"
 
-#include <Arduino.h>                         // for PSTR, strcmp_P, F
+#include <Arduino.h>                         // for PSTR, strcmp_P, F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>        // for Focus, FocusSerial
 #include <Kaleidoscope-LED-Palette-Theme.h>  // for LEDPaletteTheme
 #include <stdint.h>                          // for uint16_t, uint8_t
@@ -26,8 +26,8 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for Device, cRGB, Virtual...
+#include "kaleidoscope/device/device.h"         // for Device, cRGB, VirtualProps::Storage, Base...
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/keyswitch_state.h"       // for keyToggledOff
 
 namespace kaleidoscope {

plugins/Kaleidoscope-FocusSerial/src/kaleidoscope/plugin/FocusSerial.cpp

@@ -17,13 +17,13 @@
 
 #include "kaleidoscope/plugin/FocusSerial.h"
 
-#include <Arduino.h>         // for __FlashStringHelper, F
+#include <Arduino.h>         // for PSTR, __FlashStringHelper, F, strcmp_P
 #include <HardwareSerial.h>  // for HardwareSerial
 #include <stdint.h>          // for uint8_t
 #include <string.h>          // for memset
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/hooks.h"                 // for Hooks
 
 #ifdef __AVR__

plugins/Kaleidoscope-FocusSerial/src/kaleidoscope/plugin/FocusSerial.h

@@ -17,13 +17,13 @@
 
 #pragma once
 
-#include <Arduino.h>         // for __FlashStringHelper
+#include <Arduino.h>         // for delayMicroseconds
 #include <HardwareSerial.h>  // for HardwareSerial
 #include <stdint.h>          // for uint8_t, uint16_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"         // for cRGB
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key
 #include "kaleidoscope/plugin.h"                // for Plugin
 

plugins/Kaleidoscope-GhostInTheFirmware/src/kaleidoscope/plugin/GhostInTheFirmware.cpp

@@ -22,7 +22,7 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/keyswitch_state.h"       // for IS_PRESSED, WAS_PRESSED
 #include "kaleidoscope/progmem_helpers.h"       // for loadFromProgmem
 

plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/Eval.h

@@ -22,10 +22,10 @@
 #include <Arduino.h>
 
 #include "kaleidoscope/device/Base.h"
-#include "kaleidoscope/driver/hid/Keyboardio.h"
-#include "kaleidoscope/driver/storage/GD32Flash.h"
 #include "kaleidoscope/driver/bootloader/gd32/Base.h"
+#include "kaleidoscope/driver/hid/Keyboardio.h"
 #include "kaleidoscope/driver/mcu/GD32.h"
+#include "kaleidoscope/driver/storage/GD32Flash.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.cpp

@@ -19,11 +19,10 @@
 
 #include "kaleidoscope/device/keyboardio/Model01.h"
 
-// System headers
-#include <stdint.h>  // for uint8_t
-
 // Arduino headers
 #include <Arduino.h>  // for PROGMEM
+// System headers
+#include <stdint.h>  // for uint8_t
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #include <KeyboardioHID.h>

plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/kaleidoscope/device/keyboardio/Model01.h

@@ -21,14 +21,14 @@
 
 #ifdef ARDUINO_AVR_MODEL01
 
-// System headers
-#include <stdint.h>  // for uint8_t
 // Arduino headers
 #include <Arduino.h>  // for PROGMEM
+// System headers
+#include <stdint.h>  // for uint8_t
 
-// Kaleidoscope headers
-#include "kaleidoscope/macro_helpers.h"  // for RESTRICT_AR...
 #include "kaleidoscope/MatrixAddr.h"  // IWYU pragma: keep
+// Kaleidoscope headers
+#include "kaleidoscope/macro_helpers.h"  // for RESTRICT_ARGS_COUNT
 
 // IWYU pragma: no_include "kaleidoscope/KeyAddr.h"
 
@@ -41,13 +41,12 @@ struct cRGB {
   uint8_t r;
 };
 
-#include "kaleidoscope/device/ATmega32U4Keyboard.h"       // for ATmega32U4K...
+#include "kaleidoscope/device/ATmega32U4Keyboard.h"       // for ATmega32U4KeyboardProps, EXPORT...
 #include "kaleidoscope/driver/bootloader/avr/Caterina.h"  // for Caterina
-#include "kaleidoscope/driver/keyscanner/Base.h"          // for BaseProps
-#include "kaleidoscope/driver/led/Base.h"                 // for BaseProps
-
 // Kaleidoscope-Hardware-Keyboardio-Model01 headers
 #include "kaleidoscope/driver/keyboardio/Model01Side.h"  // for keydata_t
+#include "kaleidoscope/driver/keyscanner/Base.h"         // for BaseProps
+#include "kaleidoscope/driver/led/Base.h"                // for BaseProps
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h

@@ -42,8 +42,8 @@ struct cRGB {
 #include "kaleidoscope/driver/keyboardio/Model100Side.h"
 #include "kaleidoscope/driver/keyscanner/Base.h"
 #include "kaleidoscope/driver/led/Base.h"
-#include "kaleidoscope/driver/storage/GD32Flash.h"
 #include "kaleidoscope/driver/mcu/GD32.h"
+#include "kaleidoscope/driver/storage/GD32Flash.h"
 
 
 namespace kaleidoscope {

plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp

@@ -18,9 +18,9 @@
 
 #include <stdint.h>  // for uint8_t
 
-#include "kaleidoscope/KeyAddr.h"                         // for MatrixAddr
+#include "kaleidoscope/KeyAddr.h"                         // for MatrixAddr, MatrixAddr<>::Range
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                   // for Device, cRGB
+#include "kaleidoscope/device/device.h"                   // for Device, cRGB, CRGB, Base<>::HID
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
 #include "kaleidoscope/plugin/LEDControl.h"               // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"      // for hsvToRgb

plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.cpp

@@ -18,14 +18,14 @@
 #include "kaleidoscope/plugin/Heatmap.h"
 
 #include <Arduino.h>  // for pgm_read_byte, PROGMEM
-#include <stdint.h>   // for uint16_t, uint8_t
+#include <stdint.h>   // for uint16_t, uint8_t, INT16_MAX
 
-#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAdd...
+#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAddr<>::Range, KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"         // for cRGB
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyTog...
+#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyToggledOn
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Heatmap/src/kaleidoscope/plugin/Heatmap.h

@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint16_t
+#include <stdint.h>  // for uint16_t, uint8_t
 
 #include "kaleidoscope/KeyEvent.h"                       // for KeyEvent
-#include "kaleidoscope/Runtime.h"                        // for Runtime, Run...
+#include "kaleidoscope/Runtime.h"                        // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                  // for cRGB, Device
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS-Focus.cpp

@@ -21,7 +21,7 @@
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <stdint.h>                    // for uint8_t
 
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/plugin/HostOS.h"         // for HostOS, Type
 
 namespace kaleidoscope {

plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.cpp

@@ -20,8 +20,8 @@
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-HostPowerManagement/src/kaleidoscope/plugin/HostPowerManagement.cpp

@@ -20,7 +20,7 @@
 #include <Arduino.h>  // IWYU pragma: keep
 #include <stdint.h>   // for uint8_t
 
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 
 // This is a terrible hack until Arduino#6964 gets implemented.
 // It makes the `_usbSuspendState` symbol available to us.

plugins/Kaleidoscope-IdleLEDs/src/kaleidoscope/plugin/IdleLEDs.cpp

@@ -18,15 +18,15 @@
 
 #include "kaleidoscope/plugin/IdleLEDs.h"
 
-#include <Arduino.h>                       // for F, PSTR, __FlashStrin...
+#include <Arduino.h>                       // for F, PSTR, __FlashStringHelper, strcmp_P
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint32_t, uint16_t
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.cpp

@@ -22,7 +22,7 @@
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 

plugins/Kaleidoscope-LED-ActiveLayerColor/src/kaleidoscope/plugin/LED-ActiveLayerColor.h

@@ -19,11 +19,11 @@
 
 #include "kaleidoscope/KeyAddr.h"                        // for KeyAddr
 #include "kaleidoscope/device/device.h"                  // for cRGB
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-LED-ActiveModColor/src/kaleidoscope/plugin/LED-ActiveModColor.cpp

@@ -20,13 +20,13 @@
 #include <Kaleidoscope-OneShot.h>          // for OneShot
 #include <Kaleidoscope-OneShotMetaKeys.h>  // for OneShot_ActiveStickyKey
 
-#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr, MatrixAddr<>::Range
-#include "kaleidoscope/KeyAddrBitfield.h"       // for KeyAddrBitfield, KeyA...
+#include "kaleidoscope/KeyAddrBitfield.h"       // for KeyAddrBitfield, KeyAddrBitfield::Iterator
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/LiveKeys.h"              // for LiveKeys, live_keys
 #include "kaleidoscope/device/device.h"         // for CRGB, cRGB
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_Inactive
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Inactive, Key_Masked
 #include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 

plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare.cpp

@@ -17,17 +17,16 @@
 
 #include "kaleidoscope/plugin/LED-AlphaSquare.h"
 
-#include <Arduino.h>  // for bitRead
+#include <Arduino.h>  // for bitRead, pgm_read_word, PROGMEM
-#include <stdint.h>   // for uint16_t
+#include <stdint.h>   // for uint16_t, uint8_t
 
-#include "kaleidoscope/KeyAddr.h"            // for KeyAddr
+#include "kaleidoscope/KeyAddr.h"                          // for KeyAddr, MatrixAddr
-#include "kaleidoscope/Runtime.h"            // for Runtime
+#include "kaleidoscope/Runtime.h"                          // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                    // for cRGB
-#include "kaleidoscope/key_defs.h"           // for Key, Key_A
+#include "kaleidoscope/key_defs.h"                         // for Key, Key_A, Key_0
+#include "kaleidoscope/plugin/LED-AlphaSquare/Font-4x4.h"  // for ALPHASQUARE_SYMBOL_0, ALPHASQU...
 #include "kaleidoscope/plugin/LEDControl.h"                // for LEDControl
 
-#include "kaleidoscope/plugin/LED-AlphaSquare/Font-4x4.h"  // for ALPHASQUAR...
-
 namespace kaleidoscope {
 namespace plugin {
 

plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare.h

@@ -20,11 +20,10 @@
 #include <stdint.h>  // for uint16_t, uint8_t
 
 #include "kaleidoscope/KeyAddr.h"        // for KeyAddr
+#include "kaleidoscope/device/device.h"  // for cRGB
 #include "kaleidoscope/key_defs.h"       // for Key
 #include "kaleidoscope/plugin.h"         // for Plugin
 
-struct cRGB;
-
 // clang-format off
 #define SYM4x4(                                                   \
                p00, p01, p02, p03,                                \

plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.cpp

@@ -23,12 +23,11 @@
 #include "kaleidoscope/KeyEvent.h"                // for KeyEvent
 #include "kaleidoscope/Runtime.h"                 // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"           // for Device, CRGB
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"    // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey, Key_0
+#include "kaleidoscope/key_defs.h"                // for Key, Key_NoKey, Key_0, Key_A
 #include "kaleidoscope/keyswitch_state.h"         // for keyIsInjected
-#include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
-
 #include "kaleidoscope/plugin/LED-AlphaSquare.h"  // for AlphaSquare
+#include "kaleidoscope/plugin/LEDControl.h"       // for LEDControl
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-LED-AlphaSquare/src/kaleidoscope/plugin/LED-AlphaSquare/Effect.h

@@ -21,12 +21,12 @@
 
 #include "kaleidoscope/KeyAddr.h"                        // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"                       // for KeyEvent
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/key_defs.h"                       // for Key
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-LED-Palette-Theme/src/kaleidoscope/plugin/LED-Palette-Theme.cpp

@@ -24,9 +24,8 @@
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/Base.h"           // for Base<>::Storage
+#include "kaleidoscope/device/device.h"         // for cRGB, VirtualProps::Storage, Device, Base...
-#include "kaleidoscope/device/device.h"         // for cRGB, VirtualProps::S...
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp

@@ -18,13 +18,13 @@
 #include "kaleidoscope/plugin/LED-Stalker.h"
 
 #include <Arduino.h>  // for min
-#include <stdint.h>   // for uint8_t, uint16_t
+#include <stdint.h>   // for uint8_t, uint16_t, uint32_t
 
-#include "kaleidoscope/KeyAddr.h"                     // for MatrixAddr, Key...
+#include "kaleidoscope/KeyAddr.h"                     // for MatrixAddr, KeyAddr, MatrixAddr<>::...
 #include "kaleidoscope/KeyEvent.h"                    // for KeyEvent
 #include "kaleidoscope/Runtime.h"                     // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"               // for cRGB, CRGB
-#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult, EventHandlerRes...
 #include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"  // for hsvToRgb
 

plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.h

@@ -17,16 +17,16 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint8_t, uin...
+#include <stdint.h>  // for uint8_t, uint16_t
 
 #include "kaleidoscope/KeyEvent.h"                       // for KeyEvent
-#include "kaleidoscope/Runtime.h"                        // for Runtime, Run...
+#include "kaleidoscope/Runtime.h"                        // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                  // for cRGB, CRGB
+#include "kaleidoscope/device/device.h"                  // for cRGB, CRGB, Device
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 #define STALKER(v, ...) ({static kaleidoscope::plugin::stalker::v _effect __VA_ARGS__; &_effect; })
 

plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.cpp

@@ -20,14 +20,14 @@
 
 #include "kaleidoscope/plugin/LED-Wavepool.h"
 
-#include <Arduino.h>  // for pgm_read_byte
+#include <Arduino.h>  // for pgm_read_byte, PROGMEM, abs
-#include <stdint.h>   // for int8_t, uint8_t
+#include <stdint.h>   // for int8_t, uint8_t, int16_t, intptr_t
 
-#include "kaleidoscope/KeyAddr.h"                     // for MatrixAddr, Key...
+#include "kaleidoscope/KeyAddr.h"                     // for MatrixAddr, KeyAddr, MatrixAddr<>::...
 #include "kaleidoscope/KeyEvent.h"                    // for KeyEvent
 #include "kaleidoscope/Runtime.h"                     // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"               // for Device, cRGB
-#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult, EventHandlerRes...
 #include "kaleidoscope/keyswitch_state.h"             // for keyIsPressed
 #include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"  // for hsvToRgb

plugins/Kaleidoscope-LED-Wavepool/src/kaleidoscope/plugin/LED-Wavepool.h

@@ -21,16 +21,16 @@
 #ifdef ARDUINO_AVR_MODEL01
 
 #include <Arduino.h>  // for PROGMEM
-#include <stdint.h>   // for uint8_t, int...
+#include <stdint.h>   // for uint8_t, int16_t, int8_t, INT16_MAX
 
 #include "kaleidoscope/KeyEvent.h"                       // for KeyEvent
-#include "kaleidoscope/Runtime.h"                        // for Runtime, Run...
+#include "kaleidoscope/Runtime.h"                        // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                  // for Device
-#include "kaleidoscope/event_handler_result.h"           // for EventHandler...
+#include "kaleidoscope/event_handler_result.h"           // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                         // for Plugin
-#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransi...
+#include "kaleidoscope/plugin/AccessTransientLEDMode.h"  // for AccessTransientLEDMode
 #include "kaleidoscope/plugin/LEDMode.h"                 // for LEDMode
-#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInter...
+#include "kaleidoscope/plugin/LEDModeInterface.h"        // for LEDModeInterface
 
 #define WP_WID 14
 #define WP_HGT 5

plugins/Kaleidoscope-LEDEffect-BootAnimation/src/kaleidoscope/plugin/LEDEffect-BootAnimation.cpp

@@ -20,11 +20,11 @@
 #include <Arduino.h>  // for PROGMEM, pgm_read_byte
 #include <stdint.h>   // for uint16_t, uint8_t
 
-#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr, MatrixAddr<>::Range
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"         // for CRGB, cRGB
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_O, Key_A, Key_B
+#include "kaleidoscope/key_defs.h"              // for Key, Key_O, Key_A, Key_B, Key_D, Key_E
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 

plugins/Kaleidoscope-LEDEffect-BootGreeting/src/kaleidoscope/plugin/LEDEffect-BootGreeting.cpp

@@ -19,13 +19,13 @@
 
 #include <stdint.h>  // for uint16_t, uint8_t
 
-#include "kaleidoscope/KeyAddr.h"                     // for KeyAddr, Matrix...
+#include "kaleidoscope/KeyAddr.h"                     // for KeyAddr, MatrixAddr, MatrixAddr<>::...
 #include "kaleidoscope/Runtime.h"                     // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"               // for cRGB
-#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult, EventHandlerRes...
 #include "kaleidoscope/key_defs.h"                    // for Key
 #include "kaleidoscope/layers.h"                      // for Layer, Layer_
-#include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl, Key...
+#include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl, Key_LEDEffectNext
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"  // for breath_compute
 
 namespace kaleidoscope {

plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.cpp

@@ -19,7 +19,7 @@
 #include <stdint.h>  // for uint16_t, uint8_t
 
 #include "kaleidoscope/Runtime.h"            // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"      // for CRGB, Device, Base<>::LE...
+#include "kaleidoscope/device/device.h"      // for CRGB, Device, Base<>::LEDRangeIterator
 #include "kaleidoscope/plugin/LEDControl.h"  // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-LEDEffect-Chase/src/kaleidoscope/plugin/LEDEffect-Chase.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint8_t, int8_t
+#include <stdint.h>  // for uint8_t, int8_t, uint16_t
 
 #include "kaleidoscope/Runtime.h"                  // for Runtime, Runtime_
 #include "kaleidoscope/plugin.h"                   // for Plugin

plugins/Kaleidoscope-LEDEffect-Rainbow/src/kaleidoscope/plugin/LEDEffect-Rainbow.cpp

@@ -20,7 +20,7 @@
 #include <stdint.h>   // for uint8_t, uint16_t
 
 #include "kaleidoscope/Runtime.h"                     // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"               // for Base<>::LEDRang...
+#include "kaleidoscope/device/device.h"               // for Base<>::LEDRangeIterator, Base<>::L...
 #include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"  // for hsvToRgb
 

plugins/Kaleidoscope-LEDEffects/src/kaleidoscope/plugin/TriColor.cpp

@@ -17,9 +17,9 @@
 
 #include "kaleidoscope/plugin/TriColor.h"
 
-#include "kaleidoscope/KeyAddr.h"            // for KeyAddr, MatrixAddr, Mat...
+#include "kaleidoscope/KeyAddr.h"            // for KeyAddr, MatrixAddr, MatrixAddr<>::Range
 #include "kaleidoscope/device/device.h"      // for cRGB
-#include "kaleidoscope/key_defs.h"           // for Key, Key_0, Key_A, Key_E...
+#include "kaleidoscope/key_defs.h"           // for Key, Key_0, Key_A, Key_Escape, Key_F1, Key_F12
 #include "kaleidoscope/layers.h"             // for Layer, Layer_
 #include "kaleidoscope/plugin/LEDControl.h"  // for LEDControl
 

plugins/Kaleidoscope-LayerFocus/src/kaleidoscope/plugin/LayerFocus.cpp

@@ -18,11 +18,11 @@
 
 #include "kaleidoscope/plugin/LayerFocus.h"
 
-#include <Arduino.h>                   // for PSTR, strcmp_P, F
+#include <Arduino.h>                   // for PSTR, strcmp_P, F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <stdint.h>                    // for uint8_t
 
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.cpp

@@ -17,16 +17,16 @@
 
 #include "kaleidoscope/plugin/Leader.h"
 
-#include <Arduino.h>                   // for F, __FlashStringHelper
+#include <Arduino.h>                   // for F, __FlashStringHelper, pgm_read_ptr
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <Kaleidoscope-Ranges.h>       // for LEAD_FIRST, LEAD_LAST
-#include <stdint.h>                    // for uint16_t, uint8_t
+#include <stdint.h>                    // for uint16_t, uint8_t, int8_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"       // for KeyEventTracker
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
 #include "kaleidoscope/keyswitch_state.h"       // for INJECTED, keyToggledOff
 

plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h

@@ -19,14 +19,13 @@
 
 #include <Kaleidoscope-Ranges.h>  // for LEAD_FIRST
 #include <stddef.h>               // for NULL
-#include <stdint.h>               // for uint16_t, uint8_t
+#include <stdint.h>               // for uint16_t, uint8_t, int8_t
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"       // for KeyEventTracker
 #include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
 #include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
 #include "kaleidoscope/plugin.h"                // for Plugin
-
 // -----------------------------------------------------------------------------
 // Deprecation warning messages
 #include "kaleidoscope_internal/deprecations.h"  // for DEPRECATED

plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp

@@ -16,7 +16,7 @@
 
 #include "kaleidoscope/plugin/Macros.h"
 
-#include <Arduino.h>                   // for pgm_read_byte, delay
+#include <Arduino.h>                   // for pgm_read_byte, delay, F, PROGMEM, __F...
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <Kaleidoscope-Ranges.h>       // for MACRO_FIRST
 #include <stdint.h>                    // for uint8_t
@@ -24,10 +24,10 @@
 #include "kaleidoscope/KeyAddr.h"                   // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"                  // for KeyEvent
 #include "kaleidoscope/Runtime.h"                   // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"      // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"      // for EventHandlerResult, EventHandlerResul...
-#include "kaleidoscope/key_defs.h"                  // for Key, LSHIFT, Key_...
+#include "kaleidoscope/key_defs.h"                  // for Key, LSHIFT, Key_NoKey, Key_0, Key_1
-#include "kaleidoscope/keyswitch_state.h"           // for INJECTED, IS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"           // for INJECTED, IS_PRESSED, WAS_PRESSED
-#include "kaleidoscope/plugin/Macros/MacroSteps.h"  // for macro_t, MACRO_NONE
+#include "kaleidoscope/plugin/Macros/MacroSteps.h"  // for macro_t, MACRO_NONE, MACRO_ACTION_END
 
 // =============================================================================
 // Default `macroAction()` function definitions

plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h

@@ -18,7 +18,7 @@
 
 #include <stdint.h>  // for uint8_t
 
-#include "Kaleidoscope-Ranges.h"                    // for MACRO_FIRST, MACR...
+#include "Kaleidoscope-Ranges.h"                    // for MACRO_FIRST, MACRO_LAST
 #include "kaleidoscope/KeyEvent.h"                  // for KeyEvent
 #include "kaleidoscope/event_handler_result.h"      // for EventHandlerResult
 #include "kaleidoscope/key_defs.h"                  // for Key

plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.cpp

@@ -17,13 +17,13 @@
 
 #include "kaleidoscope/plugin/MagicCombo.h"
 
-#include <Arduino.h>                   // for F, __FlashStringHelper
+#include <Arduino.h>                   // for F, __FlashStringHelper, pgm_read_byte
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <stdint.h>                    // for uint16_t, int8_t, uin...
+#include <stdint.h>                    // for uint16_t, int8_t, uint8_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"         // for Device
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include <Arduino.h>  // for PROGMEM
-#include <stdint.h>   // for uint16_t, uint8_t
+#include <stdint.h>   // for uint16_t, uint8_t, int8_t
 
 #include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                // for Plugin

plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp

@@ -16,20 +16,20 @@
 
 #include "kaleidoscope/plugin/MouseKeys.h"
 
-#include <Arduino.h>                   // for F, __F...
+#include <Arduino.h>                   // for F, __FlashStringHelper
-#include <Kaleidoscope-FocusSerial.h>  // for Focus
+#include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <stdint.h>                    // for uint8_t
+#include <stdint.h>                    // for uint8_t, uint16_t, int8_t
 
 #include "kaleidoscope/KeyEvent.h"                             // for KeyEvent
-#include "kaleidoscope/Runtime.h"                              // for Runtime
+#include "kaleidoscope/Runtime.h"                              // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                        // for Base<>...
+#include "kaleidoscope/device/device.h"                        // for Base<>::HID, VirtualProps:...
-#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for Absolu...
+#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for AbsoluteMouse
 #include "kaleidoscope/driver/hid/keyboardio/Mouse.h"          // for Mouse
-#include "kaleidoscope/event_handler_result.h"                 // for EventH...
+#include "kaleidoscope/event_handler_result.h"                 // for EventHandlerResult, EventH...
-#include "kaleidoscope/key_defs.h"                             // for Key
+#include "kaleidoscope/key_defs.h"                             // for Key, SYNTHETIC
-#include "kaleidoscope/keyswitch_state.h"                      // for keyTog...
+#include "kaleidoscope/keyswitch_state.h"                      // for keyToggledOn
-#include "kaleidoscope/plugin/mousekeys/MouseKeyDefs.h"        // for KEY_MO...
+#include "kaleidoscope/plugin/mousekeys/MouseKeyDefs.h"        // for KEY_MOUSE_BUTTON, KEY_MOUS...
-#include "kaleidoscope/plugin/mousekeys/MouseWrapper.h"        // for MouseW...
+#include "kaleidoscope/plugin/mousekeys/MouseWrapper.h"        // for MouseWrapper, wrapper, WAR...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp

@@ -16,13 +16,13 @@
 
 #include "kaleidoscope/plugin/mousekeys/MouseWrapper.h"
 
-#include <stdint.h>  // for uint16_t
+#include <stdint.h>  // for uint16_t, uint8_t, int8_t
 
-#include "kaleidoscope/Runtime.h"                              // for Runtime
+#include "kaleidoscope/Runtime.h"                              // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                        // for Base<>...
+#include "kaleidoscope/device/device.h"                        // for Base<>::HID, VirtualProps:...
-#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for Absolu...
+#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for AbsoluteMouse
 #include "kaleidoscope/driver/hid/keyboardio/Mouse.h"          // for Mouse
-#include "kaleidoscope/plugin/mousekeys/MouseWarpModes.h"      // for MOUSE_...
+#include "kaleidoscope/plugin/mousekeys/MouseWarpModes.h"      // for MOUSE_WARP_GRID_2X2
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.cpp

@@ -18,10 +18,10 @@
 
 #include <stdint.h>  // for uint8_t
 
-#include "kaleidoscope/KeyAddr.h"                     // for KeyAddr, Matrix...
+#include "kaleidoscope/KeyAddr.h"                     // for KeyAddr, MatrixAddr, MatrixAddr<>::...
 #include "kaleidoscope/device/device.h"               // for cRGB, CRGB
-#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"        // for EventHandlerResult, EventHandlerRes...
-#include "kaleidoscope/key_defs.h"                    // for Key, KEY_FLAGS
+#include "kaleidoscope/key_defs.h"                    // for Key, KEY_FLAGS, Key_NoKey, LockLayer
 #include "kaleidoscope/layers.h"                      // for Layer, Layer_
 #include "kaleidoscope/plugin/LEDControl.h"           // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"  // for breath_compute

plugins/Kaleidoscope-NumPad/src/kaleidoscope/plugin/NumPad.h

@@ -19,11 +19,10 @@
 #include <stdint.h>  // for uint8_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/device/device.h"         // for cRGB
 #include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
 #include "kaleidoscope/plugin.h"                // for Plugin
 
-struct cRGB;
-
 namespace kaleidoscope {
 namespace plugin {
 

plugins/Kaleidoscope-OneShot/src/kaleidoscope/plugin/OneShot.cpp

@@ -17,18 +17,18 @@
 
 #include "kaleidoscope/plugin/OneShot.h"
 
-#include <Arduino.h>                   // for bitRead, F, __FlashSt...
+#include <Arduino.h>                   // for bitRead, F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <Kaleidoscope-Ranges.h>       // for OS_FIRST
 #include <stdint.h>                    // for uint8_t, int8_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
-#include "kaleidoscope/KeyAddrBitfield.h"       // for KeyAddrBitfield, KeyA...
+#include "kaleidoscope/KeyAddrBitfield.h"       // for KeyAddrBitfield, KeyAddrBitfield::Iterator
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftControl
+#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftControl, LAYER_SHIFT_OFFSET
-#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, IS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, IS_PRESSED, WAS_PRESSED, keyIsI...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-OneShot/src/kaleidoscope/plugin/OneShot.h

@@ -17,15 +17,15 @@
 
 #pragma once
 
-#include <Kaleidoscope-Ranges.h>  // for OS_FIRST, OS_LAST
+#include <Kaleidoscope-Ranges.h>  // for OSL_FIRST, OSM_FIRST, OS_FIRST, OS_LAST
-#include <stdint.h>               // for uint16_t, uint8_t
+#include <stdint.h>               // for uint16_t, uint8_t, int16_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyAddrBitfield.h"       // for KeyAddrBitfield
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
 #include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
-#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftControl
+#include "kaleidoscope/key_defs.h"              // for Key
 #include "kaleidoscope/plugin.h"                // for Plugin
 
 // IWYU pragma: no_include "HIDAliases.h"

plugins/Kaleidoscope-OneShotMetaKeys/src/kaleidoscope/plugin/OneShotMetaKeys.cpp

@@ -21,13 +21,13 @@
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 #include <Kaleidoscope-OneShot.h>      // for OneShot
 
-#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAdd...
+#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAddr<>::Range, KeyAddr
-#include "kaleidoscope/KeyAddrMap.h"            // for KeyAddrMap<>::Iterator
+#include "kaleidoscope/KeyAddrMap.h"            // for KeyAddrMap<>::Iterator, KeyAddrMap
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/KeyMap.h"                // for KeyMap
 #include "kaleidoscope/LiveKeys.h"              // for LiveKeys, live_keys
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_Inactive
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Inactive, Key_Masked
 #include "kaleidoscope/keyswitch_state.h"       // for INJECTED, keyToggledOff
 
 namespace kaleidoscope {

plugins/Kaleidoscope-OneShotMetaKeys/src/kaleidoscope/plugin/OneShotMetaKeys.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <Kaleidoscope-Ranges.h>  // for OS_ACTIVE_STICKY, OS_...
+#include <Kaleidoscope-Ranges.h>  // for OS_ACTIVE_STICKY, OS_META_STICKY
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult

plugins/Kaleidoscope-PersistentLEDMode/src/kaleidoscope/plugin/PersistentLEDMode.cpp

@@ -22,8 +22,8 @@
 #include <stdint.h>                        // for uint8_t, uint16_t
 
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.cpp

@@ -20,13 +20,13 @@
 
 #include <Arduino.h>                   // for F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <Kaleidoscope-Ranges.h>       // for DUL_FIRST, DUM_FIRST
+#include <Kaleidoscope-Ranges.h>       // for DUL_FIRST, DUM_FIRST, DUL_LAST, DUM_LAST
 
 #include "kaleidoscope/KeyAddrEventQueue.h"  // for KeyAddrEventQueue
 #include "kaleidoscope/KeyEvent.h"           // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"    // for KeyEventTracker
 #include "kaleidoscope/Runtime.h"            // for Runtime, Runtime_
-#include "kaleidoscope/keyswitch_state.h"    // for IS_PRESSED, WAS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"    // for IS_PRESSED, WAS_PRESSED, keyIsInjected
 #include "kaleidoscope/layers.h"             // for Layer, Layer_
 #include "kaleidoscope/progmem_helpers.h"    // for cloneFromProgmem
 

plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h

@@ -19,8 +19,8 @@
 #pragma once
 
 #include <Arduino.h>              // for PROGMEM
-#include <Kaleidoscope-Ranges.h>  // for DUM_FIRST
+#include <Kaleidoscope-Ranges.h>  // for DUL_FIRST, DUM_FIRST
-#include <stdint.h>               // for uint8_t, uint16_t
+#include <stdint.h>               // for uint8_t, uint16_t, int8_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyAddrEventQueue.h"     // for KeyAddrEventQueue

plugins/Kaleidoscope-Redial/src/kaleidoscope/plugin/Redial.cpp

@@ -21,8 +21,8 @@
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_0, Key_1, Key_A
+#include "kaleidoscope/key_defs.h"              // for Key, Key_0, Key_1, Key_A, Key_Z
 #include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn
 
 namespace kaleidoscope {

plugins/Kaleidoscope-ShapeShifter/src/kaleidoscope/plugin/ShapeShifter.cpp

@@ -19,10 +19,10 @@
 
 #include <stdint.h>  // for uint8_t
 
-#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAdd...
+#include "kaleidoscope/KeyAddr.h"               // for MatrixAddr, MatrixAddr<>::Range, KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/LiveKeys.h"              // for LiveKeys, live_keys
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
 
 namespace kaleidoscope {

plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.cpp

@@ -20,16 +20,16 @@
 
 #include <Arduino.h>                   // for F, __FlashStringHelper
 #include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <stdint.h>                    // for uint16_t, int8_t, uin...
+#include <stdint.h>                    // for uint16_t, int8_t, uint8_t
 
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr, MatrixAddr
 #include "kaleidoscope/KeyAddrEventQueue.h"     // for KeyAddrEventQueue
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"       // for KeyEventTracker
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftParen
+#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftParen, Key_LeftShift, Key_Ri...
-#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn, WAS_PRE...
+#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn, WAS_PRESSED, keyIsInjected
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-SpaceCadet/src/kaleidoscope/plugin/SpaceCadet.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <Kaleidoscope-Ranges.h>  // for SC_FIRST, SC_LAST
-#include <stdint.h>               // for uint16_t, uint8_t
+#include <stdint.h>               // for uint16_t, uint8_t, int8_t
 
 #include "kaleidoscope/KeyAddrEventQueue.h"     // for KeyAddrEventQueue
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent

plugins/Kaleidoscope-Steno/src/kaleidoscope/plugin/GeminiPR.cpp

@@ -25,7 +25,7 @@
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::E...
 #include "kaleidoscope/key_defs.h"              // for Key
 #include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn
 

plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.cpp

@@ -24,9 +24,9 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_Backspace
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Backspace, Key_1, Key_A, Key_0
-#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, WAS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, WAS_PRESSED, keyToggledOn, IS_P...
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.cpp

@@ -27,9 +27,9 @@
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/KeyEventTracker.h"       // for KeyEventTracker
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/key_defs.h"              // for Key
-#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyTog...
+#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyToggledOff
 #include "kaleidoscope/layers.h"                // for Layer, Layer_
 
 namespace kaleidoscope {

plugins/Kaleidoscope-TopsyTurvy/src/kaleidoscope/plugin/TopsyTurvy.cpp

@@ -19,14 +19,14 @@
 
 #include <Kaleidoscope-Ranges.h>  // for TT_FIRST
 
-#include "kaleidoscope/KeyAddr.h"                         // for KeyAddr
+#include "kaleidoscope/KeyAddr.h"                         // for KeyAddr, MatrixAddr, MatrixAddr...
 #include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
-#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys
+#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys, live_keys
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                   // for Base<>::HID
+#include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
-#include "kaleidoscope/event_handler_result.h"            // for EventHandle...
+#include "kaleidoscope/event_handler_result.h"            // for EventHandlerResult, EventHandle...
-#include "kaleidoscope/key_defs.h"                        // for Key, Key_Le...
+#include "kaleidoscope/key_defs.h"                        // for Key, Key_LeftShift, Key_NoKey
 #include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Turbo/src/kaleidoscope/plugin/Turbo.cpp

@@ -17,20 +17,20 @@
 
 #include "kaleidoscope/plugin/Turbo.h"
 
-#include <Arduino.h>                   // for F, __FlashS...
+#include <Arduino.h>                   // for F, __FlashStringHelper
-#include <Kaleidoscope-FocusSerial.h>  // for Focus, Focu...
+#include <Kaleidoscope-FocusSerial.h>  // for Focus, FocusSerial
-#include <stdint.h>                    // for uint16_t
+#include <stdint.h>                    // for uint16_t, uint32_t
 
-#include "kaleidoscope/KeyAddr.h"                         // for MatrixAddr
+#include "kaleidoscope/KeyAddr.h"                         // for MatrixAddr, MatrixAddr<>::Range
-#include "kaleidoscope/KeyAddrMap.h"                      // for KeyAddrMap<...
+#include "kaleidoscope/KeyAddrMap.h"                      // for KeyAddrMap<>::Iterator, KeyAddrMap
 #include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
 #include "kaleidoscope/KeyMap.h"                          // for KeyMap
-#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys
+#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys, live_keys
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
-#include "kaleidoscope/event_handler_result.h"            // for EventHandle...
+#include "kaleidoscope/event_handler_result.h"            // for EventHandlerResult, EventHandle...
 #include "kaleidoscope/key_defs.h"                        // for Key
-#include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff
+#include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff, keyToggledOn
 #include "kaleidoscope/plugin/LEDControl.h"               // for LEDControl
 
 namespace kaleidoscope {

plugins/Kaleidoscope-TypingBreaks/src/kaleidoscope/plugin/TypingBreaks.cpp

@@ -17,7 +17,7 @@
 
 #include "kaleidoscope/plugin/TypingBreaks.h"
 
-#include <Arduino.h>                       // for PSTR, strcmp_P, F
+#include <Arduino.h>                       // for PSTR, strcmp_P, F, __FlashStringHelper
 #include <Kaleidoscope-EEPROM-Settings.h>  // for EEPROMSettings
 #include <Kaleidoscope-FocusSerial.h>      // for Focus, FocusSerial
 #include <stdint.h>                        // for uint32_t, uint16_t
@@ -25,8 +25,8 @@
 #include "kaleidoscope/KeyAddr.h"               // for KeyAddr
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
 #include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage, Base<>::Storage
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/keyswitch_state.h"       // for keyToggledOff
 
 namespace kaleidoscope {

plugins/Kaleidoscope-USB-Quirks/src/kaleidoscope/plugin/USB-Quirks.cpp

@@ -20,8 +20,8 @@
 #include <Arduino.h>  // for delay
 #include <stdint.h>   // for uint8_t
 
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                   // for Base<>::HID
+#include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Unicode/src/kaleidoscope/plugin/Unicode.cpp

@@ -18,13 +18,13 @@
 #include "kaleidoscope/plugin/Unicode.h"
 
 #include <Arduino.h>              // for delay
-#include <Kaleidoscope-HostOS.h>  // for HostOS, LINUX
+#include <Kaleidoscope-HostOS.h>  // for HostOS, LINUX, MACOS, WINDOWS, OSX
-#include <stdint.h>               // for uint8_t
+#include <stdint.h>               // for uint8_t, uint32_t, int8_t
 
-#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
-#include "kaleidoscope/device/device.h"                   // for Base<>::HID
+#include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
-#include "kaleidoscope/key_defs.h"                        // for Key, Key_Le...
+#include "kaleidoscope/key_defs.h"                        // for Key, Key_LeftAlt, KEY_FLAGS, Key_A
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-WinKeyToggle/src/kaleidoscope/plugin/WinKeyToggle.cpp

@@ -18,8 +18,8 @@
 #include "kaleidoscope/plugin/WinKeyToggle.h"
 
 #include "kaleidoscope/KeyEvent.h"              // for KeyEvent
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
-#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftGui, Key...
+#include "kaleidoscope/key_defs.h"              // for Key, Key_LeftGui, Key_RightGui
 
 namespace kaleidoscope {
 namespace plugin {

src/kaleidoscope/KeyAddrEventQueue.h

@@ -25,7 +25,7 @@
 #include "kaleidoscope/KeyEvent.h"         // for KeyEvent, KeyEventId
 #include "kaleidoscope/Runtime.h"          // for Runtime, Runtime_
 #include "kaleidoscope/key_defs.h"         // for Key_Undefined
-#include "kaleidoscope/keyswitch_state.h"  // for IS_PRESSED, WAS_PRESSED
+#include "kaleidoscope/keyswitch_state.h"  // for IS_PRESSED, WAS_PRESSED, keyToggledOff
 
 namespace kaleidoscope {
 

src/kaleidoscope/KeyAddrMap.h

@@ -64,6 +64,7 @@ class KeyAddrMap {
   // for (Key &key : key_map) {...}
  private:
   class Iterator;
+
   friend class ThisType::Iterator;
 
  public:

src/kaleidoscope/Runtime.cpp

@@ -19,12 +19,12 @@
 #include <Arduino.h>         // for millis
 #include <HardwareSerial.h>  // for HardwareSerial
 
-#include "kaleidoscope/KeyAddr.h"                         // for KeyAddr
+#include "kaleidoscope/KeyAddr.h"                         // for KeyAddr, MatrixAddr, MatrixAddr...
 #include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
-#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys
+#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys, live_keys
-#include "kaleidoscope/device/device.h"                   // for Base<>::HID
+#include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
-#include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff
+#include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff, keyToggledOn
 #include "kaleidoscope/layers.h"                          // for Layer, Layer_
 
 namespace kaleidoscope {

src/kaleidoscope/device/ATmega32U4Keyboard.h

@@ -20,11 +20,11 @@
 #if defined(__AVR__) || defined(KALEIDOSCOPE_VIRTUAL_BUILD)
 
 // IWYU pragma: begin_exports
-#include "kaleidoscope/device/Base.h"                           // for BaseP...
+#include "kaleidoscope/device/Base.h"                           // for BaseProps
-#include "kaleidoscope/driver/hid/Keyboardio.h"                 // for Keybo...
+#include "kaleidoscope/driver/hid/Keyboardio.h"                 // for Keyboardio, KeyboardioProps
-#include "kaleidoscope/driver/mcu/ATmega32U4.h"                 // for ATmeg...
+#include "kaleidoscope/driver/mcu/ATmega32U4.h"                 // for ATmega32U4, ATmega32U4Props
-#include "kaleidoscope/driver/storage/ATmega32U4EEPROMProps.h"  // for ATmeg...
+#include "kaleidoscope/driver/storage/ATmega32U4EEPROMProps.h"  // for ATmega32U4EEPROMProps
-#include "kaleidoscope/driver/storage/AVREEPROM.h"              // for AVREE...
+#include "kaleidoscope/driver/storage/AVREEPROM.h"              // for AVREEPROM
 // IWYU pragma: end_exports
 
 namespace kaleidoscope {
@@ -48,8 +48,6 @@ class ATmega32U4Keyboard : public kaleidoscope::device::Base<_DeviceProps> {
   }
 };
 #else   // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
-template<typename _DeviceProps>
-class ATmega32U4Keyboard;
 #endif  // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
 }  // namespace device

src/kaleidoscope/device/Base.h

@@ -23,14 +23,14 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint8_t, int8_t
+#include <stdint.h>  // for uint8_t, int8_t, uint32_t
 #include <string.h>  // for size_t, strlen, memcpy
 
 #include "kaleidoscope/driver/bootloader/None.h"  // for None
 #include "kaleidoscope/driver/hid/Base.h"         // for Base, BaseProps
 #include "kaleidoscope/driver/keyscanner/Base.h"  // for BaseProps
 #include "kaleidoscope/driver/keyscanner/None.h"  // for None
-#include "kaleidoscope/driver/led/None.h"         // for cRGB, BaseProps, CRGB
+#include "kaleidoscope/driver/led/None.h"         // for cRGB, BaseProps, CRGB, None
 #include "kaleidoscope/driver/mcu/Base.h"         // for BaseProps
 #include "kaleidoscope/driver/mcu/None.h"         // for None
 #include "kaleidoscope/driver/storage/Base.h"     // for BaseProps

src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp

@@ -19,8 +19,8 @@
 #include "kaleidoscope/device/virtual/DefaultHIDReportConsumer.h"
 
 // From KeyboardioHID:
-#include <HID-Settings.h>          // for HID_REPORTID_NKRO_K...
+#include <HID-Settings.h>          // for HID_REPORTID_NKRO_KEYBOARD
-#include <MultiReport/Keyboard.h>  // for HID_KeyboardReport_...
+#include <MultiReport/Keyboard.h>  // for HID_KeyboardReport_Data_t, (anonymous u...
 // From system:
 #include <stdint.h>  // for uint8_t
 // From Arduino core:
@@ -32,8 +32,8 @@
 #undef min
 #undef max
 
-#include <sstream>  // for operator<<, strings...
+#include <sstream>  // for operator<<, stringstream, basic_ostream
-#include <string>   // for char_traits, operator+
+#include <string>   // for char_traits, operator+, basic_string
 
 namespace kaleidoscope {
 

src/kaleidoscope/device/virtual/Virtual.cpp

@@ -19,27 +19,23 @@
 
 #include "kaleidoscope/device/virtual/Virtual.h"
 
-// From system:
-#include <stdint.h>  // for uint8_t, uint16_t
-#include <stdlib.h>  // for exit, size_t
-
 // From Arduino:
 #include <EEPROM.h>  // for EEPROMClass, EERef
-#include <virtual_io.h>  // for getLineOfInput, isI...
-
 // From KeyboardioHID:
 #include <HIDReportObserver.h>  // for HIDReportObserver
+// From system:
+#include <stdint.h>      // for uint8_t, uint16_t
+#include <stdlib.h>      // for exit, size_t
+#include <virtual_io.h>  // for getLineOfInput, isInte...
+#include <sstream>       // for operator<<, string
+#include <string>        // for operator==, char_traits
 
 // From Kaleidoscope:
-#include "kaleidoscope/KeyAddr.h"                                  // for MatrixAddr, MatrixA...
+#include "kaleidoscope/KeyAddr.h"                                  // for MatrixAddr, MatrixAddr...
-#include "kaleidoscope/device/virtual/DefaultHIDReportConsumer.h"  // for DefaultHIDReportCon...
+#include "kaleidoscope/device/virtual/DefaultHIDReportConsumer.h"  // for DefaultHIDReportConsumer
 #include "kaleidoscope/device/virtual/Logging.h"                   // for log_error, logging
 #include "kaleidoscope/key_defs.h"                                 // for Key_NoKey
-#include "kaleidoscope/keyswitch_state.h"                          // for IS_PRESSED, WAS_PRE...
+#include "kaleidoscope/keyswitch_state.h"                          // for IS_PRESSED, WAS_PRESSED
-
-// These must come after other headers:
-#include <sstream>  // for operator<<, string
-#include <string>   // for operator==, char_tr...
 
 // FIXME: This relates to virtual/cores/arduino/EEPROM.h.
 //        EEPROM static data must be defined here as only

src/kaleidoscope/device/virtual/VirtualHID.cpp

@@ -22,9 +22,13 @@
 // library KeyboardioHID. It replaces all hardware related stuff
 // with stub implementations.
 
+#include <stddef.h>  // for NULL
+#include <stdint.h>  // for uint8_t
+
 // From KeyboardioHID:
-#include "HID.h"
+#include "HID.h"                // for HID_, HIDSubDescriptor, HID_::(anonymous), HID, HID_REPOR...
 #include "HIDReportObserver.h"  // for HIDReportObserver
+#include "PluggableUSB.h"       // for USBSetup, EP_TYPE_INTERRUPT_IN, PluggableUSBModule
 
 #if defined(USBCON)
 

src/kaleidoscope/driver/hid/Keyboardio.h

@@ -18,9 +18,9 @@
 #pragma once
 
 #include "kaleidoscope/driver/hid/Base.h"                      // for Base, BaseProps
-#include "keyboardio/AbsoluteMouse.h"      // for AbsoluteMouse, AbsoluteMou...
+#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for AbsoluteMouse, AbsoluteMou...
-#include "keyboardio/Keyboard.h"           // for Keyboard, KeyboardProps
+#include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"       // for Keyboard, KeyboardProps
-#include "keyboardio/Mouse.h"              // for Mouse, MouseProps
+#include "kaleidoscope/driver/hid/keyboardio/Mouse.h"          // for Mouse, MouseProps
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/hid/base/Keyboard.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>  // for uint8_t
 
-#include "kaleidoscope/key_defs.h"  // for Key, Key_LeftAlt, Key_LeftControl
+#include "kaleidoscope/key_defs.h"  // for Key, Key_LeftAlt, Key_LeftControl, Key_LeftGui, Key_L...
 
 #ifndef HID_BOOT_PROTOCOL
 #define HID_BOOT_PROTOCOL 0

src/kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h

@@ -17,14 +17,10 @@
 
 #pragma once
 
-#include <stdint.h>  // for uint8_t, int8_t
+#include <KeyboardioHID.h>  // for SingleAbsoluteMouse_, SingleAbso...
+#include <stdint.h>         // for uint8_t, int8_t, uint16_t
 
-#include <KeyboardioHID.h>
+#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h"  // for AbsoluteMouse, AbsoluteMouseProps
-// From KeyboardioHID:
-#include "DeviceAPIs/AbsoluteMouseAPI.hpp"     // for AbsoluteMous...
-#include "SingleReport/SingleAbsoluteMouse.h"  // for SingleAbsolu...
-// From Kaleidoscope:
-#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h"  // for AbsoluteMouse
 
 // IWYU pragma: no_include "DeviceAPIs/AbsoluteMouseAPI.hpp"
 

src/kaleidoscope/driver/hid/keyboardio/Keyboard.h

@@ -17,16 +17,11 @@
 
 #pragma once
 
+#include <KeyboardioHID.h>  // for BootKeyboard, BootKeyboard_, Keyboard
 #include <stdint.h>         // for uint8_t, uint16_t
 
-#include <KeyboardioHID.h>
-// From KeyboardioHID:
-#include "BootKeyboard/BootKeyboard.h"    // for BootKeyboard, Boo...
-#include "MultiReport/ConsumerControl.h"  // for ConsumerControl
-#include "MultiReport/Keyboard.h"         // for Keyboard, Keyboard_
-#include "MultiReport/SystemControl.h"    // for SystemControl
 // From Kaleidoscope:
-#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, Keyboar...
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, KeyboardProps
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/hid/keyboardio/Mouse.h

@@ -17,11 +17,9 @@
 
 #pragma once
 
+#include <KeyboardioHID.h>  // for HID_MouseReport_Data_t, (anonymous union...
 #include <stdint.h>         // for int8_t, uint8_t
 
-#include <KeyboardioHID.h>
-// From KeyboardioHID:
-#include "MultiReport/Mouse.h"  // for HID_MouseReport_Data_t
 // From Kaleidoscope:
 #include "kaleidoscope/driver/hid/base/Mouse.h"  // for Mouse, MouseProps
 

src/kaleidoscope/driver/keyscanner/Base_Impl.h

@@ -21,10 +21,10 @@
 
 #include "kaleidoscope/KeyEvent.h"                // for KeyEvent
 #include "kaleidoscope/Runtime.h"                 // for Runtime, Runtime_
-#include "kaleidoscope/device/virtual/Virtual.h"  // for Device
+#include "kaleidoscope/device/device.h"           // for Device
 #include "kaleidoscope/driver/keyscanner/Base.h"  // for Base
 #include "kaleidoscope/key_defs.h"                // for Key
-#include "kaleidoscope/keyswitch_state.h"         // for keyToggledOff, keyT...
+#include "kaleidoscope/keyswitch_state.h"         // for keyToggledOff, keyToggledOn
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/led/None.h

@@ -30,7 +30,7 @@ struct cRGB {
 
 #endif
 
-#include "kaleidoscope/driver/led/Base.h"  // for Base, BaseProps (ptr only)
+#include "kaleidoscope/driver/led/Base.h"  // for Base, BaseProps
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/mcu/None.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "kaleidoscope/driver/mcu/Base.h"  // for Base, BaseProps (ptr only)
+#include "kaleidoscope/driver/mcu/Base.h"  // for Base, BaseProps
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/storage/None.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "kaleidoscope/driver/storage/Base.h"  // for Base, BaseProps (ptr o...
+#include "kaleidoscope/driver/storage/Base.h"  // for Base, BaseProps
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/hooks.cpp

@@ -14,10 +14,10 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult, EventHandlerResult::OK
 #include "kaleidoscope/event_handlers.h"        // for _FOR_EACH_EVENT_HANDLER
 #include "kaleidoscope/hooks.h"                 // for Hooks
-#include "kaleidoscope/macro_helpers.h"         // for __NL__, MAKE_TEMPLATE...
+#include "kaleidoscope/macro_helpers.h"         // for __NL__, MAKE_TEMPLATE_SIGNATURE, UNWRAP
 
 namespace kaleidoscope {
 

src/kaleidoscope/hooks.h

@@ -19,7 +19,7 @@
 #include "kaleidoscope/KeyEvent.h"                 // IWYU pragma: keep
 #include "kaleidoscope/event_handler_result.h"     // for EventHandlerResult
 #include "kaleidoscope/event_handlers.h"           // for _FOR_EACH_EVENT_HANDLER
-#include "kaleidoscope/macro_helpers.h"            // for __NL__, MAKE_TEMPLATE...
+#include "kaleidoscope/macro_helpers.h"            // for __NL__, MAKE_TEMPLATE_SIGNATURE, UNWRAP
 #include "kaleidoscope_internal/event_dispatch.h"  // IWYU pragma: keep
 
 namespace kaleidoscope {