Tidy headers

src/xmpp/blocking.c

@@ -38,6 +38,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif

src/xmpp/bookmark.c

@@ -43,21 +43,22 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "common.h"
 #include "log.h"
-#include "muc.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
 #include "xmpp/connection.h"
 #include "xmpp/iq.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
-#include "ui/ui.h"
-#include "plugins/plugins.h"
+#include "xmpp/muc.h"
 
 #define BOOKMARK_TIMEOUT 5000
 

src/xmpp/capabilities.c

@@ -47,17 +47,18 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "common.h"
 #include "log.h"
+#include "plugins/plugins.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
 #include "xmpp/capabilities.h"
-#include "plugins/plugins.h"
 
 static gchar *cache_loc;
 static GKeyFile *cache;

src/xmpp/capabilities.h

@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif

src/xmpp/chat_session.c

@@ -38,10 +38,10 @@
 
 #include <glib.h>
 
-#include "chat_session.h"
-#include "config/preferences.h"
 #include "log.h"
+#include "config/preferences.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/chat_session.h"
 
 static GHashTable *sessions;
 

src/xmpp/chat_state.c

@@ -37,12 +37,12 @@
 
 #include <glib.h>
 
-#include "chat_state.h"
-#include "xmpp/chat_session.h"
+#include "config/preferences.h"
 #include "ui/window_list.h"
 #include "ui/win_types.h"
 #include "xmpp/xmpp.h"
-#include "config/preferences.h"
+#include "xmpp/chat_state.h"
+#include "xmpp/chat_session.h"
 
 #define PAUSED_TIMEOUT 10.0
 #define INACTIVE_TIMEOUT 30.0

src/xmpp/connection.c

@@ -41,6 +41,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif

src/xmpp/contact.c

@@ -38,10 +38,10 @@
 
 #include <glib.h>
 
-#include "contact.h"
 #include "common.h"
-#include "resource.h"
 #include "tools/autocomplete.h"
