diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index ed7c19712c..e13339b19b 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -359,15 +359,15 @@ REWIND
 MAIN
 ============================================================ */
 #if defined(_XBOX)
-#include "../../xdk/frontend/main.c"
+#include "../../frontend/frontend_xdk.c"
 #elif defined(XENON)
-#include "../../360/frontend-xenon/main.c"
+#include "../../frontend/frontend_xenon.c"
 #elif defined(GEKKO)
-#include "../../gx/frontend/main.c"
+#include "../../frontend/frontend_gx.c"
 #elif defined(__CELLOS_LV2__)
-#include "../../ps3/frontend/main.c"
+#include "../../frontend/frontend_ps3.c"
 #elif defined(PSP)
-#include "../../psp/frontend/main.c"
+#include "../../frontend/frontend_psp.c"
 #elif defined(ANDROID)
 #include "../../android/native/jni/main.c"
 #endif
diff --git a/gx/frontend/main.c b/frontend/frontend_gx.c
similarity index 98%
rename from gx/frontend/main.c
rename to frontend/frontend_gx.c
index 250593ed61..f64179776e 100644
--- a/gx/frontend/main.c
+++ b/frontend/frontend_gx.c
@@ -18,19 +18,19 @@
 #undef main
 
 #include <stdbool.h>
-#include "../../driver.h"
-#include "../../general.h"
-#include "../../libretro.h"
+#include "../driver.h"
+#include "../general.h"
+#include "../libretro.h"
 
-#include "../../console/rgui/rgui.h"
-#include "../../gfx/fonts/bitmap.h"
+#include "../console/rgui/rgui.h"
+#include "../gfx/fonts/bitmap.h"
 
-#include "../../console/rarch_console_exec.h"
-#include "../../console/rarch_console_input.h"
-#include "../../console/rarch_console_settings.h"
+#include "../console/rarch_console_exec.h"
+#include "../console/rarch_console_input.h"
+#include "../console/rarch_console_settings.h"
 
 #ifdef HW_RVL
-#include "../../wii/mem2_manager.h"
+#include "../wii/mem2_manager.h"
 #endif
 
 #include <stdlib.h>
diff --git a/ps3/frontend/main.c b/frontend/frontend_ps3.c
similarity index 95%
rename from ps3/frontend/main.c
rename to frontend/frontend_ps3.c
index e62bbe47b4..9502f9092a 100644
--- a/ps3/frontend/main.c
+++ b/frontend/frontend_ps3.c
@@ -15,36 +15,33 @@
  */
 
 #include <stdint.h>
-#include "../../boolean.h"
+#include "../boolean.h"
 #include <stddef.h>
 #include <string.h>
-
-#include "../sdk_defines.h"
-
 #include <sys/process.h>
 
-#include "../ps3_input.h"
+#include "../ps3/sdk_defines.h"
+#include "../ps3/ps3_input.h"
 
-#include "../../gfx/gl_common.h"
+#include "../gfx/gl_common.h"
 
-#include "../../console/rarch_console.h"
+#include "../console/rarch_console.h"
 
 #ifdef HAVE_RARCH_EXEC
-#include "../../console/rarch_console_exec.h"
+#include "../console/rarch_console_exec.h"
 #endif
 
-#include "../../console/rarch_console_libretro_mgmt.h"
+#include "../console/rarch_console_libretro_mgmt.h"
+#include "../console/rarch_console_input.h"
+#include "../console/rarch_console_config.h"
+#include "../console/rarch_console_settings.h"
+#include "../console/rarch_console_video.h"
+#include "../conf/config_file.h"
+#include "../conf/config_file_macros.h"
+#include "../general.h"
+#include "../file.h"
 
-#include "../../console/rarch_console_input.h"
-#include "../../console/rarch_console_config.h"
-#include "../../console/rarch_console_settings.h"
-#include "../../console/rarch_console_video.h"
-#include "../../conf/config_file.h"
-#include "../../conf/config_file_macros.h"
-#include "../../general.h"
-#include "../../file.h"
-
-#include "../../console/rmenu/rmenu.h"
+#include "../console/rmenu/rmenu.h"
 
 #define EMULATOR_CONTENT_DIR "SSNE10000"
 
diff --git a/psp/frontend/main.c b/frontend/frontend_psp.c
similarity index 99%
rename from psp/frontend/main.c
rename to frontend/frontend_psp.c
index 997ec3433f..867cea23f3 100644
--- a/psp/frontend/main.c
+++ b/frontend/frontend_psp.c
@@ -18,12 +18,12 @@
 #include <pspdebug.h>
 
 #include <stdint.h>
-#include "../../boolean.h"
+#include "../boolean.h"
 #include <stddef.h>
 #include <string.h>
 
 #undef main
-#include "../sdk_defines.h"
+#include "../psp/sdk_defines.h"
 
 PSP_MODULE_INFO("RetroArch PSP", 0, 1, 1);
 PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
diff --git a/xdk/frontend/main.c b/frontend/frontend_xdk.c
similarity index 93%
rename from xdk/frontend/main.c
rename to frontend/frontend_xdk.c
index 096087f083..39e1aaaf6c 100644
--- a/xdk/frontend/main.c
+++ b/frontend/frontend_xdk.c
@@ -22,27 +22,27 @@
 
 #if defined(_XBOX360)
 #include <xfilecache.h>
-#include "../../360/frontend-xdk/menu.h"
-#include "../../xdk/menu_shared.h"
+#include "../360/frontend-xdk/menu.h"
+#include "../xdk/menu_shared.h"
 #elif defined(_XBOX1)
-#include "../../xbox1/frontend/RetroLaunch/IoSupport.h"
-#include "../../console/rmenu/rmenu.h"
+#include "../xbox1/frontend/RetroLaunch/IoSupport.h"
+#include "../console/rmenu/rmenu.h"
 #endif
 
 #include <xbdm.h>
 
 #ifdef _XBOX
-#include "../../xdk/xdk_d3d.h"
+#include "../xdk/xdk_d3d.h"
 #endif
 
-#include "../../console/rarch_console.h"
-#include "../../console/rarch_console_exec.h"
-#include "../../console/rarch_console_libretro_mgmt.h"
-#include "../../console/rarch_console_config.h"
-#include "../../conf/config_file.h"
-#include "../../conf/config_file_macros.h"
-#include "../../file.h"
-#include "../../general.h"
+#include "../console/rarch_console.h"
+#include "../console/rarch_console_exec.h"
+#include "../console/rarch_console_libretro_mgmt.h"
+#include "../console/rarch_console_config.h"
+#include "../conf/config_file.h"
+#include "../conf/config_file_macros.h"
+#include "../file.h"
+#include "../general.h"
 
 int rarch_main(int argc, char *argv[]);
 
diff --git a/360/frontend-xenon/main.c b/frontend/frontend_xenon.c
similarity index 99%
rename from 360/frontend-xenon/main.c
rename to frontend/frontend_xenon.c
index c1995fedeb..b5a600af35 100644
--- a/360/frontend-xenon/main.c
+++ b/frontend/frontend_xenon.c
@@ -31,7 +31,7 @@
 #include <xenon_soc/xenon_power.h>
 #include <elf/elf.h>
 #include <dirent.h>
-#include "../../compat/strl.h"
+#include "../compat/strl.h"
 
 #undef main
 
@@ -241,4 +241,3 @@ int main(void)
 
    return 0;
 }
-