diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 1fc6f96a8e..137b591771 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -14,10 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <compat/strl.h>
 #include <string/stdstring.h>
+#include <retro_miscellaneous.h>
 #include <libretro.h>
 
 #if defined(_3DS)
@@ -398,6 +400,49 @@ enum frontend_architecture frontend_driver_get_cpu_architecture(void)
    return frontend->get_architecture();
 }
 
+void frontend_driver_get_cpu_architecture_str(
+      char *frontend_architecture, size_t size)
+{
+   const frontend_ctx_driver_t
+      *frontend                    = frontend_get_ptr();
+   enum frontend_architecture arch = frontend_driver_get_cpu_architecture();
+   char architecture[PATH_MAX_LENGTH];
+
+   switch (arch)
+   {
+      case FRONTEND_ARCH_X86:
+         strlcpy(architecture, "x86", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_X86_64:
+         strlcpy(architecture, "x64", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_PPC:
+         strlcpy(architecture, "PPC", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_ARM:
+         strlcpy(architecture, "ARM", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_ARMV7:
+         strlcpy(architecture, "ARMv7", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_ARMV8:
+         strlcpy(architecture, "ARMv8", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_MIPS:
+         strlcpy(architecture, "MIPS", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_TILE:
+         strlcpy(architecture, "Tilera", sizeof(architecture));
+         break;
+      case FRONTEND_ARCH_NONE:
+      default:
+         strlcpy(architecture, "N/A", sizeof(architecture));
+         break;
+   }
+   snprintf(frontend_architecture, size, "%s %s",
+         frontend->ident, architecture);
+}
+
 uint64_t frontend_driver_get_total_memory(void)
 {
    frontend_ctx_driver_t *frontend = frontend_get_ptr();
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 2fcab26516..a630c829b0 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -172,6 +172,9 @@ void frontend_driver_free(void);
 
 enum frontend_architecture frontend_driver_get_cpu_architecture(void);
 
+void frontend_driver_get_cpu_architecture_str(
+      char *frontend_architecture, size_t size);
+
 environment_get_t frontend_driver_environment_get_ptr(void);
 
 bool frontend_driver_has_get_video_driver_func(void);
diff --git a/network/netplay/netplay.h b/network/netplay/netplay.h
index 8859162eed..b7da64ffe3 100644
--- a/network/netplay/netplay.h
+++ b/network/netplay/netplay.h
@@ -124,6 +124,4 @@ int netplay_rooms_get_count(void);
 
 void netplay_rooms_free(void);
 
-void netplay_get_architecture(char *frontend_architecture, size_t size);
-
 #endif
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index b46450156a..3b5d67469b 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -301,7 +301,8 @@ bool netplay_lan_ad_server(netplay_t *netplay)
             char *p;
             char sub[NETPLAY_HOST_STR_LEN];
             char frontend[NETPLAY_HOST_STR_LEN];
-            netplay_get_architecture(frontend, sizeof(frontend));
+            frontend_driver_get_cpu_architecture_str(
+                  frontend, sizeof(frontend));
 
             p=strrchr(reply_addr,'.');
             if (p)
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 8780092a0c..35ff488034 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -811,49 +811,6 @@ static void netplay_announce_cb(retro_task_t *task,
    return;
 }
 
-void netplay_get_architecture(char *frontend_architecture, size_t size)
-{
-   const frontend_ctx_driver_t
-      *frontend                  = frontend_get_ptr();
-   enum frontend_architecture arch = frontend_driver_get_cpu_architecture();
-   char architecture[PATH_MAX_LENGTH];
-
-   switch (arch)
-   {
-      case FRONTEND_ARCH_X86:
-         strlcpy(architecture, "x86", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_X86_64:
-         strlcpy(architecture, "x64", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_PPC:
-         strlcpy(architecture, "PPC", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_ARM:
-         strlcpy(architecture, "ARM", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_ARMV7:
-         strlcpy(architecture, "ARMv7", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_ARMV8:
-         strlcpy(architecture, "ARMv8", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_MIPS:
-         strlcpy(architecture, "MIPS", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_TILE:
-         strlcpy(architecture, "Tilera", sizeof(architecture));
-         break;
-      case FRONTEND_ARCH_NONE:
-      default:
-         strlcpy(architecture,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
-               sizeof(architecture));
-         break;
-   }
-   snprintf(frontend_architecture, size, "%s %s", frontend->ident, architecture);
-}
-
 static void netplay_announce(void)
 {
    char buf[4600];
@@ -894,7 +851,8 @@ static void netplay_announce(void)
       net_http_urlencode(&subsystemname, "N/A");
    }
 
-   netplay_get_architecture(frontend_architecture, sizeof(frontend_architecture));
+   frontend_driver_get_cpu_architecture_str(
+         frontend_architecture, sizeof(frontend_architecture));
 
 #ifdef HAVE_DISCORD
    if(discord_is_ready())