14 files changed, 22 insertions, 12 deletions
diff --git a/doc/FUSE.txt b/doc/FUSE.txt
index 40055e5ab1..99ddd2d186 100644
--- a/doc/FUSE.txt
+++ b/doc/FUSE.txt
@@ -1,3 +1,12 @@
+Atmega32u4 Fuse/Lock Bits for Planck/Atomic/Preonic
+=========================
+
+	Low Fuse: 0x5E
+	High Fuse: 0x99
+	Extended Fuse: 0xF3
+	Lock Byte: 0xFF
+
+
 ATMega168P Fuse/Lock Bits
 =========================
 This configuration is from usbasploader's Makefile.
@@ -38,3 +47,4 @@ This configuration is from usbasploader's Makefile.
 #             |     |   +----- LB 2..1 (No memory lock features enabled)
 #             |     +--------- BLB0 2..1 (No restrictions for SPM or LPM accessing the Application section)
 #             +--------------- BLB1 2..1 (No restrictions for SPM or LPM accessing the Boot Loader section)
+
diff --git a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
index e33037b330..052517d70e 100644
--- a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define BASE 0 // default layer
 #define SYMB 1 // symbols
diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboard/ergodox_ez/keymaps/bepo/keymap.c
index dac6b7b51a..921a94d63a 100644
--- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/bepo/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_bepo.h"
+#include "keymap_bepo.h"
 
 #define BASE 0 // default layer
 #define QWER 1 // qwerty compat layer
diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
index da540c7a30..3b74d266f7 100644
--- a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "../../../../quantum/keymap_extras/keymap_norwegian.c"
+#include "keymap_norwegian.h"
 
 #define BASE 0 // default layer
 #define BASE_MAC 1 // default layer mac
diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c
index 572e03a1d5..b1cecf0ddd 100644
--- a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c
@@ -4,7 +4,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 // Layer names
 #define BASE 0 // default layer
diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
index 131796fc5d..5fcc14d518 100644
--- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "action_layer.h"
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define UC_ASYMPTOTICALLY_EQUAL_TO 0
 #define UC_DIVISION_SIGN 1
diff --git a/keyboard/ergodox_ez/keymaps/german/keymap.c b/keyboard/ergodox_ez/keymaps/german/keymap.c
index 7ec8d99cc0..3eab51f0e2 100644
--- a/keyboard/ergodox_ez/keymaps/german/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 // Layer names
 #define BASE 0 // default layer
diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
index 0c4f85a3da..5bfef59955 100644
--- a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_colemak.h"
+#include "keymap_colemak.h"
 
 enum {
     BASE = 0,
diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
index 20b085ed44..687a5cb8b5 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
@@ -9,7 +9,7 @@
 #include "keymap_nordic.h"
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
-#include "keymap_norwegian.c"
+#include "keymap_norwegian.h"
 #include "keymap_fr_ch.h"
 #include "keymap_german_osx.h"
 #include "keymap_spanish.h"
diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
index 4a9ceb4ef7..21d695894a 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c
@@ -7,7 +7,7 @@
 #include "keymap_nordic.h"
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
-#include "keymap_norwegian.c"
+#include "keymap_norwegian.h"
 #include "keymap_fr_ch.h"
 #include "keymap_german_osx.h"
 #include "keymap_spanish.h"
diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
index a734062f1c..2eaba0d7da 100644
--- a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
@@ -1,7 +1,7 @@
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_extras/keymap_neo2.h"
+#include "keymap_neo2.h"
 
 // Layer names
 #define BASE 0 // default layer
diff --git a/keyboard/planck/keymaps/lucas/keymap.c b/keyboard/planck/keymaps/lucas/keymap.c
index 7ac9c5cd08..2208780b18 100644
--- a/keyboard/planck/keymaps/lucas/keymap.c
+++ b/keyboard/planck/keymaps/lucas/keymap.c
@@ -9,7 +9,7 @@ If you have any question about this keymap feel free to shoot me a message on re
 */
 
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 #include "backlight.h"
 #include "debug.h"
 #include "action_layer.h"
diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h
index b54cb74b90..80439af347 100644
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@@ -2,7 +2,7 @@
 #define KEYMAP_NEO2
 
 #include "keymap.h"
-#include "keymap_extras/keymap_german.h"
+#include "keymap_german.h"
 
 #define NEO_A KC_D
 #define NEO_B KC_N
diff --git a/quantum/keymap_extras/keymap_norwegian.c b/quantum/keymap_extras/keymap_norwegian.h
index 018bfeae59..018bfeae59 100644
--- a/quantum/keymap_extras/keymap_norwegian.c
+++ b/quantum/keymap_extras/keymap_norwegian.h