diff --git a/frontend/frontend.c b/frontend/frontend.c
index 827c4647ee..e5a3117ea0 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -71,7 +71,6 @@
 #define attempt_load_game_push_history false
 #endif
 
-default_paths_t default_paths;
 static retro_keyboard_event_t key_event;
 
 #ifdef HAVE_MENU
diff --git a/frontend/frontend.h b/frontend/frontend.h
index a80d31d7ef..d398096f7c 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -21,10 +21,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
 #if defined(ANDROID)
 #define args_type() struct android_app*
 #define signature() void* data
@@ -33,24 +29,6 @@
 #define signature() int argc, char *argv[]
 #endif
 
-typedef struct
-{
-   char config_path[PATH_MAX];
-   char autoconfig_dir[PATH_MAX];
-   char assets_dir[PATH_MAX];
-   char core_dir[PATH_MAX];
-   char core_info_dir[PATH_MAX];
-   char overlay_dir[PATH_MAX];
-   char port_dir[PATH_MAX];
-   char shader_dir[PATH_MAX];
-   char savestate_dir[PATH_MAX];
-   char sram_dir[PATH_MAX];
-   char screenshot_dir[PATH_MAX];
-   char system_dir[PATH_MAX];
-} default_paths_t;
-
-default_paths_t default_paths;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/general.h b/general.h
index 66eb02fd46..2ed6fa9e90 100644
--- a/general.h
+++ b/general.h
@@ -124,6 +124,22 @@ enum sound_mode_enums
    SOUND_MODE_LAST
 };
 
+struct defaults
+{
+   char config_path[PATH_MAX];
+   char autoconfig_dir[PATH_MAX];
+   char assets_dir[PATH_MAX];
+   char core_dir[PATH_MAX];
+   char core_info_dir[PATH_MAX];
+   char overlay_dir[PATH_MAX];
+   char port_dir[PATH_MAX];
+   char shader_dir[PATH_MAX];
+   char savestate_dir[PATH_MAX];
+   char sram_dir[PATH_MAX];
+   char screenshot_dir[PATH_MAX];
+   char system_dir[PATH_MAX];
+};
+
 // All config related settings go here.
 struct settings
 {
@@ -693,6 +709,7 @@ struct rarch_main_wrap
 // Public data structures
 extern struct settings g_settings;
 extern struct global g_extern;
+extern struct defaults default_paths;
 /////////
 
 // Public functions
diff --git a/settings.c b/settings.c
index f48e2b1934..7d510d5754 100644
--- a/settings.c
+++ b/settings.c
@@ -31,6 +31,7 @@
 
 struct settings g_settings;
 struct global g_extern;
+struct defaults default_paths;
 
 const char *config_get_default_audio(void)
 {