diff --git a/src/accounts.c b/src/accounts.c
index 5feeab92..746311aa 100644
--- a/src/accounts.c
+++ b/src/accounts.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 
 #include "accounts.h"
+
 #include "autocomplete.h"
 #include "common.h"
 #include "files.h"
diff --git a/src/chat_session.c b/src/chat_session.c
index cd22e79e..d97a5184 100644
--- a/src/chat_session.c
+++ b/src/chat_session.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 
 #include "chat_session.h"
+
 #include "log.h"
 #include "preferences.h"
 
diff --git a/src/command.c b/src/command.c
index ccb506ed..6a4bc82a 100644
--- a/src/command.c
+++ b/src/command.c
@@ -20,25 +20,26 @@
  *
  */
 
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
-#include <errno.h>
 
 #include <glib.h>
 
-#include "accounts.h"
-#include "chat_session.h"
 #include "command.h"
+
+#include "accounts.h"
+#include "autocomplete.h"
+#include "chat_session.h"
 #include "common.h"
 #include "contact.h"
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
-#include "preferences.h"
-#include "autocomplete.h"
-#include "profanity.h"
 #include "muc.h"
+#include "preferences.h"
+#include "profanity.h"
 #include "theme.h"
 #include "tinyurl.h"
 #include "ui/ui.h"
diff --git a/src/common.c b/src/common.c
index 61017536..75b05516 100644
--- a/src/common.c
+++ b/src/common.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <glib.h>
 #include <curl/curl.h>
 #include <curl/easy.h>
+#include <glib.h>
 
 #include "common.h"
 
diff --git a/src/common.h b/src/common.h
index 31201b86..2c5860b6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -24,6 +24,7 @@
 #define COMMON_H
 
 #include <stdio.h>
+
 #include <glib.h>
 
 #if !GLIB_CHECK_VERSION(2,28,0)
diff --git a/src/contact.c b/src/contact.c
index aad7f630..f6f98e9e 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -25,9 +25,10 @@
 
 #include <glib.h>
 
-#include "common.h"
 #include "contact.h"
 
