diff --git a/keyboard/ergodox_ez/keymaps/guni/keymap.c b/keyboards/ergodox/keymaps/guni/keymap.c
similarity index 98%
rename from keyboard/ergodox_ez/keymaps/guni/keymap.c
rename to keyboards/ergodox/keymaps/guni/keymap.c
index fc8567e6..f33829b8 100644
--- a/keyboard/ergodox_ez/keymaps/guni/keymap.c
+++ b/keyboards/ergodox/keymaps/guni/keymap.c
@@ -1,6 +1,7 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
+#include "bootloader.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KEYMAP(  // layer 0 : default
@@ -158,7 +159,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 };
 
 // Runs just one time when the keyboard initializes.
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
 
 };