diff --git a/client.c b/client.c
index 01c41822..85305970 100644
--- a/client.c
+++ b/client.c
@@ -25,9 +25,7 @@
 #include <X11/extensions/Xinerama.h>
 
 #include "client.h"
-#include "screen.h"
 #include "awesome.h"
-#include "layout.h"
 #include "tag.h"
 #include "rules.h"
 #include "util.h"
@@ -36,6 +34,7 @@
 #include "window.h"
 #include "focus.h"
 #include "ewmh.h"
+#include "screen.h"
 #include "layouts/floating.h"
 
 
diff --git a/client.h b/client.h
index 0ebcad4f..a40eea98 100644
--- a/client.h
+++ b/client.h
@@ -23,7 +23,6 @@
 #define AWESOME_CLIENT_H
 
 #include "config.h"
-#include "uicb.h"
 
 Bool client_isvisible(Client *, int);
 Client * get_client_bywin(Client *, Window);
diff --git a/config.c b/config.c
index 633dba14..4b274828 100644
--- a/config.c
+++ b/config.c
@@ -23,7 +23,6 @@
  * @defgroup ui_callback User Interface Callbacks
  */
 
-#include <confuse.h>
 #include <X11/keysym.h>
 
 #include "statusbar.h"
diff --git a/config.h b/config.h
index 58669e5d..20aee6af 100644
--- a/config.h
+++ b/config.h
@@ -22,11 +22,8 @@
 #ifndef AWESOME_CONFIG_H
 #define AWESOME_CONFIG_H
 
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
 #include <regex.h>
 #include "draw.h"
-#include "uicb.h"
 #include "layout.h"
 
 /** Bar possible position */
diff --git a/draw.c b/draw.c
index 89744231..9fd4563c 100644
--- a/draw.c
+++ b/draw.c
@@ -23,10 +23,8 @@
 #include <cairo-ft.h>
 #include <cairo-xlib.h>
 #include <math.h>
-#include "config.h"
-#include "layout.h"
 #include "util.h"
-#include "draw.h"
+#include "config.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/event.c b/event.c
index e0131cdd..c57d2916 100644
--- a/event.c
+++ b/event.c
@@ -27,9 +27,7 @@
 
 #include "screen.h"
 #include "event.h"
-#include "layout.h"
 #include "tag.h"
-#include "draw.h"
 #include "statusbar.h"
 #include "util.h"
 #include "window.h"
diff --git a/event.h b/event.h
index b671d5f0..7f340830 100644
--- a/event.h
+++ b/event.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_EVENT_H
 #define AWESOME_EVENT_H
 
-#include "config.h"
+#include <X11/Xlib.h>
 
 #define CLEANMASK(mask)      (mask & ~(globalconf.numlockmask | LockMask))
 
diff --git a/ewmh.c b/ewmh.c
index 1b7a18e7..fe7dac21 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -28,7 +28,6 @@
 #include "focus.h"
 #include "screen.h"
 #include "client.h"
-#include "layout.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/focus.c b/focus.c
index dc242884..bd1caef9 100644
--- a/focus.c
+++ b/focus.c
@@ -21,7 +21,6 @@
 
 #include "util.h"
 #include "tag.h"
-#include "layout.h"
 #include "focus.h" 
 #include "client.h"
 
diff --git a/focus.h b/focus.h
index bda12868..fc8502f7 100644
--- a/focus.h
+++ b/focus.h
@@ -23,7 +23,6 @@
 #define AWESOME_FOCUS_H
 
 #include "config.h"
-#include "uicb.h"
 
 void focus_add_client(Client *);
 void focus_delete_client(Client *);
diff --git a/layout.c b/layout.c
index e77420b5..47c3085e 100644
--- a/layout.c
+++ b/layout.c
@@ -22,8 +22,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "screen.h"
-#include "layout.h"
 #include "tag.h"
 #include "util.h"
 #include "xutil.h"
@@ -31,6 +29,7 @@
 #include "statusbar.h"
 #include "ewmh.h"
 #include "client.h"
+#include "screen.h"
 #include "layouts/tile.h"
 #include "layouts/max.h"
 #include "layouts/fibonacci.h"
diff --git a/screen.c b/screen.c
index c3289f93..0da0bee0 100644
--- a/screen.c
+++ b/screen.c
@@ -24,7 +24,6 @@
 #include "util.h"
 #include "screen.h"
 #include "tag.h"
-#include "layout.h"
 #include "focus.h"
 #include "statusbar.h"
 #include "client.h"
diff --git a/screen.h b/screen.h
index a4d93bf7..487ad788 100644
--- a/screen.h
+++ b/screen.h
@@ -23,7 +23,6 @@
 #define AWESOME_SCREEN_H
 
 #include "config.h"
-#include "uicb.h"
 
 Area get_screen_area(int, Statusbar *, Padding *);
 Area get_display_area(int, Statusbar *, Padding *);
diff --git a/statusbar.c b/statusbar.c
index 143cad2d..04753782 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "layout.h"
 #include "statusbar.h"
