diff --git a/awesome.c b/awesome.c
index 32c71568b..9a06b0b6d 100644
--- a/awesome.c
+++ b/awesome.c
@@ -28,28 +28,17 @@
 #include <signal.h>
 
 #include <ev.h>
-#include <xcb/xcb.h>
-#include <xcb/randr.h>
-#include <xcb/xcb_aux.h>
-#include <xcb/xcb_atom.h>
-#include <xcb/xcb_icccm.h>
 
-#include "lua.h"
 #include "event.h"
-#include "layout.h"
-#include "screen.h"
 #include "window.h"
-#include "client.h"
 #include "focus.h"
 #include "ewmh.h"
-#include "tag.h"
 #include "dbus.h"
 #include "statusbar.h"
 #include "systray.h"
 #include "common/socket.h"
 #include "common/version.h"
 #include "common/configopts.h"
-#include "common/xutil.h"
 #include "config.h"
 
 awesome_t globalconf;
diff --git a/client.c b/client.c
index 4a1811c04..dae919aa5 100644
--- a/client.c
+++ b/client.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 #include <xcb/xcb_atom.h>
 
 #include "client.h"
@@ -38,8 +37,6 @@
 #include "mouse.h"
 #include "layouts/floating.h"
 #include "common/markup.h"
-#include "common/xutil.h"
-#include "common/xscreen.h"
 
 extern awesome_t globalconf;
 extern const name_func_link_t FloatingPlacementList[];
diff --git a/dbus.c b/dbus.c
index d12295472..6b3aac878 100644
--- a/dbus.c
+++ b/dbus.c
@@ -26,7 +26,6 @@
 #include <dbus/dbus.h>
 
 #include "dbus.h"
-#include "statusbar.h"
 #include "widget.h"
 
 extern awesome_t globalconf;
diff --git a/event.c b/event.c
index 27cb8f234..b92414912 100644
--- a/event.c
+++ b/event.c
@@ -19,16 +19,11 @@
  *
  */
 
-#include <xcb/xcb_keysyms.h>
+#include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
-#include <xcb/xcb_aux.h>
 
-#include "screen.h"
 #include "event.h"
-#include "tag.h"
-#include "statusbar.h"
 #include "window.h"
-#include "mouse.h"
 #include "ewmh.h"
 #include "client.h"
 #include "widget.h"
@@ -38,8 +33,6 @@
 #include "lua.h"
 #include "systray.h"
 #include "layouts/floating.h"
-#include "common/xscreen.h"
-#include "common/xutil.h"
 
 extern awesome_t globalconf;
 
diff --git a/ewmh.c b/ewmh.c
index 085a000ef..bb534f04c 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -24,7 +24,6 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
-#include <xcb/xcb_aux.h>
 
 #include "ewmh.h"
 #include "tag.h"
diff --git a/keybinding.c b/keybinding.c
index c34065ef5..797d500e9 100644
--- a/keybinding.c
+++ b/keybinding.c
@@ -25,7 +25,6 @@
 
 #include "keybinding.h"
 #include "event.h"
-#include "lua.h"
 #include "window.h"
 
 extern awesome_t globalconf;
diff --git a/keygrabber.c b/keygrabber.c
index 3dccdcbc5..005f57ee0 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -21,13 +21,9 @@
 
 #include <unistd.h>
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
-
 #include "keygrabber.h"
 #include "event.h"
 #include "structs.h"
-#include "lua.h"
 
 extern awesome_t globalconf;
 
diff --git a/layout.c b/layout.c
index 624ca7891..563238163 100644
--- a/layout.c
+++ b/layout.c
@@ -19,21 +19,10 @@
  *
  */
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_atom.h>
-#include <xcb/xcb_aux.h>
-
 #include "tag.h"
 #include "focus.h"
-#include "widget.h"
 #include "window.h"
-#include "client.h"
 #include "screen.h"
-#include "layouts/magnifier.h"
-#include "layouts/tile.h"
-#include "layouts/max.h"
-#include "layouts/fibonacci.h"
-#include "layouts/floating.h"
 
 extern awesome_t globalconf;
 
diff --git a/lua.c b/lua.c
index 0d321de93..232926881 100644
--- a/lua.c
+++ b/lua.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 
 #include <ev.h>
+
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
@@ -35,11 +36,9 @@
 
 #include "ewmh.h"
 #include "config.h"
-#include "structs.h"
 #include "lua.h"
 #include "tag.h"
 #include "client.h"
-#include "window.h"
 #include "statusbar.h"
 #include "titlebar.h"
 #include "screen.h"
diff --git a/mouse.c b/mouse.c
index 80a1cc168..ab7b9a4e9 100644
--- a/mouse.c
+++ b/mouse.c
@@ -20,16 +20,11 @@
  */
 
 #include <math.h>
-#include <stdbool.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 
 #include "common/tokenize.h"
 #include "mouse.h"
 #include "screen.h"
 #include "tag.h"
-#include "event.h"
 #include "client.h"
 #include "titlebar.h"
 #include "layouts/floating.h"
diff --git a/placement.c b/placement.c
index a661dc7bf..55f56e541 100644
--- a/placement.c
+++ b/placement.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
-
 #include "placement.h"
 #include "screen.h"
 #include "client.h"
diff --git a/statusbar.c b/statusbar.c
index b5be5450a..a893e2d0c 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -20,13 +20,10 @@
  */
 
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 
 #include "statusbar.h"
 #include "screen.h"
-#include "tag.h"
 #include "widget.h"
-#include "window.h"
 #include "ewmh.h"
 
 extern awesome_t globalconf;
diff --git a/systray.c b/systray.c
index df65aac49..be935cf07 100644
--- a/systray.c
+++ b/systray.c
@@ -20,15 +20,11 @@
  */
 
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 #include <xcb/xcb_icccm.h>
 
-#include "structs.h"
 #include "systray.h"
 #include "window.h"
 #include "widget.h"
-#include "common/xembed.h"
-#include "common/swindow.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK 0 /* Begin icon docking */
 
diff --git a/tag.c b/tag.c
index 8fa990d85..4cdc3200c 100644
--- a/tag.c
+++ b/tag.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <stdio.h>
-#include <X11/Xutil.h>
-
 #include "screen.h"
 #include "tag.h"
 #include "client.h"
diff --git a/titlebar.c b/titlebar.c
index e52d28d6c..182a7b4a5 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -26,9 +26,7 @@
 
 #include "titlebar.h"
 #include "client.h"
-#include "screen.h"
 #include "widget.h"
-#include "layouts/floating.h"
 
 extern awesome_t globalconf;
 
diff --git a/widget.c b/widget.c
index 34c3efe97..dbd16c7e6 100644
--- a/widget.c
+++ b/widget.c
@@ -22,14 +22,11 @@
 #include <math.h>
 
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 #include <xcb/xcb_atom.h>
 
 #include "widget.h"
-#include "statusbar.h"
 #include "titlebar.h"
 #include "event.h"
-#include "lua.h"
 
 extern awesome_t globalconf;
 
diff --git a/window.c b/window.c
index cddfd1f68..f55aea5a9 100644
--- a/window.c
+++ b/window.c
@@ -21,10 +21,7 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
-#include <xcb/xcb_keysyms.h>
-#include <xcb/xcb_aux.h>
 
-#include "structs.h"
 #include "window.h"
 
 extern awesome_t globalconf;