diff --git a/src/kaleidoscope/driver/keyscanner/ATmega.h b/src/kaleidoscope/driver/keyscanner/ATmega.h
index 75d4a1d7..9b0b3897 100644
--- a/src/kaleidoscope/driver/keyscanner/ATmega.h
+++ b/src/kaleidoscope/driver/keyscanner/ATmega.h
@@ -43,7 +43,8 @@
 #endif // ifndef KALEIDOSCOPE_VIRTUAL_BUILD
 
 #define ATMEGA_KEYSCANNER_BOILERPLATE                                                                   \
-  KEYSCANNER_PROPS_BOILERPLATE(kaleidoscope::Device::KeyScannerProps);                                  \
+  const uint8_t kaleidoscope::Device::KeyScannerProps::matrix_rows;                 \
+  const uint8_t kaleidoscope::Device::KeyScannerProps::matrix_columns; \
   constexpr uint8_t kaleidoscope::Device::KeyScannerProps::matrix_row_pins[matrix_rows];                \
   constexpr uint8_t kaleidoscope::Device::KeyScannerProps::matrix_col_pins[matrix_columns];             \
   template<>                                                                                            \
diff --git a/src/kaleidoscope/driver/keyscanner/Base.h b/src/kaleidoscope/driver/keyscanner/Base.h
index f9094ffb..08acce17 100644
--- a/src/kaleidoscope/driver/keyscanner/Base.h
+++ b/src/kaleidoscope/driver/keyscanner/Base.h
@@ -27,10 +27,6 @@
   static constexpr uint8_t matrix_columns = COLS_;          \
   typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
 
-#define KEYSCANNER_PROPS_BOILERPLATE(BOARD)         \
-  const uint8_t BOARD::matrix_rows;                 \
-  const uint8_t BOARD::matrix_columns;
-
 namespace kaleidoscope {
 namespace driver {
 namespace keyscanner {
@@ -38,7 +34,6 @@ namespace keyscanner {
 struct BaseProps {
   static constexpr uint8_t matrix_rows = 0;
   static constexpr uint8_t matrix_columns = 0;
-
   typedef MatrixAddr<matrix_rows, matrix_columns> KeyAddr;
 };