Include 'internal.h' before all other headers to make some non-gcc compilers happy.

This in particular impacts Solaris8, where the system headers set
_FILE_OFFSET_BITS to 32, even when it's detected by the config scripts
as 64.

Refs #10523

41 files changed, 35 insertions, 52 deletions

diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index 2b065b4b77..f4feed8adb 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -26,8 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 #include "certificate.h"
 #include "dbus-maybe.h"
diff --git a/libpurple/cmds.c b/libpurple/cmds.c
index 4e82c91d49..6a495acd06 100644
--- a/libpurple/cmds.c
+++ b/libpurple/cmds.c
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 
 #include "account.h"
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c
index 9fe0dccbbe..2c0d747cad 100644
--- a/libpurple/dbus-server.c
+++ b/libpurple/dbus-server.c
@@ -25,6 +25,8 @@
 #define DBUS_API_SUBJECT_TO_CHANGE
 #endif
 
+#include "internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +44,6 @@
 #include "dbus-bindings.h"
 #include "debug.h"
 #include "core.h"
-#include "internal.h"
 #include "savedstatuses.h"
 #include "smiley.h"
 #include "util.h"
diff --git a/libpurple/debug.c b/libpurple/debug.c
index 30b12fdb55..ca17f62bde 100644
--- a/libpurple/debug.c
+++ b/libpurple/debug.c
@@ -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 "debug.h"
 #include "internal.h"
+#include "debug.h"
 #include "prefs.h"
 #include "util.h"
 
diff --git a/libpurple/desktopitem.c b/libpurple/desktopitem.c
index 4c8b5a06b6..df0a5b5920 100644
--- a/libpurple/desktopitem.c
+++ b/libpurple/desktopitem.c
@@ -53,12 +53,12 @@
  * Boston, MA 02111-1301, USA.
  */
 
