Tidy headers

19 files changed, 68 insertions, 62 deletions

diff --git a/src/ui/buffer.h b/src/ui/buffer.h
index e37f58fa..19b7bfb7 100644
--- a/src/ui/buffer.h
+++ b/src/ui/buffer.h
@@ -35,11 +35,11 @@
 #ifndef UI_BUFFER_H
 #define UI_BUFFER_H
 
+#include <glib.h>
+
 #include "config.h"
 #include "config/theme.h"
 
-#include <glib.h>
-
 typedef struct delivery_receipt_t {
     char *id;
     gboolean received;
diff --git a/src/ui/console.c b/src/ui/console.c
index 3122b2d6..600bbdf3 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -43,18 +43,18 @@
 #include <ncurses.h>
 #endif
 
-#include "command/cmd_defs.h"
 #include "common.h"
 #include "log.h"
-#include "xmpp/muc.h"
-#include "xmpp/roster_list.h"
 #include "config/preferences.h"
 #include "config/theme.h"
-#include "ui/window.h"
-#include "window_list.h"
+#include "command/cmd_defs.h"
+#include "ui/window_list.h"
 #include "ui/ui.h"
+#include "ui/window.h"
 #include "ui/statusbar.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/muc.h"
+#include "xmpp/roster_list.h"
 
 #ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index cca836f7..2dad71fb 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -44,38 +44,40 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <glib.h>
+
 #ifdef HAVE_LIBXSS
 #include <X11/extensions/scrnsaver.h>
 #endif
-#include <glib.h>
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
-#include "xmpp/chat_session.h"
+#include "log.h"
+#include "common.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
-#include "common.h"
 #include "config/preferences.h"
 #include "config/theme.h"
-#include "xmpp/contact.h"
-#include "xmpp/roster_list.h"
-#include "xmpp/jid.h"
-#include "log.h"
-#include "xmpp/muc.h"
-#ifdef HAVE_LIBOTR
-#include "otr/otr.h"
-#endif
 #include "ui/ui.h"
 #include "ui/titlebar.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
 #include "ui/window.h"
-#include "window_list.h"
+#include "ui/window_list.h"
 #include "xmpp/xmpp.h"
-#include "plugins/plugins.h"
+#include "xmpp/muc.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/contact.h"
+#include "xmpp/roster_list.h"
+#include "xmpp/jid.h"
+
+#ifdef HAVE_LIBOTR
+#include "otr/otr.h"
+#endif
 
 static char *win_title;
 static int inp_size;
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 1f5c69cc..fdfdb0ac 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -53,22 +53,22 @@
 #include <ncurses.h>
 #endif
 
-#include "command/cmd_ac.h"
-#include "xmpp/chat_state.h"
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
+#include "command/cmd_ac.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
 #include "config/theme.h"
-#include "log.h"
-#include "xmpp/muc.h"
-#include "profanity.h"
-#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
 #include "ui/window.h"
-#include "window_list.h"
+#include "ui/window_list.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/muc.h"
+#include "xmpp/roster_list.h"
+#include "xmpp/chat_state.h"
 
 static WINDOW *inp_win;
 static int pad_start = 0;
diff --git a/src/ui/mucconfwin.c b/src/ui/mucconfwin.c
index a52f2378..b31bb928 100644
--- a/src/ui/mucconfwin.c
+++ b/src/ui/mucconfwin.c
@@ -38,7 +38,7 @@
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "ui/win_types.h"
-#include "window_list.h"
+#include "ui/window_list.h"
 
 static void _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field);
 
diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 08e9bb38..3f773431 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -38,12 +38,12 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "ui/win_types.h"
-#include "window_list.h"
 #include "log.h"
 #include "config/preferences.h"
-#include "ui/window.h"
 #include "plugins/plugins.h"
+#include "ui/window.h"
+#include "ui/win_types.h"
+#include "ui/window_list.h"
 
 void
 mucwin_role_change(ProfMucWin *mucwin, const char *const role, const char *const actor, const char *const reason)
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index f992729a..4c7bc8df 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -38,19 +38,21 @@
 #include <stdlib.h>
 
 #include <glib.h>
+
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
+
 #ifdef PLATFORM_CYGWIN
 #include <windows.h>
 #endif
 
 #include "log.h"
-#include "xmpp/muc.h"
-#include "ui/ui.h"
-#include "window_list.h"
 #include "config/preferences.h"
+#include "ui/ui.h"
+#include "ui/window_list.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/muc.h"
 
 static GTimer *remind_timer;
 
diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c
index efa8146c..716ddda7 100644
--- a/src/ui/occupantswin.c
+++ b/src/ui/occupantswin.c
@@ -34,10 +34,10 @@
 
 #include <assert.h>
 
+#include "config/preferences.h"
 #include "ui/ui.h"
 #include "ui/window.h"
-#include "window_list.h"
-#include "config/preferences.h"
+#include "ui/window_list.h"
 
 static void
 _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean showjid)