+#include "xmpp/resource.h"
+#include "xmpp/contact.h"
 
 struct p_contact_t {
     char *barejid;

src/xmpp/contact.h

@@ -35,8 +35,8 @@
 #ifndef XMPP_CONTACT_H
 #define XMPP_CONTACT_H
 
-#include "resource.h"
 #include "tools/autocomplete.h"
+#include "xmpp/resource.h"
 
 typedef struct p_contact_t *PContact;
 

src/xmpp/form.c

@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif

src/xmpp/form.h

@@ -35,15 +35,16 @@
 #ifndef XMPP_FORM_H
 #define XMPP_FORM_H
 
-#include "xmpp/xmpp.h"
-
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
+#include "xmpp/xmpp.h"
+
 DataForm* form_create(xmpp_stanza_t *const stanza);
 xmpp_stanza_t* form_create_submission(DataForm *form);
 char* form_get_form_type_field(DataForm *form);

src/xmpp/iq.c

@@ -46,30 +46,31 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
-#include "log.h"
-#include "muc.h"
 #include "profanity.h"
-#include "ui/ui.h"
-#include "ui/window_list.h"
+#include "log.h"
 #include "config/preferences.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "tools/http_upload.h"
+#include "ui/ui.h"
+#include "ui/window_list.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/connection.h"
+#include "xmpp/session.h"
+#include "xmpp/iq.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/blocking.h"
 #include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
-#include "roster_list.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/connection.h"
-#include "xmpp/session.h"
-#include "xmpp/iq.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/roster.h"
-#include "plugins/plugins.h"
-#include "tools/http_upload.h"
+#include "xmpp/muc.h"
 
 typedef struct p_room_info_data_t {
     char *room;

src/xmpp/jid.c

@@ -37,9 +37,8 @@
 
 #include <glib.h>
 
-#include "jid.h"
-
 #include "common.h"
+#include "xmpp/jid.h"
 
 Jid*
 jid_create(const gchar *const str)

src/xmpp/message.c

@@ -40,26 +40,27 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
-#include "chat_session.h"
-#include "config/preferences.h"
-#include "log.h"
-#include "muc.h"
 #include "profanity.h"
-#include "ui/ui.h"
+#include "log.h"
+#include "config/preferences.h"
 #include "event/server_events.h"
+#include "pgp/gpg.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/muc.h"
 #include "xmpp/session.h"
 #include "xmpp/message.h"
 #include "xmpp/roster.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/stanza.h"
 #include "xmpp/connection.h"
 #include "xmpp/xmpp.h"
-#include "pgp/gpg.h"
-#include "plugins/plugins.h"
 
 static int _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
 

src/xmpp/muc.c

@@ -38,13 +38,13 @@
 
 #include <glib.h>
 
-#include "xmpp/contact.h"
 #include "common.h"
-#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
 #include "ui/window_list.h"
-#include "muc.h"
+#include "xmpp/jid.h"
+#include "xmpp/muc.h"
+#include "xmpp/contact.h"
 
 typedef struct _muc_room_t {
     char *room; // e.g. test@conference.server

src/xmpp/muc.h

@@ -37,10 +37,10 @@
 
 #include <glib.h>
 
-#include "xmpp/contact.h"
-#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/win_types.h"
+#include "xmpp/contact.h"
+#include "xmpp/jid.h"
 
 typedef enum {
     MUC_ROLE_NONE,

src/xmpp/presence.c

@@ -44,24 +44,25 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
 #include "config/preferences.h"
-#include "log.h"
-#include "muc.h"
-#include "profanity.h"
-#include "ui/ui.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
 #include "xmpp/connection.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/iq.h"
 #include "xmpp/xmpp.h"
-#include "plugins/plugins.h"
+#include "xmpp/muc.h"
 
 static Autocomplete sub_requests_ac;
 

src/xmpp/roster.c

@@ -43,26 +43,26 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
-#include "log.h"
-#include "plugins/plugins.h"
 #include "profanity.h"
-#include "ui/ui.h"
+#include "log.h"
+#include "config/preferences.h"
+#include "plugins/plugins.h"
 #include "event/server_events.h"
 #include "event/client_events.h"
 #include "tools/autocomplete.h"
-#include "config/preferences.h"
+#include "ui/ui.h"
 #include "xmpp/session.h"
 #include "xmpp/iq.h"
 #include "xmpp/connection.h"
 #include "xmpp/roster.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
-#include "plugins/plugins.h"
 
 // callback data for group commands
 typedef struct _group_data {

src/xmpp/roster_list.c

@@ -39,12 +39,12 @@
 #include <glib.h>
 #include <assert.h>
 
-#include "roster_list.h"
+#include "config/preferences.h"
+#include "tools/autocomplete.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/resource.h"
 #include "xmpp/contact.h"
 #include "xmpp/jid.h"
-#include "tools/autocomplete.h"
-#include "config/preferences.h"
 
 typedef struct prof_roster_t {
     // contacts, indexed on barejid

src/xmpp/session.c

@@ -38,14 +38,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "chat_session.h"
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
 #include "config/preferences.h"
-#include "jid.h"
-#include "log.h"
-#include "muc.h"
 #include "plugins/plugins.h"
-#include "profanity.h"
 #include "event/server_events.h"
 #include "xmpp/bookmark.h"
 #include "xmpp/blocking.h"
@@ -58,6 +55,9 @@
 #include "xmpp/roster.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/muc.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/jid.h"
 
 // for auto reconnect
 static struct {

src/xmpp/session.h

@@ -35,16 +35,7 @@
 #ifndef XMPP_SESSION_H
 #define XMPP_SESSION_H
 
-#include "config.h"
-
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-#ifdef HAVE_LIBSTROPHE
-#include <strophe.h>
-#endif
-
-#include "resource.h"
+#include <glib.h>
 
 void session_login_success(gboolean secured);
 void session_login_failed(void);

src/xmpp/stanza.c

@@ -47,6 +47,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
@@ -58,8 +59,7 @@
 #include "xmpp/capabilities.h"
 #include "xmpp/connection.h"
 #include "xmpp/form.h"
-
-#include "muc.h"
+#include "xmpp/muc.h"
 
 #if 0
 xmpp_stanza_t*

src/xmpp/stanza.h

@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif

src/xmpp/xmpp.h

@@ -40,16 +40,17 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "config/accounts.h"
 #include "config/tlscerts.h"
-#include "contact.h"
-#include "jid.h"
 #include "tools/autocomplete.h"
 #include "tools/http_upload.h"
+#include "xmpp/contact.h"
+#include "xmpp/jid.h"
 
 #define JABBER_PRIORITY_MIN -128
 #define JABBER_PRIORITY_MAX 127