Merge remote-tracking branch 'origin/develop' into xap

keyboards/capsunlocked/cu75/cu75.c

@@ -2,7 +2,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "cu75.h"
-#include "keymap.h"
 #include "debug.h"
 #include "../lfkeyboards/issi.h"
 #include "../lfkeyboards/TWIlib.h"

keyboards/gboards/butterstick/sten.h

@@ -5,9 +5,10 @@
 //
 // Amen.
 
+#pragma once
+
 #include QMK_KEYBOARD_H
 #include "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 

keyboards/gboards/engine/engine.h

@@ -10,9 +10,8 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+#include QMK_KEYBOARD_H
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>

keyboards/gboards/g/engine.h

@@ -10,9 +10,9 @@
         crap is removed where possible
 */
 
-#include QMK_KEYBOARD_H
 #pragma once
-#include "keymap.h"
+
+#include QMK_KEYBOARD_H
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>

keyboards/gboards/georgi/sten.h

@@ -4,10 +4,10 @@
 // the slave and the master. Until we return from main.
 //
 // Amen.
+#pragma once
 
 #include QMK_KEYBOARD_H
 #include "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 

keyboards/handwired/arrow_pad/arrow_pad.h

@@ -1,13 +1,6 @@
 #pragma once
 
 #include "quantum.h"
-#include "matrix.h"
-#include "keymap.h"
-#ifdef BACKLIGHT_ENABLE
-	#include "backlight.h"
-#endif
-#include <avr/io.h>
-#include <stddef.h>
 
 #define XXX KC_NO
 

keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c

@@ -2,7 +2,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "lfk65_hs.h"
-#include "keymap.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {

keyboards/lfkeyboards/lfk87/lfk87.c

@@ -3,7 +3,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "lfk87.h"
-#include "keymap.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"

keyboards/lfkeyboards/mini1800/mini1800.c

@@ -3,7 +3,6 @@
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "mini1800.h"
-#include "keymap.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"

keyboards/lfkeyboards/smk65/revb/revb.c

@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
 #include "smk65.h"
-#include "keymap.h"
 #include "debug.h"
 #include "issi.h"
 #include "TWIlib.h"