diff --git a/360/frontend-xdk/main.c b/360/frontend-xdk/main.c
index 61867db91e..b8a4225ae5 100644
--- a/360/frontend-xdk/main.c
+++ b/360/frontend-xdk/main.c
@@ -24,7 +24,7 @@
 #include "../xdk360_input.h"
 #include "../xdk360_video.h"
 
-#include "../../console/console_ext.h"
+#include "../../console/retroarch_console.h"
 #include "../../conf/config_file.h"
 #include "../../conf/config_file_macros.h"
 #include "../../file.h"
diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp
index e3617423dc..5b5ebc2367 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/360/frontend-xdk/menu.cpp
@@ -19,7 +19,7 @@
 #include <tchar.h>
 #include <xtl.h>
 #include "../../console/fileio/file_browser.h"
-#include "../../console/console_ext.h"
+#include "../../console/retroarch_console.h"
 #include "../xdk360_video.h"
 #include "menu.h"
 #include "../../message.h"
diff --git a/360/xdk360_input.c b/360/xdk360_input.c
index 4ee54e7658..dff39336ea 100644
--- a/360/xdk360_input.c
+++ b/360/xdk360_input.c
@@ -20,7 +20,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../libretro.h"
-#include "../console/console_ext.h"
+#include "../console/retroarch_console.h"
 #include "xdk360_input.h"
 #include "frontend-xdk/menu.h"
 
diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp
index dda3d63efa..bb888eb841 100644
--- a/360/xdk360_video.cpp
+++ b/360/xdk360_video.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #include "./../gfx/gfx_context.h"
-#include "../console/console_ext.h"
+#include "../console/retroarch_console.h"
 #include "../general.h"
 #include "../message.h"
 
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 62bfbd19ea..64f9e955c1 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -21,7 +21,7 @@
 /*============================================================
 CONSOLE EXTENSIONS
 ============================================================ */
-#include "../console_ext.c"
+#include "../retroarch_console.c"
 #include "../console_settings.c"
 
 #ifdef HAVE_LIBRETRO_MANAGEMENT
diff --git a/console/libretro_mgmt.c b/console/libretro_mgmt.c
index 0250af2218..0b6284e28b 100644
--- a/console/libretro_mgmt.c
+++ b/console/libretro_mgmt.c
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 
-#include "console_ext.h"
+#include "retroarch_console.h"
 
 const char *rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext)
 {
diff --git a/console/console_ext.c b/console/retroarch_console.c
similarity index 99%
rename from console/console_ext.c
rename to console/retroarch_console.c
index 7334b027bb..7ca38f1da6 100644
--- a/console/console_ext.c
+++ b/console/retroarch_console.c
@@ -24,7 +24,7 @@
 #include "../libretro.h"
 #include "../general.h"
 #include "../compat/strl.h"
-#include "console_ext.h"
+#include "retroarch_console.h"
 #include "../file.h"
 
 #ifdef HAVE_CONFIGFILE
@@ -221,7 +221,7 @@ int rarch_extract_zipfile(const char *zip_path)
 	INPUT EXTENSIONS
 ============================================================ */
 
-#include "console_ext_input.h"
+#include "retroarch_console_input.h"
 
 struct platform_bind
 {
diff --git a/console/console_ext.h b/console/retroarch_console.h
similarity index 99%
rename from console/console_ext.h
rename to console/retroarch_console.h
index 6b14baa600..c31cebcea9 100644
--- a/console/console_ext.h
+++ b/console/retroarch_console.h
@@ -114,7 +114,7 @@ extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END];
 extern void rarch_set_auto_viewport(unsigned width, unsigned height);
 extern void rarch_load_shader(unsigned slot, const char *path);
 
-#include "console_ext_input.h"
+#include "retroarch_console_input.h"
 
 /*============================================================
 	SOUND
diff --git a/console/console_ext_input.h b/console/retroarch_console_input.h
similarity index 100%
rename from console/console_ext_input.h
rename to console/retroarch_console_input.h
diff --git a/dynamic.c b/dynamic.c
index cd48846e72..20c9f74996 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #ifdef RARCH_CONSOLE
-#include "console/console_ext.h"
+#include "console/retroarch_console.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index b61e31c620..39e36ebfec 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -43,7 +43,7 @@
 
 #include "../../gfx/gl_common.h"
 
-#include "../../console/console_ext.h"
+#include "../../console/retroarch_console.h"
 #include "../../conf/config_file.h"
 #include "../../conf/config_file_macros.h"
 #include "../../general.h"
diff --git a/ps3/frontend/menu.c b/ps3/frontend/menu.c
index 1f66b4a37d..e66b4a450b 100644
--- a/ps3/frontend/menu.c
+++ b/ps3/frontend/menu.c
@@ -26,7 +26,7 @@
 #include "../ps3_input.h"
 #include "../../console/fileio/file_browser.h"
 
-#include "../../console/console_ext.h"
+#include "../../console/retroarch_console.h"
 
 #include "../../gfx/gl_common.h"
 #include "../../gfx/gl_font.h"
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index 43634454b2..07a8268c92 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -30,7 +30,7 @@
 
 #include "ps3_input.h"
 #include "../driver.h"
-#include "../console/console_ext.h"
+#include "../console/retroarch_console.h"
 #include "../libretro.h"
 #include "../general.h"
 
diff --git a/retroarch.c b/retroarch.c
index 47e92276b2..c15bc91312 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -34,7 +34,7 @@
 #include "compat/getopt_rarch.h"
 
 #ifdef RARCH_CONSOLE
-#include "console/console_ext_input.h"
+#include "console/retroarch_console_input.h"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
diff --git a/wii/video.c b/wii/video.c
index c42a76f394..aec7e1fb05 100644
--- a/wii/video.c
+++ b/wii/video.c
@@ -16,7 +16,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "driver.h"
-#include "../console/console_ext.h"
+#include "../console/retroarch_console.h"
 #include <gccore.h>
 #include <ogcsys.h>
 #include <malloc.h>