# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1174766781 0
# Node ID 87ea711b9781865d680c8d38f8a396922549a6aa
# Parent  6577b292e7b46b516674c92eff7b18a75f35ba44
Re-arrange #includes so 'make check' stands a chance of passing during
'make distcheck'

diff -r 6577b292e7b4 -r 87ea711b9781 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Sat Mar 24 19:51:48 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sat Mar 24 20:06:21 2007 +0000
@@ -20,18 +20,20 @@
  */
 #include "internal.h"
 
+#include "account.h"
+#include "debug.h"
+#include "cipher.h"
+#include "conversation.h"
+#include "request.h"
+#include "sslconn.h"
+#include "util.h"
+#include "xmlnode.h"
+
 #include "jutil.h"
 #include "auth.h"
-#include "xmlnode.h"
 #include "jabber.h"
 #include "iq.h"
 
-#include "debug.h"
-#include "util.h"
-#include "cipher.h"
-#include "sslconn.h"
-#include "request.h"
-
 static void auth_old_result_cb(JabberStream *js, xmlnode *packet,
 		gpointer data);
 
diff -r 6577b292e7b4 -r 87ea711b9781 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Mar 24 19:51:48 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Mar 24 20:06:21 2007 +0000
@@ -25,6 +25,7 @@
 #include "blist.h"
 #include "cmds.h"
 #include "connection.h"
+#include "conversation.h"
 #include "debug.h"
 #include "dnssrv.h"
 #include "message.h"
@@ -36,6 +37,7 @@
 #include "server.h"
 #include "util.h"
 #include "version.h"
+#include "xmlnode.h"
 
 #include "auth.h"
 #include "buddy.h"
diff -r 6577b292e7b4 -r 87ea711b9781 libpurple/protocols/jabber/jutil.c
--- a/libpurple/protocols/jabber/jutil.c	Sat Mar 24 19:51:48 2007 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Sat Mar 24 20:06:21 2007 +0000
@@ -19,8 +19,11 @@
  *
  */
 #include "internal.h"
+#include "account.h"
+#include "conversation.h"
 #include "server.h"
 #include "util.h"
+#include "xmlnode.h"
 
 #include "chat.h"
 #include "presence.h"
diff -r 6577b292e7b4 -r 87ea711b9781 libpurple/protocols/jabber/jutil.h
--- a/libpurple/protocols/jabber/jutil.h	Sat Mar 24 19:51:48 2007 +0000
+++ b/libpurple/protocols/jabber/jutil.h	Sat Mar 24 20:06:21 2007 +0000
@@ -22,11 +22,6 @@
 #ifndef _PURPLE_JABBER_JUTIL_H_
 #define _PURPLE_JABBER_JUTIL_H_
 
-#include "account.h"
-#include "conversation.h"
-#include "xmlnode.h"
-
-
 typedef struct _JabberID {
 	char *node;
 	char *domain;
diff -r 6577b292e7b4 -r 87ea711b9781 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Sat Mar 24 19:51:48 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Mar 24 20:06:21 2007 +0000
@@ -20,20 +20,22 @@
  */
 #include "internal.h"
 
+#include "account.h"
 #include "cipher.h"
+#include "conversation.h"
 #include "debug.h"
 #include "notify.h"
 #include "request.h"
 #include "server.h"
 #include "status.h"
 #include "util.h"
+#include "xmlnode.h"
 
 #include "buddy.h"
 #include "chat.h"
 #include "presence.h"
 #include "iq.h"
 #include "jutil.h"
-#include "xmlnode.h"
 
 
 static void chats_send_presence_foreach(gpointer key, gpointer val,