diff --git a/awesome.c b/awesome.c
index 33ec50cfd..3931558b9 100644
--- a/awesome.c
+++ b/awesome.c
@@ -19,6 +19,23 @@
  *
  */
 
+#include "awesome.h"
+
+#include "banning.h"
+#include "common/atoms.h"
+#include "common/backtrace.h"
+#include "common/version.h"
+#include "common/xutil.h"
+#include "dbus.h"
+#include "event.h"
+#include "ewmh.h"
+#include "globalconf.h"
+#include "objects/client.h"
+#include "objects/screen.h"
+#include "spawn.h"
+#include "systray.h"
+#include "xwindow.h"
+
 #include <getopt.h>
 
 #include <locale.h>
@@ -29,6 +46,7 @@
 
 #include <xcb/bigreq.h>
 #include <xcb/randr.h>
+#include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xinerama.h>
 #include <xcb/xtest.h>
@@ -36,23 +54,6 @@
 
 #include <glib-unix.h>
 
-#include "awesome.h"
-#include "spawn.h"
-#include "objects/client.h"
-#include "objects/screen.h"
-#include "xwindow.h"
-#include "ewmh.h"
-#include "dbus.h"
-#include "systray.h"
-#include "event.h"
-#include "property.h"
-#include "luaa.h"
-#include "common/version.h"
-#include "common/atoms.h"
-#include "common/xcursor.h"
-#include "common/xutil.h"
-#include "common/backtrace.h"
-
 awesome_t globalconf;
 
 /** argv used to run awesome */
diff --git a/banning.c b/banning.c
index 00e165416..ef1181e8d 100644
--- a/banning.c
+++ b/banning.c
@@ -20,8 +20,8 @@
  */
 
 #include "banning.h"
-#include "objects/screen.h"
-#include "objects/tag.h"
+#include "globalconf.h"
+#include "objects/client.h"
 
 /** Reban windows following current selected tags.
  * \param screen The screen to arrange.
diff --git a/banning.h b/banning.h
index b05e336f0..85bb6a11a 100644
--- a/banning.h
+++ b/banning.h
@@ -22,8 +22,6 @@
 #ifndef AWESOME_BANNING_H
 #define AWESOME_BANNING_H
 
-#include "globalconf.h"
-
 void banning_need_update(void);
 void banning_refresh(void);
 
diff --git a/color.c b/color.c
index c05b07fe0..b9b37f8f4 100644
--- a/color.c
+++ b/color.c
@@ -20,11 +20,10 @@
  *
  */
 
-#include <ctype.h>
-
 #include "color.h"
 #include "globalconf.h"
-#include "common/xutil.h"
+
+#include <ctype.h>
 
 /* 0xFFFF / 0xFF == 0x101 (257) */
 #define RGB_8TO16(i) (((i) & 0xff)   * 0x101)
diff --git a/common/buffer.c b/common/buffer.c
index be0e5a121..0c7757f5c 100644
--- a/common/buffer.c
+++ b/common/buffer.c
@@ -27,12 +27,11 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "common/buffer.h"
+
 #include <sysexits.h>
 #include <stdio.h>
 
-#include "common/buffer.h"
-
 char buffer_slop[1];
 
 void
diff --git a/common/luaclass.c b/common/luaclass.c
index f78cd691f..68be33065 100644
--- a/common/luaclass.c
+++ b/common/luaclass.c
@@ -21,7 +21,6 @@
 
 #include "common/luaclass.h"
 #include "common/luaobject.h"
