diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 4d2921354b0..473e0e948d6 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -1,10 +1,5 @@
 #include <limits.h>
 #include <stdint.h>
-#include "keyboard.h"
-#include "keymap.h"
-#include "action.h"
-#include "util.h"
-#include "action_layer.h"
 
 #ifdef DEBUG_ACTION
 #    include "debug.h"
@@ -12,6 +7,12 @@
 #    include "nodebug.h"
 #endif
 
+#include "keyboard.h"
+#include "keymap.h"
+#include "action.h"
+#include "util.h"
+#include "action_layer.h"
+
 /** \brief Default Layer State
  */
 layer_state_t default_layer_state = 0;
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index 6f8b4f8c56a..e4366194289 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -1,10 +1,5 @@
 #include <stdint.h>
 #include <stdbool.h>
-#include "action.h"
-#include "action_layer.h"
-#include "action_tapping.h"
-#include "keycode.h"
-#include "timer.h"
 
 #ifdef DEBUG_ACTION
 #    include "debug.h"
@@ -12,6 +7,12 @@
 #    include "nodebug.h"
 #endif
 
+#include "action.h"
+#include "action_layer.h"
+#include "action_tapping.h"
+#include "keycode.h"
+#include "timer.h"
+
 #ifndef NO_ACTION_TAPPING
 
 #    define IS_TAPPING() !IS_NOEVENT(tapping_key.event)