diff --git a/src/dbus.c b/src/dbus.c
index 44aeaf1..a30413d 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -1,15 +1,16 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <glib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include "dunst.h"
 #include "dbus.h"
+
+#include <gio/gio.h>
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "dunst.h"
 #include "notification.h"
-#include "utils.h"
 #include "settings.h"
+#include "utils.h"
 
 GDBusConnection *dbus_conn;
 
diff --git a/src/dbus.h b/src/dbus.h
index 01af660..eb18c74 100644
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -3,8 +3,6 @@
 #ifndef DUNST_DBUS_H
 #define DUNST_DBUS_H
 
-#include <dbus/dbus.h>
-
 #include "notification.h"
 
 int initdbus(void);
diff --git a/src/dunst.c b/src/dunst.c
index 49e37b0..ee963fc 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -3,41 +3,24 @@
 #define _GNU_SOURCE
 #define XLIB_ILLEGAL_ACCESS
 
-#include <assert.h>
-#include <unistd.h>
-#include <time.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <fnmatch.h>
-#include <sys/time.h>
-#include <math.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <glib.h>
-#include <glib-unix.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
-#include <X11/extensions/scrnsaver.h>
-
 #include "dunst.h"
-#include "x.h"
-#include "dbus.h"
-#include "utils.h"
-#include "rules.h"
-#include "notification.h"
-#include "menu.h"
 
+#include <X11/Xlib.h>
+#include <glib-unix.h>
+#include <glib.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "dbus.h"
+#include "menu.h"
+#include "notification.h"
 #include "option_parser.h"
 #include "settings.h"
+#include "x.h"
 
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 
diff --git a/src/dunst.h b/src/dunst.h
index bc15127..5e65080 100644
--- a/src/dunst.h
+++ b/src/dunst.h
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#include "x.h"
 #include "notification.h"
 
 #define ERR(msg) printf("%s : %d\n", (msg), __LINE__)
diff --git a/src/menu.c b/src/menu.c
index a3319c1..963f016 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,20 +1,23 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
 #define _GNU_SOURCE
-#include <stdlib.h>
-#include <stdbool.h>
-#include <regex.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <glib.h>
+#include "menu.h"
+
+#include <errno.h>
+#include <glib.h>
+#include <regex.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
-#include "dunst.h"
-#include "utils.h"
-#include "settings.h"
 #include "dbus.h"
+#include "dunst.h"
+#include "settings.h"
+#include "notification.h"
+#include "utils.h"
 
 static bool is_initialized = false;
 static regex_t cregex;
diff --git a/src/menu.h b/src/menu.h
index 43cd1e6..10fc045 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -2,9 +2,6 @@
 #ifndef DUNST_MENU_H
 #define DUNST_MENU_H
 
-#include "dunst.h"
-#include <regex.h>
-
 char *extract_urls(const char *to_match);
 void open_browser(const char *url);
 void invoke_action(const char *action);
diff --git a/src/notification.c b/src/notification.c
index 3df433a..0eef38d 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -1,24 +1,26 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
 #define _GNU_SOURCE
-#include <stdlib.h>
-#include <time.h>
-#include <glib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <sys/wait.h>
+#include "notification.h"
+
 #include <assert.h>
+#include <errno.h>
+#include <glib.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "dbus.h"
-#include "x.h"
-#include "notification.h"
 #include "dunst.h"
-#include "utils.h"
-#include "settings.h"
-#include "rules.h"
 #include "menu.h"
+#include "rules.h"
+#include "settings.h"
+#include "utils.h"
+#include "x.h"
 
 int next_notification_id = 1;
 
diff --git a/src/notification.h b/src/notification.h
index 9c306a7..777ce73 100644
--- a/src/notification.h
+++ b/src/notification.h
@@ -2,7 +2,10 @@
 #ifndef DUNST_NOTIFICATION_H
 #define DUNST_NOTIFICATION_H
 
-#include "x.h"
+#include <glib.h>
+#include <stdbool.h>
+#include <time.h>
+
 #include "settings.h"
 
 #define LOW 0
diff --git a/src/option_parser.c b/src/option_parser.c
index 1486037..d915505 100644
--- a/src/option_parser.c
+++ b/src/option_parser.c
@@ -1,15 +1,14 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
 #define _GNU_SOURCE
