diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index d43219406e..9667a3860d 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -284,8 +284,8 @@ typedef struct win32_common_state
    unsigned pos_width;
    unsigned pos_height;
    unsigned taskbar_message;
-   bool quit;
    unsigned monitor_count;
+   bool quit;
    bool resized;
 } win32_common_state_t;
 
diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c
index 4316036d13..91121dd9af 100644
--- a/input/drivers/winraw_input.c
+++ b/input/drivers/winraw_input.c
@@ -36,11 +36,11 @@ typedef struct
 
 typedef struct
 {
-   bool mouse_grab;
    winraw_keyboard_t keyboard;
    HWND window;
    winraw_mouse_t *mice;
    const input_device_driver_t *joypad;
+   bool mouse_grab;
 } winraw_input_t;
 
 /* TODO/FIXME - static globals */