diff --git a/Makefile.am b/Makefile.am
index b822ca1f3..3d30a0247 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,7 +97,7 @@ bin_PROGRAMS += awesome
 awesome_SOURCES = \
 	client.c client.h \
 	focus.c focus.h \
-	draw.c draw.h \
+	common/draw.c common/draw.h \
 	event.c event.h \
 	layout.c layout.h \
 	awesome.c awesome.h \
diff --git a/draw.c b/common/draw.c
similarity index 100%
rename from draw.c
rename to common/draw.c
diff --git a/draw.h b/common/draw.h
similarity index 100%
rename from draw.h
rename to common/draw.h
diff --git a/layout.h b/layout.h
index 0c6604cdd..90a8f8301 100644
--- a/layout.h
+++ b/layout.h
@@ -22,6 +22,8 @@
 #ifndef AWESOME_LAYOUT_H
 #define AWESOME_LAYOUT_H
 
+#include <X11/Xlib.h>
+
 #include "uicb.h"
 #include "common/list.h"
 #include "common/util.h"
diff --git a/structs.h b/structs.h
index 081286ec3..9abf08121 100644
--- a/structs.h
+++ b/structs.h
@@ -23,8 +23,8 @@
 #define AWESOME_STRUCTS_H
 
 #include <regex.h>
-#include "draw.h"
 #include "layout.h"
+#include "common/draw.h"
 
 /** Bar possible position */
 typedef enum
diff --git a/widgets/graph.c b/widgets/graph.c
index 0ed68186b..7f39943ef 100644
--- a/widgets/graph.c
+++ b/widgets/graph.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include "draw.h"
 #include "widget.h"
 #include "xutil.h"
 #include "screen.h"
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 9c0731f12..00bdd5b67 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -20,7 +20,6 @@
  */
 
 #include <string.h>
-#include "draw.h"
 #include "widget.h"
 #include "xutil.h"
 #include "screen.h"