-#include "luaa.h"
 
 struct lua_class_property
 {
diff --git a/common/luaclass.h b/common/luaclass.h
index 2684a92ef..ad9197347 100644
--- a/common/luaclass.h
+++ b/common/luaclass.h
@@ -24,6 +24,9 @@
 
 #include "common/signal.h"
 
+#include <lua.h>
+#include <lauxlib.h>
+
 typedef struct lua_class_property lua_class_property_t;
 
 ARRAY_TYPE(lua_class_property_t, lua_class_property)
diff --git a/common/lualib.c b/common/lualib.c
index a53aa5cab..a2bbcf68a 100644
--- a/common/lualib.c
+++ b/common/lualib.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include "common/lualib.h"
 #include "luaa.h"
 
 void luaA_checkfunction(lua_State *L, int idx)
diff --git a/common/lualib.h b/common/lualib.h
index 59d6a16d0..af439601d 100644
--- a/common/lualib.h
+++ b/common/lualib.h
@@ -22,10 +22,9 @@
 #ifndef AWESOME_COMMON_LUALIB
 #define AWESOME_COMMON_LUALIB
 
-#include <lauxlib.h>
+#include <lua.h>
 
 #include "common/util.h"
-#include "common/luaclass.h"
 
 /** Lua function to call on dofuction() error */
 lua_CFunction lualib_dofunction_on_error;
diff --git a/common/signal.h b/common/signal.h
index a30a9ab81..f9a4cc1bb 100644
--- a/common/signal.h
+++ b/common/signal.h
@@ -22,7 +22,6 @@
 #ifndef AWESOME_COMMON_SIGNAL
 #define AWESOME_COMMON_SIGNAL
 
-#include "common/lualib.h"
 #include "common/array.h"
 
 DO_ARRAY(const void *, cptr, DO_NOTHING)
diff --git a/common/util.c b/common/util.c
index 3c95d8e8d..518da2e83 100644
--- a/common/util.c
+++ b/common/util.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/util.h"
+
 #include <stdarg.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -27,8 +29,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "common/util.h"
-
 /** Print error and exit with EXIT_FAILURE code.
  */
 void
diff --git a/common/version.c b/common/version.c
index bbca1e412..844f18e8a 100644
--- a/common/version.c
+++ b/common/version.c
@@ -19,16 +19,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+#include "common/version.h"
+#include "awesome-version-internal.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <lualib.h>
 #include <lauxlib.h>
 
-#include "config.h"
-#include "common/version.h"
-#include "awesome-version-internal.h"
-
 /** \brief Print version message and quit program.
  * \param executable program name
  */
diff --git a/common/xembed.c b/common/xembed.c
index d05ed4a1e..bb70ab1f8 100644
--- a/common/xembed.c
+++ b/common/xembed.c
@@ -21,7 +21,6 @@
  */
 
 #include "common/xembed.h"
-#include "common/xutil.h"
 #include "common/util.h"
 #include "common/atoms.h"
 
diff --git a/common/xembed.h b/common/xembed.h
index fe3322220..4a9a1622d 100644
--- a/common/xembed.h
+++ b/common/xembed.h
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 
 #include "common/array.h"
-#include "common/util.h"
 
 /** XEMBED information for a window.
  */
diff --git a/common/xutil.c b/common/xutil.c
index f8ecfc9b8..8e96b2462 100644
--- a/common/xutil.c
+++ b/common/xutil.c
@@ -19,16 +19,14 @@
  *
  */
 
+#include "common/xutil.h"
+
 /* XCB doesn't provide keysyms definition */
 #include <X11/keysym.h>
 
-#include "common/util.h"
-
 #include <xcb/xcb.h>
 #include <xcb/xcb_icccm.h>
 
-#include "common/xutil.h"
-
 /** Get the lock masks (shiftlock, numlock, capslock, modeswitch).
  * \param connection The X connection.
  * \param cookie The cookie of the request.
diff --git a/common/xutil.h b/common/xutil.h
index d223ab2ff..a7ca46d34 100644
--- a/common/xutil.h
+++ b/common/xutil.h
@@ -24,13 +24,9 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
-#include <xcb/xcb_aux.h>
-#include <xcb/xcb_event.h>
-#include <xcb/xcb_atom.h>
-#include <xcb/xproto.h>
 
-#include "common/array.h"
 #include "common/atoms.h"
+#include "common/util.h"
 
 static inline char *
 xutil_get_text_property_from_reply(xcb_get_property_reply_t *reply)
diff --git a/dbus.c b/dbus.c
index 94b838647..5b65acb88 100644
--- a/dbus.c
+++ b/dbus.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "dbus.h"
+
 #include <glib.h>
 
 #ifdef WITH_DBUS
diff --git a/draw.c b/draw.c
index f38e7781b..2990633e6 100644
--- a/draw.c
+++ b/draw.c
@@ -19,9 +19,8 @@
  *
  */
 
-#include <cairo-xcb.h>
-
 #include "config.h"
+#include "draw.h"
 
 #include <langinfo.h>
 #include <iconv.h>
@@ -30,10 +29,8 @@
 #include <math.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "globalconf.h"
-#include "objects/screen.h"
-#include "common/xutil.h"
+#include <cairo-xcb.h>
+#include <lauxlib.h>
 
 /** Convert text from any charset to UTF-8 using iconv.
  * \param iso The ISO string to convert.
diff --git a/event.c b/event.c
index 27ff0479d..a6a3b8a2d 100644
--- a/event.c
+++ b/event.c
@@ -19,15 +19,8 @@
  *
  */
 
-#include <xcb/xcb.h>
-#include <xcb/randr.h>
-#include <xcb/shape.h>
-#include <xcb/xcb_atom.h>
-#include <xcb/xcb_icccm.h>
-#include <xcb/xcb_event.h>
-
-#include "awesome.h"
 #include "event.h"
+#include "awesome.h"
 #include "property.h"
 #include "objects/tag.h"
 #include "objects/drawin.h"
@@ -43,6 +36,13 @@
 #include "common/atoms.h"
 #include "common/xutil.h"
 
+#include <xcb/xcb.h>
+#include <xcb/randr.h>
+#include <xcb/shape.h>
+#include <xcb/xcb_atom.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xcb_event.h>
+
 #define DO_EVENT_HOOK_CALLBACK(type, xcbtype, xcbeventprefix, arraytype, match) \
     static void \
     event_##xcbtype##_callback(xcb_##xcbtype##_press_event_t *ev, \
diff --git a/event.h b/event.h
index 9c7e54e8a..82f7fdde8 100644
--- a/event.h
+++ b/event.h
@@ -22,11 +22,18 @@
 #ifndef AWESOME_EVENT_H
 #define AWESOME_EVENT_H
 
-#include "objects/client.h"
+#include "banning.h"
+#include "globalconf.h"
+#include "stack.h"
+
+#include <xcb/xcb.h>
 
 /* luaa.c */
 void luaA_emit_refresh(void);
 
+/* objects/client.c */
+void client_focus_refresh(void);
+
 static inline int
 awesome_refresh(void)
 {
diff --git a/ewmh.c b/ewmh.c
index 042cf08c3..4ce9c5e83 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -19,21 +19,17 @@
  *
  */
 
+#include "ewmh.h"
+#include "objects/client.h"
+#include "objects/tag.h"
+#include "common/atoms.h"
+
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 
-#include "ewmh.h"
-#include "objects/client.h"
-#include "objects/screen.h"
-#include "objects/tag.h"
-#include "luaa.h"
-#include "common/atoms.h"
-#include "common/buffer.h"
-#include "common/xutil.h"
-
 #define _NET_WM_STATE_REMOVE 0
 #define _NET_WM_STATE_ADD 1
 #define _NET_WM_STATE_TOGGLE 2
diff --git a/ewmh.h b/ewmh.h
index 4a8c0833e..420162159 100644
--- a/ewmh.h
+++ b/ewmh.h
@@ -23,10 +23,12 @@
 #define AWESOME_EWMH_H
 
 #include <cairo.h>
+#include <xcb/xcb.h>
 
-#include "globalconf.h"
 #include "strut.h"
 
+typedef struct client_t client_t;
+
 void ewmh_init(void);
 void ewmh_update_net_numbers_of_desktop(void);
 void ewmh_update_net_current_desktop(void);
diff --git a/globalconf.h b/globalconf.h
index 414b6fcb3..9bc1c41e6 100644
--- a/globalconf.h
+++ b/globalconf.h
@@ -32,7 +32,6 @@
 #include <xcb/xcb_cursor.h>
 
 #include "objects/key.h"
-#include "color.h"
 #include "common/xembed.h"
 #include "common/buffer.h"
 
@@ -52,7 +51,6 @@ typedef struct drawable_t drawable_t;
 typedef struct drawin_t drawin_t;
 typedef struct a_screen screen_t;
 typedef struct button_t button_t;
-typedef struct widget_t widget_t;
 typedef struct client_t client_t;
 typedef struct tag tag_t;
 typedef struct xproperty xproperty_t;
diff --git a/keygrabber.c b/keygrabber.c
index c56bae6fb..3b3c42164 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -21,12 +21,9 @@
 
 #include <unistd.h>
 
-#include "globalconf.h"
 #include "keygrabber.h"
-#include "objects/key.h"
-#include "luaa.h"
+#include "globalconf.h"
 #include "keyresolv.h"
-#include "common/xutil.h"
 
 /** Grab the keyboard.
  * \return True if keyboard was grabbed.
diff --git a/keygrabber.h b/keygrabber.h
index 3893cb588..99b86aede 100644
--- a/keygrabber.h
+++ b/keygrabber.h
@@ -25,6 +25,8 @@
 #include <lua.h>
 #include <xcb/xcb.h>
 
+#include <stdbool.h>
+
 int luaA_keygrabber_stop(lua_State *);
 bool keygrabber_handlekpress(lua_State *, xcb_key_press_event_t *);
 
diff --git a/keyresolv.c b/keyresolv.c
index 946c61c34..c41d3e930 100644
--- a/keyresolv.c
+++ b/keyresolv.c
@@ -20,13 +20,13 @@
  *
  */
 
+#include "keyresolv.h"
+#include "globalconf.h"
+
 /* XCB doesn't provide keysyms definition */
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 
-#include "globalconf.h"
-#include "keyresolv.h"
-
 /** XCB equivalent of XLookupString which translate the keycode given
  * by PressEvent to a KeySym and a string
  * \todo use XKB!
diff --git a/keyresolv.h b/keyresolv.h
index 9fb229956..b3c12afa6 100644
--- a/keyresolv.h
+++ b/keyresolv.h
@@ -23,6 +23,7 @@
 #define AWESOME_KEYRESOLV_H
 
 #include <xcb/xcb.h>
+#include <stdbool.h>
 
 xcb_keysym_t keyresolv_get_keysym(xcb_keycode_t, uint16_t);
 bool keyresolv_keysym_to_string(xcb_keysym_t, char *, ssize_t);
diff --git a/luaa.c b/luaa.c
index 0424550fb..074f2b895 100644
--- a/luaa.c
+++ b/luaa.c
@@ -21,6 +21,24 @@
 
 #define _GNU_SOURCE
 
+#include "luaa.h"
+#include "globalconf.h"
+#include "awesome-version-internal.h"
+#include "awesome.h"
+#include "common/backtrace.h"
+#include "config.h"
+#include "event.h"
+#include "objects/client.h"
+#include "objects/drawable.h"
+#include "objects/drawin.h"
+#include "objects/screen.h"
+#include "objects/tag.h"
+#include "objects/timer.h"
+#include "property.h"
+#include "selection.h"
+#include "spawn.h"
+#include "systray.h"
+
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
@@ -29,26 +47,6 @@
 
 #include <xcb/xcb_atom.h>
 
-#include "awesome.h"
-#include "config.h"
-#include "objects/timer.h"
-#include "awesome-version-internal.h"
-#include "ewmh.h"
-#include "luaa.h"
-#include "spawn.h"
-#include "objects/tag.h"
-#include "objects/client.h"
-#include "objects/drawin.h"
-#include "objects/drawable.h"
-#include "objects/screen.h"
-#include "event.h"
-#include "property.h"
-#include "selection.h"
-#include "systray.h"
-#include "common/xcursor.h"
-#include "common/buffer.h"
-#include "common/backtrace.h"
-
 #ifdef WITH_DBUS
 extern const struct luaL_Reg awesome_dbus_lib[];
 #endif
diff --git a/mouse.c b/mouse.c
index 6fb4fc7bd..f0f1cbbb5 100644
--- a/mouse.c
+++ b/mouse.c
@@ -20,12 +20,11 @@
  */
 
 #include "mouse.h"
-#include "objects/screen.h"
-#include "objects/client.h"
+#include "common/util.h"
 #include "globalconf.h"
+#include "objects/client.h"
 #include "objects/drawin.h"
-#include "luaa.h"
-#include "common/xutil.h"
+#include "objects/screen.h"
 
 /** Get the pointer position.
  * \param window The window to get position on.
diff --git a/mousegrabber.c b/mousegrabber.c
index fd0a209dc..1df805de6 100644
--- a/mousegrabber.c
+++ b/mousegrabber.c
@@ -19,14 +19,13 @@
  *
  */
 
-#include <unistd.h>
-
-#include "globalconf.h"
-#include "mouse.h"
 #include "mousegrabber.h"
-#include "luaa.h"
 #include "common/xcursor.h"
-#include "common/xutil.h"
+#include "mouse.h"
+#include "globalconf.h"
+
+#include <unistd.h>
+#include <stdbool.h>
 
 /** Grab the mouse.
  * \param cursor The cursor to use while grabbing.
diff --git a/objects/button.c b/objects/button.c
index 4eac0fc05..67258f5b9 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -20,9 +20,6 @@
  */
 
 #include "button.h"
-#include "luaa.h"
-#include "objects/key.h"
-#include "common/luaobject.h"
 
 /** Create a new mouse button bindings.
  * \param L The Lua VM state.
diff --git a/objects/button.h b/objects/button.h
index 44ba63f0a..fb8bb8da2 100644
--- a/objects/button.h
+++ b/objects/button.h
@@ -23,16 +23,21 @@
 #define AWESOME_OBJECTS_BUTTON_H
 
 #include "globalconf.h"
+#include "common/luaclass.h"
+#include "common/luaobject.h"
+
+#include <stdint.h>
+#include <xcb/xcb.h>
 
 /** Mouse buttons bindings */
-struct button_t
+typedef struct button_t
 {
     LUA_OBJECT_HEADER
     /** Key modifiers */
     uint16_t modifiers;
     /** Mouse button number */
     xcb_button_t button;
-};
+} button_t;
 
 lua_class_t button_class;
 LUA_OBJECT_FUNCS(button_class, button_t, button)
diff --git a/objects/client.c b/objects/client.c
index aa23cbe8d..f8eff42ba 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -19,21 +19,23 @@
  *
  */
 
+#include "objects/client.h"
+#include "common/atoms.h"
+#include "common/xutil.h"
+#include "event.h"
+#include "ewmh.h"
+#include "objects/drawable.h"
+#include "objects/screen.h"
+#include "objects/tag.h"
+#include "property.h"
+#include "spawn.h"
+#include "systray.h"
+#include "xwindow.h"
+
 #include <xcb/xcb_atom.h>
 #include <xcb/shape.h>
 #include <cairo-xcb.h>
 
-#include "objects/tag.h"
-#include "objects/screen.h"
-#include "ewmh.h"
-#include "systray.h"
-#include "property.h"
-#include "spawn.h"
-#include "luaa.h"
-#include "xwindow.h"
-#include "common/atoms.h"
-#include "common/xutil.h"
-
 static area_t titlebar_get_area(client_t *c, client_titlebar_t bar);
 static drawable_t *titlebar_get_drawable(lua_State *L, client_t *c, int cl_idx, client_titlebar_t bar);
 
diff --git a/objects/client.h b/objects/client.h
index a5bbe902a..ad2aa702a 100644
--- a/objects/client.h
+++ b/objects/client.h
@@ -22,13 +22,8 @@
 #ifndef AWESOME_OBJECTS_CLIENT_H
 #define AWESOME_OBJECTS_CLIENT_H
 
-#include "mouse.h"
 #include "stack.h"
-#include "draw.h"
-#include "banning.h"
 #include "objects/window.h"
-#include "objects/drawable.h"
-#include "common/luaobject.h"
 
 #define CLIENT_SELECT_INPUT_EVENT_MASK (XCB_EVENT_MASK_STRUCTURE_NOTIFY \
                                         | XCB_EVENT_MASK_PROPERTY_CHANGE \
@@ -173,7 +168,6 @@ void client_set_icon(client_t *c, cairo_surface_t *s);
 void client_set_skip_taskbar(lua_State *, int, bool);
 void client_focus(client_t *);
 void client_focus_update(client_t *);
-void client_focus_refresh(void);
 bool client_hasproto(client_t *, xcb_atom_t);
 void client_ignore_enterleave_events(void);
 void client_restore_enterleave_events(void);
diff --git a/objects/drawable.c b/objects/drawable.c
index 16c4fac46..e0484b56b 100644
--- a/objects/drawable.c
+++ b/objects/drawable.c
@@ -21,6 +21,8 @@
  */
 
 #include "drawable.h"
+#include "common/luaobject.h"
+#include "globalconf.h"
 
 #include <cairo-xcb.h>
 
diff --git a/objects/drawable.h b/objects/drawable.h
index 7e008f50d..dcb8e6796 100644
--- a/objects/drawable.h
+++ b/objects/drawable.h
@@ -24,7 +24,7 @@
 #define AWESOME_OBJECTS_DRAWABLE_H
 
 #include "common/luaclass.h"
-#include "globalconf.h"
+#include "draw.h"
 
 typedef void drawable_refresh_callback(void *);
 
@@ -45,6 +45,7 @@ struct drawable_t
     /** Data for refresh callback. */
     void *refresh_data;
 };
