diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index 8fb1d4feac..b46450156a 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -71,16 +71,16 @@ struct ad_packet
    char subsystem_name[NETPLAY_HOST_STR_LEN];
 };
 
+/* TODO/FIXME - globals - remove to make code thread-safe */
+int netplay_room_count                 = 0;
+struct netplay_room *netplay_room_list = NULL;
+
 static bool netplay_lan_ad_client(void);
 
 /* LAN discovery sockets */
 static int lan_ad_server_fd            = -1;
 static int lan_ad_client_fd            = -1;
 
-int netplay_room_count                 = 0;
-
-struct netplay_room *netplay_room_list = NULL;
-
 /* Packet buffer for advertisement and responses */
 static struct ad_packet ad_packet_buffer;