# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1182363829 0
# Node ID b8572b937c090389b45813459351570c75dfb250
# Parent  d3cd11e135571d566021826c9f4df8ae586fcc95
#include reorganizations to allow compiling with glib < 2.8 using the
G_GNUC_NULL_TERMINATED define from internal.h

diff -r d3cd11e13557 -r b8572b937c09 finch/finch.c
--- a/finch/finch.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/finch.c	Wed Jun 20 18:23:49 2007 +0000
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
@@ -37,7 +39,6 @@
 #include "whiteboard.h"
 
 #include "gntdebug.h"
-#include "finch.h"
 #include "gntprefs.h"
 #include "gntui.h"
 #include "gntidle.h"
diff -r d3cd11e13557 -r b8572b937c09 finch/gntaccount.c
--- a/finch/gntaccount.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntaccount.c	Wed Jun 20 18:23:49 2007 +0000
@@ -33,6 +33,8 @@
 #include <gnttree.h>
 #include <gntwindow.h>
 
+#include "finch.h"
+
 #include <account.h>
 #include <accountopt.h>
 #include <connection.h>
@@ -42,7 +44,6 @@
 
 #include "gntaccount.h"
 #include "gntblist.h"
-#include "finch.h"
 
 #include <string.h>
 
diff -r d3cd11e13557 -r b8572b937c09 finch/gntblist.c
--- a/finch/gntblist.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntblist.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include <account.h>
 #include <blist.h>
 #include <notify.h>
@@ -33,7 +35,6 @@
 #include <util.h>
 #include "debug.h"
 
-#include "finch.h"
 #include "gntbox.h"
 #include "gntcombobox.h"
 #include "gntentry.h"
diff -r d3cd11e13557 -r b8572b937c09 finch/gntconn.c
--- a/finch/gntconn.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntconn.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include "account.h"
 #include "core.h"
 #include "connection.h"
@@ -29,7 +31,6 @@
 #include "request.h"
 
 #include "gntconn.h"
-#include "finch.h"
 
 #define INITIAL_RECON_DELAY_MIN  8000
 #define INITIAL_RECON_DELAY_MAX 60000
diff -r d3cd11e13557 -r b8572b937c09 finch/gntconv.c
--- a/finch/gntconv.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntconv.c	Wed Jun 20 18:23:49 2007 +0000
@@ -24,12 +24,13 @@
  */
 #include <string.h>
 
+#include "finch.h"
+
 #include <cmds.h>
 #include <idle.h>
 #include <prefs.h>
 #include <util.h>
 
-#include "finch.h"
 #include "gntaccount.h"
 #include "gntblist.h"
 #include "gntconv.h"
diff -r d3cd11e13557 -r b8572b937c09 finch/gntnotify.c
--- a/finch/gntnotify.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntnotify.c	Wed Jun 20 18:23:49 2007 +0000
@@ -29,10 +29,11 @@
 #include <gnttree.h>
 #include <gntutils.h>
 
+#include "finch.h"
+
 #include <util.h>
 
 #include "gntnotify.h"