+typedef struct drawable_t drawable_t;
 
 drawable_t *drawable_allocator(lua_State *, drawable_refresh_callback *, void *);
 void drawable_set_geometry(drawable_t *, int, area_t);
diff --git a/objects/drawin.c b/objects/drawin.c
index da426e1aa..765d5dff9 100644
--- a/objects/drawin.c
+++ b/objects/drawin.c
@@ -21,14 +21,13 @@
  */
 
 #include "drawin.h"
+#include "common/atoms.h"
+#include "common/xcursor.h"
+#include "ewmh.h"
 #include "objects/client.h"
 #include "objects/screen.h"
-#include "xwindow.h"
-#include "luaa.h"
-#include "ewmh.h"
 #include "systray.h"
-#include "common/xcursor.h"
-#include "common/xutil.h"
+#include "xwindow.h"
 
 #include <cairo-xcb.h>
 #include <xcb/shape.h>
diff --git a/objects/drawin.h b/objects/drawin.h
index 29b6a0f8a..29e0c8329 100644
--- a/objects/drawin.h
+++ b/objects/drawin.h
@@ -24,9 +24,7 @@
 #define AWESOME_OBJECTS_DRAWIN_H
 
 #include "objects/window.h"
-#include "common/luaobject.h"
 #include "objects/drawable.h"
