diff --git a/drivers/avr/ssd1306.c b/drivers/avr/ssd1306.c
index 61d7a9953113..2e3e153ba2e7 100644
--- a/drivers/avr/ssd1306.c
+++ b/drivers/avr/ssd1306.c
@@ -14,6 +14,8 @@
 #    include "sendchar.h"
 #    include "timer.h"
 
+struct CharacterMatrix display;
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes
diff --git a/drivers/avr/ssd1306.h b/drivers/avr/ssd1306.h
index 9669d1b7e77e..9131afcf6122 100644
--- a/drivers/avr/ssd1306.h
+++ b/drivers/avr/ssd1306.h
@@ -66,7 +66,7 @@ struct CharacterMatrix {
     bool     dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(void);
 void iota_gfx_task(void);
diff --git a/keyboards/claw44/ssd1306.c b/keyboards/claw44/ssd1306.c
index e32fc091c244..1af63f00b8b2 100644
--- a/keyboards/claw44/ssd1306.c
+++ b/keyboards/claw44/ssd1306.c
@@ -13,6 +13,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/claw44/ssd1306.h b/keyboards/claw44/ssd1306.h
index 0ca093093a17..11a3cc67f449 100644
--- a/keyboards/claw44/ssd1306.h
+++ b/keyboards/claw44/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);
diff --git a/keyboards/comet46/ssd1306.c b/keyboards/comet46/ssd1306.c
index 20c2738db774..ea91ab129eef 100644
--- a/keyboards/comet46/ssd1306.c
+++ b/keyboards/comet46/ssd1306.c
@@ -13,6 +13,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/comet46/ssd1306.h b/keyboards/comet46/ssd1306.h
index 0ca093093a17..11a3cc67f449 100644
--- a/keyboards/comet46/ssd1306.h
+++ b/keyboards/comet46/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);
diff --git a/keyboards/crkbd/ssd1306.c b/keyboards/crkbd/ssd1306.c
index 622e44e35f59..812f5335d16f 100644
--- a/keyboards/crkbd/ssd1306.c
+++ b/keyboards/crkbd/ssd1306.c
@@ -13,6 +13,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 #ifndef OLED_BLANK_CHAR
diff --git a/keyboards/crkbd/ssd1306.h b/keyboards/crkbd/ssd1306.h
index 0ca093093a17..11a3cc67f449 100644
--- a/keyboards/crkbd/ssd1306.h
+++ b/keyboards/crkbd/ssd1306.h
@@ -65,7 +65,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c
index dd3290ba0cc8..8461c7b1a513 100644
--- a/keyboards/helix/local_drivers/ssd1306.c
+++ b/keyboards/helix/local_drivers/ssd1306.c
@@ -19,6 +19,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 // Set this to 1 to help diagnose early startup problems
 // when testing power-on with ble.  Turn it off otherwise,
 // as the latency of printing most of the debug info messes
diff --git a/keyboards/helix/local_drivers/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h
index f9f91c6fedf5..bcb30f88595d 100644
--- a/keyboards/helix/local_drivers/ssd1306.h
+++ b/keyboards/helix/local_drivers/ssd1306.h
@@ -66,7 +66,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);
diff --git a/keyboards/yosino58/ssd1306.c b/keyboards/yosino58/ssd1306.c
index 3353f615f581..1bb387156f42 100644
--- a/keyboards/yosino58/ssd1306.c
+++ b/keyboards/yosino58/ssd1306.c
@@ -13,6 +13,8 @@
 #include "sendchar.h"
 #include "timer.h"
 
+struct CharacterMatrix display;
+
 extern const unsigned char font[] PROGMEM;
 
 // Set this to 1 to help diagnose early startup problems
diff --git a/keyboards/yosino58/ssd1306.h b/keyboards/yosino58/ssd1306.h
index acaf6217ef05..35e4c144cc7b 100644
--- a/keyboards/yosino58/ssd1306.h
+++ b/keyboards/yosino58/ssd1306.h
@@ -70,7 +70,7 @@ struct CharacterMatrix {
   bool dirty;
 };
 
-struct CharacterMatrix display;
+extern struct CharacterMatrix display;
 
 bool iota_gfx_init(bool rotate);
 void iota_gfx_task(void);