diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index ce0faf69ca9..9389e654ad3 100644
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -62,6 +62,19 @@ struct gl_buffer_object;
 struct _mesa_HashTable;
 struct _glapi_table;
 
+/* Used by both glthread and gl_context. */
+union gl_vertex_format_user {
+   struct {
+      GLenum16 Type;        /**< datatype: GL_FLOAT, GL_INT, etc */
+      bool Bgra;            /**< true if GL_BGRA, else GL_RGBA */
+      uint8_t Size:5;       /**< components per element (1,2,3,4) */
+      bool Normalized:1;    /**< GL_ARB_vertex_program */
+      bool Integer:1;       /**< Integer-valued? */
+      bool Doubles:1;       /**< double values are not converted to floats */
+   };
+   uint32_t All;
+};
+
 struct glthread_attrib_binding {
    struct gl_buffer_object *buffer; /**< where non-VBO data was uploaded */
    int offset;                      /**< offset to uploaded non-VBO data */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bfa12419d58..80ce5f90309 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -319,18 +319,6 @@ struct gl_colorbuffer_attrib
    GLboolean sRGBEnabled;  /**< Framebuffer sRGB blending/updating requested */
 };
 
-union gl_vertex_format_user {
-   struct {
-      GLenum16 Type;        /**< datatype: GL_FLOAT, GL_INT, etc */
-      bool Bgra;            /**< true if GL_BGRA, else GL_RGBA */
-      GLubyte Size:5;       /**< components per element (1,2,3,4) */
-      GLubyte Normalized:1; /**< GL_ARB_vertex_program */
-      GLubyte Integer:1;    /**< Integer-valued? */
-      GLubyte Doubles:1;    /**< double values are not converted to floats */
-   };
-   uint32_t All;
-};
-
 /**
  * Vertex format to describe a vertex element.
  */