3 files changed, 32 insertions, 28 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index b1273bc9..afc642e4 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -41,17 +41,17 @@
 #include <dirent.h>
 
 #include "common.h"
-#include "tools/parser.h"
-#include "ui/win_types.h"
-#include "command/cmd_funcs.h"
 #include "config/preferences.h"
 #include "config/scripts.h"
+#include "command/cmd_ac.h"
+#include "command/cmd_funcs.h"
+#include "tools/parser.h"
+#include "plugins/plugins.h"
+#include "ui/win_types.h"
+#include "ui/window_list.h"
 #include "xmpp/muc.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/roster_list.h"
-#include "ui/window_list.h"
-#include "plugins/plugins.h"
-#include "command/cmd_ac.h"
 
 #ifdef HAVE_LIBGPGME
 #include "pgp/gpg.h"
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index fa55ec83..14afd7c2 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -48,29 +48,29 @@
 
 #include <glib.h>
 
-#include "xmpp/chat_session.h"
+#include "profanity.h"
+#include "log.h"
+#include "common.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_ac.h"
-#include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "config/tlscerts.h"
 #include "config/scripts.h"
-#include "xmpp/contact.h"
-#include "xmpp/roster_list.h"
-#include "xmpp/jid.h"
-#include "log.h"
-#include "xmpp/muc.h"
 #include "plugins/plugins.h"
-#include "profanity.h"
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
 #include "tools/tinyurl.h"
-#include "xmpp/xmpp.h"
 #include "ui/ui.h"
 #include "ui/window_list.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/contact.h"
+#include "xmpp/roster_list.h"
+#include "xmpp/jid.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/muc.h"
 
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index f68f725d..26b22c4f 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -49,41 +49,45 @@
 #include <langinfo.h>
 #include <ctype.h>
 
-#include "xmpp/chat_session.h"
+#include "profanity.h"
+#include "log.h"
+#include "common.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
-#include "common.h"
 #include "config/accounts.h"
 #include "config/account.h"
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "config/tlscerts.h"
 #include "config/scripts.h"
+#include "event/client_events.h"
+#include "tools/http_upload.h"
+#include "tools/autocomplete.h"
+#include "tools/parser.h"
+#include "tools/tinyurl.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
+#include "ui/window_list.h"
+#include "xmpp/xmpp.h"
 #include "xmpp/contact.h"
 #include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
-#include "log.h"
 #include "xmpp/muc.h"
+#include "xmpp/chat_session.h"
+
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
+
 #ifdef HAVE_LIBGPGME
 #include "pgp/gpg.h"
 #endif
-#include "profanity.h"
-#include "plugins/plugins.h"
-#include "tools/autocomplete.h"
-#include "tools/parser.h"
-#include "tools/tinyurl.h"
-#include "xmpp/xmpp.h"
-#include "ui/ui.h"
-#include "ui/window_list.h"
-#include "event/client_events.h"
+
 #ifdef HAVE_GTK
 #include "ui/tray.h"
 #endif
-#include "tools/http_upload.h"
+
 #ifdef HAVE_PYTHON
 #include "plugins/python_plugins.h"
 #endif