diff --git a/src/x11_platform.h b/src/x11_platform.h
index 4d23899e..5b9ca894 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -112,10 +112,18 @@ typedef struct _GLFWlibraryX11
 
     // Invisible cursor for hidden cursor mode
     Cursor          cursor;
+    // Context for mapping window XIDs to _GLFWwindow pointers
     XContext        context;
+    // True if window manager supports EWMH
+    GLboolean       hasEWMH;
+    // Most recent error code received by X error handler
+    int             errorCode;
 
     char*           clipboardString;
 
+    // LUT for mapping X11 key codes to GLFW key codes
+    int             keyCodeLUT[256];
+
     // Window manager atoms
     Atom            WM_PROTOCOLS;
     Atom            WM_STATE;
@@ -156,12 +164,6 @@ typedef struct _GLFWlibraryX11
     Atom            ATOM_PAIR;
     Atom            GLFW_SELECTION;
 
-    // True if window manager supports EWMH
-    GLboolean       hasEWMH;
-
-    // Error code received by the X error handler
-    int             errorCode;
-
     struct {
         GLboolean   available;
         int         eventBase;
@@ -197,9 +199,6 @@ typedef struct _GLFWlibraryX11
         int         versionMinor;
     } xi;
 
-    // LUT for mapping X11 key codes to GLFW key codes
-    int             keyCodeLUT[256];
-
     struct {
         int         count;
         int         timeout;