diff --git a/quantum/quantum.c b/quantum/quantum.c
index c6a40a4baa2..3d440e0de89 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -16,24 +16,64 @@
 
 #include "quantum.h"
 
+#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
+#    include "process_backlight.h"
+#endif
+
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
 #endif
 
-#ifdef BACKLIGHT_ENABLE
-#    include "backlight.h"
+#ifdef GRAVE_ESC_ENABLE
+#    include "process_grave_esc.h"
+#endif
+
+#ifdef HAPTIC_ENABLE
+#    include "process_haptic.h"
+#endif
+
+#ifdef JOYSTICK_ENABLE
+#    include "process_joystick.h"
+#endif
+
+#ifdef LEADER_ENABLE
+#    include "process_leader.h"
+#endif
+
+#ifdef MAGIC_KEYCODE_ENABLE
+#    include "process_magic.h"
 #endif
 
 #ifdef MIDI_ENABLE
 #    include "process_midi.h"
 #endif
 
-#ifdef VELOCIKEY_ENABLE
-#    include "velocikey.h"
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+#    include "process_programmable_button.h"
 #endif
 
-#ifdef HAPTIC_ENABLE
-#    include "haptic.h"
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#    include "process_rgb.h"
+#endif
+
+#ifdef SECURE_ENABLE
+#    include "process_secure.h"
+#endif
+
+#ifdef TRI_LAYER_ENABLE
+#    include "process_tri_layer.h"
+#endif
+
+#ifdef UNICODE_COMMON_ENABLE
+#    include "process_unicode_common.h"
+#endif
+
+#ifdef UNICODE_ENABLE
+#    include "process_unicode.h"
+#endif
+
+#ifdef VELOCIKEY_ENABLE
+#    include "velocikey.h"
 #endif
 
 #ifdef AUDIO_ENABLE
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 31a1a63a7ac..017844c558d 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -93,17 +93,8 @@ extern layer_state_t layer_state;
 #    include "process_music.h"
 #endif
 
-#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE)
-#    include "process_backlight.h"
-#endif
-
 #ifdef LEADER_ENABLE
 #    include "leader.h"
-#    include "process_leader.h"
-#endif
-
-#ifdef UNICODE_ENABLE
-#    include "process_unicode.h"
 #endif
 
 #ifdef UCIS_ENABLE
@@ -116,7 +107,6 @@ extern layer_state_t layer_state;
 
 #ifdef UNICODE_COMMON_ENABLE
 #    include "unicode.h"
-#    include "process_unicode_common.h"
 #endif
 
 #ifdef KEY_OVERRIDE_ENABLE
@@ -147,24 +137,8 @@ extern layer_state_t layer_state;
 #    include "process_space_cadet.h"
 #endif
 
-#ifdef MAGIC_KEYCODE_ENABLE
-#    include "process_magic.h"
-#endif
-
-#ifdef JOYSTICK_ENABLE
-#    include "process_joystick.h"
-#endif
-
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-#    include "process_programmable_button.h"
-#endif
-
-#ifdef GRAVE_ESC_ENABLE
-#    include "process_grave_esc.h"
-#endif
-
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#    include "process_rgb.h"
+#    include "programmable_button.h"
 #endif
 
 #ifdef HD44780_ENABLE
@@ -177,7 +151,6 @@ extern layer_state_t layer_state;
 
 #ifdef HAPTIC_ENABLE
 #    include "haptic.h"
-#    include "process_haptic.h"
 #endif
 
 #ifdef OLED_ENABLE
@@ -202,7 +175,6 @@ extern layer_state_t layer_state;
 
 #ifdef SECURE_ENABLE
 #    include "secure.h"
-#    include "process_secure.h"
 #endif
 
 #ifdef DYNAMIC_KEYMAP_ENABLE
@@ -248,7 +220,6 @@ extern layer_state_t layer_state;
 
 #ifdef TRI_LAYER_ENABLE
 #    include "tri_layer.h"
-#    include "process_tri_layer.h"
 #endif
 
 #ifdef REPEAT_KEY_ENABLE