diff --git a/frontend/frontend.c b/frontend/frontend.c
index 5c960a8731..cfd38048d8 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -38,7 +38,6 @@
 
 #define main_entry android_app_entry
 #define returntype void
-#define signature_expand() data
 #define returnfunc() exit(0)
 #define return_negative() return
 #define return_var(var) return
@@ -54,7 +53,6 @@
 #endif
 
 #define returntype int
-#define signature_expand() argc, argv
 #define returnfunc() return 0
 #define return_negative() return 1
 #define return_var(var) return var
diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h
index 1d7678eff6..8b2c5bb90d 100644
--- a/frontend/frontend_context.h
+++ b/frontend/frontend_context.h
@@ -25,6 +25,7 @@
 #endif
 
 #if defined(ANDROID)
+#include "platform/platform_android.h"
 #define args_type() struct android_app*
 #define signature() void* data
 #define signature_expand() data
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 591d5bc7cb..5d2f573529 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -341,8 +341,6 @@ static unsigned input_frame(uint64_t trigger_state)
 
 bool menu_iterate(void)
 {
-   const char *path = NULL;
-   const char *label = NULL;
    unsigned action = MENU_ACTION_NOOP;
    static bool initial_held = true;
    static bool first_held = false;
diff --git a/input/input_common.c b/input/input_common.c
index cb92adcc51..56cb224b00 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -843,7 +843,7 @@ const struct rarch_key_map rarch_key_map_linux[] = {
    //{ ?, RETROK_EXCLAIM },
    //{ ?, RETROK_QUOTEDBL },
    //{ ?, RETROK_HASH },
-#ifdef ANDROID
+#ifndef ANDROID
    { KEY_DOLLAR, RETROK_DOLLAR },
 #endif
    //{ ?, RETROK_AMPERSAND },