diff --git a/Makefile b/Makefile
index fbb47c0a80..14995c1be0 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ OBJ = frontend/frontend.o \
 		core_options.o \
 		compat/compat.o \
 		cheats.o \
-		frontend/info/core_info.o \
+		core_info.o \
 		conf/config_file.o \
 		screenshot.o \
 		gfx/scaler/scaler.o \
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 99cb5b0856..a977c4e654 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -50,7 +50,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		audio/cc_resampler.o \
 		audio/null.o \
 		performance.o \
-		frontend/info/core_info.o \
+		core_info.o \
 		camera/rwebcam.o
 
 HAVE_OPENGL = 1
diff --git a/Makefile.win b/Makefile.win
index 4d9148bc4f..ab451ec36d 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -29,7 +29,7 @@ OBJ = frontend/frontend.o \
 		compat/compat.o \
 		screenshot.o \
 		cheats.o \
-		frontend/info/core_info.o \
+		core_info.o \
 		audio/utils.o \
 		input/overlay.o \
 		fifo_buffer.o \
diff --git a/frontend/info/core_info.c b/core_info.c
similarity index 98%
rename from frontend/info/core_info.c
rename to core_info.c
index bc6688dace..7fe36382aa 100644
--- a/frontend/info/core_info.c
+++ b/core_info.c
@@ -14,14 +14,14 @@
  */
 
 #include "core_info.h"
-#include "../../general.h"
-#include "../../file.h"
-#include "../../file_ext.h"
-#include "../../file_extract.h"
-#include "../../config.def.h"
+#include "general.h"
+#include "file.h"
+#include "file_ext.h"
+#include "file_extract.h"
+#include "config.def.h"
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif
 
 static core_info_list_t *global_core_list;
diff --git a/frontend/info/core_info.h b/core_info.h
similarity index 98%
rename from frontend/info/core_info.h
rename to core_info.h
index 9e5e2692c4..933a0d0b70 100644
--- a/frontend/info/core_info.h
+++ b/core_info.h
@@ -18,8 +18,8 @@
 #ifndef CORE_INFO_H_
 #define CORE_INFO_H_
 
-#include "../../conf/config_file.h"
-#include "../../file.h"
+#include "conf/config_file.h"
+#include "file.h"
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/driver_menu.h b/driver_menu.h
index 830e6dd9a0..f91e2388ad 100644
--- a/driver_menu.h
+++ b/driver_menu.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include "boolean.h"
 #include "file_list.h"
-#include "frontend/info/core_info.h"
+#include "core_info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 877667f015..313dbf1465 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -25,7 +25,7 @@
 #include "../../boolean.h"
 #include "../../general.h"
 #include "menu_navigation.h"
-#include "../info/core_info.h"
+#include "../../core_info.h"
 #include "../../file_list.h"
 #include "../../history.h"
 #include "../../input/input_common.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index dc4a8c2473..35c209c0ff 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -552,7 +552,7 @@ FRONTEND
 #endif
 #include "../frontend/platform/platform_null.c"
 
-#include "../frontend/info/core_info.c"
+#include "../core_info.c"
 
 /*============================================================
 MAIN
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index bf5a243ecc..b796505dae 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -224,7 +224,7 @@
     <ClCompile Include="..\..\frontend\menu\menu_common.c" />
     <ClCompile Include="..\..\frontend\menu\menu_input_line_cb.c" />
     <ClCompile Include="..\..\frontend\menu\menu_navigation.c" />
-    <ClCompile Include="..\..\frontend\info\core_info.c" />
+    <ClCompile Include="..\..\core_info.c" />
     <ClCompile Include="..\..\frontend\platform\platform_null.c" />
     <ClCompile Include="..\..\gfx\d3d9\d3d.cpp" />
     <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp" />