diff --git a/src/kaleidoscope/hardware/ATMegaKeyboard.h b/src/kaleidoscope/hardware/ATMegaKeyboard.h
index 54cc51dd..e4874146 100644
--- a/src/kaleidoscope/hardware/ATMegaKeyboard.h
+++ b/src/kaleidoscope/hardware/ATMegaKeyboard.h
@@ -50,6 +50,7 @@ struct cRGB {
   static const int8_t matrix_columns = NUM_ARGS(COL_PINS_);              \
   static constexpr uint8_t matrix_row_pins[matrix_rows] =  ROW_PINS_;    \
   static constexpr uint8_t matrix_col_pins[matrix_columns] =  COL_PINS_; \
+  typedef MatrixAddr<NUM_ARGS(ROW_PINS_), NUM_ARGS(COL_PINS_)> KeyAddr;  \
                                                                          \
   static uint16_t previousKeyState_[matrix_rows];                        \
   static uint16_t keyState_[matrix_rows];                                \
diff --git a/src/kaleidoscope/hardware/kbdfans/KBD4x.h b/src/kaleidoscope/hardware/kbdfans/KBD4x.h
index b1c4a13c..cd5dda9d 100644
--- a/src/kaleidoscope/hardware/kbdfans/KBD4x.h
+++ b/src/kaleidoscope/hardware/kbdfans/KBD4x.h
@@ -45,7 +45,6 @@ class KBD4x: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }
diff --git a/src/kaleidoscope/hardware/olkb/Planck.h b/src/kaleidoscope/hardware/olkb/Planck.h
index 47540244..680527d6 100644
--- a/src/kaleidoscope/hardware/olkb/Planck.h
+++ b/src/kaleidoscope/hardware/olkb/Planck.h
@@ -42,7 +42,6 @@ class Planck: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }
diff --git a/src/kaleidoscope/hardware/softhruf/Splitography.h b/src/kaleidoscope/hardware/softhruf/Splitography.h
index 1078a8a3..0ab8f2cd 100644
--- a/src/kaleidoscope/hardware/softhruf/Splitography.h
+++ b/src/kaleidoscope/hardware/softhruf/Splitography.h
@@ -51,7 +51,6 @@ class Splitography: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }
diff --git a/src/kaleidoscope/hardware/technomancy/Atreus.h b/src/kaleidoscope/hardware/technomancy/Atreus.h
index 4e5fb477..46900f68 100644
--- a/src/kaleidoscope/hardware/technomancy/Atreus.h
+++ b/src/kaleidoscope/hardware/technomancy/Atreus.h
@@ -65,7 +65,6 @@ class Atreus: public kaleidoscope::hardware::ATMegaKeyboard {
 
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }
diff --git a/src/kaleidoscope/hardware/technomancy/Atreus2.h b/src/kaleidoscope/hardware/technomancy/Atreus2.h
index 170a7d61..a61f6930 100644
--- a/src/kaleidoscope/hardware/technomancy/Atreus2.h
+++ b/src/kaleidoscope/hardware/technomancy/Atreus2.h
@@ -43,7 +43,6 @@ class Atreus2: public kaleidoscope::hardware::ATMegaKeyboard {
   )
   static constexpr int8_t led_count = 0;
 
-  typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
   static constexpr int8_t numKeys() {
     return matrix_columns * matrix_rows;
   }