-#include "draw.h"
 #include "screen.h"
 #include "util.h"
 #include "tag.h"
diff --git a/statusbar.h b/statusbar.h
index 92326727..d42447b2 100644
--- a/statusbar.h
+++ b/statusbar.h
@@ -23,7 +23,6 @@
 #define AWESOME_STATUSBAR_H
 
 #include "config.h"
-#include "uicb.h"
 
 void statusbar_draw_all(int);
 void statusbar_init(Statusbar *, int);
diff --git a/tag.c b/tag.c
index 0179628f..077cfc74 100644
--- a/tag.c
+++ b/tag.c
@@ -23,7 +23,6 @@
 #include <X11/Xutil.h>
 
 #include "screen.h"
-#include "layout.h"
 #include "tag.h"
 #include "util.h"
 #include "rules.h"
diff --git a/tag.h b/tag.h
index bf12cd12..6a53fe7e 100644
--- a/tag.h
+++ b/tag.h
@@ -23,7 +23,6 @@
 #define AWESOME_TAG_H
 
 #include "config.h"
-#include "uicb.h"
 
 /** Check if a client is tiled */
 #define IS_TILED(client, screen)            (client && !client->isfloating && client_isvisible(client, screen))
diff --git a/uicb.c b/uicb.c
index aab4b270..6cb06615 100644
--- a/uicb.c
+++ b/uicb.c
@@ -22,14 +22,13 @@
 #include "awesome.h"
 #include "util.h"
 #include "xutil.h"
-#include "screen.h"
 #include "tag.h"
-#include "layout.h"
 #include "mouse.h"
 #include "statusbar.h"
 #include "widget.h"
 #include "focus.h"
 #include "client.h"
+#include "screen.h"
 #include "layouts/tile.h"
 
 extern AwesomeConf globalconf;
diff --git a/widget.h b/widget.h
index aee8a173..e13e3ad7 100644
--- a/widget.h
+++ b/widget.h
@@ -26,8 +26,6 @@
 #include <confuse.h>
 
 #include "config.h"
-#include "draw.h"
-#include "uicb.h"
 
 enum { AlignLeft, AlignRight, AlignFlex };
 
diff --git a/widgets/focustitle.c b/widgets/focustitle.c
index 9ed10274..c999b8a5 100644
--- a/widgets/focustitle.c
+++ b/widgets/focustitle.c
@@ -21,13 +21,13 @@
  */
 
 #include <stdio.h>
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 #include "layout.h"
 #include "tag.h"
 #include "focus.h"
 #include "xutil.h"
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/widgets/iconbox.c b/widgets/iconbox.c
index 5ca79bcf..fb7d2f0a 100644
--- a/widgets/iconbox.c
+++ b/widgets/iconbox.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 
diff --git a/widgets/layoutinfo.c b/widgets/layoutinfo.c
index 98e047e7..2be498d8 100644
--- a/widgets/layoutinfo.c
+++ b/widgets/layoutinfo.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <confuse.h>
 #include "widget.h"
 #include "util.h"
 #include "tag.h"
diff --git a/widgets/netwmicon.c b/widgets/netwmicon.c
index 4433c70a..6a7631ec 100644
--- a/widgets/netwmicon.c
+++ b/widgets/netwmicon.c
@@ -21,7 +21,6 @@
 
 #include <X11/Xmd.h>
 #include <X11/Xatom.h>
-#include <confuse.h>
 #include "util.h"
 #include "focus.h"
 #include "tag.h"
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 8057a032..5c7cc8ed 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include <string.h>
 #include "util.h"
 #include "draw.h"
diff --git a/widgets/taglist.c b/widgets/taglist.c
index 398520e6..74760523 100644
--- a/widgets/taglist.c
+++ b/widgets/taglist.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <confuse.h>
 #include "config.h"
 #include "util.h"
 #include "widget.h"
diff --git a/widgets/textbox.c b/widgets/textbox.c
index 1e978fad..6d5207f2 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -19,10 +19,10 @@
  *
  */
 
-#include <confuse.h>
 #include "util.h"
 #include "widget.h"
 #include "xutil.h"
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/xutil.c b/xutil.c
index 4cefa8ff..3515d0db 100644
--- a/xutil.c
+++ b/xutil.c
@@ -23,9 +23,10 @@
 #include <X11/extensions/Xinerama.h>
 #include <sys/wait.h>
 
+#include "config.h"
 #include "util.h"
 #include "xutil.h"
-
+#include "screen.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/xutil.h b/xutil.h
index 9f7a4cef..c4398a6a 100644
--- a/xutil.h
+++ b/xutil.h
@@ -22,7 +22,8 @@
 #ifndef AWESOME_XUTIL_H
 #define AWESOME_XUTIL_H
 
-#include "screen.h"
+#include <X11/Xlib.h>
+#include "uicb.h"
 
 Bool xgettextprop(Display *, Window, Atom, char *, ssize_t);
 XColor initxcolor(int, const char *);