### MESA
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
index 1bb63c1..3e6bea4 100644
--- a/include/GL/internal/glcore.h
+++ b/include/GL/internal/glcore.h
@@ -71,15 +71,20 @@ typedef struct __GLcontextRec __GLcontext;
 typedef struct __GLcontextModesRec {
     struct __GLcontextModesRec * next;
 
-    GLboolean rgbMode;
-    GLboolean floatMode;
-    GLboolean colorIndexMode;
+    /* these three once were GLboolean but we have to use GLint
+     * instead to make the struct aligned */
+    GLint rgbMode;
+    GLint floatMode;
+    GLint colorIndexMode;
+
     GLuint doubleBufferMode;
     GLuint stereoMode;
 
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
+    /* these three once were GLboolean but we have to use GLint
+     * instead to make the struct aligned */
+    GLint haveAccumBuffer;
+    GLint haveDepthBuffer;
+    GLint haveStencilBuffer;
 
     GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
     GLuint redMask, greenMask, blueMask, alphaMask;

### XSERVER
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 39d162d..83289cc 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -58,15 +58,21 @@ void __glXSwapBarrierInit(int screen, __GLXSwapBarrierExtensionFuncs *funcs);
 typedef struct __GLXconfig __GLXconfig;
 struct __GLXconfig {
     __GLXconfig *next;
-    GLboolean rgbMode;
-    GLboolean floatMode;
-    GLboolean colorIndexMode;
+
+    /* these three once were GLboolean but we have to use GLint
+     * instead to make the struct aligned */
+    GLint rgbMode;
+    GLint floatMode;
+    GLint colorIndexMode;
+
     GLuint doubleBufferMode;
     GLuint stereoMode;
 
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
+    /* these three once were GLboolean but we have to use GLint
+     * instead to make the struct aligned */
+    GLint haveAccumBuffer;
+    GLint haveDepthBuffer;
+    GLint haveStencilBuffer;
 
     GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
     GLuint redMask, greenMask, blueMask, alphaMask;