6 files changed, 8 insertions, 5 deletions
diff --git a/pugl/detail/win.c b/pugl/detail/win.c
index 1b86d3c..8a9ff0a 100644
--- a/pugl/detail/win.c
+++ b/pugl/detail/win.c
@@ -18,8 +18,9 @@
    @file win.c Windows implementation.
 */
 
-#include "pugl/detail/implementation.h"
 #include "pugl/detail/win.h"
+
+#include "pugl/detail/implementation.h"
 #include "pugl/pugl.h"
 #include "pugl/pugl_stub.h"
 
diff --git a/pugl/detail/x11.c b/pugl/detail/x11.c
index 9156c57..347876a 100644
--- a/pugl/detail/x11.c
+++ b/pugl/detail/x11.c
@@ -22,9 +22,10 @@
 
 #define _POSIX_C_SOURCE 199309L
 
+#include "pugl/detail/x11.h"
+
 #include "pugl/detail/implementation.h"
 #include "pugl/detail/types.h"
-#include "pugl/detail/x11.h"
 #include "pugl/pugl.h"
 #include "pugl/pugl_stub.h"
 
diff --git a/pugl/detail/x11.h b/pugl/detail/x11.h
index 32bd4fb..220f3c8 100644
--- a/pugl/detail/x11.h
+++ b/pugl/detail/x11.h
@@ -18,8 +18,10 @@
    @file x11.h Shared definitions for X11 implementation.
 */
 
-#include "pugl/detail/implementation.h"
+#include "pugl/detail/types.h"
+#include "pugl/pugl.h"
 
+#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
diff --git a/pugl/detail/x11_cairo.c b/pugl/detail/x11_cairo.c
index 03a3f8e..45fb28a 100644
--- a/pugl/detail/x11_cairo.c
+++ b/pugl/detail/x11_cairo.c
@@ -28,7 +28,6 @@
 #include <cairo-xlib.h>
 #include <cairo.h>
 
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/pugl/detail/x11_gl.c b/pugl/detail/x11_gl.c
index d3807f2..5dd6d68 100644
--- a/pugl/detail/x11_gl.c
+++ b/pugl/detail/x11_gl.c
@@ -29,7 +29,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/test/pugl_gl3_test.c b/test/pugl_gl3_test.c
index abcb977..e990c25 100644
--- a/test/pugl_gl3_test.c
+++ b/test/pugl_gl3_test.c
@@ -47,6 +47,7 @@
 
 #include <math.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>