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.

15 files changed, 23 insertions, 20 deletions

diff --git a/finch/finch.c b/finch/finch.c
index 49a88ecef6..d6c9017763 100644
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include "account.h"
 #include "conversation.h"
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index ff72c310a8..4f230850c0 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -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 --git a/finch/gntblist.c b/finch/gntblist.c
index d02b26b13c..53b331c0df 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include <account.h>
 #include <blist.h>
diff --git a/finch/gntcertmgr.c b/finch/gntcertmgr.c
index e123823815..6c7b6b6488 100644
--- a/finch/gntcertmgr.c
+++ b/finch/gntcertmgr.c
@@ -25,8 +25,8 @@
  *
  */
 
-#include "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include "certificate.h"
 #include "debug.h"
diff --git a/finch/gntconn.c b/finch/gntconn.c
index d66b9a284b..28e0b9f30c 100644
--- a/finch/gntconn.c
+++ b/finch/gntconn.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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include "account.h"
 #include "core.h"
diff --git a/finch/gntconv.c b/finch/gntconv.c
index 254bcc3fe2..3fa9c6baa0 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include <cmds.h>
 #include <core.h>
diff --git a/finch/gntdebug.c b/finch/gntdebug.c
index 44bb5d42c2..a9c38306ad 100644
--- a/finch/gntdebug.c
+++ b/finch/gntdebug.c
@@ -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 --git a/finch/gntft.c b/finch/gntft.c
index 222bddc267..b54714520f 100644
--- a/finch/gntft.c
+++ b/finch/gntft.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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include <gnt.h>
 #include <gntbox.h>
diff --git a/finch/gntlog.c b/finch/gntlog.c
index f938655097..d8d98a3d5b 100644
--- a/finch/gntlog.c
+++ b/finch/gntlog.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 "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include <gnt.h>
 #include <gntbox.h>
diff --git a/finch/gntmedia.c b/finch/gntmedia.c
index adc51372ec..c300511780 100644
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "finch.h"
 #include <internal.h>
+#include "finch.h"
 #include "gntconv.h"
 #include "gntmedia.h"
 
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
index f5e0151cd5..63887114c1 100644
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -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 --git a/finch/gntplugin.c b/finch/gntplugin.c
index 94b153e704..332584ba27 100644
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -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 --git a/finch/gntpounce.c b/finch/gntpounce.c
index 449d525323..53a8eaf17d 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -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 --git a/finch/libgnt/gntutils.c b/finch/libgnt/gntutils.c
index 171e2c04fb..fcfab85b6a 100644
--- a/finch/libgnt/gntutils.c
+++ b/finch/libgnt/gntutils.c
@@ -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 --git a/finch/libgnt/wms/s.c b/finch/libgnt/wms/s.c
index 3813fc4346..b995d1aa67 100644
--- a/finch/libgnt/wms/s.c
+++ b/finch/libgnt/wms/s.c
@@ -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"