From a27a4170fecd0884025138355d02268da0e37b52 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 10 Feb 2019 17:44:31 +0000
Subject: move #includes closer to where they're used

---
 Model01-Firmware.ino | 20 +++++++++++---------
 keymap-wrapper.h     |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 184ce0f..21ea742 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -5,18 +5,11 @@
 #endif
 
 #include "Kaleidoscope.h"
-#include "Kaleidoscope-EEPROM-Settings.h"
-#include "Kaleidoscope-FocusSerial.h"
-#include "Kaleidoscope-MouseKeys.h"
-#include "Kaleidoscope-Macros.h"
-#include "Kaleidoscope-LEDControl.h"
-#include "Kaleidoscope-LEDEffect-BootGreeting.h"
-#include "Kaleidoscope-Model01-TestMode.h"
 #include "Kaleidoscope-HostPowerManagement.h"
-#include "Kaleidoscope-MagicCombo.h"
-#include "Kaleidoscope-USB-Quirks.h"
+
 
 /* macros */
+#include "Kaleidoscope-Macros.h"
 
 enum { MACRO_VERSION_INFO,
        MACRO_ANY
@@ -56,6 +49,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
 }
 
 /* power management */
+#include "Kaleidoscope-LEDControl.h"
 
 void toggleLedsOnSuspendResume(kaleidoscope::plugin::HostPowerManagement::Event event) {
   switch (event) {
@@ -78,6 +72,8 @@ void hostPowerManagementEventHandler(kaleidoscope::plugin::HostPowerManagement::
 }
 
 /* combos */
+#include "Kaleidoscope-MagicCombo.h"
+#include "Kaleidoscope-USB-Quirks.h"
 
 enum {
   // Toggle between Boot (6-key rollover; for BIOSes and early boot) and NKRO
@@ -105,6 +101,12 @@ static DakkarColor DakkarColorDark(color_keymaps,dark_colors);
 static DakkarColor DakkarColorBright(color_keymaps,bright_colors);
 
 /* plugins */
+#include "Kaleidoscope-EEPROM-Settings.h"
+#include "Kaleidoscope-FocusSerial.h"
+#include "Kaleidoscope-MouseKeys.h"
+#include "Kaleidoscope-LEDEffect-BootGreeting.h"
+#include "Kaleidoscope-Model01-TestMode.h"
+
 KALEIDOSCOPE_INIT_PLUGINS(
   EEPROMSettings,
 
diff --git a/keymap-wrapper.h b/keymap-wrapper.h
index 82271a0..dbce4d1 100644
--- a/keymap-wrapper.h
+++ b/keymap-wrapper.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Kaleidoscope-MouseKeys.h"
+
 enum { PRIMARY, NUMPAD, FUNCTION, FVWM }; // layers
 
 #define PRIMARY_KEYMAP_QWERTY
-- 
cgit v1.2.3