diff --git a/src/ui/privwin.c b/src/ui/privwin.c
index 716adf2d..1caf4845 100644
--- a/src/ui/privwin.c
+++ b/src/ui/privwin.c
@@ -36,12 +36,11 @@
 #include <glib.h>
 #include <stdlib.h>
 
+#include "config/preferences.h"
 #include "ui/win_types.h"
 #include "ui/window.h"
 #include "ui/titlebar.h"
-#include "window_list.h"
-#include "config/preferences.h"
-
+#include "ui/window_list.h"
 
 void
 privwin_incoming_msg(ProfPrivateWin *privatewin, const char *const message, GDateTime *timestamp)
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index 06d34894..690677cd 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -36,12 +36,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmpp/contact.h"
+#include "config/preferences.h"
 #include "ui/ui.h"
 #include "ui/window.h"
-#include "window_list.h"
-#include "config/preferences.h"
+#include "ui/window_list.h"
 #include "xmpp/roster_list.h"
+#include "xmpp/contact.h"
 
 typedef enum {
     ROSTER_CONTACT,
diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
index 36017168..af165908 100644
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -45,10 +45,10 @@
 #endif
 
 #include "config/theme.h"
+#include "config/preferences.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
-#include "config/preferences.h"
 
 #define TIME_CHECK 60000000
 
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 67764221..701c01c2 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -44,7 +44,7 @@
 #include "ui/ui.h"
 #include "ui/titlebar.h"
 #include "ui/inputwin.h"
-#include "window_list.h"
+#include "ui/window_list.h"
 #include "ui/window.h"
 #include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
diff --git a/src/ui/tray.c b/src/ui/tray.c
index 9011bec9..8471f039 100644
--- a/src/ui/tray.c
+++ b/src/ui/tray.c
@@ -39,10 +39,10 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "tray.h"
-#include "window_list.h"
 #include "log.h"
 #include "config/preferences.h"
+#include "ui/tray.h"
+#include "ui/window_list.h"
 
 static gboolean gtk_ready = FALSE;
 static GtkStatusIcon *prof_tray = NULL;
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 3e4292c9..2683a32b 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -37,11 +37,12 @@
 
 #include "config.h"
 
+#include "config/tlscerts.h"
+#include "config/account.h"
 #include "command/cmd_funcs.h"
 #include "ui/win_types.h"
 #include "xmpp/muc.h"
-#include "config/tlscerts.h"
-#include "config/account.h"
+
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
diff --git a/src/ui/win_types.h b/src/ui/win_types.h
index b523ef2f..47bc7657 100644
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -39,15 +39,16 @@
 
 #include <wchar.h>
 #include <glib.h>
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
+#include "tools/autocomplete.h"
 #include "ui/buffer.h"
 #include "xmpp/chat_state.h"
-#include "tools/autocomplete.h"
 
 #define LAYOUT_SPLIT_MEMCHECK       12345671
 #define PROFCHATWIN_MEMCHECK        22374522
diff --git a/src/ui/window.c b/src/ui/window.c
index 9b210972..89e5f1ac 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -41,6 +41,7 @@
 #include <wchar.h>
 
 #include <glib.h>
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -49,10 +50,10 @@
 
 #include "config/theme.h"
 #include "config/preferences.h"
-#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/roster_list.h"
 
 #define CONS_WIN_TITLE "Profanity. Type /help for help information."
 #define XML_WIN_TITLE "XML Console"
diff --git a/src/ui/window.h b/src/ui/window.h
index c570e6c7..cc9ae8df 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -39,19 +39,19 @@
 
 #include <wchar.h>
 
-#include "xmpp/contact.h"
-#include "xmpp/muc.h"
-#include "ui/ui.h"
-#include "ui/buffer.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/chat_state.h"
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
 #include <ncurses.h>
 #endif
 
+#include "ui/ui.h"
+#include "ui/buffer.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/chat_state.h"
+#include "xmpp/contact.h"
+#include "xmpp/muc.h"
+
 #define PAD_SIZE 1000
 
 void win_move_to_end(ProfWin *window);
diff --git a/src/ui/window_list.c b/src/ui/window_list.c
index 1e5ff426..20994e34 100644
--- a/src/ui/window_list.c
+++ b/src/ui/window_list.c
@@ -41,14 +41,14 @@
 #include <glib.h>
 
 #include "common.h"
-#include "xmpp/roster_list.h"
+#include "config/preferences.h"
 #include "config/theme.h"
+#include "plugins/plugins.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
-#include "window_list.h"
-#include "plugins/plugins.h"
+#include "ui/window_list.h"
 #include "xmpp/xmpp.h"
-#include "config/preferences.h"
+#include "xmpp/roster_list.h"
 
 static GHashTable *windows;
 static int current;
diff --git a/src/ui/xmlwin.c b/src/ui/xmlwin.c
index 16246585..80870b46 100644
--- a/src/ui/xmlwin.c
+++ b/src/ui/xmlwin.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include "ui/win_types.h"
-#include "window_list.h"
+#include "ui/window_list.h"
 
 void
 xmlwin_show(ProfXMLWin *xmlwin, const char *const msg)