20 files changed, 34 insertions, 52 deletions
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index e6e825835..323bbb98b 100644
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -2,11 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom-manager.h"
-
 #include "test-helper.h"
 
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c
index 4a0f655e3..a64fd2ce0 100644
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -3,7 +3,6 @@
 #include <string.h>
 
 #include "test-helper.h"
-
 #include "empathy-chatroom.h"
 
 #if 0
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index 9a3c46afe..7fb195f02 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -3,10 +3,9 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
 #include "empathy-irc-network-manager.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
 
 #define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
 #define USER_SAMPLE "user-irc-networks-sample.xml"
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index d22e04f05..5ca4fba73 100644
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -2,10 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
 #include "empathy-irc-network.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
 
 static void
 test_empathy_irc_network_new (void)
diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index 291a34de1..225d57bc8 100644
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -2,10 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
 #include "empathy-irc-server.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
 
 static void
 test_empathy_irc_server_new (void)
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 0934fe4c7..10f0346f3 100644
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -4,13 +4,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "empathy-live-search.h"
 #include "test-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include "empathy-debug.h"
 
-#include "empathy-live-search.h"
-
 typedef struct
 {
   const gchar *string;
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 24cd5d676..0cf037444 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -3,16 +3,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <telepathy-glib/telepathy-glib.h>
 
+#include "empathy-string-parser.h"
 #include "test-helper.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include "empathy-debug.h"
 
-#include "empathy-string-parser.h"
-
 static void
 test_replace_match (const gchar *text,
                     gssize len,
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 03cc9d7a8..3e5706c6a 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -1,19 +1,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
-#include "empathy-tls-verifier.h"
-#include "test-helper.h"
-#include "mock-pkcs11.h"
-
 #include <gcr/gcr.h>
-
 #include <gnutls/gnutls.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/svc-tls.h>
 #include <telepathy-glib/svc-generic.h>
 
+#include "empathy-tls-verifier.h"
+#include "mock-pkcs11.h"
+#include "test-helper.h"
+
 #define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
 
 /* Forward decl */
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 4a440f9ed..613bf7516 100644
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -19,15 +19,16 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 #include "empathy-log-window.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 static void
 destroy_cb (GtkWidget *dialog,
diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index 8a4d08fcf..159f8fcfa 100644
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include "empathy-ui-utils.h"
 #include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
 
 static void
 filter_func (TpAccount *account,
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index d4a76933d..185f4e954 100644
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -19,14 +19,13 @@
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
 #include "empathy-client-factory.h"
-
-#include "empathy-ui-utils.h"
 #include "empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
 
 static void
 am_prepare_cb (GObject *source,
diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c
index d7c54a647..74bb59f17 100644
--- a/tests/interactive/test-empathy-dual-roster-view.c
+++ b/tests/interactive/test-empathy-dual-roster-view.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
 
 #include "empathy-roster-model.h"
 #include "empathy-roster-model-manager.h"
-
 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.h"
 
diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 5710fb146..208c9a12e 100644
--- a/tests/interactive/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
@@ -20,14 +20,13 @@
  * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
+#include "empathy-presence-chooser.h"
 #include "empathy-status-presets.h"
-
 #include "empathy-ui-utils.h"
-#include "empathy-presence-chooser.h"
 
 int
 main (int argc, char **argv)
diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index f91cb1203..ca548a85b 100644
--- a/tests/interactive/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include "empathy-ui-utils.h"
 #include "empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
 
 int
 main (int argc,
diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c
index bb3195022..478b4e6cc 100644
--- a/tests/interactive/test-empathy-roster-model-aggregator.c
+++ b/tests/interactive/test-empathy-roster-model-aggregator.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
 
-#include "empathy-roster-model.h"
 #include "empathy-roster-model-aggregator.h"
-
+#include "empathy-roster-model.h"
 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.h"
 
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index ff5de0fdc..f814d9658 100644
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
 
 #include "empathy-roster-model.h"
 #include "empathy-roster-model-manager.h"
-
 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.h"
 
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index db9cd361d..2494d78b7 100644
--- a/tests/interactive/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
@@ -22,14 +22,13 @@
  *   Will Thompson <will.thompson@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
+#include "empathy-status-preset-dialog.h"
 #include "empathy-status-presets.h"
-
 #include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
 
 int
 main (int argc, char **argv)
diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 4b1219f2c..997b3311c 100644
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -19,13 +19,10 @@
  */
 
 #include "config.h"
-
 #include "mock-pkcs11.h"
 
 #include <gcr/gcr.h>
-
 #include <glib.h>
-
 #include <string.h>
 
 /*
diff --git a/tests/test-helper.c b/tests/test-helper.c
index f6fc0ffda..8d7be5f4a 100644
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include "test-helper.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -24,8 +27,6 @@
 
 #include "empathy-ui-utils.h"
 
-#include "test-helper.h"
-
 void
 test_init (int argc,
     char **argv)
diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c
index ade247f39..6fafac804 100644
--- a/tests/test-irc-helper.c
+++ b/tests/test-irc-helper.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "test-irc-helper.h"
 
 void