diff --git a/Makefile.common b/Makefile.common
index 4e90d7b47e..df6ced6b21 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -239,7 +239,7 @@ OBJ += frontend/frontend.o \
        core_info.o \
        $(LIBRETRO_COMM_DIR)/file/config_file.o \
        $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \
-       $(LIBRETRO_COMM_DIR)/file/runtime_file.o \
+       runtime_file.o \
        tasks/task_screenshot.o \
        tasks/task_powerstate.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 69a957bf16..0a34067cde 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -143,7 +143,7 @@ CONFIG FILE
 /*============================================================
 RUNTIME FILE
 ============================================================ */
-#include "../libretro-common/file/runtime_file.c"
+#include "../runtime_file.c"
 
 /*============================================================
 ACHIEVEMENTS
diff --git a/retroarch.c b/retroarch.c
index 887a0f0149..8acf0156df 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -53,7 +53,7 @@
 #include <queues/message_queue.h>
 #include <queues/task_queue.h>
 #include <features/features_cpu.h>
-#include <file/runtime_file.h>
+#include "runtime_file.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/libretro-common/file/runtime_file.c b/runtime_file.c
similarity index 99%
rename from libretro-common/file/runtime_file.c
rename to runtime_file.c
index b86590ed0e..9b0ee4f977 100644
--- a/libretro-common/file/runtime_file.c
+++ b/runtime_file.c
@@ -25,18 +25,19 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include <retro_miscellaneous.h>
-#include <file_path_special.h>
-#include <dirs.h>
-#include <core_info.h>
-#include <configuration.h>
 #include <file/file_path.h>
+#include <retro_miscellaneous.h>
 #include <streams/file_stream.h>
 #include <formats/jsonsax_full.h>
 #include <string/stdstring.h>
-#include <verbosity.h>
 
-#include <file/runtime_file.h>
+#include "file_path_special.h"
+#include "dirs.h"
+#include "core_info.h"
+#include "configuration.h"
+#include "verbosity.h"
+
+#include "runtime_file.h"
 
 #define LOG_FILE_RUNTIME_FORMAT_STR "%u:%02u:%02u"
 #define LOG_FILE_LAST_PLAYED_FORMAT_STR "%04u-%02u-%02u %02u:%02u:%02u"
diff --git a/libretro-common/include/file/runtime_file.h b/runtime_file.h
similarity index 100%
rename from libretro-common/include/file/runtime_file.h
rename to runtime_file.h