Tidy headers

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;

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"

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;

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;

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);
 

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)

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;
 

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)

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)

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,

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
 

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"

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;

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

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

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"

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);

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;

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)