diff --git a/src/server/prime.c b/src/server/prime.c
index f91966e..6f66c09 100644
--- a/src/server/prime.c
+++ b/src/server/prime.c
@@ -25,8 +25,8 @@
 
 #include <string.h>
 
-#include "server/stanzas.h"
 #include "server/stanza.h"
+#include "server/stanzas.h"
 
 static char *required_passwd = NULL;
 static GHashTable *idstubs = NULL;
diff --git a/src/server/prime.h b/src/server/prime.h
index a3769a7..5c5c7ac 100644
--- a/src/server/prime.h
+++ b/src/server/prime.h
@@ -23,7 +23,7 @@
 #ifndef __H_PRIME
 #define __H_PRIME
 
-#include "server/stanzas.h"
+#include "server/stanza.h"
 
 void prime_init(void);
 void prime_free_all(void);
diff --git a/src/server/server.c b/src/server/server.c
index f2a78a8..2177409 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -31,6 +31,7 @@
 #include "server/xmppclient.h"
 #include "server/stream_parser.h"
 #include "server/prime.h"
+#include "server/stanza.h"
 #include "server/stanzas.h"
 #include "server/verify.h"
 #include "server/server.h"
diff --git a/src/server/stanza.c b/src/server/stanza.c
index 8063c2b..177b6b8 100644
--- a/src/server/stanza.c
+++ b/src/server/stanza.c
@@ -24,6 +24,7 @@
 #include <expat.h>
 #include <glib.h>
 
+#include "server/stanza.h"
 #include "server/stanzas.h"
 
 typedef struct parse_state_t {
diff --git a/src/server/stanza.h b/src/server/stanza.h
index e473b82..d8a3b42 100644
--- a/src/server/stanza.h
+++ b/src/server/stanza.h
@@ -23,7 +23,20 @@
 #ifndef __H_STANZA
 #define __H_STANZA
 
-#include "server/stanzas.h"
+#include <glib.h>
+
+typedef struct xmpp_attr_t {
+    char *name;
+    char *value;
+} XMPPAttr;
+
+typedef struct xmpp_stanza_t {
+    char *name;
+    GList *attrs;
+    GList *children;
+    GString *content;
+    struct xmpp_stanza_t *parent;
+} XMPPStanza;
 
 XMPPStanza* parse_stanza(char *stanza_text);
 
diff --git a/src/server/stanzas.c b/src/server/stanzas.c
index ef9a25f..322ea1a 100644
--- a/src/server/stanzas.c
+++ b/src/server/stanzas.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "server/stanzas.h"
+#include "server/stanza.h"
 #include "server/log.h"
 
 pthread_mutex_t stanzas_lock;
diff --git a/src/server/stanzas.h b/src/server/stanzas.h
index 2d539aa..afe23ed 100644
--- a/src/server/stanzas.h
+++ b/src/server/stanzas.h
@@ -25,18 +25,7 @@
 
 #include <glib.h>
 
-typedef struct xmpp_attr_t {
-    char *name;
-    char *value;
-} XMPPAttr;
-
-typedef struct xmpp_stanza_t {
-    char *name;
-    GList *attrs;
-    GList *children;
-    GString *content;
-    struct xmpp_stanza_t *parent;
-} XMPPStanza;
+#include "server/stanza.h"
 
 XMPPStanza* stanza_new(const char *name, const char **attributes);
 void stanza_show(XMPPStanza *stanza);
diff --git a/src/server/stream_parser.c b/src/server/stream_parser.c
index 8392968..df5a9f6 100644
--- a/src/server/stream_parser.c
+++ b/src/server/stream_parser.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 
 #include "server/stream_parser.h"
+#include "server/stanza.h"
 #include "server/stanzas.h"
 #include "server/log.h"
 
diff --git a/src/server/stream_parser.h b/src/server/stream_parser.h
index 9a16513..c7d1071 100644
--- a/src/server/stream_parser.h
+++ b/src/server/stream_parser.h
@@ -23,8 +23,7 @@
 #ifndef __H_STREAM_PARSER
 #define __H_STREAM_PARSER
 
-#include "server/stanzas.h"
-#include "server/xmppclient.h"
+#include "server/stanza.h"
 
 typedef void (*stream_start_func)(void);
 typedef void (*auth_func)(XMPPStanza *stanza);
diff --git a/src/server/verify.c b/src/server/verify.c
index a739ecb..2307139 100644
--- a/src/server/verify.c
+++ b/src/server/verify.c
@@ -25,6 +25,7 @@
 
 #include <expat.h>
 
+#include "server/stanza.h"
 #include "server/stanzas.h"
 #include "server/log.h"