+#include "internal.h"
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "desktopitem.h"
-#include "internal.h"
 
 struct _PurpleDesktopItem {
 	int refcount;
diff --git a/libpurple/eventloop.c b/libpurple/eventloop.c
index 99d9bb2665..35467a4e9b 100644
--- a/libpurple/eventloop.c
+++ b/libpurple/eventloop.c
@@ -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 "eventloop.h"
 #include "internal.h"
+#include "eventloop.h"
 
 static PurpleEventLoopUiOps *eventloop_ui_ops = NULL;
 
diff --git a/libpurple/imgstore.c b/libpurple/imgstore.c
index 66ab440231..b7fed19109 100644
--- a/libpurple/imgstore.c
+++ b/libpurple/imgstore.c
@@ -25,7 +25,6 @@
  *
 */
 
-#include <glib.h>
 #include "internal.h"
 
 #include "dbus-maybe.h"
diff --git a/libpurple/media.c b/libpurple/media.c
index 3f266ddc2c..4f6356b618 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "internal.h"
 
 #include "account.h"
diff --git a/libpurple/mime.c b/libpurple/mime.c
index 46d0929284..4038141744 100644
--- a/libpurple/mime.c
+++ b/libpurple/mime.c
@@ -21,11 +21,6 @@
  * USA.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-
 #include "internal.h"
 
 /* this should become "util.h" if we ever get this into purple proper */
diff --git a/libpurple/nat-pmp.c b/libpurple/nat-pmp.c
index f58ae526e8..9bec0e1ef8 100644
--- a/libpurple/nat-pmp.c
+++ b/libpurple/nat-pmp.c
@@ -29,8 +29,8 @@
  * OF SUCH DAMAGE.
  */
 
-#include "nat-pmp.h"
 #include "internal.h"
+#include "nat-pmp.h"
 #include "debug.h"
 #include "signals.h"
 #include "network.h"
diff --git a/libpurple/ntlm.c b/libpurple/ntlm.c
index d551d02d2f..0610a81354 100644
--- a/libpurple/ntlm.c
+++ b/libpurple/ntlm.c
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <stdlib.h>
 #include "internal.h"
 
 #include "util.h"
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 0feebad98a..9da6ee1c2d 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -1,7 +1,7 @@
-#include <stdio.h>
-
 #include "internal.h"
 
+#include <stdio.h>
+
 #include "debug.h"
 #include "log.h"
 #include "plugin.h"
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index f6f0e89736..041e93785e 100644
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -20,9 +20,10 @@
  */
 #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
 
+#include "internal.h"
+
 #include <stdio.h>
 
-#include "internal.h"
 #include "cipher.h"
 #include "connection.h"
 #include "conversation.h"
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c
index 9987ee1533..4ed2d17b07 100644
--- a/libpurple/protocols/jabber/data.c
+++ b/libpurple/protocols/jabber/data.c
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
 
-#include "internal.h"
 #include "data.h"
 #include "debug.h"
 #include "xmlnode.h"
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 7a8fd179de..9530d971ac 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -23,8 +23,6 @@
  */
 #define PHOTO_SUPPORT 1
 
-#include <glib.h>
-
 #include "msn.h"
 #include "accountopt.h"
 #include "contact.h"
diff --git a/libpurple/protocols/msn/object.c b/libpurple/protocols/msn/object.c
index e74578c460..09b40e26f7 100644
--- a/libpurple/protocols/msn/object.c
+++ b/libpurple/protocols/msn/object.c
@@ -21,6 +21,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 "msn.h"
 #include "object.h"
 #include "debug.h"
 /* Sha1 stuff */
diff --git a/libpurple/protocols/myspace/myspace.h b/libpurple/protocols/myspace/myspace.h
index ff725e5ef6..eecfc20db9 100644
--- a/libpurple/protocols/myspace/myspace.h
+++ b/libpurple/protocols/myspace/myspace.h
@@ -20,6 +20,8 @@
 #ifndef _MYSPACE_MYSPACE_H
 #define _MYSPACE_MYSPACE_H
 
+#include "internal.h"
+
 /* Other includes */
 #include <string.h>
 #include <errno.h>/* for EAGAIN */
@@ -36,8 +38,6 @@
 #include <sys/socket.h>
 #endif
 
-#include "internal.h"
-
 #include "notify.h"
 #include "plugin.h"
 #include "accountopt.h"
diff --git a/libpurple/protocols/novell/nmuser.c b/libpurple/protocols/novell/nmuser.c
index bb5b49c67c..ed3dcea081 100644
--- a/libpurple/protocols/novell/nmuser.c
+++ b/libpurple/protocols/novell/nmuser.c
@@ -18,9 +18,8 @@
  *
  */
 
-#include <glib.h>
-#include <string.h>
 #include "internal.h"
+#include <string.h>
 #include "nmfield.h"
 #include "nmuser.h"
 #include "nmconn.h"
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 6ea143600b..fa90458657 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -29,10 +29,10 @@
 #ifndef _OSCAR_H_
 #define _OSCAR_H_
 
+#include "internal.h"
 #include "circbuffer.h"
 #include "debug.h"
 #include "eventloop.h"
-#include "internal.h"
 #include "proxy.h"
 #include "sslconn.h"
 
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index d89fb11fc9..7498e1a54f 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "qq.h"
 
 #include "debug.h"
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index 2d3e73d4f5..f8bb588367 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "debug.h"
 #include "internal.h"
+#include "debug.h"
 #include "notify.h"
 #include "request.h"
 #include "privacy.h"
diff --git a/libpurple/protocols/qq/char_conv.c b/libpurple/protocols/qq/char_conv.c
index 1c2c5bc275..3db2c0caf3 100644
--- a/libpurple/protocols/qq/char_conv.c
+++ b/libpurple/protocols/qq/char_conv.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "debug.h"
 #include "internal.h"
+#include "debug.h"
 
 #include "char_conv.h"
 #include "packet_parse.h"
diff --git a/libpurple/protocols/qq/qq.h b/libpurple/protocols/qq/qq.h
index 537feaf504..ad2206655e 100644
--- a/libpurple/protocols/qq/qq.h
+++ b/libpurple/protocols/qq/qq.h
@@ -25,7 +25,6 @@
 #ifndef _QQ_QQ_H_
 #define _QQ_QQ_H_
 
-#include <glib.h>
 #include "internal.h"
 #include "ft.h"
 #include "circbuffer.h"
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index 969e698fe2..34ba975dfa 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "debug.h"
 #include "internal.h"
+#include "debug.h"
 #include "server.h"
 #include "cipher.h"
 #include "request.h"
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index 0c31b608b4..4c391d475b 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "group_info.h"
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index f90ba20304..56f00c8116 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "buddy_list.h"
diff --git a/libpurple/protocols/qq/utils.c b/libpurple/protocols/qq/utils.c
index 178b699ee9..e7a7e09f83 100644
--- a/libpurple/protocols/qq/utils.c
+++ b/libpurple/protocols/qq/utils.c
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include "limits.h"
 #include "stdlib.h"
 #include "string.h"
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index c36e27c452..0092e137e4 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -21,6 +21,7 @@
   USA.
 */
 
+#include "internal.h"
 
 /* system includes */
 #include <stdlib.h>
@@ -30,9 +31,6 @@
 #include <glib.h>
 
 /* purple includes */
-#include "internal.h"
-#include "config.h"
-
 #include "account.h"
 #include "accountopt.h"
 #include "circbuffer.h"
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 072509c06b..7c07da1f16 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index fa95dd708b..477970849f 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/ft.c b/libpurple/protocols/silc/ft.c
index 13a34ed2ac..0fad6d66e4 100644
--- a/libpurple/protocols/silc/ft.c
+++ b/libpurple/protocols/silc/ft.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index e57ba67018..df4a338667 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/pk.c b/libpurple/protocols/silc/pk.c
index bf06b1db62..6d25db910d 100644
--- a/libpurple/protocols/silc/pk.c
+++ b/libpurple/protocols/silc/pk.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 7680562e6f..fe75fe3a02 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/util.c b/libpurple/protocols/silc/util.c
index 6aebad8360..68eac3275a 100644
--- a/libpurple/protocols/silc/util.c
+++ b/libpurple/protocols/silc/util.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/wb.c b/libpurple/protocols/silc/wb.c
index 52c2a89074..984925e823 100644
--- a/libpurple/protocols/silc/wb.c
+++ b/libpurple/protocols/silc/wb.c
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
index 2e7a944a6e..8a415ebe00 100644
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 
 #include "account.h"
diff --git a/libpurple/theme-manager.c b/libpurple/theme-manager.c
index c46d260a1b..1ad48c1ea5 100644
--- a/libpurple/theme-manager.c
+++ b/libpurple/theme-manager.c
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme-manager.h"
 #include "util.h"
diff --git a/libpurple/theme.c b/libpurple/theme.c
index 49f5c89fad..c21e71a053 100644
--- a/libpurple/theme.c
+++ b/libpurple/theme.c
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme.h"
 #include "util.h"
diff --git a/libpurple/whiteboard.c b/libpurple/whiteboard.c
index 97f061545e..3ac4c4e010 100644
--- a/libpurple/whiteboard.c
+++ b/libpurple/whiteboard.c
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "whiteboard.h"
 #include "prpl.h"
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index ae59687321..b46d22ea07 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -29,8 +29,8 @@
  * as I want to be.  Thank you libxode for giving me a good starting point */
 #define _PURPLE_XMLNODE_C_
 
-#include "debug.h"
 #include "internal.h"
+#include "debug.h"
 
 #include <libxml/parser.h>
 #include <string.h>