diff --git a/Makefile.common b/Makefile.common
index 91070f8928..20b2a0e1e0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -199,7 +199,7 @@ OBJ += frontend/frontend.o \
        managers/cheat_manager.o \
        core_info.o \
        $(LIBRETRO_COMM_DIR)/file/config_file.o \
-       config_file_userdata.o \
+       $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \
        tasks/task_screenshot.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \
        gfx/drivers_shader/shader_null.o \
diff --git a/audio/audio_dsp_filter.c b/audio/audio_dsp_filter.c
index aaa948070e..1ca916ed6e 100644
--- a/audio/audio_dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@@ -22,6 +22,7 @@
 #include <dynamic/dylib.h>
 
 #include <file/file_path.h>
+#include <file/config_file_userdata.h>
 #include <lists/dir_list.h>
 #include <features/features_cpu.h>
 #include <string/stdstring.h>
@@ -29,7 +30,6 @@
 #include "audio_dsp_filter.h"
 #include "audio_filters/dspfilter.h"
 
-#include "../config_file_userdata.h"
 #include "../frontend/frontend_driver.h"
 #include "../performance_counters.h"
 #include "../dynamic.h"
diff --git a/audio/audio_resampler_driver.c b/audio/audio_resampler_driver.c
index 5de5a4e1aa..209cd2cbef 100644
--- a/audio/audio_resampler_driver.c
+++ b/audio/audio_resampler_driver.c
@@ -18,10 +18,9 @@
 
 #include <string/stdstring.h>
 #include <features/features_cpu.h>
+#include <file/config_file_userdata.h>
 
 #include "audio_resampler_driver.h"
-#include "../config_file_userdata.h"
-#include "../performance_counters.h"
 
 static const rarch_resampler_t *resampler_drivers[] = {
    &sinc_resampler,
@@ -108,11 +107,6 @@ static const rarch_resampler_t *find_resampler_driver(const char *ident)
    return resampler_drivers[0];
 }
 
-static resampler_simd_mask_t resampler_get_cpu_features(void)
-{
-   return cpu_features_get();
-}
-
 /**
  * resampler_append_plugs:
  * @re                         : Resampler handle
@@ -127,7 +121,7 @@ static bool resampler_append_plugs(void **re,
       const rarch_resampler_t **backend,
       double bw_ratio)
 {
-   resampler_simd_mask_t mask = resampler_get_cpu_features();
+   resampler_simd_mask_t mask = cpu_features_get();
 
    *re = (*backend)->init(&resampler_config, bw_ratio, mask);
 
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index f082811a62..6eb5de5843 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 
 #include <file/file_path.h>
+#include <file/config_file_userdata.h>
 #include <lists/dir_list.h>
 #include <dynamic/dylib.h>
 #include <features/features_cpu.h>
@@ -28,7 +29,6 @@
 #endif
 
 #include "../frontend/frontend_driver.h"
-#include "../config_file_userdata.h"
 #include "../dynamic.h"
 #include "../performance_counters.h"
 #include "../verbosity.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index df953b780d..8c8b619506 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -122,7 +122,7 @@ CONFIG FILE
 #endif
 
 #include "../libretro-common/file/config_file.c"
-#include "../config_file_userdata.c"
+#include "../libretro-common/file/config_file_userdata.c"
 #include "../managers/core_option_manager.c"
 
 /*============================================================
diff --git a/config_file_userdata.c b/libretro-common/file/config_file_userdata.c
similarity index 99%
rename from config_file_userdata.c
rename to libretro-common/file/config_file_userdata.c
index f4544c68a2..b1ff8138e2 100644
--- a/config_file_userdata.c
+++ b/libretro-common/file/config_file_userdata.c
@@ -23,7 +23,7 @@
 #include <file/file_path.h>
 #include <lists/string_list.h>
 
-#include "config_file_userdata.h"
+#include <file/config_file_userdata.h>
 
 int config_userdata_get_float(void *userdata, const char *key_str,
       float *value, float default_value)
diff --git a/config_file_userdata.h b/libretro-common/include/file/config_file_userdata.h
similarity index 100%
rename from config_file_userdata.h
rename to libretro-common/include/file/config_file_userdata.h