diff --git a/quantum/wpm.c b/quantum/wpm.c
index b2e6fe0430c..6a4e39a8d6a 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -16,7 +16,9 @@
  */
 
 #include "wpm.h"
-
+#include "timer.h"
+#include "keycode.h"
+#include "quantum_keycodes.h"
 #include <math.h>
 
 // WPM Stuff
diff --git a/quantum/wpm.h b/quantum/wpm.h
index 305d75b4508..87a55fd4223 100644
--- a/quantum/wpm.h
+++ b/quantum/wpm.h
@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #ifndef WPM_ESTIMATED_WORD_SIZE
 #    define WPM_ESTIMATED_WORD_SIZE 5