diff --git a/src/dunst.c b/src/dunst.c
index 0a2b495..5d55467 100644
--- a/src/dunst.c
+++ b/src/dunst.c
@@ -18,8 +18,8 @@
 #include "option_parser.h"
 #include "queues.h"
 #include "settings.h"
-#include "x11/x.h"
 #include "x11/screen.h"
+#include "x11/x.h"
 
 #ifndef VERSION
 #define VERSION "version info needed"
diff --git a/src/dunst.h b/src/dunst.h
index 9fa6a7e..657cfdd 100644
--- a/src/dunst.h
+++ b/src/dunst.h
@@ -4,8 +4,8 @@
 #define DUNST_DUNST_H
 
 #include <glib.h>
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #include "notification.h"
 
diff --git a/src/menu.c b/src/menu.c
index 6344c55..8750e83 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -14,9 +14,9 @@
 
 #include "dbus.h"
 #include "dunst.h"
-#include "settings.h"
 #include "notification.h"
 #include "queues.h"
+#include "settings.h"
 #include "utils.h"
 
 static bool is_initialized = false;
diff --git a/src/notification.c b/src/notification.c
index ad6beea..a4be3a1 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -5,21 +5,21 @@
 #include <assert.h>
 #include <errno.h>
 #include <glib.h>
+#include <libgen.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <libgen.h>
 
 #include "dbus.h"
 #include "dunst.h"
 #include "markup.h"
 #include "menu.h"
+#include "queues.h"
 #include "rules.h"
 #include "settings.h"
-#include "queues.h"
 #include "utils.h"
 #include "x11/x.h"
 
diff --git a/src/queues.h b/src/queues.h
index 8bd23f6..f280cd5 100644
--- a/src/queues.h
+++ b/src/queues.h
@@ -3,8 +3,8 @@
 #ifndef DUNST_QUEUE_H
 #define DUNST_QUEUE_H
 
-#include "notification.h"
 #include "dbus.h"
+#include "notification.h"
 
 /*
  * Initialise neccessary queues
diff --git a/src/utils.c b/src/utils.c
index fcd69ae..a726d4b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,8 +2,8 @@
 #include "utils.h"
 
 #include <assert.h>
-#include <glib.h>
 #include <errno.h>
+#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/x11/screen.c b/src/x11/screen.c
index 384708c..ae7fb93 100644
--- a/src/x11/screen.c
+++ b/src/x11/screen.c
@@ -4,9 +4,9 @@
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
-#include <X11/extensions/randr.h>
-#include <X11/extensions/Xrandr.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>
diff --git a/src/x11/x.c b/src/x11/x.c
index 1b17983..c2ed312 100644
--- a/src/x11/x.c
+++ b/src/x11/x.c
@@ -7,18 +7,18 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <assert.h>
-#include <cairo.h>
 #include <cairo-xlib.h>
-#include <gdk/gdk.h>
+#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include <glib-object.h>
 #include <locale.h>
 #include <math.h>
-#include <pango/pangocairo.h>
 #include <pango/pango-attributes.h>
 #include <pango/pango-font.h>
 #include <pango/pango-layout.h>
 #include <pango/pango-types.h>
+#include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,8 +29,8 @@
 #include "src/dunst.h"
 #include "src/markup.h"
 #include "src/notification.h"
-#include "src/settings.h"
 #include "src/queues.h"
+#include "src/settings.h"
 #include "src/utils.h"
 
 #include "screen.h"