diff --git a/color.c b/color.c
index 15b853818..52474bc2b 100644
--- a/color.c
+++ b/color.c
@@ -20,9 +20,11 @@
  *
  */
 
+#include <ctype.h>
+
 #include "color.h"
 #include "structs.h"
-#include <ctype.h>
+#include "common/xutil.h"
 
 #define RGB_8TO16(i)   (0xffff * ((i) & 0xff) / 0xff)
 #define RGB_16TO8(i)   (0xff * ((i) & 0xffff) / 0xffff)
diff --git a/color.h b/color.h
index 7fdc3a684..6e0108903 100644
--- a/color.h
+++ b/color.h
@@ -23,7 +23,8 @@
 #ifndef AWESOME_COLOR_H
 #define AWESOME_COLOR_H
 
-#include "common/xutil.h"
+#include <xcb/xcb.h>
+#include <stdbool.h>
 
 typedef struct
 {