diff --git a/KeyboardioFirmware.h b/KeyboardioFirmware.h
index 6ffac297..b1919389 100644
--- a/KeyboardioFirmware.h
+++ b/KeyboardioFirmware.h
@@ -27,7 +27,6 @@ void setup();
 
 extern HARDWARE_IMPLEMENTATION KeyboardHardware;
 
-extern const Key keymaps[KEYMAPS][ROWS][COLS];
 extern uint8_t primary_keymap;
 extern uint8_t temporary_keymap;
 
diff --git a/KeyboardioFirmware.ino b/KeyboardioFirmware.ino
index 54fec12b..40f1c683 100644
--- a/KeyboardioFirmware.ino
+++ b/KeyboardioFirmware.ino
@@ -7,7 +7,6 @@
 #include "KeyboardioHID.h"
 
 
-const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
 uint8_t primary_keymap = 0;
 uint8_t temporary_keymap = 0;
 
diff --git a/key_events.cpp b/key_events.cpp
index e37bade8..1010adcf 100644
--- a/key_events.cpp
+++ b/key_events.cpp
@@ -1,5 +1,7 @@
 #include "key_events.h"
 
+const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
+
 void handle_synthetic_key_event(uint8_t switchState, Key mappedKey) {
     if (mappedKey.flags & IS_MOUSE_KEY && !( mappedKey.rawKey & KEY_MOUSE_WARP) ) {
         handle_mouse_key_event(switchState, mappedKey);
diff --git a/key_events.h b/key_events.h
index a05aff0e..b6fc2049 100644
--- a/key_events.h
+++ b/key_events.h
@@ -6,6 +6,8 @@
 #include "MouseWrapper.h"
 #include "LEDControl.h"
 #include "Storage.h"
+#include "keymaps.h"
+#include "generated/keymaps.h"
 
 extern const Key keymaps[KEYMAPS][ROWS][COLS];
 extern uint8_t primary_keymap;