Tidied #include's

7 files changed, 25 insertions, 23 deletions

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