diff --git a/libretro-common/file/archive_file_7z.c b/libretro-common/file/archive_file_7z.c
index d256b63e82..2179e321e9 100644
--- a/libretro-common/file/archive_file_7z.c
+++ b/libretro-common/file/archive_file_7z.c
@@ -48,6 +48,7 @@
 
 struct sevenzip_context_t
 {
+   uint8_t *output;
    CFileInStream archiveStream;
    CLookToRead lookStream;
    ISzAlloc allocImp;
@@ -58,7 +59,6 @@ struct sevenzip_context_t
    uint32_t parse_index;
    uint32_t decompress_index;
    uint32_t packIndex;
-   uint8_t *output;
 };
 
 static void *sevenzip_stream_alloc_impl(void *p, size_t size)
diff --git a/libretro-common/include/encodings/utf.h b/libretro-common/include/encodings/utf.h
index d260cde814..bea4e145d9 100644
--- a/libretro-common/include/encodings/utf.h
+++ b/libretro-common/include/encodings/utf.h
@@ -35,7 +35,7 @@ RETRO_BEGIN_DECLS
 enum CodePage
 {
    CODEPAGE_LOCAL = 0, /* CP_ACP */
-   CODEPAGE_UTF8 = 65001 /* CP_UTF8 */
+   CODEPAGE_UTF8  = 65001 /* CP_UTF8 */
 };
 
 size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index ba7582a71f..ff0cb9ce67 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -55,24 +55,22 @@ enum
 
 struct http_socket_state_t
 {
+   void *ssl_ctx;
    int fd;
    bool ssl;
-   void *ssl_ctx;
 };
 
 struct http_t
 {
-   int status;
-
-   char part;
-   char bodytype;
-   bool error;
-
+   char *data;
+   struct http_socket_state_t sock_state; /* ptr alignment */
    size_t pos;
    size_t len;
    size_t buflen;
-   char *data;
-   struct http_socket_state_t sock_state;
+   int status;
+   char part;
+   char bodytype;
+   bool error;
 };
 
 struct http_connection_t
@@ -85,8 +83,8 @@ struct http_connection_t
    char *contenttypecopy;
    char *postdatacopy;
    char* useragentcopy;
+   struct http_socket_state_t sock_state; /* ptr alignment */
    int port;
-   struct http_socket_state_t sock_state;
 };
 
 /* URL Encode a string
diff --git a/libretro-common/queues/message_queue.c b/libretro-common/queues/message_queue.c
index 277edb012b..74db7f0bce 100644
--- a/libretro-common/queues/message_queue.c
+++ b/libretro-common/queues/message_queue.c
@@ -30,21 +30,20 @@
 
 struct queue_elem
 {
+   char *msg;
+   char *title;
    unsigned duration;
    unsigned prio;
-   char *msg;
-
-   char *title;
    enum message_queue_icon icon;
    enum message_queue_category category;
 };
 
 struct msg_queue
 {
+   char *tmp_msg;
    struct queue_elem **elems;
    size_t ptr;
    size_t size;
-   char *tmp_msg;
 };
 
 /**