diff --git a/firmware/backlight.c b/firmware/backlight.c
index f9575dfdb7..1d98a0cfa7 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -973,7 +973,6 @@ void backlight_init(void)
 
 void backlight_on(void) {}
 void backlight_off(void) {}
-void buttonlight_on(void) {}
 void backlight_set_timeout(int value) {(void)value;}
 
 bool is_backlight_on(bool ignore_always_off)
@@ -995,7 +994,12 @@ bool is_remote_backlight_on(bool ignore_always_off)
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
 void backlight_set_brightness(int val) { (void)val; }
 #endif
+
+#ifdef HAVE_BUTTONLIGHT
+void buttonlight_on(void) {}
 #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
 void buttonlight_set_brightness(int val) { (void)val; }
 #endif
+#endif /* HAVE_BUTTONLIGHT */
+
 #endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */
diff --git a/firmware/sdmmc.c b/firmware/sdmmc.c
index f499ffae08..bb3820f930 100644
--- a/firmware/sdmmc.c
+++ b/firmware/sdmmc.c
@@ -18,13 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include <stdbool.h>
 #include "config.h"
-#if (CONFIG_STORAGE & STORAGE_MMC)
-#include "ata_mmc.h"
-#else
 #include "sdmmc.h"
-#endif
 
 /* helper function to extract n (<=32) bits from an arbitrary position.
    counting from MSB to LSB */