-#include "finch.h"
 
 static struct
 {
diff -r d3cd11e13557 -r b8572b937c09 finch/gntplugin.c
--- a/finch/gntplugin.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntplugin.c	Wed Jun 20 18:23:49 2007 +0000
@@ -29,10 +29,11 @@
 #include <gntline.h>
 #include <gnttree.h>
 
+#include "finch.h"
+
 #include "notify.h"
 #include "request.h"
 
-#include "finch.h"
 #include "gntplugin.h"
 #include "gntrequest.h"
 
diff -r d3cd11e13557 -r b8572b937c09 finch/gntprefs.c
--- a/finch/gntprefs.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntprefs.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,10 +22,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "finch.h"
+
 #include <prefs.h>
 #include <savedstatuses.h>
 
-#include "finch.h"
 #include "gntprefs.h"
 #include "gntrequest.h"
 
diff -r d3cd11e13557 -r b8572b937c09 finch/gntstatus.c
--- a/finch/gntstatus.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntstatus.c	Wed Jun 20 18:23:49 2007 +0000
@@ -31,10 +31,11 @@
 #include <gntline.h>
 #include <gnttree.h>
 
+#include "finch.h"
+
 #include <notify.h>
 #include <request.h>
 
-#include "finch.h"
 #include "gntstatus.h"
 
 static struct
diff -r d3cd11e13557 -r b8572b937c09 finch/gntui.c
--- a/finch/gntui.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/gntui.c	Wed Jun 20 18:23:49 2007 +0000
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
+
 #include "gntui.h"
 
 #include "gntaccount.h"
@@ -33,7 +35,6 @@
 #include "gntprefs.h"
 #include "gntrequest.h"
 #include "gntstatus.h"
-#include "internal.h"
 
 #include <prefs.h>
 
diff -r d3cd11e13557 -r b8572b937c09 finch/libgnt/wms/s.c
--- a/finch/libgnt/wms/s.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/finch/libgnt/wms/s.c	Wed Jun 20 18:23:49 2007 +0000
@@ -1,6 +1,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "internal.h"
+
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/example/nullclient.c	Wed Jun 20 18:23:49 2007 +0000
@@ -20,6 +20,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
+/* XXX: we probably shouldn't include internal.h in examples */
+#include "internal.h"
+
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/plugins/perl/perl-common.h
--- a/libpurple/plugins/perl/perl-common.h	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.h	Wed Jun 20 18:23:49 2007 +0000
@@ -9,6 +9,9 @@
 #include <EXTERN.h>
 #include <perl.h>
 
+/* XXX: perl defines it's own _ but I think it's safe to undef it */
+#undef _
+#include "internal.h"
 #include "plugin.h"
 #include "value.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/gg/gg.h
--- a/libpurple/protocols/gg/gg.h	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/gg/gg.h	Wed Jun 20 18:23:49 2007 +0000
@@ -25,6 +25,7 @@
 #define _PURPLE_GG_H
 
 #include <libgadu.h>
+#include "internal.h"
 #include "search.h"
 #include "connection.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Wed Jun 20 18:23:49 2007 +0000
@@ -25,8 +25,9 @@
  * share code.
  */
 
+#include "internal.h"
+
 #include "accountopt.h"
-#include "internal.h"
 #include "version.h"
 
 #include "iq.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/jabber/si.c
--- a/libpurple/protocols/jabber/si.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Wed Jun 20 18:23:49 2007 +0000
@@ -20,9 +20,9 @@
  *
  */
 
-#include "blist.h"
+#include "internal.h"
 
-#include "internal.h"
+#include "blist.h"
 #include "cipher.h"
 #include "debug.h"
 #include "ft.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/Makefile.am
--- a/libpurple/protocols/qq/Makefile.am	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Wed Jun 20 18:23:49 2007 +0000
@@ -34,8 +34,6 @@
 	group_info.h \
 	group_join.c \
 	group_join.h \
-	group_misc.c \
-	group_misc.h \
 	group_network.c \
 	group_network.h \
 	group_opt.c \
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/buddy_list.c
--- a/libpurple/protocols/qq/buddy_list.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Wed Jun 20 18:23:49 2007 +0000
@@ -23,8 +23,10 @@
  */
 
 #include <string.h>
+
+#include "qq.h"
+
 #include "debug.h"
-
 #include "notify.h"
 #include "utils.h"
 #include "packet_parse.h"
@@ -35,9 +37,8 @@
 #include "char_conv.h"
 #include "crypt.h"
 #include "header_info.h"
-#include "keep_alive.h"	
+#include "keep_alive.h"
 #include "send_core.h"
-#include "qq.h"	
 #include "group.h"
 #include "group_find.h"
 #include "group_internal.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/buddy_status.c
--- a/libpurple/protocols/qq/buddy_status.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/buddy_status.c	Wed Jun 20 18:23:49 2007 +0000
@@ -23,6 +23,7 @@
  */
 
 #include <string.h>
+#include "internal.h"
 #include "debug.h"
 #include "prefs.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/file_trans.c
--- a/libpurple/protocols/qq/file_trans.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/file_trans.c	Wed Jun 20 18:23:49 2007 +0000
@@ -26,6 +26,8 @@
 #define random rand
 #endif
 
+#include "internal.h"
+
 #include "debug.h"
 #include "ft.h"
 #include "cipher.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_conv.c
--- a/libpurple/protocols/qq/group_conv.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_conv.c	Wed Jun 20 18:23:49 2007 +0000
@@ -23,11 +23,12 @@
  */
 
 #include <glib.h>
+#include "qq.h"
+
 #include "conversation.h"
 
 #include "buddy_status.h"
 #include "group_conv.h"
-#include "qq.h"
 #include "utils.h"
 
 /* show group conversation window */
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_find.c
--- a/libpurple/protocols/qq/group_find.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_find.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,13 +22,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "util.h"
 
 #include "group_find.h"
 #include "group_network.h"
-#include "qq.h"
 #include "utils.h"
 
 /* find the internal_group_id by the reply packet sequence
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_free.c
--- a/libpurple/protocols/qq/group_free.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_free.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 
 #include "buddy_status.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_im.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "notify.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_info.c
--- a/libpurple/protocols/qq/group_info.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_info.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_internal.c
--- a/libpurple/protocols/qq/group_internal.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_internal.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,13 +22,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
 #include "blist.h"
 #include "debug.h"
 
 #include "buddy_opt.h"
 #include "group_free.h"
 #include "group_internal.h"
-#include "group_misc.h"
 #include "utils.h"
 
 static gchar *_qq_group_set_my_status_desc(qq_group *group)
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_join.c
--- a/libpurple/protocols/qq/group_join.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_join.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "notify.h"
 #include "request.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_misc.c
--- a/libpurple/protocols/qq/group_misc.c	Wed Jun 20 18:22:19 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/**
- * @file group_misc.c
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "debug.h"
-
-#include "buddy_status.h"
-#include "group_misc.h"
-#include "utils.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_misc.h
--- a/libpurple/protocols/qq/group_misc.h	Wed Jun 20 18:22:19 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
- * @file group_misc.h
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _QQ_GROUP_MISC_H_
-#define _QQ_GROUP_MISC_H_
-
-#include <glib.h>
-#include "group.h"
-
-#endif
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_network.c
--- a/libpurple/protocols/qq/group_network.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_network.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "notify.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_opt.c
--- a/libpurple/protocols/qq/group_opt.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "debug.h"
 #include "notify.h"
 #include "request.h"
@@ -35,7 +37,6 @@
 #include "group_network.h"
 #include "group_opt.h"
 #include "packet_parse.h"
-#include "qq.h"
 #include "utils.h"
 
 /* TODO: can't we use qsort here? */
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/group_search.c
--- a/libpurple/protocols/qq/group_search.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/group_search.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "debug.h"
 
 #include "char_conv.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/header_info.c
--- a/libpurple/protocols/qq/header_info.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/header_info.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "header_info.h"
 
 #define QQ_CLIENT_062E 0x062e	/* GB QQ2000c build 0630 */
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/im.c
--- a/libpurple/protocols/qq/im.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/im.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "conversation.h"
 #include "debug.h"
 #include "internal.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/keep_alive.c
--- a/libpurple/protocols/qq/keep_alive.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/keep_alive.c	Wed Jun 20 18:23:49 2007 +0000
@@ -28,6 +28,8 @@
  * Puzzlebird, Nov-Dec 2002
  */
 
+#include "internal.h"
+
 #include "debug.h"
 #include "server.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/qq.h
--- a/libpurple/protocols/qq/qq.h	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/qq.h	Wed Jun 20 18:23:49 2007 +0000
@@ -26,8 +26,8 @@
 #define _QQ_QQ_H_
 
 #include <glib.h>
+#include "internal.h"
 #include "ft.h"
-#include "internal.h"
 #include "proxy.h"
 #include "roomlist.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/send_file.c
--- a/libpurple/protocols/qq/send_file.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/send_file.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "qq.h"
+
 #include "send_file.h"
 #include "debug.h"
 #include "network.h"
@@ -34,7 +36,6 @@
 #include "im.h"
 #include "keep_alive.h"
 #include "packet_parse.h"
-#include "qq.h"
 #include "send_core.h"
 #include "utils.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/qq/sendqueue.c
--- a/libpurple/protocols/qq/sendqueue.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/qq/sendqueue.c	Wed Jun 20 18:23:49 2007 +0000
@@ -22,9 +22,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "connection.h"
 #include "debug.h"
-#include "internal.h"
 #include "notify.h"
 #include "prefs.h"
 #include "request.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/yahoo/yahoo_auth.c
--- a/libpurple/protocols/yahoo/yahoo_auth.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_auth.c	Wed Jun 20 18:23:49 2007 +0000
@@ -7,6 +7,8 @@
  *
  */
 
+#include "internal.h"
+
 #include "yahoo.h"
 #include "yahoo_auth.h"
 
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/yahoo/yahoo_filexfer.c
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Wed Jun 20 18:23:49 2007 +0000
@@ -20,8 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "prpl.h"
-#include "internal.h"
 #include "util.h"
 #include "debug.h"
 #include "notify.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/yahoo/yahoochat.c
--- a/libpurple/protocols/yahoo/yahoochat.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoochat.c	Wed Jun 20 18:23:49 2007 +0000
@@ -26,6 +26,8 @@
  *
  */
 
+#include "internal.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -37,7 +39,6 @@
 #include "conversation.h"
 #include "notify.h"
 #include "util.h"
-#include "internal.h"
 
 #include "yahoo.h"
 #include "yahoo_packet.h"
diff -r d3cd11e13557 -r b8572b937c09 libpurple/protocols/zephyr/ZVariables.c
--- a/libpurple/protocols/zephyr/ZVariables.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/libpurple/protocols/zephyr/ZVariables.c	Wed Jun 20 18:23:49 2007 +0000
@@ -9,6 +9,7 @@
  *	"mit-copyright.h". 
  */
 
+#include "libpurple/internal.h"
 #include "internal.h"
 #include "util.h"
 
diff -r d3cd11e13557 -r b8572b937c09 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed Jun 20 18:23:49 2007 +0000
@@ -29,6 +29,7 @@
 #endif
 
 #include "pidgin.h"
+#include "internal.h"
 
 #include "debug.h"
 #include "util.h"
diff -r d3cd11e13557 -r b8572b937c09 pidgin/gtksavedstatuses.c
--- a/pidgin/gtksavedstatuses.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Wed Jun 20 18:23:49 2007 +0000
@@ -23,8 +23,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "internal.h"
+
 #include "account.h"
-#include "internal.h"
 #include "notify.h"
 #include "request.h"
 #include "savedstatuses.h"
diff -r d3cd11e13557 -r b8572b937c09 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Wed Jun 20 18:22:19 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Wed Jun 20 18:23:49 2007 +0000
@@ -41,10 +41,11 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "internal.h"
+
 #include "account.h"
 #include "buddyicon.h"
 #include "core.h"
-#include "internal.h"
 #include "imgstore.h"
 #include "network.h"
 #include "request.h"