diff --git a/configuration.c b/configuration.c
index a1bd36c71b..c7420f5992 100644
--- a/configuration.c
+++ b/configuration.c
@@ -3639,7 +3639,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
 
    for (i = 0; invalid_filename_chars[i]; i++)
    {
-      while (1)
+      for (;;)
       {
          char *tmp = strstr(path_new, invalid_filename_chars[i]);
 
diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c
index 2008be9ecc..974e9c61ad 100644
--- a/input/connect/connect_wii.c
+++ b/input/connect/connect_wii.c
@@ -423,7 +423,7 @@ static int wiimote_handshake(struct connect_wii_wiimote_t* wm,
    if (!wm)
       return 0;
 
-   do
+   for (;;)
    {
       switch (wm->handshake_state)
       {
@@ -605,7 +605,7 @@ static int wiimote_handshake(struct connect_wii_wiimote_t* wm,
          default:
             break;
       }
-   }while(1);
+   }
 }
 
 static void hidpad_wii_deinit(void *data)
diff --git a/libretro-common/compat/compat_ifaddrs.c b/libretro-common/compat/compat_ifaddrs.c
index 3e54e899e1..ceb4be0d84 100644
--- a/libretro-common/compat/compat_ifaddrs.c
+++ b/libretro-common/compat/compat_ifaddrs.c
@@ -48,12 +48,13 @@ static int netlink_socket(void)
    struct sockaddr_nl l_addr;
    int l_socket = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
 
-   if(l_socket < 0)
+   if (l_socket < 0)
       return -1;
 
    memset(&l_addr, 0, sizeof(l_addr));
    l_addr.nl_family = AF_NETLINK;
-   if(bind(l_socket, (struct sockaddr *)&l_addr, sizeof(l_addr)) < 0)
+
+   if (bind(l_socket, (struct sockaddr *)&l_addr, sizeof(l_addr)) < 0)
    {
       close(l_socket);
       return -1;
@@ -91,67 +92,77 @@ static int netlink_recv(int p_socket, void *p_buffer, size_t p_len)
    struct iovec l_iov = { p_buffer, p_len };
    struct sockaddr_nl l_addr;
 
-   for(;;)
+   for (;;)
    {
-      l_msg.msg_name = (void *)&l_addr;
-      l_msg.msg_namelen = sizeof(l_addr);
-      l_msg.msg_iov = &l_iov;
-      l_msg.msg_iovlen = 1;
-      l_msg.msg_control = NULL;
-      l_msg.msg_controllen = 0;
-      l_msg.msg_flags = 0;
-      int l_result = recvmsg(p_socket, &l_msg, 0);
+      int l_result;
 
-      if(l_result < 0)
+      l_msg.msg_name       = (void *)&l_addr;
+      l_msg.msg_namelen    = sizeof(l_addr);
+      l_msg.msg_iov        = &l_iov;
+      l_msg.msg_iovlen     = 1;
+      l_msg.msg_control    = NULL;
+      l_msg.msg_controllen = 0;
+      l_msg.msg_flags      = 0;
+
+      l_result             = recvmsg(p_socket, &l_msg, 0);
+
+      if (l_result < 0)
       {
-         if(errno == EINTR)
+         if (errno == EINTR)
             continue;
          return -2;
       }
 
-      if(l_msg.msg_flags & MSG_TRUNC) /* buffer too small */
+      if (l_msg.msg_flags & MSG_TRUNC) /* buffer too small */
          return -1;
       return l_result;
    }
 }
 
-static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_done)
+static struct nlmsghdr *getNetlinkResponse(int p_socket,
+      int *p_size, int *p_done)
 {
-   size_t l_size = 4096;
+   size_t l_size  = 4096;
    void *l_buffer = NULL;
 
-   for(;;)
+   for (;;)
    {
+      int l_read;
+
       free(l_buffer);
       l_buffer = malloc(l_size);
-      if (l_buffer == NULL)
+      if (!l_buffer)
          return NULL;
 
-      int l_read = netlink_recv(p_socket, l_buffer, l_size);
+      l_read  = netlink_recv(p_socket, l_buffer, l_size);
       *p_size = l_read;
 
-      if(l_read == -2)
+      if (l_read == -2)
       {
          free(l_buffer);
          return NULL;
       }
 
-      if(l_read >= 0)
+      if (l_read >= 0)
       {
          pid_t l_pid = getpid();
          struct nlmsghdr *l_hdr;
-         for(l_hdr = (struct nlmsghdr *)l_buffer; NLMSG_OK(l_hdr, (unsigned int)l_read); l_hdr = (struct nlmsghdr *)NLMSG_NEXT(l_hdr, l_read))
+
+         for (l_hdr = (struct nlmsghdr *)l_buffer;
+               NLMSG_OK(l_hdr, (unsigned int)l_read);
+               l_hdr = (struct nlmsghdr *)NLMSG_NEXT(l_hdr, l_read))
          {
-            if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
+            if (  (pid_t)l_hdr->nlmsg_pid != l_pid || 
+                  (int)l_hdr->nlmsg_seq   != p_socket)
                continue;
 
-            if(l_hdr->nlmsg_type == NLMSG_DONE)
+            if (l_hdr->nlmsg_type == NLMSG_DONE)
             {
                *p_done = 1;
                break;
             }
 
-            if(l_hdr->nlmsg_type == NLMSG_ERROR)
+            if (l_hdr->nlmsg_type == NLMSG_ERROR)
             {
                free(l_buffer);
                return NULL;
@@ -166,8 +177,8 @@ static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_don
 
 static NetlinkList *newListItem(struct nlmsghdr *p_data, unsigned int p_size)
 {
-   NetlinkList *l_item = malloc(sizeof(NetlinkList));
-   if (l_item == NULL)
+   NetlinkList *l_item = (NetlinkList*)malloc(sizeof(NetlinkList));
+   if (!l_item)
       return NULL;
 
    l_item->m_next = NULL;
@@ -179,7 +190,8 @@ static NetlinkList *newListItem(struct nlmsghdr *p_data, unsigned int p_size)
 static void freeResultList(NetlinkList *p_list)
 {
    NetlinkList *l_cur;
-   while(p_list)
+
+   while (p_list)
    {
       l_cur = p_list;
       p_list = p_list->m_next;
@@ -190,29 +202,30 @@ static void freeResultList(NetlinkList *p_list)
 
 static NetlinkList *getResultList(int p_socket, int p_request)
 {
-   if(netlink_send(p_socket, p_request) < 0)
+   int l_size;
+   NetlinkList *l_list = NULL;
+   NetlinkList *l_end  = NULL;
+   int l_done          = 0;
+
+   if (netlink_send(p_socket, p_request) < 0)
       return NULL;
 
-   NetlinkList *l_list = NULL;
-   NetlinkList *l_end = NULL;
-   int l_size;
-   int l_done = 0;
-   while(!l_done)
+   while (!l_done)
    {
       NetlinkList *l_item    = NULL;
       struct nlmsghdr *l_hdr = getNetlinkResponse(p_socket, &l_size, &l_done);
-      if(!l_hdr)
+      if (!l_hdr)
          goto error;
 
       l_item = newListItem(l_hdr, l_size);
       if (!l_item)
          goto error;
 
-      if(!l_list)
-         l_list = l_item;
+      if (!l_list)
+         l_list        = l_item;
       else
          l_end->m_next = l_item;
-      l_end = l_item;
+      l_end            = l_item;
    }
 
    return l_list;
@@ -267,12 +280,12 @@ static void makeSockaddr(sa_family_t p_family, struct sockaddr *p_dest, void *p_
 
 static void addToEnd(struct ifaddrs **p_resultList, struct ifaddrs *p_entry)
 {
-   if(!*p_resultList)
+   if (!*p_resultList)
       *p_resultList = p_entry;
    else
    {
       struct ifaddrs *l_cur = *p_resultList;
-      while(l_cur->ifa_next)
+      while (l_cur->ifa_next)
          l_cur = l_cur->ifa_next;
       l_cur->ifa_next = p_entry;
    }
@@ -288,7 +301,8 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
    size_t l_dataSize        = 0;
    size_t l_rtaSize         = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg));
 
-   for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
+   for (l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize);
+         l_rta = RTA_NEXT(l_rta, l_rtaSize))
    {
       size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
       switch(l_rta->rta_type)
@@ -308,8 +322,8 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
       }
    }
 
-   l_entry = malloc(sizeof(struct ifaddrs) + sizeof(int) + l_nameSize + l_addrSize + l_dataSize);
-   if (l_entry == NULL)
+   l_entry = (sruct ifaddrs*)malloc(sizeof(struct ifaddrs) + sizeof(int) + l_nameSize + l_addrSize + l_dataSize);
+   if (!l_entry)
       return -1;
 
    memset(l_entry, 0, sizeof(struct ifaddrs));
@@ -320,16 +334,20 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
    char *l_addr = l_name + l_nameSize;
    char *l_data = l_addr + l_addrSize;
 
-   // save the interface index so we can look it up when handling the addresses.
+   /* save the interface index so we can look 
+    * it up when handling the addresses. */
    memcpy(l_index, &l_info->ifi_index, sizeof(int));
 
    l_entry->ifa_flags = l_info->ifi_flags;
 
-   l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg));
-   for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
+   l_rtaSize          = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg));
+
+   for (l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize);
+         l_rta = RTA_NEXT(l_rta, l_rtaSize))
    {
-      void *l_rtaData = RTA_DATA(l_rta);
+      void      *l_rtaData = RTA_DATA(l_rta);
       size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
+
       switch(l_rta->rta_type)
       {
          case IFLA_ADDRESS:
@@ -339,8 +357,8 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
                makeSockaddr(AF_PACKET, (struct sockaddr *)l_addr, l_rtaData, l_rtaDataSize);
                ((struct sockaddr_ll *)l_addr)->sll_ifindex = l_info->ifi_index;
                ((struct sockaddr_ll *)l_addr)->sll_hatype = l_info->ifi_type;
-               if(l_rta->rta_type == IFLA_ADDRESS)
-                  l_entry->ifa_addr = (struct sockaddr *)l_addr;
+               if (l_rta->rta_type == IFLA_ADDRESS)
+                  l_entry->ifa_addr      = (struct sockaddr *)l_addr;
                else
                   l_entry->ifa_broadaddr = (struct sockaddr *)l_addr;
                l_addr += NLMSG_ALIGN(l_addrLen);
@@ -364,17 +382,19 @@ static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
    return 0;
 }
 
-static struct ifaddrs *findInterface(int p_index, struct ifaddrs **p_links, int p_numLinks)
+static struct ifaddrs *findInterface(int p_index,
+      struct ifaddrs **p_links, int p_numLinks)
 {
-   int l_num = 0;
+   int l_num             = 0;
    struct ifaddrs *l_cur = *p_links;
-   while(l_cur && l_num < p_numLinks)
+
+   while (l_cur && l_num < p_numLinks)
    {
       int l_index;
       char *l_indexPtr = ((char *)l_cur) + sizeof(struct ifaddrs);
 
       memcpy(&l_index, l_indexPtr, sizeof(int));
-      if(l_index == p_index)
+      if (l_index == p_index)
          return l_cur;
 
       l_cur = l_cur->ifa_next;
@@ -383,21 +403,24 @@ static struct ifaddrs *findInterface(int p_index, struct ifaddrs **p_links, int
    return NULL;
 }
 
-static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList, int p_numLinks)
+static int interpretAddr(struct nlmsghdr *p_hdr,
+      struct ifaddrs **p_resultList, int p_numLinks)
 {
-   size_t l_nameSize = 0;
-   size_t l_addrSize = 0;
-   int l_addedNetmask = 0;
-   struct ifaddrmsg *l_info = (struct ifaddrmsg *)NLMSG_DATA(p_hdr);
+   struct rtattr *l_rta;
+   size_t l_rtaSize;
+   size_t l_nameSize           = 0;
+   size_t l_addrSize           = 0;
+   int l_addedNetmask          = 0;
+   struct ifaddrmsg *l_info    = (struct ifaddrmsg *)NLMSG_DATA(p_hdr);
    struct ifaddrs *l_interface = findInterface(l_info->ifa_index, p_resultList, p_numLinks);
 
-   if(l_info->ifa_family == AF_PACKET)
+   if (l_info->ifa_family == AF_PACKET)
       return 0;
 
-   size_t l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
-   struct rtattr *l_rta;
+   l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
 
-   for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
+   for (l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize);
+         l_rta = RTA_NEXT(l_rta, l_rtaSize))
    {
       size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
 
@@ -405,7 +428,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
       {
          case IFA_ADDRESS:
          case IFA_LOCAL:
-            if((l_info->ifa_family == AF_INET || l_info->ifa_family == AF_INET6) && !l_addedNetmask)
+            if ((l_info->ifa_family == AF_INET || l_info->ifa_family == AF_INET6) && !l_addedNetmask)
             {
                /* make room for netmask */
                l_addrSize += NLMSG_ALIGN(calcAddrLen(l_info->ifa_family, l_rtaDataSize));
@@ -422,8 +445,8 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
       }
    }
 
-   struct ifaddrs *l_entry = malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize);
-   if (l_entry == NULL)
+   struct ifaddrs *l_entry = (struct ifaddrs*)malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize);
+   if (!l_entry)
       return -1;
 
    memset(l_entry, 0, sizeof(struct ifaddrs));
@@ -433,11 +456,12 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
    char *l_addr = l_name + l_nameSize;
 
    l_entry->ifa_flags = l_info->ifa_flags;
-   if(l_interface)
+   if (l_interface)
       l_entry->ifa_flags |= l_interface->ifa_flags;
 
    l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
-   for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
+   for (l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize);
+         l_rta = RTA_NEXT(l_rta, l_rtaSize))
    {
       void *l_rtaData = RTA_DATA(l_rta);
       size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
@@ -449,24 +473,24 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
             {
                size_t l_addrLen = calcAddrLen(l_info->ifa_family, l_rtaDataSize);
                makeSockaddr(l_info->ifa_family, (struct sockaddr *)l_addr, l_rtaData, l_rtaDataSize);
-               if(l_info->ifa_family == AF_INET6)
+               if (l_info->ifa_family == AF_INET6)
                {
-                  if(IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)l_rtaData) || IN6_IS_ADDR_MC_LINKLOCAL((struct in6_addr *)l_rtaData))
+                  if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)l_rtaData) || IN6_IS_ADDR_MC_LINKLOCAL((struct in6_addr *)l_rtaData))
                      ((struct sockaddr_in6 *)l_addr)->sin6_scope_id = l_info->ifa_index;
                }
 
