[xutil] Move xcolor_t into draw

Signed-off-by: Julien Danjou <julien@danjou.info>

common/configopts.c

@@ -19,11 +19,6 @@
  *
  */
 
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #include "common/configopts.h"
 #include "common/util.h"
 

common/draw.c

@@ -22,8 +22,6 @@
 /* asprintf */
 #define _GNU_SOURCE
 
-#include <config.h>
-
 #include <cairo-xcb.h>
 
 #ifdef WITH_IMLIB2

common/draw.h

@@ -27,10 +27,16 @@
 
 #include <xcb/xcb.h>
 
-#include "config.h"
 #include "common/util.h"
 #include "common/list.h"
-#include "common/xutil.h"
+
+typedef struct
+{
+    uint32_t pixel;
+    uint16_t red;
+    uint16_t green;
+    uint16_t blue;
+} xcolor_t;
 
 typedef enum
 {

common/xutil.h

@@ -85,14 +85,6 @@ typedef struct
     char *res_class;
 } class_hint_t;
 
-typedef struct
-{
-    uint32_t pixel;
-    uint16_t red;
-    uint16_t green;
-    uint16_t blue;
-} xcolor_t;
-
 class_hint_t *xutil_get_class_hint(xcb_connection_t *, xcb_window_t);
 
 /** Cache entry */

structs.h

@@ -26,6 +26,7 @@
 
 #include "lua.h"
 #include "layout.h"
+#include "common/xutil.h"
 #include "common/draw.h"
 #include "common/swindow.h"
 #include "common/xscreen.h"