# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1260245912 0
# Node ID 259bbfb423d4787b0149b0a79ae4dc83b7d9a419
# Parent  756cfb3d66c11c88a250c9f4572964118f671a7e
Fix all the remaining files for which internal.h doesn't end up being the first include.

This should resolve the warnings on Solaris as reported by aab.  Closes #10523.

diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/finch.c
--- a/finch/finch.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/finch.c	Tue Dec 08 04:18:32 2009 +0000
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntaccount.c
--- a/finch/gntaccount.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntaccount.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntblist.c
--- a/finch/gntblist.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntblist.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <blist.h>
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntcertmgr.c
--- a/finch/gntcertmgr.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntcertmgr.c	Tue Dec 08 04:18:32 2009 +0000
@@ -25,8 +25,8 @@
  *
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "certificate.h"
 #include "debug.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntconn.c
--- a/finch/gntconn.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntconn.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "core.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntconv.c
--- a/finch/gntconv.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntconv.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <string.h>
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <cmds.h>
 #include <core.h>
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntdebug.c
--- a/finch/gntdebug.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntdebug.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,6 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,7 +38,6 @@
 
 #include "gntdebug.h"
 #include "finch.h"
-#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntft.c
--- a/finch/gntft.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntft.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntlog.c
--- a/finch/gntlog.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntlog.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntmedia.c
--- a/finch/gntmedia.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntmedia.c	Tue Dec 08 04:18:32 2009 +0000
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 #include "gntconv.h"
 #include "gntmedia.h"
 
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntnotify.c
--- a/finch/gntnotify.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntnotify.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <util.h>
 
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntplugin.c
--- a/finch/gntplugin.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntplugin.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/gntpounce.c
--- a/finch/gntpounce.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/gntpounce.c	Tue Dec 08 04:18:32 2009 +0000
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/libgnt/gntutils.c
--- a/finch/libgnt/gntutils.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/libgnt/gntutils.c	Tue Dec 08 04:18:32 2009 +0000
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "config.h"
+
 #include "gntinternal.h"
 #undef GNT_LOG_DOMAIN
 #define GNT_LOG_DOMAIN "Utils"
@@ -35,8 +37,6 @@
 #include "gntutils.h"
 #include "gntwindow.h"
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,8 +46,6 @@
 #include <libxml/tree.h>
 #endif
 
