Merge pull request #1138 from gedankenexperimenter/includes-reorg

Reorganize header includes with help from `include-what-you-use`

examples/Features/GhostInTheFirmware/GhostInTheFirmware.ino

@@ -16,6 +16,7 @@
  */
 
 #include <Kaleidoscope.h>
+#include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-GhostInTheFirmware.h>
 #include <Kaleidoscope-LED-Stalker.h>
 #include <Kaleidoscope-Macros.h>

examples/LEDs/Colormap/Colormap.ino

@@ -20,6 +20,7 @@
 #include <Kaleidoscope-Colormap.h>
 #include <Kaleidoscope-FocusSerial.h>
 #include <Kaleidoscope-LED-Palette-Theme.h>
+#include <Kaleidoscope-LEDControl.h>
 
 // *INDENT-OFF*
 KEYMAPS(

examples/LEDs/LED-Brightness/LED-Brightness.ino

@@ -16,6 +16,7 @@
  */
 
 #include <Kaleidoscope.h>
+#include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LEDEffect-Rainbow.h>
 #include <Kaleidoscope-Macros.h>
 

examples/LEDs/LEDEffects/LEDEffects.ino

@@ -16,6 +16,7 @@
  */
 
 #include <Kaleidoscope.h>
+#include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LEDEffects.h>
 
 // *INDENT-OFF*

plugins/Kaleidoscope-AutoShift/src/Kaleidoscope-AutoShift.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/AutoShift.h>
+#include "kaleidoscope/plugin/AutoShift.h"  // IWYU pragma: export

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

@@ -17,11 +17,14 @@
 
 #include "kaleidoscope/plugin/AutoShift.h"
 
-#include "kaleidoscope/KeyAddr.h"
+#include "kaleidoscope/KeyAddr.h"          // for KeyAddr, MatrixAddr
-#include "kaleidoscope/key_defs.h"
+#include "kaleidoscope/KeyEvent.h"         // for KeyEvent
-#include "kaleidoscope/KeyEvent.h"
+#include "kaleidoscope/KeyEventTracker.h"  // for KeyEventTracker
-#include "kaleidoscope/keyswitch_state.h"
+#include "kaleidoscope/Runtime.h"          // for Runtime, Runtime_
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/key_defs.h"         // for Key, Key_0, Key_1, Key_A
+#include "kaleidoscope/keyswitch_state.h"  // for keyToggledOn, keyIsInjected
+
+// IWYU pragma: no_include "HIDAliases.h"
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,9 +17,14 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint8_t, uint16_t
-#include "kaleidoscope/KeyEventTracker.h"
+
-#include "kaleidoscope/KeyAddrEventQueue.h"
+#include "kaleidoscope/KeyAddrEventQueue.h"     // for KeyAddrEventQueue
+#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
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -15,12 +15,17 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/plugin/AutoShift.h"
+#include "kaleidoscope/plugin/AutoShift.h"  // IWYU pragma: associated
 
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <Arduino.h>                              // for PSTR, strcmp_P, str...
-#include <Kaleidoscope-FocusSerial.h>
+#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"
+#include "kaleidoscope/Runtime.h"                 // for Runtime, Runtime_
+#include "kaleidoscope/device/Base.h"             // for Base<>::Storage
+#include "kaleidoscope/device/virtual/Virtual.h"  // for VirtualProps::Storage
+#include "kaleidoscope/event_handler_result.h"    // for EventHandlerResult
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-CharShift/src/Kaleidoscope-CharShift.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/CharShift.h>
+#include "kaleidoscope/plugin/CharShift.h"  // IWYU pragma: export

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

@@ -17,15 +17,21 @@
 
 #include "kaleidoscope/plugin/CharShift.h"
 
-#include <Kaleidoscope-Ranges.h>
+#include <Arduino.h>                                      // for F, __FlashS...
-#include <Kaleidoscope-FocusSerial.h>
+#include <Kaleidoscope-FocusSerial.h>                     // for Focus, Focu...
-
+#include <Kaleidoscope-Ranges.h>                          // for CS_FIRST
-#include "kaleidoscope/KeyAddr.h"
+
-#include "kaleidoscope/key_defs.h"
+#include "kaleidoscope/KeyAddrMap.h"                      // for KeyAddrMap<...
-#include "kaleidoscope/KeyEvent.h"
+#include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
-#include "kaleidoscope/keyswitch_state.h"
+#include "kaleidoscope/KeyMap.h"                          // for KeyMap
-#include "kaleidoscope/progmem_helpers.h"
+#include "kaleidoscope/LiveKeys.h"                        // for LiveKeys
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/Runtime.h"                         // for Runtime
+#include "kaleidoscope/device/Base.h"                     // for Base<>::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/keyswitch_state.h"                 // for keyToggledOff
+#include "kaleidoscope/progmem_helpers.h"                 // for cloneFromPr...
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,9 +17,14 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <Kaleidoscope-Ranges.h>                // for CS_FIRST
-
+#include <stdint.h>                             // for uint8_t
-#include <Kaleidoscope-Ranges.h>
+
+#include "Arduino.h"                            // for PROGMEM
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/Colormap.h>
+#include "kaleidoscope/plugin/Colormap.h"  // IWYU pragma: export

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

@@ -15,11 +15,18 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "kaleidoscope/plugin/Colormap.h"
 
-#include <Kaleidoscope-Colormap.h>
+#include <Arduino.h>                            // for F, PSTR, __FlashStrin...
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
-#include <Kaleidoscope-FocusSerial.h>
+#include <Kaleidoscope-LED-Palette-Theme.h>     // for LEDPaletteTheme
-#include "kaleidoscope/layers.h"
+#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/layers.h"                // for Layer, Layer_
+#include "kaleidoscope/plugin/LEDControl.h"     // for LEDControl
 
 namespace kaleidoscope {
 namespace plugin {

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

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

plugins/Kaleidoscope-Cycle/src/Kaleidoscope-Cycle.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/Cycle.h>
+#include "kaleidoscope/plugin/Cycle.h"  // IWYU pragma: export

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

@@ -15,10 +15,19 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/plugin/Cycle.h"
-#include <Kaleidoscope-Cycle.h>
+
-#include <Kaleidoscope-FocusSerial.h>
+#include <Arduino.h>                            // for F, __FlashStringHelper
-#include "kaleidoscope/keyswitch_state.h"
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
+#include <Kaleidoscope-Ranges.h>                // for CYCLE
+#include <stdint.h>                             // for uint8_t
+
+#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/key_defs.h"              // for Key, Key_Backspace
+#include "kaleidoscope/keyswitch_state.h"       // for INJECTED, IS_PRESSED
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,8 +17,15 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <Kaleidoscope-Ranges.h>                // for CYCLE
-#include <Kaleidoscope-Ranges.h>
+#include <stdint.h>                             // for uint8_t
+
+#include "Arduino.h"                            // for PROGMEM
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 constexpr Key Key_Cycle = Key(kaleidoscope::ranges::CYCLE);
 

plugins/Kaleidoscope-CycleTimeReport/src/Kaleidoscope-CycleTimeReport.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/CycleTimeReport.h>
+#include "kaleidoscope/plugin/CycleTimeReport.h"  // IWYU pragma: export

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

@@ -15,8 +15,14 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-CycleTimeReport.h>
+#include "kaleidoscope/plugin/CycleTimeReport.h"
-#include <Kaleidoscope-FocusSerial.h>
+
+#include <Arduino.h>                            // for micros, F, __FlashStr...
+#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
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,7 +17,10 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint32_t, uint16_t
+
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include <Arduino.h>
+#include <Arduino.h>  // for PROGMEM, F
+#include <stddef.h>   // for size_t
 
 #ifndef ARDUINOTRACE_ENABLE
 #define ARDUINOTRACE_ENABLE 1

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

@@ -17,14 +17,13 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
-
 #ifndef ARDUINOTRACE_SERIAL
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 #define ARDUINOTRACE_SERIAL DebugStderr
 #endif
 #endif
 
-#include "ArduinoTrace.h"
+#include "ArduinoTrace.h"    // for ARDUINOTRACE_INIT
+#include <HardwareSerial.h>  // for DebugStderrSerial, DebugStderr
 
 ARDUINOTRACE_INIT(9600)

plugins/Kaleidoscope-DynamicMacros/src/Kaleidoscope-DynamicMacros.h

@@ -16,5 +16,6 @@
 
 #pragma once
 
-#include "Kaleidoscope-Macros.h"
+#include <Kaleidoscope-Macros.h> // IWYU pragma: keep
-#include "kaleidoscope/plugin/DynamicMacros.h"
+
+#include "kaleidoscope/plugin/DynamicMacros.h"  // IWYU pragma: export

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

@@ -14,9 +14,23 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Kaleidoscope-DynamicMacros.h"
+#include "kaleidoscope/plugin/DynamicMacros.h"
-#include "Kaleidoscope-FocusSerial.h"
+
-#include "kaleidoscope/keyswitch_state.h"
+#include <Arduino.h>                                // for delay, PSTR, strc...
+#include <Kaleidoscope-FocusSerial.h>               // for Focus, FocusSerial
+#include <Kaleidoscope-Ranges.h>                    // for DYNAMIC_MACRO_FIRST
+
+#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/keyswitch_state.h"           // for INJECTED, IS_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
 
 namespace kaleidoscope {
 namespace plugin {
@@ -176,7 +190,7 @@ void DynamicMacros::play(uint8_t macro_id) {
     case MACRO_ACTION_STEP_TAP_SEQUENCE: {
       while (true) {
         key.setFlags(0);
-        key.setKeyCode(pgm_read_byte(pos++));
+        key.setKeyCode(Runtime.storage().read(pos++));
         if (key == Key_NoKey)
           break;
         tap(key);
@@ -187,7 +201,7 @@ void DynamicMacros::play(uint8_t macro_id) {
     case MACRO_ACTION_STEP_TAP_CODE_SEQUENCE: {
       while (true) {
         key.setFlags(0);
-        key.setKeyCode(pgm_read_byte(pos++));
+        key.setKeyCode(Runtime.storage().read(pos++));
         if (key.getKeyCode() == 0)
           break;
         tap(key);

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

@@ -16,11 +16,13 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <Kaleidoscope-Ranges.h>                // for DYNAMIC_MACRO_FIRST
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <stdint.h>                             // for uint16_t, uint8_t
-#include <Kaleidoscope-Ranges.h>
 
-#include "kaleidoscope/plugin/Macros/MacroSteps.h"
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 #define DM(n) ::kaleidoscope::plugin::DynamicMacrosKey(n)
 

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

@@ -17,5 +17,4 @@
 
 #pragma once
 
-#include "Kaleidoscope-TapDance.h"
+#include "kaleidoscope/plugin/DynamicTapDance.h"  // IWYU pragma: export
-#include "kaleidoscope/plugin/DynamicTapDance.h"

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

@@ -15,12 +15,21 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Kaleidoscope-DynamicTapDance.h"
+#include "kaleidoscope/plugin/DynamicTapDance.h"
-
+
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <Arduino.h>                            // for PSTR, F, __FlashStrin...
-#include "Kaleidoscope-FocusSerial.h"
+#include <Kaleidoscope-EEPROM-Settings.h>       // for EEPROMSettings
-#include "kaleidoscope/Runtime.h"
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
-#include "kaleidoscope/KeyEvent.h"
+#include <stdint.h>                             // for uint16_t, uint8_t
+
+#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/event_handler_result.h"  // for EventHandlerResult
+#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...
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,8 +17,13 @@
 
 #pragma once
 
-#include <Kaleidoscope.h>
+#include <Kaleidoscope-Ranges.h>                // for TD_FIRST, TD_LAST
-#include <Kaleidoscope-TapDance.h>
+#include <Kaleidoscope-TapDance.h>              // for TapDance, TapDance::A...
+#include <stdint.h>                             // for uint8_t, uint16_t
+
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-EEPROM-Keymap-Programmer/src/Kaleidoscope-EEPROM-Keymap-Programmer.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/EEPROM-Keymap-Programmer.h>
+#include "kaleidoscope/plugin/EEPROM-Keymap-Programmer.h"  // IWYU pragma: export

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

@@ -15,10 +15,21 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-EEPROM-Keymap-Programmer.h>
+#include "kaleidoscope/plugin/EEPROM-Keymap-Programmer.h"
-#include <Kaleidoscope-FocusSerial.h>
+
-#include "kaleidoscope/keyswitch_state.h"
+#include <Arduino.h>                            // for PSTR, strcmp_P
-#include "kaleidoscope/layers.h"
+#include <Kaleidoscope-EEPROM-Keymap.h>         // for EEPROMKeymap
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
+#include <stdint.h>                             // for uint16_t, uint8_t
+
+#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/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key, Key_0, Key_1
+#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOn, keyTogg...
+#include "kaleidoscope/layers.h"                // for Layer, Layer_
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,8 +17,12 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint16_t
-#include <Kaleidoscope-EEPROM-Keymap.h>
+
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-EEPROM-Keymap/src/Kaleidoscope-EEPROM-Keymap.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/EEPROM-Keymap.h>
+#include "kaleidoscope/plugin/EEPROM-Keymap.h"  // IWYU pragma: export

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

@@ -15,10 +15,19 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include "kaleidoscope/plugin/EEPROM-Keymap.h"
-#include <Kaleidoscope-EEPROM-Keymap.h>
+
-#include <Kaleidoscope-FocusSerial.h>
+#include <Arduino.h>                            // for PSTR, strcmp_P, F
-#include "kaleidoscope/layers.h"
+#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/Runtime.h"               // for Runtime, Runtime_
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key, Key_NoKey
+#include "kaleidoscope/layers.h"                // for Layer_, Layer, layer_...
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,8 +17,12 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint8_t, uint16_t
-#include <Kaleidoscope-EEPROM-Settings.h>
+
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-EEPROM-Settings/src/Kaleidoscope-EEPROM-Settings.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/EEPROM-Settings.h>
+#include "kaleidoscope/plugin/EEPROM-Settings.h"  // IWYU pragma: export

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

@@ -15,10 +15,17 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include "kaleidoscope/plugin/EEPROM-Settings.h"
-#include <Kaleidoscope-FocusSerial.h>
+
-#include "kaleidoscope/plugin/EEPROM-Settings/crc.h"
+#include <Arduino.h>                                  // for PSTR, strcmp_P, F
-#include "kaleidoscope/layers.h"
+#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/event_handler_result.h"        // for EventHandlerResult
+#include "kaleidoscope/layers.h"                      // for Layer, Layer_
+#include "kaleidoscope/plugin/EEPROM-Settings/crc.h"  // for CRCCalculator
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,7 +17,10 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint8_t, uint16_t
+
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-EEPROM-Settings/src/kaleidoscope/plugin/EEPROM-Settings/crc.h

@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <Arduino.h>
+#include <stdint.h>  // for uint8_t, uint16_t
 
 class CRC_ {
  public:

plugins/Kaleidoscope-Escape-OneShot/src/Kaleidoscope-Escape-OneShot.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/Escape-OneShot.h>
+#include "kaleidoscope/plugin/Escape-OneShot.h"  // IWYU pragma: export

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

@@ -15,12 +15,17 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/plugin/Escape-OneShot.h"
+#include "kaleidoscope/plugin/Escape-OneShot.h"  // IWYU pragma: associated
 
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <Arduino.h>                            // for PSTR, F, __FlashStrin...
-#include <Kaleidoscope-FocusSerial.h>
+#include <Kaleidoscope-EEPROM-Settings.h>       // for EEPROMSettings
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
+#include <stdint.h>                             // for uint16_t
 
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/Runtime.h"               // for Runtime, Runtime_
+#include "kaleidoscope/device/device.h"         // for VirtualProps::Storage
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -15,11 +15,14 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/plugin/Escape-OneShot.h"
-#include <Kaleidoscope-OneShot.h>
+
-#include <Kaleidoscope-Escape-OneShot.h>
+#include <Kaleidoscope-OneShot.h>               // for OneShot
-#include "kaleidoscope/keyswitch_state.h"
+
-#include "kaleidoscope/layers.h"
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key, Key_Escape, Key_...
+#include "kaleidoscope/keyswitch_state.h"       // for keyIsInjected, keyTog...
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,8 +17,13 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <Kaleidoscope-Ranges.h>                // for OS_CANCEL
-#include <Kaleidoscope-Ranges.h>
+#include <stdint.h>                             // for uint16_t
+
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 // DEPRECATED: `OneShotCancelKey` doesn't match our normal naming, and should
 // eventually be removed.

plugins/Kaleidoscope-FingerPainter/src/Kaleidoscope-FingerPainter.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/FingerPainter.h>
+#include "kaleidoscope/plugin/FingerPainter.h"  // IWYU pragma: export

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

@@ -15,13 +15,20 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-FingerPainter.h>
+#include "kaleidoscope/plugin/FingerPainter.h"
-
+
-#include <Kaleidoscope-EEPROM-Settings.h>
+#include <Arduino.h>                            // for PSTR, strcmp_P, F
-#include <Kaleidoscope-FocusSerial.h>
+#include <Kaleidoscope-FocusSerial.h>           // for Focus, FocusSerial
-#include <Kaleidoscope-LEDControl.h>
+#include <Kaleidoscope-LED-Palette-Theme.h>     // for LEDPaletteTheme
-#include <Kaleidoscope-LED-Palette-Theme.h>
+#include <stdint.h>                             // for uint16_t, uint8_t
-#include "kaleidoscope/keyswitch_state.h"
+#include <string.h>                             // for memcmp
+
+#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/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/keyswitch_state.h"       // for keyToggledOff
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,7 +17,12 @@
 
 #pragma once
 
-#include <Kaleidoscope-LEDControl.h>
+#include <stdint.h>                             // for uint16_t
+
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/KeyEvent.h"              // for KeyEvent
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin/LEDMode.h"        // for LEDMode
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-FirmwareDump/src/Kaleidoscope-FirmwareDump.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/FirmwareDump.h>
+#include "kaleidoscope/plugin/FirmwareDump.h"  // IWYU pragma: export

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

@@ -18,7 +18,9 @@
 #ifdef __AVR__
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include <Kaleidoscope-FirmwareDump.h>
+#include "kaleidoscope/plugin/FirmwareDump.h"
+
+#include <Arduino.h>
 #include <Kaleidoscope-FocusSerial.h>
 #include <avr/boot.h>
 

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

@@ -23,7 +23,10 @@
 
 #ifdef __AVR__
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint16_t
+
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/FocusSerial.h>
+#include "kaleidoscope/plugin/FocusSerial.h"  // IWYU pragma: export

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

@@ -15,7 +15,16 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Kaleidoscope-FocusSerial.h>
+#include "kaleidoscope/plugin/FocusSerial.h"
+
+#include <Arduino.h>                            // for __FlashStringHelper, F
+#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/hooks.h"                 // for Hooks
 
 #ifdef __AVR__
 #include <avr/pgmspace.h>

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

@@ -17,7 +17,15 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <Arduino.h>                            // for __FlashStringHelper
+#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/key_defs.h"              // for Key
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-GhostInTheFirmware/src/Kaleidoscope-GhostInTheFirmware.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include <kaleidoscope/plugin/GhostInTheFirmware.h>
+#include "kaleidoscope/plugin/GhostInTheFirmware.h"  // IWYU pragma: export

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

@@ -15,10 +15,16 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/plugin/GhostInTheFirmware.h"
-#include <Kaleidoscope-GhostInTheFirmware.h>
+
-#include "kaleidoscope/keyswitch_state.h"
+#include <stdint.h>                             // for uint16_t
-#include "kaleidoscope/progmem_helpers.h"
+
+#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/keyswitch_state.h"       // for IS_PRESSED, WAS_PRESSED
+#include "kaleidoscope/progmem_helpers.h"       // for loadFromProgmem
 
 namespace kaleidoscope {
 namespace plugin {

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

@@ -17,7 +17,11 @@
 
 #pragma once
 
-#include "kaleidoscope/Runtime.h"
+#include <stdint.h>                             // for uint16_t
+
+#include "kaleidoscope/KeyAddr.h"               // for KeyAddr
+#include "kaleidoscope/event_handler_result.h"  // for EventHandlerResult
+#include "kaleidoscope/plugin.h"                // for Plugin
 
 namespace kaleidoscope {
 namespace plugin {

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/Kaleidoscope-Hardware-Dygma-Raise.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/dygma/Raise.h"
+#include "kaleidoscope/device/dygma/Raise.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.cpp

@@ -18,15 +18,15 @@
 
 #ifdef ARDUINO_SAMD_RAISE
 
-#include "kaleidoscope/Runtime.h"
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include <Kaleidoscope-LEDControl.h>
 #include <KeyboardioHID.h>
 #include <Wire.h>
 
-#include "kaleidoscope/util/crc16.h"
+#include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/color/GammaCorrection.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"
+#include "kaleidoscope/util/crc16.h"
 
 #define I2C_CLOCK_KHZ 100
 #define I2C_FLASH_CLOCK_KHZ 100 // flashing doesn't work reliably at higher clock speeds

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/Raise.h

@@ -25,12 +25,12 @@
 
 #define CRGB(r,g,b) (cRGB){b, g, r}
 
-#include "kaleidoscope/driver/keyscanner/Base.h"
+#include "kaleidoscope/device/Base.h"
+#include "kaleidoscope/driver/bootloader/samd/Bossac.h"
 #include "kaleidoscope/driver/hid/Keyboardio.h"
+#include "kaleidoscope/driver/keyscanner/Base.h"
 #include "kaleidoscope/driver/led/Base.h"
-#include "kaleidoscope/driver/bootloader/samd/Bossac.h"
 #include "kaleidoscope/driver/storage/Flash.h"
-#include "kaleidoscope/device/Base.h"
 #include "kaleidoscope/util/flasher/KeyboardioI2CBootloader.h"
 
 namespace kaleidoscope {

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/raise/Focus.cpp

@@ -18,10 +18,12 @@
 
 #ifdef ARDUINO_SAMD_RAISE
 
-#include "kaleidoscope/Runtime.h"
-#include <Kaleidoscope-FocusSerial.h>
 #include "kaleidoscope/device/dygma/raise/Focus.h"
 
+#include <Kaleidoscope-FocusSerial.h>
+
+#include "kaleidoscope/Runtime.h"
+
 namespace kaleidoscope {
 namespace device {
 namespace dygma {

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/raise/RaiseSide.cpp

@@ -18,8 +18,9 @@
 
 #ifdef ARDUINO_SAMD_RAISE
 
+#include "kaleidoscope/device/dygma/raise/RaiseSide.h"
+
 #include <Arduino.h>
-#include "RaiseSide.h"
 
 #include "kaleidoscope/driver/color/GammaCorrection.h"
 

plugins/Kaleidoscope-Hardware-Dygma-Raise/src/kaleidoscope/device/dygma/raise/RaiseSide.h

@@ -21,6 +21,7 @@
 #ifdef ARDUINO_SAMD_RAISE
 
 #include <Arduino.h>
+
 #include "TWI.h"
 
 struct cRGB {

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/Kaleidoscope-Hardware-EZ-ErgoDox.h

@@ -17,4 +17,4 @@
  */
 
 #pragma once
-#include "kaleidoscope/device/ez/ErgoDox.h"
+#include "kaleidoscope/device/ez/ErgoDox.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.cpp

@@ -29,10 +29,10 @@
 
 #include <avr/wdt.h>
 
-#include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h"
-#include "kaleidoscope/keyswitch_state.h"
 #include "kaleidoscope/KeyEvent.h"
 #include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h"
+#include "kaleidoscope/keyswitch_state.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox.h

@@ -35,9 +35,9 @@ struct cRGB {
 
 #define CRGB(r,g,b) (cRGB){b, g, r}
 
-#include "kaleidoscope/driver/keyscanner/Base.h"
-#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
+#include "kaleidoscope/driver/keyscanner/Base.h"
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h"
 #endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.cpp

@@ -27,7 +27,10 @@
 #ifdef ARDUINO_AVR_ERGODOX
 
 #include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h"
+
+#include <Arduino.h>
 #include <avr/wdt.h>
+
 #include "kaleidoscope/device/avr/pins_and_ports.h"
 #include "kaleidoscope/device/ez/ErgoDox/i2cmaster.h"
 

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h

@@ -27,7 +27,7 @@
 
 #ifdef ARDUINO_AVR_ERGODOX
 
-#include <Arduino.h>
+#include <stdint.h>
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-EZ-ErgoDox/src/kaleidoscope/device/ez/ErgoDox/i2cmaster.cpp

@@ -10,11 +10,10 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_ERGODOX
 
-#include <inttypes.h>
-#include <compat/twi.h>
-
 #include "kaleidoscope/device/ez/ErgoDox/i2cmaster.h"
 
+#include <compat/twi.h>
+#include <inttypes.h>
 
 /* define CPU frequency in Mhz here if not defined in Makefile */
 #ifndef F_CPU

plugins/Kaleidoscope-Hardware-GD32-Eval/src/Kaleidoscope-Hardware-GD32-Eval.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/gd32/Eval.h"
+#include "kaleidoscope/device/gd32/Eval.h"  // IWYU pragma: export

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

@@ -22,10 +22,9 @@
 #include <Arduino.h>
 
 #include "kaleidoscope/device/Base.h"
-#include "kaleidoscope/driver/storage/GD32Flash.h"
-#include "kaleidoscope/driver/bootloader/gd32/Base.h"
-
 #include "kaleidoscope/device/gd32/eval/KeyScanner.h"
+#include "kaleidoscope/driver/bootloader/gd32/Base.h"
+#include "kaleidoscope/driver/storage/GD32Flash.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-GD32-Eval/src/kaleidoscope/device/gd32/eval/KeyScanner.cpp

@@ -17,8 +17,9 @@
 
 #ifdef ARDUINO_GD32F303ZE_EVAL
 
-#include "Arduino.h"
+#include <Arduino.h>
-#include "HardwareTimer.h"
+#include <HardwareTimer.h>
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/device/gd32/eval/KeyScanner.h"
 

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

@@ -19,10 +19,10 @@
 
 #ifdef ARDUINO_GD32F303ZE_EVAL
 
-#include <Arduino.h>
-
 #include "kaleidoscope/device/gd32/eval/KeyScanner.h"
 
+#include <Arduino.h>
+
 namespace kaleidoscope {
 namespace device {
 namespace gd32 {

plugins/Kaleidoscope-Hardware-KBDFans-KBD4x/src/Kaleidoscope-Hardware-KBDFans-KBD4x.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/kbdfans/KBD4x.h"
+#include "kaleidoscope/device/kbdfans/KBD4x.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-KBDFans-KBD4x/src/kaleidoscope/device/kbdfans/KBD4x.h

@@ -23,9 +23,9 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/keyscanner/ATmega.h"
-#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/src/Kaleidoscope-Hardware-Keyboardio-Atreus.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/keyboardio/Atreus2.h"
+#include "kaleidoscope/device/keyboardio/Atreus2.h"  // IWYU pragma: export

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

@@ -22,8 +22,9 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Imago/src/Kaleidoscope-Hardware-Keyboardio-Imago.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/keyboardio/Imago.h"
+#include "kaleidoscope/device/keyboardio/Imago.h"  // IWYU pragma: export

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

@@ -29,10 +29,10 @@ struct cRGB {
 
 #define CRGB(r,g,b) (cRGB){b, g, r}
 
+#include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
 #include "kaleidoscope/driver/keyscanner/ATmega.h"
 #include "kaleidoscope/driver/led/Base.h"
-#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
-#include "kaleidoscope/device/ATmega32U4Keyboard.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src/Kaleidoscope-Hardware-Keyboardio-Model01.h

@@ -15,6 +15,8 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+// IWYU pragma: private, include "kaleidoscope/device/device.h"
+
 #pragma once
 
-#include "kaleidoscope/device/keyboardio/Model01.h"
+#include "kaleidoscope/device/keyboardio/Model01.h"  // IWYU pragma: export

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

@@ -17,15 +17,25 @@
 
 #ifdef ARDUINO_AVR_MODEL01
 
-#include "Arduino.h"                                 // for PROGMEM
+#include "kaleidoscope/device/keyboardio/Model01.h"
-#include "kaleidoscope/device/keyboardio/Model01.h"  // for Model01LEDDriver...
+
-#include "kaleidoscope/driver/keyscanner/Base_Impl.h"
+// System headers
+#include <stdint.h>                                  // for uint8_t
+
+// Arduino headers
+#include <Arduino.h>                                 // for PROGMEM
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #include <KeyboardioHID.h>
 #include <avr/wdt.h>
 #endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
+// Kaleidoscope headers
+#include "kaleidoscope/driver/keyscanner/Base_Impl.h"  // IWYU pragma: keep
+
+// Kaleidoscope-Hardware-Keyboardio-Model01 headers
+#include "kaleidoscope/driver/keyboardio/Model01Side.h"
+
 namespace kaleidoscope {
 namespace device {
 namespace keyboardio {

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

@@ -15,11 +15,20 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+// IWYU pragma: private, include "kaleidoscope/device/device.h"
+
 #pragma once
 
 #ifdef ARDUINO_AVR_MODEL01
 
-#include <Arduino.h>
+// System headers
+#include <stdint.h>                                       // for uint8_t
+// Arduino headers
+#include <Arduino.h>                                      // for PROGMEM
+
+// Kaleidoscope headers
+#include "kaleidoscope/MatrixAddr.h"                      // for MatrixAddr
+#include "kaleidoscope/macro_helpers.h"                   // for RESTRICT_AR...
 
 #define CRGB(r,g,b) (cRGB){b, g, r}
 
@@ -29,12 +38,13 @@ struct cRGB {
   uint8_t r;
 };
 
-#include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/device/ATmega32U4Keyboard.h"       // for ATmega32U4K...
+#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
 
-#include "kaleidoscope/driver/keyscanner/Base.h"
+// Kaleidoscope-Hardware-Keyboardio-Model01 headers
-#include "kaleidoscope/driver/keyboardio/Model01Side.h"
+#include "kaleidoscope/driver/keyboardio/Model01Side.h"   // for keydata_t
-#include "kaleidoscope/driver/led/Base.h"
-#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
 
 namespace kaleidoscope {
 namespace device {

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

@@ -22,14 +22,18 @@
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
+#include "kaleidoscope/driver/keyboardio/Model01Side.h"
+
 #include <Arduino.h>
-#include "Model01Side.h"
 
 extern "C" {
 #include "kaleidoscope/device/keyboardio/twi.h"
 }
 
+// Kaleidoscope headers
 #include "kaleidoscope/driver/color/GammaCorrection.h"
+// Kaleidoscope-Hardware-Keyboardio-Model01 headers
+#include "kaleidoscope/driver/keyboardio/wire-protocol-constants.h"
 
 namespace kaleidoscope {
 namespace driver {

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

@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include <Arduino.h>
+// System headers
-#include "wire-protocol-constants.h"
+#include <stdint.h>  // for uint8_t, uint32_t
 
 // We allow cRGB/CRGB to be defined already when this is included.
 //
@@ -97,8 +97,6 @@ class Model01Side {
   void sendLEDBank(uint8_t bank);
   int readRegister(uint8_t cmd);
 };
-#else // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
-class Model01Side;
 #endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
 } // namespace keyboardio

plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/Kaleidoscope-Hardware-Keyboardio-Model100.h

@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/keyboardio/Model100.h"
+#include "kaleidoscope/device/keyboardio/Model100.h"  // IWYU pragma: export

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

@@ -17,14 +17,12 @@
 
 #ifdef ARDUINO_keyboardio_model_100
 
-#include "Arduino.h"                                 // for PROGMEM
+#include "kaleidoscope/device/keyboardio/Model100.h"
-#include "kaleidoscope/device/keyboardio/Model100.h"  // for Model100LEDDriver...
-#include "kaleidoscope/driver/keyscanner/Base_Impl.h"
 
-#include "Wire.h"
+#include <Arduino.h>                                   // for PROGMEM
+#include <Wire.h>                                      // for Wire
 
-#ifndef KALEIDOSCOPE_VIRTUAL_BUILD
+#include "kaleidoscope/driver/keyscanner/Base_Impl.h"  // For Base<>
-#endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
 namespace kaleidoscope {
 namespace device {

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

@@ -34,14 +34,14 @@ struct cRGB {
 };
 
 
-#include "kaleidoscope/driver/keyscanner/Base.h"
-#include "kaleidoscope/driver/storage/GD32Flash.h"
-#include "kaleidoscope/driver/keyboardio/Model100Side.h"
-#include "kaleidoscope/driver/led/Base.h"
 #include "kaleidoscope/device/Base.h"
-#include "kaleidoscope/driver/hid/Keyboardio.h"
-#include "kaleidoscope/driver/hid/Base.h"
 #include "kaleidoscope/driver/bootloader/gd32/Base.h"
+#include "kaleidoscope/driver/hid/Base.h"
+#include "kaleidoscope/driver/hid/Keyboardio.h"
+#include "kaleidoscope/driver/keyboardio/Model100Side.h"
+#include "kaleidoscope/driver/keyscanner/Base.h"
+#include "kaleidoscope/driver/led/Base.h"
+#include "kaleidoscope/driver/storage/GD32Flash.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/driver/keyboardio/Model100Side.cpp

@@ -22,12 +22,14 @@
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
+#include "kaleidoscope/driver/keyboardio/Model100Side.h"
+
 #include <Arduino.h>
-#include "Model100Side.h"
 #include <Wire.h>
 #include <utility/twi.h>
 
 #include "kaleidoscope/driver/color/GammaCorrection.h"
+#include "kaleidoscope/driver/keyboardio/wire-protocol-constants.h"
 
 namespace kaleidoscope {
 namespace driver {

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

@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include <Arduino.h>
+#include <Arduino.h>  // for byte
-#include "wire-protocol-constants.h"
+#include <stdint.h>   // for uint8_t, uint32_t
 
 // We allow cRGB/CRGB to be defined already when this is included.
 //
@@ -105,8 +105,6 @@ class Model100Side {
   int readRegister(uint8_t cmd);
   uint8_t writeData(uint8_t* data, uint8_t length);
 };
-#else // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
-class Model100Side;
 #endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
 } // namespace keyboardio

plugins/Kaleidoscope-Hardware-OLKB-Planck/src/Kaleidoscope-Hardware-OLKB-Planck.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/olkb/Planck.h"
+#include "kaleidoscope/device/olkb/Planck.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-OLKB-Planck/src/kaleidoscope/device/olkb/Planck.cpp

@@ -18,6 +18,8 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_PLANCK
 
+#include "kaleidoscope/device/olkb/Planck.h"
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"
 

plugins/Kaleidoscope-Hardware-OLKB-Planck/src/kaleidoscope/device/olkb/Planck.h

@@ -21,8 +21,9 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/softhruf/Splitography.h"
+#include "kaleidoscope/device/softhruf/Splitography.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.cpp

@@ -25,6 +25,8 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_SPLITOGRAPHY
 
+#include "kaleidoscope/device/softhruf/Splitography.h"
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"
 

plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/src/kaleidoscope/device/softhruf/Splitography.h

@@ -30,9 +30,9 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/keyscanner/ATmega.h"
-#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/Kaleidoscope-Hardware-Technomancy-Atreus.h

@@ -24,4 +24,4 @@
 #define KALEIDOSCOPE_HARDWARE_ATREUS_PINOUT_ASTAR 1
 #endif
 
-#include "kaleidoscope/device/technomancy/Atreus.h"
+#include "kaleidoscope/device/technomancy/Atreus.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.cpp

@@ -27,6 +27,8 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_ATREUS
 
+#include "kaleidoscope/device/technomancy/Atreus.h"
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"
 

plugins/Kaleidoscope-Hardware-Technomancy-Atreus/src/kaleidoscope/device/technomancy/Atreus.h

@@ -28,9 +28,10 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
-#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/Caterina.h"
+#include "kaleidoscope/driver/bootloader/avr/HalfKay.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-gHeavy-ButterStick/src/Kaleidoscope-Hardware-gHeavy-ButterStick.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/gheavy/ButterStick.h"
+#include "kaleidoscope/device/gheavy/ButterStick.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-gHeavy-ButterStick/src/kaleidoscope/device/gheavy/ButterStick.cpp

@@ -18,6 +18,8 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_GHEAVY_BUTTERSTICK
 
+#include "kaleidoscope/device/gheavy/ButterStick.h"
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"
 

plugins/Kaleidoscope-Hardware-gHeavy-ButterStick/src/kaleidoscope/device/gheavy/ButterStick.h

@@ -23,9 +23,9 @@
 
 #include <Arduino.h>
 
-#include "kaleidoscope/driver/keyscanner/ATmega.h"
-#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
 #include "kaleidoscope/device/ATmega32U4Keyboard.h"
+#include "kaleidoscope/driver/bootloader/avr/FLIP.h"
+#include "kaleidoscope/driver/keyscanner/ATmega.h"
 
 namespace kaleidoscope {
 namespace device {

plugins/Kaleidoscope-Hardware-gHeavy-FaunchPad/src/Kaleidoscope-Hardware-gHeavy-FaunchPad.h

@@ -18,4 +18,4 @@
 
 #pragma once
 
-#include "kaleidoscope/device/gheavy/FaunchPad.h"
+#include "kaleidoscope/device/gheavy/FaunchPad.h"  // IWYU pragma: export

plugins/Kaleidoscope-Hardware-gHeavy-FaunchPad/src/kaleidoscope/device/gheavy/FaunchPad.cpp

@@ -18,6 +18,8 @@
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 #ifdef ARDUINO_AVR_GHEAVY_FAUNCHPAD
 
+#include "kaleidoscope/device/gheavy/FaunchPad.h"
+
 #include "kaleidoscope/Runtime.h"
 #include "kaleidoscope/driver/keyscanner/Base_Impl.h"