diff --git a/libretro-common/glsym/glsym_gl.c b/libretro-common/glsym/glsym_gl.c
index 8b9550a1ec..f72e976486 100644
--- a/libretro-common/glsym/glsym_gl.c
+++ b/libretro-common/glsym/glsym_gl.c
@@ -20,9 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <glsym/glsym.h>
 #include <stddef.h>
 
+#include <glsym/glsym.h>
+
 #define SYM(x) { "gl" #x, &(gl##x) }
 
 const struct rglgen_sym_map rglgen_symbol_map[] = {
diff --git a/libretro-common/glsym/rglgen.c b/libretro-common/glsym/rglgen.c
index 64fcc933f0..29403c9d00 100644
--- a/libretro-common/glsym/rglgen.c
+++ b/libretro-common/glsym/rglgen.c
@@ -21,9 +21,10 @@
  */
 
 #include <stdint.h>
+#include <string.h>
+
 #include <glsym/rglgen.h>
 #include <glsym/glsym.h>
-#include <string.h>
 
 void rglgen_resolve_symbols_custom(rglgen_proc_address_t proc,
       const struct rglgen_sym_map *map)
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
index b0cfbf6920..ec33d74360 100644
--- a/libretro-common/net/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -14,12 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <net/net_compat.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <net/net_compat.h>
+
 int getaddrinfo_rarch(const char *node, const char *service,
       const struct addrinfo *hints,
       struct addrinfo **res)
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index e5d362179c..7e85624b2c 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+
 #include <net/net_http.h>
 #include <net/net_compat.h>
 #include <compat/strl.h>
diff --git a/libretro-common/queues/fifo_buffer.c b/libretro-common/queues/fifo_buffer.c
index d4619ffaa8..2a02b68dc2 100644
--- a/libretro-common/queues/fifo_buffer.c
+++ b/libretro-common/queues/fifo_buffer.c
@@ -20,7 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libretro-common/queues/message_queue.c b/libretro-common/queues/message_queue.c
index 47bfcf9f27..1f7aa7612a 100644
--- a/libretro-common/queues/message_queue.c
+++ b/libretro-common/queues/message_queue.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include <boolean.h>
 #include <queues/message_queue.h>
 #include <compat/strl.h>
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index a3496b6051..9aaa38c933 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -20,9 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <rthreads/rthreads.h>
 #include <stdlib.h>
 
+#include <rthreads/rthreads.h>
+
 #if defined(_WIN32)
 #ifdef _XBOX
 #include <xtl.h>
diff --git a/libretro-common/string/stdstring.c b/libretro-common/string/stdstring.c
index abd39145e6..b4a978d016 100644
--- a/libretro-common/string/stdstring.c
+++ b/libretro-common/string/stdstring.c
@@ -20,9 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <string/stdstring.h>
 #include <ctype.h>
 
+#include <string/stdstring.h>
+
 bool string_is_empty(const char *data)
 {
 	char **str = NULL;
diff --git a/libretro-common/string/string_list.c b/libretro-common/string/string_list.c
index efe7145162..96840dd8d6 100644
--- a/libretro-common/string/string_list.c
+++ b/libretro-common/string/string_list.c
@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <string/string_list.h>
 #include <string.h>
+
+#include <string/string_list.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
 #include <compat/strl.h>
diff --git a/libretro-common/utils/md5.c b/libretro-common/utils/md5.c
index e1863a6269..b592e27b21 100644
--- a/libretro-common/utils/md5.c
+++ b/libretro-common/utils/md5.c
@@ -36,15 +36,13 @@
  ** documentation and/or software.                                   **
  **********************************************************************
  */
-
-/* typedef a 32 bit type */
-typedef unsigned long int UINT4;
+#include <stdint.h>
 
 /* Data structure for MD5 (Message Digest) computation */
 typedef struct
 {
-   UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
-   UINT4 buf[4];                                    /* scratch buffer */
+   uint32_t i[2];                   /* number of _bits_ handled mod 2^64 */
+   uint32_t buf[4];                                    /* scratch buffer */
    unsigned char in[64];                              /* input buffer */
    unsigned char digest[16];     /* actual digest after MD5Final call */
 } MD5_CTX;
@@ -114,43 +112,43 @@ static unsigned char PADDING[64] = {
 /* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
 /* Rotation is separate from addition to prevent recomputation */
 #define FF(a, b, c, d, x, s, ac) \
-  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+  {(a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \
    (a) = ROTATE_LEFT ((a), (s)); \
    (a) += (b); \
   }
 #define GG(a, b, c, d, x, s, ac) \
-  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+  {(a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \
    (a) = ROTATE_LEFT ((a), (s)); \
    (a) += (b); \
   }
 #define HH(a, b, c, d, x, s, ac) \
-  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+  {(a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \
    (a) = ROTATE_LEFT ((a), (s)); \
    (a) += (b); \
   }
 #define II(a, b, c, d, x, s, ac) \
-  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+  {(a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \
    (a) = ROTATE_LEFT ((a), (s)); \
    (a) += (b); \
   }
 
 void MD5Init(MD5_CTX *mdContext)
 {
-   mdContext->i[0] = mdContext->i[1] = (UINT4)0;
+   mdContext->i[0] = mdContext->i[1] = (uint32_t)0;
 
    /* Load magic initialization constants.
    */
-   mdContext->buf[0] = (UINT4)0x67452301;
-   mdContext->buf[1] = (UINT4)0xefcdab89;
-   mdContext->buf[2] = (UINT4)0x98badcfe;
-   mdContext->buf[3] = (UINT4)0x10325476;
+   mdContext->buf[0] = (uint32_t)0x67452301;
+   mdContext->buf[1] = (uint32_t)0xefcdab89;
+   mdContext->buf[2] = (uint32_t)0x98badcfe;
+   mdContext->buf[3] = (uint32_t)0x10325476;
 }
 
 /* Basic MD5 step. Transform buf based on in.
  */
-static void Transform (UINT4 *buf, UINT4 *in)
+static void Transform (uint32_t *buf, uint32_t *in)
 {
-   UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+   uint32_t a = buf[0], b = buf[1], c = buf[2], d = buf[3];
 
    /* Round 1 */
 #define S11 7
@@ -249,7 +247,7 @@ static void Transform (UINT4 *buf, UINT4 *in)
 void MD5Update (MD5_CTX *mdContext,
       unsigned char *inBuf, unsigned int inLen)
 {
-   UINT4 in[16];
+   uint32_t in[16];
    int mdi;
    unsigned int i, ii;
 
@@ -257,10 +255,10 @@ void MD5Update (MD5_CTX *mdContext,
    mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
 
    /* update number of bits */
-   if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0])
+   if ((mdContext->i[0] + ((uint32_t)inLen << 3)) < mdContext->i[0])
       mdContext->i[1]++;
-   mdContext->i[0] += ((UINT4)inLen << 3);
-   mdContext->i[1] += ((UINT4)inLen >> 29);
+   mdContext->i[0] += ((uint32_t)inLen << 3);
+   mdContext->i[1] += ((uint32_t)inLen >> 29);
 
    while (inLen--)
    {
@@ -271,10 +269,10 @@ void MD5Update (MD5_CTX *mdContext,
       if (mdi == 0x40)
       {
          for (i = 0, ii = 0; i < 16; i++, ii += 4)
-            in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
-               (((UINT4)mdContext->in[ii+2]) << 16) |
-               (((UINT4)mdContext->in[ii+1]) << 8) |
-               ((UINT4)mdContext->in[ii]);
+            in[i] = (((uint32_t)mdContext->in[ii+3]) << 24) |
+               (((uint32_t)mdContext->in[ii+2]) << 16) |
+               (((uint32_t)mdContext->in[ii+1]) << 8) |
+               ((uint32_t)mdContext->in[ii]);
          Transform (mdContext->buf, in);
          mdi = 0;
       }
@@ -283,7 +281,7 @@ void MD5Update (MD5_CTX *mdContext,
 
 void MD5Final (MD5_CTX *mdContext)
 {
-   UINT4 in[16];
+   uint32_t in[16];
    int mdi;
    unsigned int i, ii;
    unsigned int padLen;
@@ -301,10 +299,10 @@ void MD5Final (MD5_CTX *mdContext)
 
    /* append length in bits and transform */
    for (i = 0, ii = 0; i < 14; i++, ii += 4)
-      in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
-         (((UINT4)mdContext->in[ii+2]) << 16) |
-         (((UINT4)mdContext->in[ii+1]) << 8) |
-         ((UINT4)mdContext->in[ii]);
+      in[i] = (((uint32_t)mdContext->in[ii+3]) << 24) |
+         (((uint32_t)mdContext->in[ii+2]) << 16) |
+         (((uint32_t)mdContext->in[ii+1]) << 8) |
+         ((uint32_t)mdContext->in[ii]);
    Transform (mdContext->buf, in);
 
    /* store buffer in digest */