diff --git a/libretro-common/include/file/config_file.h b/libretro-common/include/file/config_file.h
index c6faeafe0c..d56bdd793d 100644
--- a/libretro-common/include/file/config_file.h
+++ b/libretro-common/include/file/config_file.h
@@ -57,11 +57,10 @@ struct config_file
    struct config_entry_list *entries;
    struct config_entry_list *tail;
    struct config_entry_list *last;
+   struct config_include_list *includes;
    unsigned include_depth;
    bool guaranteed_no_duplicates;
    bool modified;
-
-   struct config_include_list *includes;
 };
 
 typedef struct config_file config_file_t;
diff --git a/libretro-common/include/queues/message_queue.h b/libretro-common/include/queues/message_queue.h
index 61aba1ad12..5d0e6e59b5 100644
--- a/libretro-common/include/queues/message_queue.h
+++ b/libretro-common/include/queues/message_queue.h
@@ -47,12 +47,12 @@ typedef struct msg_queue msg_queue_t;
 
 typedef struct
 {
-   char msg[1024];
-   char title[1024];
    unsigned duration;
    unsigned prio;
    enum message_queue_icon icon;
    enum message_queue_category category;
+   char msg[1024];
+   char title[1024];
 } msg_queue_entry_t;
 
 /**
diff --git a/libretro-common/include/vfs/vfs.h b/libretro-common/include/vfs/vfs.h
index 2f42c60d4f..5366f3340c 100644
--- a/libretro-common/include/vfs/vfs.h
+++ b/libretro-common/include/vfs/vfs.h
@@ -41,17 +41,17 @@ typedef void* HANDLE;
 #ifdef HAVE_CDROM
 typedef struct
 {
+   int64_t byte_pos;
    char *cue_buf;
    size_t cue_len;
-   int64_t byte_pos;
-   char drive;
+   unsigned cur_lba;
+   unsigned last_frame_lba;
    unsigned char cur_min;
    unsigned char cur_sec;
    unsigned char cur_frame;
    unsigned char cur_track;
-   unsigned cur_lba;
-   unsigned last_frame_lba;
    unsigned char last_frame[2352];
+   char drive;
    bool last_frame_valid;
 } vfs_cdrom_t;
 #endif
@@ -69,22 +69,22 @@ struct retro_vfs_file_handle
 struct libretro_vfs_implementation_file
 #endif
 {
-   int fd;
-   unsigned hints;
+#ifdef HAVE_CDROM
+   vfs_cdrom_t cdrom; /* int64_t alignment */
+#endif
    int64_t size;
-   char *buf;
+   uint64_t mappos;
+   uint64_t mapsize;
    FILE *fp;
 #ifdef _WIN32
    HANDLE fh;
 #endif
+   char *buf;
    char* orig_path;
-   uint64_t mappos;
-   uint64_t mapsize;
    uint8_t *mapped;
+   int fd;
+   unsigned hints;
    enum vfs_scheme scheme;
-#ifdef HAVE_CDROM
-   vfs_cdrom_t cdrom;
-#endif
 };
 #endif