diff --git a/hhkb/matrix.c b/hhkb/matrix.c
index a425439cc..a64065560 100644
--- a/hhkb/matrix.c
+++ b/hhkb/matrix.c
@@ -3,7 +3,6 @@
  */
 #include <avr/io.h>
 #include <util/delay.h>
-#include "keymap.h"
 #include "matrix.h"
 #include "print.h"
 
diff --git a/key_process.c b/key_process.c
index 10cac032b..5445a4a24 100644
--- a/key_process.c
+++ b/key_process.c
@@ -8,9 +8,9 @@
 #include "usb_keyboard.h"
 #include "usb_mouse.h"
 #include "print.h"
-#include "matrix_skel.h"
-#include "keymap.h"
 #include "jump_bootloader.h"
+#include "matrix_skel.h"
+#include "keymap_skel.h"
 
 #include "key_process.h"
 
diff --git a/matrix_skel.h b/matrix_skel.h
index 0d483034d..3086bded7 100644
--- a/matrix_skel.h
+++ b/matrix_skel.h
@@ -17,6 +17,8 @@ bool matrix_is_modified(void);
 bool matrix_has_ghost(void);
 /* matrix state on row */
 uint16_t matrix_get_row(int row);
+/* count keys pressed */
+int matrix_key_count(void);
 /* print matrix for debug */
 void matrix_print(void);