diff --git a/src/draw.c b/src/draw.c
index 6f56573..cf51ae1 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -4,17 +4,17 @@
 #include <cairo.h>
 #include <math.h>
 #include <pango/pango-attributes.h>
+#include <pango/pangocairo.h>
 #include <pango/pango-font.h>
 #include <pango/pango-layout.h>
 #include <pango/pango-types.h>
-#include <pango/pangocairo.h>
 #include <stdlib.h>
 
 #include "dunst.h"
 #include "icon.h"
+#include "log.h"
 #include "markup.h"
 #include "notification.h"
-#include "log.h"
 #include "queues.h"
 #include "x11/x.h"
 
diff --git a/src/dunst.c b/src/dunst.c
index 0cac70b..1449a43 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -2,13 +2,13 @@
 
 #include "dunst.h"
 
-#include <X11/Xlib.h>
-#include <glib-unix.h>
 #include <glib.h>
+#include <glib-unix.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <X11/Xlib.h>
 
 #include "dbus.h"
 #include "draw.h"
diff --git a/src/markup.c b/src/markup.c
index 884fb24..3f74716 100644
--- a/src/markup.c
+++ b/src/markup.c
@@ -3,10 +3,10 @@
 #include "markup.h"
 
 #include <assert.h>
-#include <stdbool.h>
-#include <string.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "log.h"
 #include "settings.h"
diff --git a/src/settings.c b/src/settings.c
index aad5c9d..bdd299f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -6,15 +6,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rules.h" // put before config.h to fix missing include
-#include "../config.h"
 #include "dunst.h"
 #include "log.h"
 #include "notification.h"
 #include "option_parser.h"
+#include "rules.h"
 #include "utils.h"
 #include "x11/x.h"
 
+#include "../config.h"
+
 struct settings settings;
 
 static const char *follow_mode_to_string(enum follow_mode f_mode)
diff --git a/src/x11/screen.c b/src/x11/screen.c
index 7425c03..f00431a 100644
--- a/src/x11/screen.c
+++ b/src/x11/screen.c
@@ -1,12 +1,5 @@
 #include "screen.h"
 
-#include <X11/X.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-#include <X11/extensions/Xinerama.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/extensions/randr.h>
 #include <assert.h>
 #include <glib.h>
 #include <locale.h>
@@ -14,6 +7,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <X11/extensions/randr.h>
+#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/Xrandr.h>
+#include <X11/Xatom.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xresource.h>
 
 #include "../log.h"
 #include "../settings.h"
diff --git a/src/x11/screen.h b/src/x11/screen.h
index 5ff2e69..13b9c44 100644
--- a/src/x11/screen.h
+++ b/src/x11/screen.h
@@ -2,8 +2,8 @@
 #ifndef DUNST_SCREEN_H
 #define DUNST_SCREEN_H
 
-#include <X11/Xlib.h>
 #include <stdbool.h>
+#include <X11/Xlib.h>
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 
diff --git a/src/x11/x.c b/src/x11/x.c
index d269595..ca613a6 100644
--- a/src/x11/x.c
+++ b/src/x11/x.c
@@ -1,15 +1,9 @@
 /* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
 #include "x.h"
 
-#include <X11/X.h>
-#include <X11/XKBlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/shape.h>
 #include <assert.h>
-#include <cairo-xlib.h>
 #include <cairo.h>
+#include <cairo-xlib.h>
 #include <glib-object.h>
 #include <locale.h>
 #include <math.h>
@@ -18,9 +12,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <X11/extensions/shape.h>
+#include <X11/Xatom.h>
+#include <X11/X.h>
+#include <X11/XKBlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
-#include "../draw.h"
 #include "../dbus.h"
+#include "../draw.h"
 #include "../dunst.h"
 #include "../log.h"
 #include "../markup.h"
diff --git a/src/x11/x.h b/src/x11/x.h
index 0be1329..6f4ced1 100644
--- a/src/x11/x.h
+++ b/src/x11/x.h
@@ -5,11 +5,11 @@
 #define XLIB_ILLEGAL_ACCESS
 
 #include <cairo.h>
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/scrnsaver.h>
 #include <glib.h>
 #include <stdbool.h>
+#include <X11/extensions/scrnsaver.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
 
 #include "screen.h"
 
diff --git a/test/test.c b/test/test.c
index 799ef4a..432911d 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,9 +1,9 @@
 #include "greatest.h"
 
+#include <errno.h>
+#include <libgen.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <libgen.h>
-#include <errno.h>
 
 #include "../src/log.h"