diff --git a/frontend/frontend.c b/frontend/frontend.c
index eb4a1017f3..9650cbff68 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -91,6 +91,7 @@ static void rarch_get_environment_console(void)
 #endif
 
 #if defined(ANDROID)
+
 #define main_entry android_app_entry
 #define returntype void
 #define signature_expand() data
@@ -100,28 +101,16 @@ static void rarch_get_environment_console(void)
 #define declare_argc() int argc = 0;
 #define declare_argv() char *argv[1]
 #define args_initial_ptr() data
-#elif defined(__APPLE__) || defined(HAVE_BB10)
+#else
+
+#if defined(__APPLE__) || defined(HAVE_BB10)
 #define main_entry rarch_main
-#define returntype int
-#define signature_expand() argc, argv
-#define returnfunc() return 0
-#define return_negative() return 1
-#define return_var(var) return var
-#define declare_argc()
-#define declare_argv()
-#define args_initial_ptr() NULL
 #elif defined(EMSCRIPTEN)
 #define main_entry _fakemain
-#define returntype int
-#define signature_expand() argc, argv
-#define returnfunc() return 0
-#define return_negative() return 1
-#define return_var(var) return var
-#define declare_argc()
-#define declare_argv()
-#define args_initial_ptr() NULL
 #else
 #define main_entry main
+#endif
+
 #define returntype int
 #define signature_expand() argc, argv
 #define returnfunc() return 0
@@ -130,6 +119,7 @@ static void rarch_get_environment_console(void)
 #define declare_argc()
 #define declare_argv()
 #define args_initial_ptr() NULL
+
 #endif
 
 #if defined(HAVE_BB10) || defined(ANDROID)
diff --git a/frontend/frontend.h b/frontend/frontend.h
index f8d2a73461..3a5ac8903e 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -21,9 +21,6 @@
 #if defined(ANDROID)
 #define args_type() struct android_app*
 #define signature() void* data
-#elif defined(__APPLE__) || defined(HAVE_BB10)
-#define args_type() void*
-#define signature() int argc, char *argv[]
 #else
 #define args_type() void*
 #define signature() int argc, char *argv[]