6 files changed, 8 insertions, 8 deletions
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
index 4a88acba7d..6fc84937c4 100644
--- a/users/bcat/bcat.h
+++ b/users/bcat/bcat.h
@@ -18,7 +18,7 @@
 
 #include <stdbool.h>
 
-#include "keymap.h"
+#include "keycodes.h"
 
 /* Layer numbers shared across keymaps. */
 enum user_layer {
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index ec3b3e81e8..e5f0f397d4 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define TAP_CODE_DELAY 10
+
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c
index 23def968d4..5c8ecb9007 100644
--- a/users/mechmerlin/mechmerlin.c
+++ b/users/mechmerlin/mechmerlin.c
@@ -1,8 +1,6 @@
 #include "mechmerlin.h"
 #include "version.h"
 
-#define TAP_CODE_DELAY 10
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static uint16_t fnx_layer_timer;
 
@@ -26,4 +24,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     }
     return true;
-}
-\ No newline at end of file
+}
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
index 17122f4a63..12547ec508 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c
@@ -248,9 +248,7 @@ void keyboard_post_init_user(void) {
 
 void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
-    #ifdef RGB_DI_PIN
         rgblight_setrgb(RGB_GREEN);
-    #endif
     #endif //RGB_matrix  
 }
 
diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk
index 9338568b97..957ce2a71a 100644
--- a/users/talljoe/rules.mk
+++ b/users/talljoe/rules.mk
@@ -1,4 +1,6 @@
-SRC += talljoe.c macros.c $(wildcard users/talljoe/tapdance/*.c)
+INTROSPECTION_KEYMAP_C = talljoe.c
+
+SRC += macros.c $(wildcard users/talljoe/tapdance/*.c)
 ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
   SRC += visualizer.c
 endif
diff --git a/users/toinux/keymap_qwerty_fr.h b/users/toinux/keymap_qwerty_fr.h
index 4bd50c4075..3c0195c7f0 100644
--- a/users/toinux/keymap_qwerty_fr.h
+++ b/users/toinux/keymap_qwerty_fr.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "keymap.h"
+#include "keycodes.h"
 
 // clang-format off