diff --git a/config.def.h b/config.def.h
index 2312cd1ddf..79ef068d47 100644
--- a/config.def.h
+++ b/config.def.h
@@ -868,7 +868,7 @@ static const int netplay_check_frames = 600;
 
 static const bool netplay_use_mitm_server = false;
 
-static const char *netplay_mitm_server = "nyc";
+#define DEFAULT_NETPLAY_MITM_SERVER "nyc"
 
 #ifdef HAVE_NETWORKING
 static const unsigned netplay_share_digital = RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE;
diff --git a/configuration.c b/configuration.c
index 18535947c2..6a466ef8df 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1979,7 +1979,7 @@ void config_set_defaults(void *data)
    const char *def_location        = config_get_default_location();
    const char *def_record          = config_get_default_record();
    const char *def_midi            = config_get_default_midi();
-   const char *def_mitm            = netplay_mitm_server;
+   const char *def_mitm            = DEFAULT_NETPLAY_MITM_SERVER;
    struct config_float_setting      *float_settings = populate_settings_float  (settings, &float_settings_size);
    struct config_bool_setting       *bool_settings  = populate_settings_bool  (settings, &bool_settings_size);
    struct config_int_setting        *int_settings   = populate_settings_int   (settings, &int_settings_size);
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index b88284fb67..7b813698fd 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -244,7 +244,9 @@ static int action_start_netplay_mitm_server(
       unsigned type, size_t idx, size_t entry_idx)
 {
    settings_t *settings = config_get_ptr();
-   strlcpy(settings->arrays.netplay_mitm_server, netplay_mitm_server, sizeof(settings->arrays.netplay_mitm_server));
+   strlcpy(settings->arrays.netplay_mitm_server,
+         DEFAULT_NETPLAY_MITM_SERVER,
+         sizeof(settings->arrays.netplay_mitm_server));
    return 0;
 }
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e9e0484a05..0c0354eaae 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -15548,7 +15548,7 @@ static bool setting_append_list(
                   sizeof(settings->arrays.netplay_mitm_server),
                   MENU_ENUM_LABEL_NETPLAY_MITM_SERVER,
                   MENU_ENUM_LABEL_VALUE_NETPLAY_MITM_SERVER,
-                  netplay_mitm_server,
+                  DEFAULT_NETPLAY_MITM_SERVER,
                   &group_info,
                   &subgroup_info,
                   parent_group,
diff --git a/retroarch.c b/retroarch.c
index d27c840d74..2dc4b463cc 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3551,31 +3551,6 @@ static char *strcpy_alloc_force(const char *src)
    return result;
 }
 
-static void strcat_alloc(char **dst, const char *s)
-{
-   size_t len1;
-   char *src  = *dst;
-
-   if (!src)
-   {
-      src     = strcpy_alloc_force(s);
-      *dst    = src;
-      return;
-   }
-
-   if (!s)
-      return;
-
-   len1       = strlen(src);
-   src        = (char*)realloc(src, len1 + strlen(s) + 1);
-
-   if (!src)
-      return;
-
-   *dst       = src;
-   strcpy(src + len1, s);
-}
-
 #if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)
 /* Forward declarations */
 static bool secondary_core_create(void);
@@ -10926,6 +10901,31 @@ static void set_load_content_info(const retro_ctx_load_content_info_t *ctx)
 
 /* RUNAHEAD - SECONDARY CORE  */
 #if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)
+static void strcat_alloc(char **dst, const char *s)
+{
+   size_t len1;
+   char *src  = *dst;
+
+   if (!src)
+   {
+      src     = strcpy_alloc_force(s);
+      *dst    = src;
+      return;
+   }
+
+   if (!s)
+      return;
+
+   len1       = strlen(src);
+   src        = (char*)realloc(src, len1 + strlen(s) + 1);
+
+   if (!src)
+      return;
+
+   *dst       = src;
+   strcpy(src + len1, s);
+}
+
 static void secondary_core_destroy(void)
 {
    if (!secondary_module)