diff --git a/src/cairo-gl-dispatch-private.h b/src/cairo-gl-dispatch-private.h
index cfe737c7f..7f582e62b 100644
--- a/src/cairo-gl-dispatch-private.h
+++ b/src/cairo-gl-dispatch-private.h
@@ -32,8 +32,8 @@
 #ifndef CAIRO_GL_DISPATCH_PRIVATE_H
 #define CAIRO_GL_DISPATCH_PRIVATE_H
 
-#include <stddef.h>
 #include "cairo-gl-private.h"
+#include <stddef.h>
 
 typedef struct _cairo_gl_dispatch_entry {
     const char *name_core;
diff --git a/src/cairo-gl-dispatch.c b/src/cairo-gl-dispatch.c
index f44d3b855..0f6473142 100644
--- a/src/cairo-gl-dispatch.c
+++ b/src/cairo-gl-dispatch.c
@@ -29,6 +29,7 @@
  *      Alexandros Frantzis <alexandros.frantzis@linaro.org>
  */
 
+#include "cairoint.h"
 #include "cairo-gl-private.h"
 #include "cairo-gl-dispatch-private.h"
 
diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index 95995b4fc..5b4190e4c 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -29,6 +29,7 @@
  *      Alexandros Frantzis <alexandros.frantzis@linaro.org>
  */
 
+#include "cairoint.h"
 #include "cairo-gl-private.h"
 
 int