+#include "option_parser.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <glib.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <glib.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "option_parser.h"
 #include "utils.h"
 
 typedef struct _entry_t {
diff --git a/src/option_parser.h b/src/option_parser.h
index 394fa26..1f9728e 100644
--- a/src/option_parser.h
+++ b/src/option_parser.h
@@ -2,6 +2,7 @@
 #ifndef DUNST_OPTION_PARSER_H
 #define DUNST_OPTION_PARSER_H
 
+#include <stdbool.h>
 #include <stdio.h>
 
 int load_ini_file(FILE *);
diff --git a/src/rules.c b/src/rules.c
index a3989b6..a40fc55 100644
--- a/src/rules.c
+++ b/src/rules.c
@@ -1,10 +1,11 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
-#include <glib.h>
+#include "rules.h"
+
 #include <fnmatch.h>
+#include <glib.h>
 
 #include "dunst.h"
-#include "rules.h"
 
 /*
  * Apply rule to notification.
diff --git a/src/rules.h b/src/rules.h
index 4fad056..b9cbcea 100644
--- a/src/rules.h
+++ b/src/rules.h
@@ -3,8 +3,8 @@
 #define DUNST_RULES_H
 
 #include <glib.h>
+#include <stdbool.h>
 
-#include "dunst.h"
 #include "notification.h"
 #include "settings.h"
 
diff --git a/src/settings.c b/src/settings.c
index f4876f6..7cc3666 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,19 +1,21 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
+#include "settings.h"
+
 #include <glib.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #ifndef STATIC_CONFIG
 #include <basedir.h>
 #include <basedir_fs.h>
 #endif
 
-#include "dunst.h"
-#include "rules.h"
-#include "option_parser.h"
-#include "settings.h"
+#include "rules.h" // put before config.h to fix missing include
 #include "config.h"
+#include "dunst.h"
+#include "notification.h"
+#include "option_parser.h"
 #include "utils.h"
 
 settings_t settings;
diff --git a/src/settings.h b/src/settings.h
index eb386fd..160da14 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -2,6 +2,10 @@
 #ifndef DUNST_SETTINGS_H
 #define DUNST_SETTINGS_H
 
+#include <stdbool.h>
+
+#include "x.h"
+
 enum alignment { left, center, right };
 enum icon_position_t { icons_left, icons_right, icons_off };
 enum separator_color { FOREGROUND, AUTO, FRAME, CUSTOM };
diff --git a/src/utils.c b/src/utils.c
index 73ade27..1ff3d5a 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,14 +1,11 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 #define _GNU_SOURCE
-
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <glib.h>
-
 #include "utils.h"
-#include "dunst.h"
+
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 char *string_replace_char(char needle, char replacement, char *haystack) {
         char *current = haystack;
diff --git a/src/x.c b/src/x.c
index 7a1c776..b37a788 100644
--- a/src/x.c
+++ b/src/x.c
@@ -1,26 +1,30 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
-#include <math.h>
-#include <sys/time.h>
-#include <ctype.h>
-#include <assert.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <X11/Xlib.h>
+#include "x.h"
+
 #include <X11/X.h>
+#include <X11/XKBlib.h>
 #include <X11/Xatom.h>
-#include <pango/pangocairo.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#include <assert.h>
+#endif
 #include <cairo-xlib.h>
 #include <gdk/gdk.h>
+#include <locale.h>
+#include <math.h>
+#include <pango/pangocairo.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
-#include "x.h"
-#include "utils.h"
 #include "dunst.h"
-#include "settings.h"
 #include "notification.h"
+#include "settings.h"
+#include "utils.h"
 
 #define WIDTH 400
 #define HEIGHT 400
diff --git a/src/x.h b/src/x.h
index 55e4b6e..b016cb3 100644
--- a/src/x.h
+++ b/src/x.h
@@ -2,16 +2,10 @@
 #ifndef DUNST_X_H
 #define DUNST_X_H
 
-#include <stdbool.h>
-#include "glib.h"
 #include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
 #include <X11/extensions/scrnsaver.h>
+#include <glib.h>
+#include <stdbool.h>
 
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define FONT_HEIGHT_BORDER 2