+#include "common.h"
+
 struct p_contact_t {
     char *jid;
     char *name;
diff --git a/src/contact_list.c b/src/contact_list.c
index 75f0eed7..1b22ff4c 100644
--- a/src/contact_list.c
+++ b/src/contact_list.c
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 
-#include "contact.h"
 #include "autocomplete.h"
+#include "contact.h"
 
 static Autocomplete ac;
 static GHashTable *contacts;
diff --git a/src/jid.c b/src/jid.c
index 84372af7..7a62e141 100644
--- a/src/jid.c
+++ b/src/jid.c
@@ -25,9 +25,10 @@
 
 #include <glib.h>
 
-#include "common.h"
 #include "jid.h"
 
+#include "common.h"
+
 Jid *
 jid_create(const gchar * const str)
 {
diff --git a/src/log.c b/src/log.c
index 05e2ec3d..fd7bd370 100644
--- a/src/log.c
+++ b/src/log.c
@@ -24,14 +24,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "glib.h"
 
+#include "log.h"
+
 #include "common.h"
 #include "files.h"
-#include "log.h"
 #include "preferences.h"
 
 #define PROF "prof"
diff --git a/src/main.c b/src/main.c
index 6ff4d6c0..99f71351 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <config.h>
-
 #include <glib.h>
 
+#include "config.h"
+
 #include "profanity.h"
 
 static gboolean disable_tls = FALSE;
diff --git a/src/muc.c b/src/muc.c
index a599aea9..2658983b 100644
--- a/src/muc.c
+++ b/src/muc.c
@@ -25,9 +25,9 @@
 
 #include <glib.h>
 
+#include "autocomplete.h"
 #include "contact.h"
 #include "jid.h"
-#include "autocomplete.h"
 
 typedef struct _muc_room_t {
     char *room; // e.g. test@conference.server
diff --git a/src/preferences.c b/src/preferences.c
index d12470f6..6a5aa66c 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -20,22 +20,23 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
-#include "config.h"
+#include "preferences.h"
+
+#include "autocomplete.h"
 #include "files.h"
 #include "log.h"
-#include "preferences.h"
-#include "autocomplete.h"
 
 static gchar *prefs_loc;
 static GKeyFile *prefs;
diff --git a/src/preferences.h b/src/preferences.h
index e27411c6..a68dc16b 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
diff --git a/src/profanity.c b/src/profanity.c
index 1875e4d4..6ba50236 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -23,12 +23,14 @@
 #include "config.h"
 
 #include <locale.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
 
 #include <glib.h>
 
+#include "profanity.h"
+
 #include "accounts.h"
 #include "chat_session.h"
 #include "command.h"
@@ -37,9 +39,8 @@
 #include "contact_list.h"
 #include "files.h"
 #include "log.h"
-#include "preferences.h"
-#include "profanity.h"
 #include "muc.h"
+#include "preferences.h"
 #include "theme.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
diff --git a/src/theme.c b/src/theme.c
index e8ab5198..ec061ce4 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -26,16 +26,16 @@
 #include <string.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
+#include "theme.h"
+
 #include "files.h"
 #include "log.h"
-#include "theme.h"
 
 static GString *theme_loc;
 static GKeyFile *theme;
diff --git a/src/theme.h b/src/theme.h
index 21cc5f19..d87b69f2 100644
--- a/src/theme.h
+++ b/src/theme.h
@@ -26,7 +26,6 @@
 #include "config.h"
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
diff --git a/src/tinyurl.c b/src/tinyurl.c
index 5dd3bd77..87fafc47 100644
--- a/src/tinyurl.c
+++ b/src/tinyurl.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <curl/curl.h>
 #include <curl/easy.h>
+#include <glib.h>
 
 struct curl_data_t
 {
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 46a3cb13..203efe30 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -33,14 +33,14 @@
 #include <ncurses.h>
 #endif
 
-#include "common.h"
 #include "command.h"
+#include "common.h"
 #include "contact_list.h"
 #include "log.h"
 #include "preferences.h"
 #include "profanity.h"
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 #define _inp_win_refresh() prefresh(inp_win, 0, pad_start, rows-1, 0, rows-1, cols-1)
 
diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
index 07f4295a..7d894f07 100644
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 static WINDOW *status_bar;
 static char *message = NULL;
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index e563381b..fc208063 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -25,7 +25,7 @@
 
 #include "common.h"
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 static WINDOW *title_bar;
 static char *current_title = NULL;
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 7599d374..d83b73f3 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -28,7 +28,6 @@
 #include <wchar.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
diff --git a/src/ui/window.c b/src/ui/window.c
index 2a597127..b9c5d9cb 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -34,7 +33,7 @@
 #endif
 
 #include "theme.h"
-#include "window.h"
+#include "ui/window.h"
 
 #define CONS_WIN_TITLE "_cons"
 
diff --git a/src/ui/window.h b/src/ui/window.h
index 61790de2..ce980dd6 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -23,7 +23,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "ui.h"
+#include "ui/ui.h"
 
 typedef struct prof_win_t {
     char *from;
diff --git a/src/ui/windows.c b/src/ui/windows.c
index b809a513..389c362f 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -24,20 +24,16 @@
 
 #include <stdlib.h>
 #include <string.h>
-
 #ifdef HAVE_LIBXSS
 #include <X11/extensions/scrnsaver.h>
 #endif
-
 #include <glib.h>
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
 #ifdef PLATFORM_CYGWIN
 #include <windows.h>
 #endif
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -51,11 +47,11 @@
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
-#include "preferences.h"
 #include "muc.h"
+#include "preferences.h"
 #include "theme.h"
-#include "ui.h"
-#include "window.h"
+#include "ui/ui.h"
+#include "ui/window.h"
 
 #define CONS_WIN_TITLE "_cons"
 #define NUM_WINS 10
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index 535849e5..fa87ced5 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,10 +29,9 @@
 #include <openssl/evp.h>
 #include <strophe.h>
 
-#include "config.h"
 #include "common.h"
-#include "xmpp.h"
-#include "stanza.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/stanza.h"
 
 static GHashTable *capabilities;
 
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
index 10c59927..b837fcdd 100644
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -25,7 +25,7 @@
 
 #include <strophe.h>
 
-#include "xmpp.h"
+#include "xmpp/xmpp.h"
 
 void caps_add(const char * const caps_str, const char * const client);
 gboolean caps_contains(const char * const caps_str);
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 9d6f6822..93512f5e 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -20,9 +20,9 @@
  *
  */
 
+#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include <strophe.h>
 
@@ -31,14 +31,14 @@
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
+#include "muc.h"
 #include "preferences.h"
 #include "profanity.h"
-#include "muc.h"
-#include "xmpp.h"
-#include "stanza.h"
-#include "message.h"
-#include "iq.h"
-#include "presence.h"
+#include "xmpp/iq.h"
+#include "xmpp/message.h"
+#include "xmpp/presence.h"
+#include "xmpp/stanza.h"
+#include "xmpp/xmpp.h"
 
 static struct _jabber_conn_t {
     xmpp_log_t *log;
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 72f7c39f..e4bcecb4 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -20,19 +20,20 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include <strophe.h>
 
 #include "common.h"
-#include "config.h"
 #include "contact_list.h"
 #include "log.h"
-#include "xmpp.h"
-#include "stanza.h"
-#include "iq.h"
-#include "capabilities.h"
+#include "xmpp/capabilities.h"
+#include "xmpp/iq.h"
+#include "xmpp/stanza.h"
+#include "xmpp/xmpp.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_IQ, type, ctx)
 
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 6769147f..42769cf7 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -30,9 +30,9 @@
 #include "muc.h"
 #include "preferences.h"
 #include "profanity.h"
-#include "xmpp.h"
-#include "stanza.h"
-#include "message.h"
+#include "xmpp/message.h"
+#include "xmpp/stanza.h"
+#include "xmpp/xmpp.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_MESSAGE, type, ctx)
 
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index b679317e..f4631b12 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -30,9 +30,9 @@
 #include "muc.h"
 #include "preferences.h"
 #include "profanity.h"
-#include "xmpp.h"
-#include "stanza.h"
-#include "capabilities.h"
+#include "xmpp/capabilities.h"
+#include "xmpp/stanza.h"
+#include "xmpp/xmpp.h"
 
 static GHashTable *sub_requests;
 
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 554dfc1c..bac88826 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -27,7 +27,7 @@
 #include <strophe.h>
 
 #include "common.h"
-#include "stanza.h"
+#include "xmpp/stanza.h"
 
 static int _field_compare(FormField *f1, FormField *f2);