diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index d1f99840f..146690bf1 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -514,12 +514,13 @@ typedef struct _Screen {
     short x, y, width, height;
     short mmWidth, mmHeight;
     short numDepths;
-    unsigned char rootDepth;
+    short numVisuals;
     DepthPtr allowedDepths;
     unsigned long rootVisual;
     unsigned long defColormap;
-    short minInstalledCmaps, maxInstalledCmaps;
+    unsigned char rootDepth;
     char backingStoreSupport, saveUnderSupport;
+    short minInstalledCmaps, maxInstalledCmaps;
     unsigned long whitePixel, blackPixel;
     GCPtr GCperDepth[MAXFORMATS + 1];
     /* next field is a stipple to use as default in a GC.  we don't build
@@ -529,7 +530,6 @@ typedef struct _Screen {
      */
     PixmapPtr defaultStipple;
     void *devPrivate;
-    short numVisuals;
     VisualPtr visuals;
     WindowPtr root;
     ScreenSaverStuffRec screensaver;
@@ -621,6 +621,7 @@ typedef struct _Screen {
     NameWindowPixmapProcPtr NameWindowPixmap;
 
     unsigned int totalPixmapSize;
+    int output_secondarys;
 
     MarkWindowProcPtr MarkWindow;
     MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
@@ -651,7 +652,6 @@ typedef struct _Screen {
     /* Info on this screen's secondarys (if any) */
     struct xorg_list secondary_list;
     struct xorg_list secondary_head;
-    int output_secondarys;
     /* Info for when this screen is a secondary */
     ScreenPtr current_primary;
     Bool is_output_secondary;