From f23639517683378bed12792903e0d9cc6a1a6794 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 13 Mar 2021 11:38:26 +1100
Subject: [PATCH] LED Matrix: Clean up includes (#12197)

---
 keyboards/clueboard/66_hotswap/gen1/gen1.c | 2 --
 keyboards/terrazzo/terrazzo.c              | 1 -
 quantum/led_matrix.c                       | 3 ---
 quantum/led_matrix.h                       | 7 +++++++
 quantum/led_matrix_drivers.c               | 7 -------
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
index dd399317c1b5..339bd78d5abd 100644
--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
@@ -16,8 +16,6 @@
 #include "gen1.h"
 
 #ifdef LED_MATRIX_ENABLE
-    #include "is31fl3731-simple.h"
-
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
  *    driver
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index f079ded4d7ba..2afda085b3cc 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -17,7 +17,6 @@
 #include "terrazzo.h"
 
 #ifdef LED_MATRIX_ENABLE
-    #include "is31fl3731-simple.h"
     #include <math.h>
     #include "print.h"
     #include "quantum.h"
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index 39bccdd58052..1cbd908c7a6f 100644
--- a/quantum/led_matrix.c
+++ b/quantum/led_matrix.c
@@ -17,9 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "quantum.h"
 #include "led_matrix.h"
 #include "progmem.h"
 #include "config.h"
diff --git a/quantum/led_matrix.h b/quantum/led_matrix.h
index 0817d1357313..e4322a150908 100644
--- a/quantum/led_matrix.h
+++ b/quantum/led_matrix.h
@@ -19,7 +19,14 @@
 
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "led_matrix_types.h"
+#include "quantum.h"
+
+#ifdef IS31FL3731
+#    include "is31fl3731-simple.h"
+#endif
 
 enum led_matrix_effects {
     LED_MATRIX_UNIFORM_BRIGHTNESS = 1,
diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix_drivers.c
index eddf3f28635d..370c5e6853fb 100644
--- a/quantum/led_matrix_drivers.c
+++ b/quantum/led_matrix_drivers.c
@@ -15,9 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "quantum.h"
 #include "led_matrix.h"
 
 /* Each driver needs to define a struct:
@@ -30,10 +27,6 @@
 
 #if defined(IS31FL3731) || defined(IS31FL3733)
 
-#    if defined(IS31FL3731)
-#        include "is31fl3731-simple.h"
-#    endif
-
 #    include "i2c_master.h"
 
 static void init(void) {