-#include "draw.h"
 
 /** Drawin type */
 struct drawin_t
diff --git a/objects/key.c b/objects/key.c
index af0d7076c..495d7e57e 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -20,15 +20,13 @@
  *
  */
 
+#include "objects/key.h"
+#include "common/xutil.h"
+#include "keyresolv.h"
+
 /* XStringToKeysym() and XKeysymToString */
 #include <X11/Xlib.h>
 
-#include "globalconf.h"
-#include "luaa.h"
-#include "keyresolv.h"
-#include "common/xutil.h"
-#include "common/luaobject.h"
-
 static void
 luaA_keystore(lua_State *L, int ud, const char *str, ssize_t len)
 {
diff --git a/objects/screen.c b/objects/screen.c
index 4cddaa102..12b44a0a3 100644
--- a/objects/screen.c
+++ b/objects/screen.c
@@ -19,20 +19,17 @@
  *
  */
 
+#include "objects/screen.h"
+#include "banning.h"
+#include "objects/client.h"
+#include "objects/drawin.h"
+
 #include <stdio.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xinerama.h>
 #include <xcb/randr.h>
 
-#include "objects/screen.h"
-#include "objects/tag.h"
-#include "objects/client.h"
-#include "objects/drawin.h"
-#include "ewmh.h"
-#include "luaa.h"
-#include "common/xutil.h"
-
 struct screen_output_t
 {
     /** The XRandR names of the output */
diff --git a/objects/screen.h b/objects/screen.h
index fb8335391..1e1e4c7cc 100644
--- a/objects/screen.h
+++ b/objects/screen.h
@@ -24,6 +24,8 @@
 
 #include "globalconf.h"
 #include "draw.h"
+#include "common/array.h"
+#include "common/luaclass.h"
 
 typedef struct screen_output_t screen_output_t;
 ARRAY_TYPE(screen_output_t, screen_output)
diff --git a/objects/tag.c b/objects/tag.c
index 23007a408..4d7f3cb06 100644
--- a/objects/tag.c
+++ b/objects/tag.c
@@ -20,6 +20,7 @@
  */
 
 #include "tag.h"
+#include "banning.h"
 #include "client.h"
 #include "ewmh.h"
 #include "luaa.h"
diff --git a/objects/timer.c b/objects/timer.c
index 36dc17cfb..0cf57f8a6 100644
--- a/objects/timer.c
+++ b/objects/timer.c
@@ -19,10 +19,10 @@
  *
  */
 
-#include "globalconf.h"
-#include "luaa.h"
 #include "timer.h"
 #include "common/luaobject.h"
+#include "globalconf.h"
+#include "luaa.h"
 
 typedef struct
 {
diff --git a/objects/window.c b/objects/window.c
index a843e89b4..f974ed4d8 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -19,14 +19,11 @@
  *
  */
 
-#include "luaa.h"
-#include "xwindow.h"
-#include "ewmh.h"
-#include "property.h"
-#include "objects/screen.h"
 #include "objects/window.h"
 #include "common/atoms.h"
-#include "common/luaobject.h"
+#include "ewmh.h"
+#include "property.h"
+#include "xwindow.h"
 
 LUA_CLASS_FUNCS(window, window_class)
 
diff --git a/objects/window.h b/objects/window.h
index b027f26d8..30e492c3e 100644
--- a/objects/window.h
+++ b/objects/window.h
@@ -22,9 +22,10 @@
 #ifndef AWESOME_OBJECTS_WINDOW_H
 #define AWESOME_OBJECTS_WINDOW_H
 
-#include "strut.h"
-#include "objects/button.h"
+#include "color.h"
 #include "common/luaclass.h"
+#include "objects/button.h"
+#include "strut.h"
 
 /** Windows type */
 typedef enum
diff --git a/property.c b/property.c
index 9b3d26499..8b77ded68 100644
--- a/property.c
+++ b/property.c
@@ -19,17 +19,15 @@
  *
  */
 
-#include <xcb/xcb_atom.h>
-
 #include "property.h"
+#include "common/atoms.h"
+#include "common/xutil.h"
 #include "ewmh.h"
 #include "objects/client.h"
 #include "objects/drawin.h"
-#include "objects/screen.h"
 #include "xwindow.h"
-#include "luaa.h"
-#include "common/atoms.h"
-#include "common/xutil.h"
+
+#include <xcb/xcb_atom.h>
 
 #define HANDLE_TEXT_PROPERTY(funcname, atom, setfunc) \
     xcb_get_property_cookie_t \
diff --git a/property.h b/property.h
index ded1b75a9..588fb0009 100644
--- a/property.h
+++ b/property.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_PROPERTY_H
 #define AWESOME_PROPERTY_H
 
-#include "globalconf.h"
+#include "objects/client.h"
 
 #define PROPERTY(funcname) \
     xcb_get_property_cookie_t property_get_##funcname(client_t *c); \
diff --git a/root.c b/root.c
index d6258c3ad..8f123bb81 100644
--- a/root.c
+++ b/root.c
@@ -19,18 +19,16 @@
  *
  */
 
-#include <X11/keysym.h>
-#include <X11/XF86keysym.h>
-#include <xcb/xtest.h>
-#include <cairo-xcb.h>
-
 #include "globalconf.h"
-#include "objects/button.h"
-#include "objects/drawin.h"
-#include "luaa.h"
-#include "xwindow.h"
+
+#include "common/atoms.h"
 #include "common/xcursor.h"
-#include "common/xutil.h"
+#include "objects/button.h"
+#include "xwindow.h"
+
+#include <xcb/xtest.h>
+#include <xcb/xcb_aux.h>
+#include <cairo-xcb.h>
 
 static void
 root_set_wallpaper_pixmap(xcb_connection_t *c, xcb_pixmap_t p)
diff --git a/selection.c b/selection.c
index 979d3d5a6..721001e45 100644
--- a/selection.c
+++ b/selection.c
@@ -20,12 +20,13 @@
  *
  */
 
-#include <xcb/xcb_atom.h>
-
 #include "selection.h"
-#include "event.h"
+#include "globalconf.h"
 #include "common/atoms.h"
-#include "common/xutil.h"
+#include "event.h"
+
+#include <xcb/xcb_atom.h>
+#include <xcb/xcb_event.h>
 
 static xcb_window_t selection_window = XCB_NONE;
 
diff --git a/spawn.c b/spawn.c
index d5e393960..a2577214a 100644
--- a/spawn.c
+++ b/spawn.c
@@ -19,16 +19,10 @@
  *
  */
 
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <glib.h>
-
 #include "spawn.h"
-#include "luaa.h"
-#include "event.h"
+
+#include <unistd.h>
+#include <glib.h>
 
 /** 20 seconds timeout */
 #define AWESOME_SPAWN_TIMEOUT 20.0
diff --git a/spawn.h b/spawn.h
index f1312983f..24a5335bd 100644
--- a/spawn.h
+++ b/spawn.h
@@ -22,7 +22,9 @@
 #ifndef AWESOME_SPAWN_H
 #define AWESOME_SPAWN_H
 
-#include "globalconf.h"
+#include "objects/client.h"
+
+#include <lua.h>
 
 void spawn_init(void);
 void spawn_start_notify(client_t *, const char *);
diff --git a/stack.c b/stack.c
index 3f21509f8..7c9168963 100644
--- a/stack.c
+++ b/stack.c
@@ -19,8 +19,8 @@
  *
  */
 
-#include "ewmh.h"
 #include "stack.h"
+#include "ewmh.h"
 #include "objects/client.h"
 #include "objects/drawin.h"
 
diff --git a/stack.h b/stack.h
index f19725cd6..c7d66a787 100644
--- a/stack.h
+++ b/stack.h
@@ -22,7 +22,7 @@
 #ifndef AWESOME_STACK_H
 #define AWESOME_STACK_H
 
-#include "globalconf.h"
+typedef struct client_t client_t;
 
 void stack_client_remove(client_t *);
 void stack_client_push(client_t *);
diff --git a/systray.c b/systray.c
index e4824b5f8..7115564df 100644
--- a/systray.c
+++ b/systray.c
@@ -19,18 +19,16 @@
  *
  */
 
+#include "systray.h"
+#include "common/atoms.h"
+#include "objects/drawin.h"
+#include "xwindow.h"
+#include "globalconf.h"
+
 #include <xcb/xcb.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_atom.h>
 
-#include "luaa.h"
-#include "systray.h"
-#include "xwindow.h"
-#include "common/array.h"
-#include "common/atoms.h"
-#include "common/xutil.h"
-#include "objects/drawin.h"
-
 #define SYSTEM_TRAY_REQUEST_DOCK 0 /* Begin icon docking */
 
 /** Initialize systray information in X.
diff --git a/xwindow.c b/xwindow.c
index 6556ce726..2c38dcefc 100644
--- a/xwindow.c
+++ b/xwindow.c
@@ -19,15 +19,14 @@
  *
  */
 
+#include "xwindow.h"
+#include "common/atoms.h"
+#include "objects/button.h"
+
 #include <xcb/xcb.h>
-#include <xcb/xcb_atom.h>
 #include <xcb/shape.h>
 #include <cairo-xcb.h>
 
-#include "xwindow.h"
-#include "objects/button.h"
-#include "common/atoms.h"
-
 /** Mask shorthands */
 #define BUTTONMASK     (XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE)
 
diff --git a/xwindow.h b/xwindow.h
index be15a8490..c2d48b8ab 100644
--- a/xwindow.h
+++ b/xwindow.h
@@ -23,7 +23,7 @@
 #define AWESOME_WINDOW_H
 
 #include "globalconf.h"
-#include "draw.h"
+#include "color.h"
 
 enum xcb_shape_sk_t;