diff --git a/frontend/frontend.c b/frontend/frontend.c
index a46f53d72d..e18cb79eb2 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -257,9 +257,9 @@ int rarch_main(int argc, char *argv[])
 
 #if !defined(__APPLE__)
    rarch_main_clear_state();
+   rarch_get_environment(argc, argv);
 #endif
 
-   rarch_get_environment(argc, argv);
 
 #if !defined(RARCH_CONSOLE)
 #if defined(__APPLE__)
@@ -434,7 +434,9 @@ int rarch_main(int argc, char *argv[])
    return 0;
 }
 
+#ifndef __APPLE__
 int main(int argc, char *argv[])
 {
    return rarch_main(argc, argv);
 }
+#endif
diff --git a/general.h b/general.h
index 3633552f16..4b191fc2e4 100644
--- a/general.h
+++ b/general.h
@@ -670,7 +670,11 @@ bool config_save_keybinds(const char *path);
 void rarch_game_reset(void);
 void rarch_main_clear_state(void);
 void rarch_init_system_info(void);
+#ifdef __APPLE__
+void * rarch_main(void *args);
+#else
 int rarch_main(int argc, char *argv[]);
+#endif
 int rarch_main_init_wrap(const struct rarch_main_wrap *args);
 int rarch_main_init(int argc, char *argv[]);
 bool rarch_main_idle_iterate(void);