3 files changed, 4 insertions, 2 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 075ca9a563..79642e1f1d 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -317,4 +317,6 @@ keymaps/keymap-mpio-hd300.c
 keymaps/keymap-android.c
 #elif CONFIG_KEYPAD == SDL_PAD
 keymaps/keymap-sdl.c
+#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
+keymaps/keymap-fuzeplus.c
 #endif
diff --git a/apps/misc.c b/apps/misc.c
index bba3969e81..83e42cf3e0 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -528,7 +528,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
         case SYS_USB_CONNECTED:
             if (callback != NULL)
                 callback(parameter);
-#if (CONFIG_STORAGE & STORAGE_MMC)
+#if (CONFIG_STORAGE & STORAGE_MMC) && (defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM))
             if (!mmc_touched() ||
                 (mmc_remove_request() == SYS_HOTSWAP_EXTRACTED))
 #endif
diff --git a/apps/screens.c b/apps/screens.c
index 6c70477fbd..e20f96731c 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -59,7 +59,7 @@
 #include "dsp.h"
 #endif
 
-#if (CONFIG_STORAGE & STORAGE_MMC)
+#if (CONFIG_STORAGE & STORAGE_MMC) && (defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM))
 int mmc_remove_request(void)
 {
     struct queue_event ev;