diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c
index 5182a38e6d..2d25870e9b 100644
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@@ -31,6 +31,9 @@ typedef struct audio_thread
    sthread_t *thread;
    slock_t *lock;
    scond_t *cond;
+   const char *device;
+   unsigned *new_rate;
+
    bool alive;
    bool stopped;
    bool stopped_ack;
@@ -41,8 +44,6 @@ typedef struct audio_thread
    int inited;
 
    /* Initialization options. */
-   const char *device;
-   unsigned *new_rate;
    unsigned out_rate;
    unsigned latency;
    unsigned block_frames;
diff --git a/libretro-common/include/lists/file_list.h b/libretro-common/include/lists/file_list.h
index accbe232a4..5a486929ae 100644
--- a/libretro-common/include/lists/file_list.h
+++ b/libretro-common/include/lists/file_list.h
@@ -34,14 +34,14 @@ RETRO_BEGIN_DECLS
 
 struct item_file
 {
+   void *userdata;
+   void *actiondata;
    char *path;
    char *label;
    char *alt;
    unsigned type;
    size_t directory_ptr;
    size_t entry_idx;
-   void *userdata;
-   void *actiondata;
 };
 
 typedef struct file_list