diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 588c705ed2..d5615dabe8 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3388,12 +3388,12 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha
             calloc(netplay_room_count + lan_room_count,
                   sizeof(struct netplay_room));
 
-         for (i = 0; i < netplay_room_count; i++)
+         for (i = 0; i < (unsigned)netplay_room_count; i++)
             memcpy(&netplay_room_list[i], netplay_room_get(i), sizeof(netplay_room_list[i]));
 
          if (lan_room_count != 0)
          {
-            for (i = netplay_room_count; i < netplay_room_count + lan_room_count; i++)
+            for (i = netplay_room_count; i < (unsigned)(netplay_room_count + lan_room_count); i++)
             {
                struct netplay_host *host = &lan_hosts->hosts[j++];
 
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index 6ab0591318..82e63ada7a 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -128,8 +128,8 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
 {
 #ifndef RARCH_CONSOLE
    char port_str[6];
-   int k = 0;
    int ret;
+   unsigned k = 0;
 
    if (lan_ad_client_fd < 0)
       return false;
@@ -138,10 +138,9 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
    {
       case RARCH_NETPLAY_DISCOVERY_CTL_LAN_SEND_QUERY:
       {
-         struct addrinfo hints = {0}, *addr;
-         int canBroadcast = 1;
-
          net_ifinfo_t interfaces;
+         struct addrinfo hints = {0}, *addr;
+         int canBroadcast      = 1;
 
          if (!net_ifinfo_new(&interfaces))
             return false;
@@ -162,7 +161,7 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
          memcpy((void *) &ad_packet_buffer, "RANQ", 4);
          ad_packet_buffer.protocol_version = htonl(NETPLAY_PROTOCOL_VERSION);
 
-         for (k=0; k < interfaces.size; k++)
+         for (k = 0; k < (unsigned)interfaces.size; k++)
          {
             strlcpy(ad_packet_buffer.address, interfaces.entries[k].host,
                NETPLAY_HOST_STR_LEN);
@@ -233,11 +232,12 @@ bool netplay_lan_ad_server(netplay_t *netplay)
 /* Todo: implement net_ifinfo and ntohs for consoles */
 #ifndef RARCH_CONSOLE
    fd_set fds;
+   int ret;
    struct timeval tmp_tv = {0};
    struct sockaddr their_addr;
    socklen_t addr_size;
    rarch_system_info_t *info = NULL;
-   int ret, k = 0;
+   unsigned k = 0;
    char reply_addr[NETPLAY_HOST_STR_LEN], port_str[6];
    struct addrinfo *our_addr, hints = {0};