diff --git a/awesome.c b/awesome.c
index 367afdc94..99b301734 100644
--- a/awesome.c
+++ b/awesome.c
@@ -47,7 +47,6 @@
 #include "layout.h"
 #include "screen.h"
 #include "statusbar.h"
-#include "uicb.h"
 #include "window.h"
 #include "client.h"
 #include "focus.h"
@@ -55,10 +54,8 @@
 #include "tag.h"
 #include "dbus.h"
 #include "common/socket.h"
-#include "common/util.h"
 #include "common/version.h"
 #include "common/configopts.h"
-#include "common/xscreen.h"
 #include "common/xutil.h"
 
 static bool running = true;
diff --git a/common/configopts.c b/common/configopts.c
index 99252d6c0..a65eb49eb 100644
--- a/common/configopts.c
+++ b/common/configopts.c
@@ -20,13 +20,10 @@
  */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <confuse.h>
-
 #include "rules.h"
 #include "common/configopts.h"
 
diff --git a/common/draw.c b/common/draw.c
index 28561159d..9636342e5 100644
--- a/common/draw.c
+++ b/common/draw.c
@@ -42,8 +42,6 @@
 #include <math.h>
 
 #include "common/draw.h"
-#include "common/util.h"
-#include "common/xutil.h"
 #include "common/markup.h"
 
 /** Convert text from any charset to UTF-8 using iconv
diff --git a/common/markup.c b/common/markup.c
index 620e5740f..485558484 100644
--- a/common/markup.c
+++ b/common/markup.c
@@ -25,7 +25,6 @@
 #include <glib.h>
 
 #include <stdio.h>
-#include <string.h>
 
 #include "common/markup.h"
 
diff --git a/dbus.c b/dbus.c
index ef2942fd6..88f259e5b 100644
--- a/dbus.c
+++ b/dbus.c
@@ -24,7 +24,6 @@
 #include "dbus.h"
 #include "statusbar.h"
 #include "widget.h"
-#include "common/util.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/event.c b/event.c
index 5ec58385d..6498d08c1 100644
--- a/event.c
+++ b/event.c
@@ -20,11 +20,8 @@
  */
 
 #include <xcb/xcb_keysyms.h>
-#include <xcb/xcb_icccm.h>
 #include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
-#include <xcb/shape.h>
-#include <xcb/randr.h>
 
 #include "screen.h"
 #include "event.h"
diff --git a/layouts/fibonacci.c b/layouts/fibonacci.c
index dcff6fbaf..61478fcde 100644
--- a/layouts/fibonacci.c
+++ b/layouts/fibonacci.c
@@ -23,7 +23,6 @@
 #include "tag.h"
 #include "client.h"
 #include "layouts/fibonacci.h"
-#include "common/util.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/layouts/max.c b/layouts/max.c
index f00a26794..dc2e3d8b2 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -23,7 +23,6 @@
 #include "screen.h"
 #include "client.h"
 #include "layouts/max.h"
-#include "common/util.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/layouts/tile.c b/layouts/tile.c
index fd92a3945..6738504c6 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -24,7 +24,6 @@
 #include "screen.h"
 #include "awesome.h"
 #include "tag.h"
-#include "layout.h"
 #include "client.h"
 #include "layouts/tile.h"
 #include "common/util.h"
diff --git a/mouse.c b/mouse.c
index 2bbb8919d..44e35d33c 100644
--- a/mouse.c
+++ b/mouse.c
@@ -32,7 +32,6 @@
 #include "titlebar.h"
 #include "layouts/floating.h"
 #include "layouts/tile.h"
-#include "common/xscreen.h"
 
 #define MOUSEMASK      (XCB_EVENT_MASK_BUTTON_PRESS \
                         | XCB_EVENT_MASK_BUTTON_RELEASE \
diff --git a/widget.h b/widget.h
index f9d82cbbe..75157145b 100644
--- a/widget.h
+++ b/widget.h
@@ -23,8 +23,6 @@
 #ifndef AWESOME_WIDGET_H
 #define AWESOME_WIDGET_H
 
-#include <confuse.h>
-
 #include "structs.h"
 
 #define WIDGET_CACHE_CLIENTS        1<<0
diff --git a/widgets/graph.c b/widgets/graph.c
index 929a0bd4f..2badb7c20 100644
--- a/widgets/graph.c
+++ b/widgets/graph.c
@@ -22,10 +22,8 @@
 
 #include "widget.h"
 #include "screen.h"
-#include "common/util.h"
 #include "common/draw.h"
 #include "common/configopts.h"
-#include "common/xutil.h"
 
 extern AwesomeConf globalconf;
 
diff --git a/widgets/layoutinfo.c b/widgets/layoutinfo.c
index 7f3c40a5e..748a64c56 100644
--- a/widgets/layoutinfo.c
+++ b/widgets/layoutinfo.c
@@ -23,7 +23,6 @@
 
 #include "widget.h"
 #include "tag.h"
-#include "common/util.h"
 #include "common/configopts.h"
 
 extern AwesomeConf globalconf;
diff --git a/widgets/progressbar.c b/widgets/progressbar.c
index 921698067..1c537ef9f 100644
--- a/widgets/progressbar.c
+++ b/widgets/progressbar.c
@@ -20,15 +20,10 @@
  *
  */
 
-#include <string.h>
-#include "widget.h"
-
-#include "widgets/common.h"
 #include "screen.h"
-#include "common/util.h"
+#include "widgets/common.h"
 #include "common/configopts.h"
 
-
 extern AwesomeConf globalconf;
 
 typedef struct
diff --git a/widgets/taglist.c b/widgets/taglist.c
index 39fae7ba3..4978e4a47 100644
--- a/widgets/taglist.c
+++ b/widgets/taglist.c
@@ -25,7 +25,6 @@
 #include "tag.h"
 #include "event.h"
 #include "common/markup.h"
-#include "common/util.h"
 #include "common/configopts.h"
 
 extern AwesomeConf globalconf;
diff --git a/widgets/tasklist.c b/widgets/tasklist.c
index 118b7d525..20e1b3ae2 100644
--- a/widgets/tasklist.c
+++ b/widgets/tasklist.c
@@ -27,7 +27,6 @@
 #include "ewmh.h"
 #include "rules.h"
 #include "tag.h"
-#include "common/util.h"
 #include "common/configopts.h"
 
 extern AwesomeConf globalconf;