From 407972eb00e979366c3e16c2af96fdabf62fac12 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 30 May 2008 12:30:20 +0200
Subject: [PATCH] [xutil] Move xcolor_t into draw

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 common/configopts.c |  5 -----
 common/draw.c       |  2 --
 common/draw.h       | 10 ++++++++--
 common/xutil.h      |  8 --------
 structs.h           |  1 +
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/common/configopts.c b/common/configopts.c
index 68b7c24d8..a203c04b0 100644
--- a/common/configopts.c
+++ b/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"
 
diff --git a/common/draw.c b/common/draw.c
index bbc685bdb..6df50484f 100644
--- a/common/draw.c
+++ b/common/draw.c
@@ -22,8 +22,6 @@
 /* asprintf */
 #define _GNU_SOURCE
 
-#include <config.h>
-
 #include <cairo-xcb.h>
 
 #ifdef WITH_IMLIB2
diff --git a/common/draw.h b/common/draw.h
index af875447b..78761e9c3 100644
--- a/common/draw.h
+++ b/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
 {
diff --git a/common/xutil.h b/common/xutil.h
index 93a9a0c1e..9222a6915 100644
--- a/common/xutil.h
+++ b/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 */
diff --git a/structs.h b/structs.h
index 0fc16c796..babedf20e 100644
--- a/structs.h
+++ b/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"