diff --git a/KeyboardioFirmware.h b/KeyboardioFirmware.h
index 9241345e..9e9fd2c4 100644
--- a/KeyboardioFirmware.h
+++ b/KeyboardioFirmware.h
@@ -27,7 +27,7 @@ void setup();
 #include "KeyboardConfig.h"
 #include "led_control.h"
 #include "generated/keymaps.h"
-#include "debouncing.h"
+#include "matrix_state.h"
 #include "mouse_movement.h"
 #include "storage.h"
 
diff --git a/debouncing.cpp b/matrix_state.cpp
similarity index 93%
rename from debouncing.cpp
rename to matrix_state.cpp
index 79c76087..2457be44 100644
--- a/debouncing.cpp
+++ b/matrix_state.cpp
@@ -1,6 +1,4 @@
-
-#include <Arduino.h>
-#include "debouncing.h"
+#include "matrix_state.h"
 // switch debouncing and status
 
 
diff --git a/debouncing.h b/matrix_state.h
similarity index 90%
rename from debouncing.h
rename to matrix_state.h
index c3d1922d..8466781b 100644
--- a/debouncing.h
+++ b/matrix_state.h
@@ -1,6 +1,8 @@
 #pragma once
 // switch debouncing and status
 
+#include <Arduino.h>
+
 
 boolean key_was_pressed (byte keyState);
 boolean key_is_pressed (byte keyState);
diff --git a/mouse_movement.cpp b/mouse_movement.cpp
index b78759f5..df66ebf6 100644
--- a/mouse_movement.cpp
+++ b/mouse_movement.cpp
@@ -2,10 +2,6 @@
 // Mouse-related methods
 //
 //
-#include "Arduino.h"
-#include "key_defs.h"
-#include "debouncing.h"
-#include "HID-Project.h"
 #include "mouse_movement.h"
 
 
diff --git a/mouse_movement.h b/mouse_movement.h
index c47470f3..56d1d6c7 100644
--- a/mouse_movement.h
+++ b/mouse_movement.h
@@ -1,6 +1,10 @@
 
 #pragma once
 
+#include "Arduino.h"
+#include "key_defs.h"
+#include "matrix_state.h"
+#include "HID-Project.h"
 // Mouse-related 'public' API methods
 
 double mouse_accel (double cycles);