diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c
index 2e26f8605e..6138d44c95 100644
--- a/keyboards/keychron/q10/q10.c
+++ b/keyboards/keychron/q10/q10.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b1111111111111111,
diff --git a/keyboards/keychron/q12/q12.c b/keyboards/keychron/q12/q12.c
index 47efe941dd..2f7387f863 100644
--- a/keyboards/keychron/q12/q12.c
+++ b/keyboards/keychron/q12/q12.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 // clang-format off
 const matrix_row_t matrix_mask[] = {
diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c
index 80d900ba69..9cc795e0dc 100644
--- a/keyboards/keychron/q5/q5.c
+++ b/keyboards/keychron/q5/q5.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111111,
diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c
index a703f77fea..f4ff2a2e61 100644
--- a/keyboards/keychron/q6/q6.c
+++ b/keyboards/keychron/q6/q6.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b11111111111111111111,
diff --git a/keyboards/keychron/q65/q65.c b/keyboards/keychron/q65/q65.c
index 64b9b14257..2c2fe5ff4a 100644
--- a/keyboards/keychron/q65/q65.c
+++ b/keyboards/keychron/q65/q65.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b1111111111111111,
diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c
index f2a6f645db..bce9389336 100644
--- a/keyboards/keychron/q8/q8.c
+++ b/keyboards/keychron/q8/q8.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c
index 45d724c528..b23f507d3b 100644
--- a/keyboards/keychron/q9/q9.c
+++ b/keyboards/keychron/q9/q9.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/v1/v1.c b/keyboards/keychron/v1/v1.c
index 0a32a6181f..44f6099155 100644
--- a/keyboards/keychron/v1/v1.c
+++ b/keyboards/keychron/v1/v1.c
@@ -38,6 +38,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
 #endif
 
 #if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS)
+#include "keychron_common.h"
 
 void keyboard_post_init_kb(void) {
     keyboard_post_init_keychron();
diff --git a/keyboards/keychron/v10/v10.c b/keyboards/keychron/v10/v10.c
index 2e26f8605e..6138d44c95 100644
--- a/keyboards/keychron/v10/v10.c
+++ b/keyboards/keychron/v10/v10.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b1111111111111111,
diff --git a/keyboards/keychron/v2/v2.c b/keyboards/keychron/v2/v2.c
index f2a6f645db..bce9389336 100644
--- a/keyboards/keychron/v2/v2.c
+++ b/keyboards/keychron/v2/v2.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/v3/v3.c b/keyboards/keychron/v3/v3.c
index e9e3b837eb..930910d1d2 100644
--- a/keyboards/keychron/v3/v3.c
+++ b/keyboards/keychron/v3/v3.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 // clang-format off
 
diff --git a/keyboards/keychron/v5/v5.c b/keyboards/keychron/v5/v5.c
index 80d900ba69..9cc795e0dc 100644
--- a/keyboards/keychron/v5/v5.c
+++ b/keyboards/keychron/v5/v5.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111111,
diff --git a/keyboards/keychron/v6/v6.c b/keyboards/keychron/v6/v6.c
index a8272c9708..8740fc0698 100644
--- a/keyboards/keychron/v6/v6.c
+++ b/keyboards/keychron/v6/v6.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 // clang-format off
 const matrix_row_t matrix_mask[] = {
diff --git a/keyboards/keychron/v8/v8.c b/keyboards/keychron/v8/v8.c
index b7518a60af..5377a882e0 100644
--- a/keyboards/keychron/v8/v8.c
+++ b/keyboards/keychron/v8/v8.c
@@ -15,6 +15,7 @@
  */
 
 #include "quantum.h"
+#include "keychron_common.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,