-               if(l_rta->rta_type == IFA_ADDRESS)
+               if (l_rta->rta_type == IFA_ADDRESS)
                {
                   /* apparently in a point-to-point network IFA_ADDRESS
                    * contains the dest address and IFA_LOCAL contains the local address */
-                  if(l_entry->ifa_addr)
+                  if (l_entry->ifa_addr)
                      l_entry->ifa_dstaddr = (struct sockaddr *)l_addr;
                   else
                      l_entry->ifa_addr = (struct sockaddr *)l_addr;
                }
-               else if(l_rta->rta_type == IFA_LOCAL)
+               else if (l_rta->rta_type == IFA_LOCAL)
                {
-                  if(l_entry->ifa_addr)
+                  if (l_entry->ifa_addr)
                      l_entry->ifa_dstaddr = l_entry->ifa_addr;
                   l_entry->ifa_addr = (struct sockaddr *)l_addr;
                }
@@ -485,7 +509,7 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
       }
    }
 
-   if(l_entry->ifa_addr &&
+   if (l_entry->ifa_addr &&
          (   l_entry->ifa_addr->sa_family == AF_INET
           || l_entry->ifa_addr->sa_family == AF_INET6))
    {
@@ -498,9 +522,9 @@ static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList,
 
       l_mask[0] = '\0';
 
-      for(i=0; i<(l_prefix/8); ++i)
+      for (i=0; i<(l_prefix/8); ++i)
          l_mask[i] = 0xff;
-      if(l_prefix % 8)
+      if (l_prefix % 8)
          l_mask[i] = 0xff << (8 - (l_prefix % 8));
 
       makeSockaddr(l_entry->ifa_addr->sa_family,
@@ -516,23 +540,26 @@ static int interpretLinks(int p_socket, NetlinkList *p_netlinkList,
       struct ifaddrs **p_resultList)
 {
    int l_numLinks = 0;
-   pid_t l_pid = getpid();
-   for(; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
+   pid_t l_pid    = getpid();
+
+   for (; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
    {
       struct nlmsghdr *l_hdr = NULL;
       unsigned int l_nlsize  = p_netlinkList->m_size;
 
-      for(l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize); l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
+      for (l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize);
+            l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
       {
-         if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
+         if (  (pid_t)l_hdr->nlmsg_pid != l_pid || 
+               (int)l_hdr->nlmsg_seq   != p_socket)
             continue;
 
-         if(l_hdr->nlmsg_type == NLMSG_DONE)
+         if (l_hdr->nlmsg_type == NLMSG_DONE)
             break;
 
-         if(l_hdr->nlmsg_type == RTM_NEWLINK)
+         if (l_hdr->nlmsg_type == RTM_NEWLINK)
          {
-            if(interpretLink(l_hdr, p_resultList) == -1)
+            if (interpretLink(l_hdr, p_resultList) == -1)
                return -1;
             ++l_numLinks;
          }
@@ -545,20 +572,22 @@ static int interpretAddrs(int p_socket, NetlinkList *p_netlinkList,
       struct ifaddrs **p_resultList, int p_numLinks)
 {
    pid_t l_pid = getpid();
-   for(; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
+   for (; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
    {
       struct nlmsghdr *l_hdr = NULL;
       unsigned int l_nlsize  = p_netlinkList->m_size;
 
-      for(l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize); l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
+      for (l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize);
+            l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
       {
-         if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
+         if (     (pid_t)l_hdr->nlmsg_pid != l_pid 
+               || (int)l_hdr->nlmsg_seq   != p_socket)
             continue;
 
-         if(l_hdr->nlmsg_type == NLMSG_DONE)
+         if (l_hdr->nlmsg_type == NLMSG_DONE)
             break;
 
-         if(l_hdr->nlmsg_type == RTM_NEWADDR)
+         if (l_hdr->nlmsg_type == RTM_NEWADDR)
          {
             if (interpretAddr(l_hdr, p_resultList, p_numLinks) == -1)
                return -1;
@@ -570,34 +599,40 @@ static int interpretAddrs(int p_socket, NetlinkList *p_netlinkList,
 
 int getifaddrs(struct ifaddrs **ifap)
 {
-   int l_socket = 0;
-   int l_result = 0;
-   if(!ifap)
+   NetlinkList *l_linkResults;
+   NetlinkList *l_addrResults;
+   int l_numLinks;
+   int l_socket   = 0;
+   int l_result   = 0;
+   if (!ifap)
       return -1;
-   *ifap = NULL;
+
+   *ifap    = NULL;
 
    l_socket = netlink_socket();
-   if(l_socket < 0)
+
+   if (l_socket < 0)
       return -1;
 
-   NetlinkList *l_linkResults = getResultList(l_socket, RTM_GETLINK);
-   if(!l_linkResults)
+   l_linkResults = getResultList(l_socket, RTM_GETLINK);
+   if (!l_linkResults)
    {
       close(l_socket);
       return -1;
    }
 
-   NetlinkList *l_addrResults = getResultList(l_socket, RTM_GETADDR);
-   if(!l_addrResults)
+   l_addrResults = getResultList(l_socket, RTM_GETADDR);
+   if (!l_addrResults)
    {
       close(l_socket);
       freeResultList(l_linkResults);
       return -1;
    }
 
-   int l_numLinks = interpretLinks(l_socket, l_linkResults, ifap);
+   l_numLinks = interpretLinks(l_socket, l_linkResults, ifap);
 
-   if(l_numLinks == -1 || interpretAddrs(l_socket, l_addrResults, ifap, l_numLinks) == -1)
+   if (  l_numLinks == -1 || 
+         interpretAddrs(l_socket, l_addrResults, ifap, l_numLinks) == -1)
       l_result = -1;
 
    freeResultList(l_linkResults);
@@ -610,10 +645,10 @@ void freeifaddrs(struct ifaddrs *ifa)
 {
    struct ifaddrs *l_cur = NULL;
 
-   while(ifa)
+   while (ifa)
    {
       l_cur = ifa;
-      ifa = ifa->ifa_next;
+      ifa   = ifa->ifa_next;
       free(l_cur);
    }
 }
diff --git a/libretro-common/net/net_socket_ssl.c b/libretro-common/net/net_socket_ssl.c
index 83f26b875d..391f814d29 100644
--- a/libretro-common/net/net_socket_ssl.c
+++ b/libretro-common/net/net_socket_ssl.c
@@ -189,7 +189,7 @@ int ssl_socket_receive_all_blocking(void *state_data, void *data_, size_t size)
 
    mbedtls_net_set_block(&state->net_ctx);
 
-   while (1)
+   for (;;)
    {
       /* mbedtls_ssl_read wants non-const data but it only reads it, so this cast is safe */
       int ret = mbedtls_ssl_read(&state->ctx, (unsigned char*)data, size);
diff --git a/libretro-db/rmsgpack_dom.c b/libretro-db/rmsgpack_dom.c
index a731d0434d..d0f4f977e1 100644
--- a/libretro-db/rmsgpack_dom.c
+++ b/libretro-db/rmsgpack_dom.c
@@ -448,7 +448,7 @@ int rmsgpack_dom_read_into(RFILE *fd, ...)
    if (map.type != RDT_MAP)
       goto clean;
 
-   while (1)
+   for (;;)
    {
       key_name = va_arg(ap, const char *);
 
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index d715b667b8..350ce91e39 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -260,7 +260,7 @@ bool netplay_lan_ad_server(netplay_t *netplay)
       return false;
 
    /* Check for any ad queries */
-   while (1)
+   for (;;)
    {
       FD_ZERO(&fds);
       FD_SET(lan_ad_server_fd, &fds);
@@ -426,7 +426,7 @@ static bool netplay_lan_ad_client(void)
       return false;
 
    /* Check for any ad queries */
-   while (1)
+   for (;;)
    {
       FD_ZERO(&fds);
       FD_SET(lan_ad_client_fd, &fds);
diff --git a/retroarch.c b/retroarch.c
index e90388c5ae..45cdc48baa 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -8002,7 +8002,7 @@ int rarch_main(int argc, char *argv[], void *data)
    ui_companion_driver_init_first();
 
 #if !defined(HAVE_MAIN) || defined(HAVE_QT)
-   do
+   for (;;)
    {
       int ret;
       bool app_exit     = false;
@@ -8024,7 +8024,7 @@ int rarch_main(int argc, char *argv[], void *data)
 #endif
          break;
       }
-   }while(1);
+   }
 
    main_exit(data);
 #endif
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index fcd693689e..988b685a1d 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -70,7 +70,7 @@ static int64_t get_token(intfstream_t *fd, char *token, uint64_t max_len)
    int64_t len   = 0;
    int in_string = 0;
 
-   while (1)
+   for (;;)
    {
       int64_t rv = (int64_t)intfstream_read(fd, c, 1);
       if (rv == 0)
diff --git a/tools/ranetplayer/ranetplayer.c b/tools/ranetplayer/ranetplayer.c
index 11743cf079..7ff0952f71 100644
--- a/tools/ranetplayer/ranetplayer.c
+++ b/tools/ranetplayer/ranetplayer.c
@@ -135,7 +135,7 @@ uint32_t frame_offset_cmd(bool ntoh)
 /* Send a bit of our input */
 bool send_input(uint32_t cur_frame)
 {
-   while (1)
+   for (;;)
    {
       uint32_t rd_frame = 0;
 
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
       {"ahead",      1, NULL, 'a'}
    };
 
-   while (1)
+   for (;;)
    {
       int c;
 
@@ -345,7 +345,7 @@ int main(int argc, char **argv)
    }
 
    /* Now handle netplay commands */
-   while (1)
+   for (;;)
    {
       RECV();
 
diff --git a/ui/drivers/cocoa/ui_cocoa_application.m b/ui/drivers/cocoa/ui_cocoa_application.m
index 1d5d2993d5..57fdb69b08 100644
--- a/ui/drivers/cocoa/ui_cocoa_application.m
+++ b/ui/drivers/cocoa/ui_cocoa_application.m
@@ -31,7 +31,7 @@ static void* ui_application_cocoa_initialize(void)
 
 static void ui_application_cocoa_process_events(void)
 {
-    while (1)
+    for (;;)
     {
         NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
         if (!event)
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index e5595bbb98..c054a58a19 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -377,7 +377,7 @@ static char** waiting_argv;
 
 - (void) rarch_main
 {
-    do
+    for (;;)
     {
        int ret;
 #ifdef HAVE_QT
@@ -400,7 +400,7 @@ static char** waiting_argv;
 #endif
           break;
        }
-    }while(1);
+    }
 
     main_exit(NULL);
 }