diff --git a/Makefile.common b/Makefile.common
index 8a4f8f42f2..a24b57e634 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -95,7 +95,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/file/file_list.o \
 		dir_list.o \
 		libretro-sdk/string/string_list.o \
-		rarch_file_path.o \
+		file_ops.o \
 		file_path.o \
 		rarch_compr_file_path.o \
 		hash.o \
diff --git a/content.c b/content.c
index 846b3b0519..df2c1fc8ed 100644
--- a/content.c
+++ b/content.c
@@ -14,8 +14,8 @@
  */
 
 #include "content.h"
+#include "file_ops.h"
 #include "file_path.h"
-#include "rarch_file_path.h"
 #include "general.h"
 #include <stdlib.h>
 #include <boolean.h>
diff --git a/file_extract.c b/file_extract.c
index 055ffe0f72..00d7ca32a5 100644
--- a/file_extract.c
+++ b/file_extract.c
@@ -14,7 +14,7 @@
  */
 
 #include "file_extract.h"
-#include "rarch_file_path.h"
+#include "file_ops.h"
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 #include "retroarch_logger.h"
diff --git a/rarch_file_path.c b/file_ops.c
similarity index 99%
rename from rarch_file_path.c
rename to file_ops.c
index 3f66caed15..8080ac65d6 100644
--- a/rarch_file_path.c
+++ b/file_ops.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rarch_file_path.h"
+#include "file_ops.h"
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
diff --git a/rarch_file_path.h b/file_ops.h
similarity index 95%
rename from rarch_file_path.h
rename to file_ops.h
index d3d9270a0a..1925a6be9a 100644
--- a/rarch_file_path.h
+++ b/file_ops.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __RARCH_FILE_PATH_H
-#define __RARCH_FILE_PATH_H
+#ifndef __LIBRETRO_SDK_FILE_OPS_H
+#define __LIBRETRO_SDK_FILE_OPS_H
 
 #include <boolean.h>
 #include <stdio.h>
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index a228fd0f83..3a4fb344a5 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -17,7 +17,7 @@
 #include "menu_entries.h"
 #include "menu_action.h"
 #include "menu_list.h"
-#include "../../rarch_file_path.h"
+#include "../../file_ops.h"
 #include "../../dir_list.h"
 #include "../../settings_data.h"
 #include "../../performance.h"
diff --git a/gfx/image/image_rpng.c b/gfx/image/image_rpng.c
index 2970a462fb..7adf72a15b 100644
--- a/gfx/image/image_rpng.c
+++ b/gfx/image/image_rpng.c
@@ -18,7 +18,7 @@
 #endif
 
 #include "image.h"
-#include "../../rarch_file_path.h"
+#include "../../file_ops.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/gfx/py_state/py_state.c b/gfx/py_state/py_state.c
index eba4d9bfdd..68b4f4b239 100644
--- a/gfx/py_state/py_state.c
+++ b/gfx/py_state/py_state.c
@@ -25,7 +25,7 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "../../input/input_common.h"
-#include "../../rarch_file_path.h"
+#include "../../file_ops.h"
 
 static PyObject* py_read_wram(PyObject *self, PyObject *args)
 {
diff --git a/gfx/shader/shader_glsl.c b/gfx/shader/shader_glsl.c
index 1726abce28..ebb6e9815a 100644
--- a/gfx/shader/shader_glsl.c
+++ b/gfx/shader/shader_glsl.c
@@ -20,7 +20,7 @@
 #include <compat/posix_string.h>
 #include "../state_tracker.h"
 #include "../../dynamic.h"
-#include "../../rarch_file_path.h"
+#include "../../file_ops.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 36fe605315..e0a46968b5 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -523,7 +523,7 @@ FILE
 #include "../file_path.c"
 #include "../dir_list.c"
 #include "../libretro-sdk/string/string_list.c"
-#include "../rarch_file_path.c"
+#include "../file_ops.c"
 #include "../rarch_compr_file_path.c"
 #include "../libretro-sdk/file/file_list.c"
 
diff --git a/retroarch.c b/retroarch.c
index f6f02a0dab..b51e3b5a70 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -23,7 +23,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include "content.h"
-#include "rarch_file_path.h"
+#include "file_ops.h"
+#include "file_path.h"
 #include "dir_list.h"
 #include "general.h"
 #include <compat/strl.h>