-#include "config.h"
-
 void gnt_util_get_text_bound(const char *text, int *width, int *height)
 {
 	const char *s = text, *last;
diff -r 756cfb3d66c1 -r 259bbfb423d4 finch/libgnt/wms/s.c
--- a/finch/libgnt/wms/s.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/finch/libgnt/wms/s.c	Tue Dec 08 04:18:32 2009 +0000
@@ -1,8 +1,8 @@
+#include "internal.h"
+
 #include <string.h>
 #include <sys/types.h>
 
-#include "internal.h"
-
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/common.c
--- a/libpurple/protocols/gg/lib/common.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/common.c	Tue Dec 08 04:18:32 2009 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #ifndef _WIN32
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -41,8 +43,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 FILE *gg_debug_file = NULL;
 
 #ifndef GG_DEBUG_DISABLE
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/dcc.c
--- a/libpurple/protocols/gg/lib/dcc.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/dcc.c	Tue Dec 08 04:18:32 2009 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32
@@ -41,8 +43,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
-
 #ifndef GG_DEBUG_DISABLE
 /*
  * gg_dcc_debug_data() // funkcja wewnętrzna
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/events.c
--- a/libpurple/protocols/gg/lib/events.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/events.c	Tue Dec 08 04:18:32 2009 +0000
@@ -20,6 +20,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -46,7 +48,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_event_free()
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/http.c
--- a/libpurple/protocols/gg/lib/http.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/http.c	Tue Dec 08 04:18:32 2009 +0000
@@ -18,6 +18,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -43,7 +45,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_http_connect() // funkcja pomocnicza
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/libgadu.c
--- a/libpurple/protocols/gg/lib/libgadu.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/libgadu.c	Tue Dec 08 04:18:32 2009 +0000
@@ -21,6 +21,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -57,7 +59,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 int gg_debug_level = 0;
 void (*gg_debug_handler)(int level, const char *format, va_list ap) = NULL;
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/pubdir.c
--- a/libpurple/protocols/gg/lib/pubdir.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/pubdir.c	Tue Dec 08 04:18:32 2009 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -27,8 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 /*
  * gg_register3()
  *
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/gg/lib/pubdir50.c
--- a/libpurple/protocols/gg/lib/pubdir50.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/gg/lib/pubdir50.c	Tue Dec 08 04:18:32 2009 +0000
@@ -18,13 +18,13 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "libgadu.h"
-
 /*
  * gg_pubdir50_new()
  *
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/actions.c
--- a/libpurple/protocols/mxit/actions.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/actions.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<time.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/chunk.c
--- a/libpurple/protocols/mxit/chunk.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/chunk.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/cipher.c
--- a/libpurple/protocols/mxit/cipher.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/cipher.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/filexfer.c
--- a/libpurple/protocols/mxit/filexfer.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/filexfer.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/formcmds.c
--- a/libpurple/protocols/mxit/formcmds.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/formcmds.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <glib.h>
+
+#include "internal.h"
 #include <glib/gprintf.h>
 
 #include "purple.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/http.c
--- a/libpurple/protocols/mxit/http.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/http.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/login.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/markup.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/multimx.c
--- a/libpurple/protocols/mxit/multimx.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/multimx.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <errno.h>
-
+#include "internal.h"
 #include "purple.h"
 #include "prpl.h"
 
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<glib.h>
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"notify.h"
 #include	"plugin.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/profile.c
--- a/libpurple/protocols/mxit/profile.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/profile.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<ctype.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/protocol.c
--- a/libpurple/protocols/mxit/protocol.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/roster.c
--- a/libpurple/protocols/mxit/roster.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/roster.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/mxit/splashscreen.c
--- a/libpurple/protocols/mxit/splashscreen.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/mxit/splashscreen.c	Tue Dec 08 04:18:32 2009 +0000
@@ -23,6 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include <glib/gstdio.h>
 
 #include "purple.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/oscar/clientlogin.c
--- a/libpurple/protocols/oscar/clientlogin.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Tue Dec 08 04:18:32 2009 +0000
@@ -36,12 +36,12 @@
  * http://dev.aol.com/authentication_for_clients
  */
 
+#include "oscar.h"
+#include "oscarcommon.h"
+
 #include "cipher.h"
 #include "core.h"
 
-#include "oscar.h"
-#include "oscarcommon.h"
-
 #define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
 #define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession"
 
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/oscar/family_auth.c
--- a/libpurple/protocols/oscar/family_auth.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/oscar/family_auth.c	Tue Dec 08 04:18:32 2009 +0000
@@ -26,12 +26,12 @@
  *
  */
 
+#include "oscar.h"
+
 #include <ctype.h>
 
 #include "cipher.h"
 
-#include "oscar.h"
-
 /* #define USE_XOR_FOR_ICQ */
 
 #ifdef USE_XOR_FOR_ICQ
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/oscar/oscarcommon.h
--- a/libpurple/protocols/oscar/oscarcommon.h	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Tue Dec 08 04:18:32 2009 +0000
@@ -24,8 +24,9 @@
  * and libicq.c
  */
 
+#include "internal.h"
+
 #include "accountopt.h"
-#include "internal.h"
 #include "prpl.h"
 #include "version.h"
 #include "notify.h"
diff -r 756cfb3d66c1 -r 259bbfb423d4 libpurple/protocols/yahoo/ycht.c
--- a/libpurple/protocols/yahoo/ycht.c	Tue Dec 08 03:42:59 2009 +0000
+++ b/libpurple/protocols/yahoo/ycht.c	Tue Dec 08 04:18:32 2009 +0000
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "prpl.h"
 #include "notify.h"