diff --git a/client.c b/client.c
index b3284351..dfb8b4ec 100644
--- a/client.c
+++ b/client.c
@@ -19,24 +19,15 @@
  *
  */
 
-#include <stdio.h>
-
-#include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 
 #include "cnode.h"
-#include "image.h"
-#include "client.h"
 #include "tag.h"
 #include "window.h"
 #include "ewmh.h"
-#include "widget.h"
 #include "screen.h"
 #include "titlebar.h"
-#include "luaa.h"
-#include "mouse.h"
 #include "systray.h"
-#include "wibox.h"
 #include "property.h"
 #include "layouts/floating.h"
 #include "common/markup.h"
diff --git a/client.h b/client.h
index d259f046..2b05a9c4 100644
--- a/client.h
+++ b/client.h
@@ -22,9 +22,6 @@
 #ifndef AWESOME_CLIENT_H
 #define AWESOME_CLIENT_H
 
-#include <xcb/xcb_icccm.h>
-
-#include "structs.h"
 #include "mouse.h"
 #include "stack.h"
 
diff --git a/common/array.h b/common/array.h
index cd2556ae..fcda00d9 100644
--- a/common/array.h
+++ b/common/array.h
@@ -22,7 +22,6 @@
 #ifndef AWESOME_COMMON_ARRAY_H
 #define AWESOME_COMMON_ARRAY_H
 
-#include <assert.h>
 #include "common/util.h"
 
 #define ARRAY_TYPE(type_t, pfx)                                             \
diff --git a/common/xutil.h b/common/xutil.h
index 269daf33..b36cea13 100644
--- a/common/xutil.h
+++ b/common/xutil.h
@@ -22,8 +22,6 @@
 #ifndef AWESOME_COMMON_XUTIL_H
 #define AWESOME_COMMON_XUTIL_H
 
-#include <stdbool.h>
-
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
 #include <xcb/xcb_aux.h>
diff --git a/draw.c b/draw.c
index b25dcb61..21ac6d20 100644
--- a/draw.c
+++ b/draw.c
@@ -26,7 +26,6 @@
 #include <langinfo.h>
 #include <iconv.h>
 #include <errno.h>
-#include <string.h>
 #include <ctype.h>
 #include <math.h>
 
diff --git a/keybinding.c b/keybinding.c
index 154f9371..7ed99bf1 100644
--- a/keybinding.c
+++ b/keybinding.c
@@ -24,8 +24,6 @@
 #include <X11/Xlib.h>
 
 #include "structs.h"
-#include "common/refcount.h"
-#include "common/array.h"
 #include "keybinding.h"
 
 ARRAY_TYPE(keybinding_t *, keybinding)
diff --git a/mouse.c b/mouse.c
index ab8a958d..56e54c21 100644
--- a/mouse.c
+++ b/mouse.c
@@ -22,12 +22,9 @@
 #include <math.h>
 
 #include "common/tokenize.h"
-#include "mouse.h"
 #include "screen.h"
 #include "tag.h"
-#include "client.h"
 #include "titlebar.h"
-#include "wibox.h"
 #include "layouts/floating.h"
 #include "layouts/tile.h"
 #include "layouts/magnifier.h"
diff --git a/structs.h b/structs.h
index c678edc4..21861fb5 100644
--- a/structs.h
+++ b/structs.h
@@ -22,15 +22,12 @@
 #ifndef AWESOME_STRUCTS_H
 #define AWESOME_STRUCTS_H
 
-#include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_property.h>
-#include <ev.h>
 
 #include "luaa.h"
 #include "layout.h"
 #include "swindow.h"
-#include "image.h"
 #include "common/xutil.h"
 #include "common/xembed.h"
 #include "common/refcount.h"
diff --git a/titlebar.h b/titlebar.h
index ec23ddaa..8294e3f8 100644
--- a/titlebar.h
+++ b/titlebar.h
@@ -22,7 +22,6 @@
 #ifndef AWESOME_TITLEBAR_H
 #define AWESOME_TITLEBAR_H
 
-#include "structs.h"
 #include "wibox.h"
 
 client_t * client_getbytitlebar(wibox_t *);
diff --git a/wibox.h b/wibox.h
index 50ab4d6d..53043226 100644
--- a/wibox.h
+++ b/wibox.h
@@ -24,9 +24,6 @@
 
 #include "widget.h"
 #include "swindow.h"
-#include "common/util.h"
-#include "common/refcount.h"
-#include "common/array.h"
 
 void wibox_refresh(void);