From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Mon, 1 Apr 2013 15:04:08 +0000 (+0200)
Subject: Reorder header inclusions accordingly to the Telepathy coding style
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=0d137b74e57840bd85f090becd4144f62c89d6ab

Reorder header inclusions accordingly to the Telepathy coding style

Sort by:
• "config.h"
• API declarations, if any
• public libraries
• internal headers, alphabetically sorted (mostly)

http://telepathy.freedesktop.org/wiki/Style#A.23includes

https://bugzilla.gnome.org/show_bug.cgi?id=697076
---

diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6e..4af7828a 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -24,13 +24,11 @@
  */
 
 #include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "mcp-account-manager-goa.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
-
-#include "mcp-account-manager-goa.h"
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG g_debug
 #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 40653056..3431d0ec 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -23,6 +23,8 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <mission-control-plugins/mission-control-plugins.h>
 
 #include "mcp-account-manager-goa.h"
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index a272309e..e6f4367c 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -22,11 +22,11 @@
  */
 
 #include "config.h"
+#include "empathy-account-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-account-selector-dialog.c b/libempathy-gtk/empathy-account-selector-dialog.c
index 72a7b2ff..0dd67ea7 100644
--- a/libempathy-gtk/empathy-account-selector-dialog.c
+++ b/libempathy-gtk/empathy-account-selector-dialog.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-account-selector-dialog.h"
 
 enum
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index e0647a9b..e86cec41 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -19,9 +19,9 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget-irc.h"
 
 #include "empathy-account-widget-private.h"
-#include "empathy-account-widget-irc.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 7545efb1..b76078d5 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -20,11 +20,11 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget-sip.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
 #include "empathy-ui-utils.h"
 
 typedef struct {
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fb4ab8bf..0751b24a 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -25,17 +25,17 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
 
 #include <glib/gi18n-lib.h>
-
-#include "empathy-utils.h"
-
 #include <dbus/dbus-protocol.h>
 
+#include "empathy-account-widget-irc.h"
 #include "empathy-account-widget-private.h"
 #include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 30022c9d..19314fe5 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -21,20 +21,19 @@
  */
 
 #include "config.h"
+#include "empathy-avatar-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
+#ifdef HAVE_CHEESE
+#include <cheese-avatar-chooser.h>
+#endif /* HAVE_CHEESE */
+
 #include "empathy-camera-monitor.h"
 #include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
-#include "empathy-avatar-chooser.h"
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
-
-#ifdef HAVE_CHEESE
-#include <cheese-avatar-chooser.h>
-#endif /* HAVE_CHEESE */
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index dc82c057..1636e289 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -26,6 +26,7 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index f66827f6..f61c1b23 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,13 +22,13 @@
  */
 
 #include "config.h"
+#include "empathy-avatar-image.h"
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
 
-#include "empathy-utils.h"
-#include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /**
  * SECTION:empathy-avatar-image
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 9429a287..65f088ec 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -26,6 +26,8 @@
 
 #include <gtk/gtk.h>
 
+#include "empathy-contact.h"
+
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_AVATAR_IMAGE         (empathy_avatar_image_get_type ())
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index 228a1497..5cdb90d1 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-bad-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index b47e5b59..9cbb178f 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -18,14 +18,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-base-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
     GTK_TYPE_MESSAGE_DIALOG)
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
index 86cea89d..ca96a423 100644
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -18,11 +18,10 @@
  */
 
 #include "config.h"
+#include "empathy-calendar-button.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-calendar-button.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
 #include "empathy-debug.h"
 
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 44fce09e..cbcfdce8 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -19,15 +19,12 @@
  */
 
 #include "config.h"
+#include "empathy-call-utils.h"
 
 #include <glib/gi18n-lib.h>
-
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "empathy-call-utils.h"
-
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 12fca684..7e342d81 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,6 +21,9 @@
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 
+#include <glib.h>
+#include <telepathy-glib/telepathy-glib.h>
+
 G_BEGIN_DECLS
 
 /* Calls */
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 6a8fe72e..bdbf1cb0 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -21,11 +21,10 @@
  */
 
 #include "config.h"
+#include "empathy-cell-renderer-activatable.h"
 
 #include "empathy-utils.h"
 
-#include "empathy-cell-renderer-activatable.h"
-
 enum {
   PATH_ACTIVATED,
   LAST_SIGNAL
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 9887b712..8653fae8 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,9 +21,11 @@
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 
-#include "empathy-utils.h"
+#include "config.h"
 #include "empathy-cell-renderer-expander.h"
 
+#include "empathy-utils.h"
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
 typedef struct {
 	GtkExpanderStyle     expander_style;
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index afefb2af..44bbd7ea 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,9 +22,9 @@
  */
 
 #include "config.h"
+#include "empathy-cell-renderer-text.h"
 
 #include "empathy-utils.h"
-#include "empathy-cell-renderer-text.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
 typedef struct {
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f853fb3b..ed0d27cc 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,29 +26,29 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include "config.h"
 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
+#include "config.h"
+#include "empathy-chat.h"
+
 #include <glib/gi18n-lib.h>
 
-#include "empathy-gsettings.h"
-#include "empathy-keyring.h"
-#include "empathy-utils.h"
-#include "empathy-request-util.h"
 #include "empathy-client-factory.h"
-
-#include "empathy-chat.h"
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
 #include "empathy-individual-information-dialog.h"
 #include "empathy-individual-store-channel.h"
 #include "empathy-individual-view.h"
 #include "empathy-input-text-view.h"
+#include "empathy-keyring.h"
+#include "empathy-request-util.h"
 #include "empathy-search-bar.h"
-#include "empathy-theme-manager.h"
 #include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"
 #include "empathy-string-parser.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 93f317f2..ddcbcf31 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -21,16 +21,15 @@
  *
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-blocking-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
 #include "empathy-account-chooser.h"
 #include "empathy-ui-utils.h"
-
-#include "empathy-contact-blocking-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index d1368e95..dd81dde4 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -10,15 +10,13 @@
  */
 
 #include "config.h"
-
 #include "empathy-contact-chooser.h"
 
-#include "empathy-utils.h"
 #include "empathy-client-factory.h"
-
 #include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyContactChooser,
     empathy_contact_chooser, GTK_TYPE_BOX);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index fd594e8c..2696f5ab 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -22,18 +22,19 @@
  *     Danielle Madeley <danielle.madeley@collabora.co.uk>
  *     Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-search-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-#include "empathy-client-factory.h"
-
 #include "empathy-account-chooser.h"
-#include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-activatable.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-client-factory.h"
 #include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index fd4d783b..80a1aafb 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -20,17 +20,16 @@
  */
 
 #include "config.h"
+#include "empathy-contact-widget.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-#include "empathy-client-factory.h"
-
-#include "empathy-contact-widget.h"
 #include "empathy-avatar-image.h"
+#include "empathy-client-factory.h"
 #include "empathy-groups-widget.h"
-#include "empathy-ui-utils.h"
 #include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 3dca3740..38f64375 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -21,14 +21,13 @@
  */
 
 #include "config.h"
+#include "empathy-contactinfo-utils.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-time.h"
 #include "empathy-request-util.h"
-
-#include "empathy-contactinfo-utils.h"
 #include "empathy-string-parser.h"
+#include "empathy-time.h"
 #include "empathy-ui-utils.h"
 
 static gchar *
diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c
index bddf42bf..792241fd 100644
--- a/libempathy-gtk/empathy-dialpad-button.c
+++ b/libempathy-gtk/empathy-dialpad-button.c
@@ -20,9 +20,7 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-
 #include "config.h"
-
 #include "empathy-dialpad-button.h"
 
 G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON)
diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 340d6fc0..6c85c797 100644
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-dialpad-widget.h"
 
 #include "empathy-dialpad-button.h"
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 1562001f..452952bb 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,12 +22,12 @@
  */
 
 #include "config.h"
+#include "empathy-geometry.h"
 
 #include <sys/stat.h>
 
-#include "empathy-utils.h"
-#include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 8b666516..d1a6febf 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -20,14 +20,13 @@
  */
 
 #include "config.h"
+#include "empathy-groups-widget.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-utils.h"
 #include "empathy-connection-aggregator.h"
 
-#include "empathy-groups-widget.h"
-
 /**
  * SECTION:empathy-groups-widget
  * @title:EmpathyGroupsWidget
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 9f011775..ce03d0a2 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -20,15 +20,14 @@
  */
 
 #include "config.h"
+#include "empathy-individual-dialogs.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-contact-widget.h"
 #include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 
-#include "empathy-individual-dialogs.h"
-#include "empathy-contact-widget.h"
-
 #define BULLET_POINT "\342\200\242"
 
 static GtkWidget *new_individual_dialog = NULL;
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index 457dd957..dbd01c97 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -21,13 +21,12 @@
  */
 
 #include "config.h"
+#include "empathy-individual-edit-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-widget.h"
+#include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
 
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index f4f8bda9..2b8d64bd 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -22,16 +22,15 @@
  */
 
 #include "config.h"
+#include "empathy-individual-information-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-individual-manager.h"
-#include "empathy-utils.h"
-#include "empathy-pkg-kit.h"
-
-#include "empathy-individual-information-dialog.h"
 #include "empathy-individual-widget.h"
+#include "empathy-pkg-kit.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 907c678b..e70146bf 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -21,27 +21,27 @@
  */
 
 #include "config.h"
+#include "empathy-individual-menu.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-account-selector-dialog.h"
+#include "empathy-call-utils.h"
 #include "empathy-camera-monitor.h"
-#include "empathy-request-util.h"
-#include "empathy-individual-manager.h"
 #include "empathy-chatroom-manager.h"
-#include "empathy-utils.h"
-
-#include "empathy-account-selector-dialog.h"
+#include "empathy-gtk-enum-types.h"
 #include "empathy-images.h"
-#include "empathy-log-window.h"
 #include "empathy-individual-dialogs.h"
-#include "empathy-gtk-enum-types.h"
 #include "empathy-individual-dialogs.h"
 #include "empathy-individual-edit-dialog.h"
-#include "empathy-ui-utils.h"
-#include "empathy-share-my-desktop.h"
-#include "empathy-call-utils.h"
-#include "empathy-individual-store-channel.h"
 #include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store-channel.h"
+#include "empathy-log-window.h"
+#include "empathy-request-util.h"
+#include "empathy-share-my-desktop.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 5db93d5f..16134a61 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -24,11 +24,10 @@
  */
 
 #include "config.h"
+#include "empathy-individual-store-channel.h"
 
 #include "empathy-utils.h"
 
-#include "empathy-individual-store-channel.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
 
diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 2cc6b5be..07cc096e 100644
--- a/libempathy-gtk/empathy-individual-store-channel.h
+++ b/libempathy-gtk/empathy-individual-store-channel.h
@@ -27,6 +27,7 @@
 #define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__
 
 #include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-individual-store.h"
 
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index ca062871..d080242e 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 4055091f..3ebe35a6 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -25,13 +25,13 @@
  */
 
 #include "config.h"
+#include "empathy-individual-store.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
-#include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index d02d3dea..87fa3d96 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,22 +25,22 @@
  */
 
 #include "config.h"
+#include "empathy-individual-view.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-cell-renderer-expander.h"
+#include "empathy-cell-renderer-text.h"
 #include "empathy-connection-aggregator.h"
-#include "empathy-individual-manager.h"
 #include "empathy-contact-groups.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"
+#include "empathy-gtk-enum-types.h"
 #include "empathy-images.h"
-#include "empathy-cell-renderer-expander.h"
-#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 371ddb1b..a267a7d7 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -28,15 +29,14 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
-#include "empathy-utils.h"
-#include "empathy-location.h"
-#include "empathy-time.h"
-
 #include "empathy-avatar-image.h"
 #include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c
index 78502ef8..d7c24a68 100644
--- a/libempathy-gtk/empathy-input-text-view.c
+++ b/libempathy-gtk/empathy-input-text-view.c
@@ -25,6 +25,7 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
+#include "config.h"
 #include "empathy-input-text-view.h"
 
 G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view,
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index cb937daa..60945aed 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-chooser-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
-
 #include "empathy-irc-network-dialog.h"
+#include "empathy-irc-network-manager.h"
 #include "empathy-live-search.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 4945bb7c..fab6a3a3 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -20,18 +20,16 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-chooser.h"
 
-#include "empathy-utils.h"
+#include "empathy-irc-network-chooser-dialog.h"
 #include "empathy-irc-network-manager.h"
-
 #include "empathy-ui-utils.h"
-#include "empathy-irc-network-chooser-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
 
-#include "empathy-irc-network-chooser.h"
-
 #define DEFAULT_IRC_NETWORK "irc.gimp.org"
 #define DEFAULT_IRC_PORT 6667
 #define DEFAULT_IRC_SSL FALSE
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 8e4339cf..fc3cc1fb 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -19,16 +19,14 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 #include "totem-subtitle-encoding.h"
 
-#include "empathy-irc-network-dialog.h"
-
 typedef struct {
   EmpathyIrcNetwork *network;
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 3047612b..51f6a2e0 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
+#include "empathy-live-search.h"
 
 #include "empathy-utils.h"
 
-#include "empathy-live-search.h"
-
 G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch)
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index dea29762..f0f6aefe 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,10 +23,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
 #include "empathy-account-widget.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index bb6dfa6d..3a97c94c 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
+#include "empathy-location-manager.h"
 
 #include <geoclue/geoclue-master.h>
 
-#include "empathy-location-manager.h"
-
 #include "empathy-gsettings.h"
 #include "empathy-location.h"
 #include "empathy-time.h"
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 1f091f62..3650a33c 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -23,29 +23,26 @@
  */
 
 #include "config.h"
+#include "empathy-log-window.h"
 
 #include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
-
 #include <telepathy-glib/proxy-subclass.h>
-
-#include "extensions.h"
+#include <webkit/webkit.h>
 
 #include "action-chain-internal.h"
-#include "empathy-camera-monitor.h"
-#include "empathy-gsettings.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-
-#include "empathy-log-window.h"
 #include "empathy-account-chooser.h"
 #include "empathy-call-utils.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
 #include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-request-util.h"
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 #include "empathy-webkit-utils.h"
-#include "empathy-geometry.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index f8f76905..48554fc3 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,6 +25,7 @@
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 
+#include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index 09f41a4e..ed9242b5 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -22,12 +22,12 @@
 
 #include <glib/gi18n-lib.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
-
 #include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
+
 G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
     GTK_TYPE_DIALOG)
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 61b3870d..7dda2f9e 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -19,22 +19,20 @@
  */
 
 #include "config.h"
+#include "empathy-new-call-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-call-utils.h"
 #include "empathy-camera-monitor.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
 
-#include "empathy-contact-chooser.h"
-#include "empathy-ui-utils.h"
-#include "empathy-images.h"
-
-#include "empathy-new-call-dialog.h"
-#include "empathy-call-utils.h"
-
 static EmpathyNewCallDialog *dialog_singleton = NULL;
 
 G_DEFINE_TYPE(EmpathyNewCallDialog, empathy_new_call_dialog,
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 7308d147..36614725 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -19,19 +19,17 @@
  */
 
 #include "config.h"
+#include "empathy-new-message-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-request-util.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
-
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
 #include "empathy-images.h"
 
-#include "empathy-new-message-dialog.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
 
 static EmpathyNewMessageDialog *dialog_singleton = NULL;
 
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index b322ac7f..033557e8 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,19 +18,17 @@
  */
 
 #include "config.h"
+#include "empathy-notify-manager.h"
 
 #include <libnotify/notify.h>
 
 #include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-#include "empathy-notify-manager.h"
-
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
 
 typedef struct
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index e06a7249..ef03061a 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index ddaa97b7..e1113a07 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -19,13 +19,12 @@
  */
 
 #include "config.h"
+#include "empathy-plist.h"
 
 #include <string.h>
 #include <libxml/tree.h>
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "empathy-plist.h"
-
 static GValue *empathy_plist_parse_node (xmlNode *a_node);
 
 static GValue *
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cf2dbdf7..445f79b6 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -25,12 +25,13 @@
  */
 
 #include "config.h"
+#include "empathy-presence-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-presence-manager.h"
-#include "empathy-utils.h"
 #include "empathy-status-presets.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 4722462f..a060d9f7 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -21,14 +21,13 @@
  */
 
 #include "config.h"
+#include "empathy-protocol-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
 #include "empathy-connection-managers.h"
-
-#include "empathy-protocol-chooser.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index a560f095..2db024a3 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,13 +1,11 @@
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-roster-contact.h"
 
-#include "empathy-utils.h"
+#include <glib/gi18n-lib.h>
 
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 
diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c
index 643fed52..9ca53a8e 100644
--- a/libempathy-gtk/empathy-roster-group.c
+++ b/libempathy-gtk/empathy-roster-group.c
@@ -1,5 +1,4 @@
 #include "config.h"
-
 #include "empathy-roster-group.h"
 
 #include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index a81b2c25..b82fd162 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
+#include "empathy-roster-model-aggregator.h"
 
 #include <folks/folks-telepathy.h>
 
-#include "empathy-roster-model-aggregator.h"
-
 /**
  * SECTION: empathy-roster-model-aggregator
  * @title: EmpathyRosterModelAggregator
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 99c92900..e0fff03e 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -22,13 +22,11 @@
  */
 
 #include "config.h"
-
 #include "empathy-roster-model-manager.h"
 
-#include "empathy-roster-model.h"
-
 #include <glib/gi18n-lib.h>
 
+#include "empathy-roster-model.h"
 #include "empathy-utils.h"
 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index 3fd84b7f..994ab989 100644
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "config.h"
-
 #include "empathy-roster-model.h"
 
 G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index 336f629c..657deaa9 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -1,11 +1,9 @@
 #include "config.h"
-
 #include "empathy-roster-view.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-contact-groups.h"
-
 #include "empathy-roster-contact.h"
 #include "empathy-roster-group.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index cfb595c2..dce1bdd1 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
+#include "empathy-search-bar.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-
-#include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
 
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 78bf1472..9c29533c 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -19,12 +19,11 @@
  */
 
 #include "config.h"
+#include "empathy-share-my-desktop.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
 #include "empathy-debug.h"
 
-#include "empathy-share-my-desktop.h"
-
 static void
 create_tube_channel_cb (GObject *source,
     GAsyncResult *result,
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 77ea5b33..2e8ef3aa 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -21,10 +21,10 @@
  */
 
 #include "config.h"
-
-#include "empathy-utils.h"
 #include "empathy-smiley-manager.h"
+
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 typedef struct _SmileyManagerTree SmileyManagerTree;
 
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index a66e5f4c..600816f6 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -18,16 +18,16 @@
  */
 
 #include "config.h"
-
 #include "empathy-sound-manager.h"
 
 #include <glib/gi18n-lib.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
 #include "empathy-gsettings.h"
 #include "empathy-utils.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
+
 typedef struct {
   EmpathySound sound_id;
   const char * event_ca_id;
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 409b41bd..27f27f90 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -22,6 +22,7 @@
  */
 
 #include "config.h"
+#include "empathy-spell.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -29,11 +30,10 @@
 #include <enchant.h>
 #endif
 
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-gsettings.h"
 
 #ifdef HAVE_ENCHANT
 
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 91c81607..b122f287 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -35,18 +35,17 @@
  */
 
 #include "config.h"
+#include "empathy-status-preset-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
 #include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-#include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
-
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog)
 
 G_DEFINE_TYPE (EmpathyStatusPresetDialog, empathy_status_preset_dialog, GTK_TYPE_DIALOG);
diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5cf0e339..5de6071e 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.h
+++ b/libempathy-gtk/empathy-status-preset-dialog.h
@@ -29,6 +29,7 @@
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index cb7d3c3e..7cbd290f 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-string-parser.h"
+
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 9f8af521..87883265 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
-
 #include "empathy-subscription-dialog.h"
 
-#include "empathy-utils.h"
-#include "empathy-individual-widget.h"
-
 #include <glib/gi18n-lib.h>
 
+#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
+
 G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG)
 
 enum
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 851d7ad4..31715c30 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -20,18 +20,17 @@
  */
 
 #include "config.h"
+#include "empathy-theme-adium.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-gsettings.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
-#include "empathy-theme-adium.h"
+#include "empathy-images.h"
+#include "empathy-plist.h"
 #include "empathy-smiley-manager.h"
+#include "empathy-time.h"
 #include "empathy-ui-utils.h"
-#include "empathy-plist.h"
-#include "empathy-images.h"
+#include "empathy-utils.h"
 #include "empathy-webkit-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 461aca35..d921372a 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -21,15 +21,13 @@
  */
 
 #include "config.h"
+#include "empathy-theme-manager.h"
 
 #include <string.h>
-
 #include <gtk/gtk.h>
 
 #include "empathy-gsettings.h"
 
-#include "empathy-theme-manager.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index ee4a943d..def31d22 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -19,15 +19,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-tls-dialog.h"
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
     GTK_TYPE_MESSAGE_DIALOG)
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 1cadaf41..86edb3b0 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -30,20 +30,20 @@
  */
 
 #include "config.h"
+#include "empathy-ui-utils.h"
 
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include "empathy-ui-utils.h"
+#include "empathy-ft-factory.h"
 #include "empathy-images.h"
 #include "empathy-live-search.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-utils.h"
-#include "empathy-ft-factory.h"
 
 void
 empathy_gtk_init (void)
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 0bbb5765..e63f320f 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -22,14 +22,14 @@
 
 #include <glib/gi18n-lib.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"
 #include "empathy-contactinfo-utils.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID)
 
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index d221e5f9..0fc31908 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-webkit-utils.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-webkit-utils.h"
 #include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
 #include "empathy-theme-adium.h"
+#include "empathy-ui-utils.h"
 
 #define BORING_DPI_DEFAULT 96
 
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 1a1391e1..064d4d21 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-account-settings.h"
+
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"
-#include "empathy-utils.h"
 #include "empathy-presence-manager.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 92a59dab..cba4607a 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-auth-factory.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-keyring.h"
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
@@ -40,6 +37,9 @@
 
 #include "extensions.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
+
 G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
 
 struct _EmpathyAuthFactoryPriv {
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 1e603e98..6e669112 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-camera-monitor.h"
+
 #include "cheese-camera-device-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 7a6532f3..3f182861 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -22,11 +22,11 @@
  */
 
 #include "config.h"
+#include "empathy-chatroom-manager.h"
 
 #include <sys/stat.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index dcc72d5f..32bb4ce3 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-chatroom.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 1c8fc58c..39760998 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-client-factory.h"
 
 #include "empathy-tp-chat.h"
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 83e15f15..763715f9 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-aggregator.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 6f2cd8c5..b94ac125 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-managers.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index 7fb02499..81a1b313 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
+#include "empathy-contact-groups.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-contact-groups.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h
index 181b2875..0be1c81b 100644
--- a/libempathy/empathy-contact-groups.h
+++ b/libempathy/empathy-contact-groups.h
@@ -23,10 +23,10 @@
 #ifndef __EMPATHY_CONTACT_GROUPS_H__
 #define __EMPATHY_CONTACT_GROUPS_H__
 
-G_BEGIN_DECLS
-
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 void     empathy_contact_groups_get_all     (void);
 
 gboolean empathy_contact_group_get_expanded (const gchar *group);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 3c91e631..35610443 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "empathy-contact.h"
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 09573c39..75900f4a 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9cf90014..855ddb98 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -21,7 +21,9 @@
 
 /* empathy-ft-factory.c */
 
+#include "config.h"
 #include "empathy-ft-factory.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 30711c7d..96c8e47f 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -22,10 +22,10 @@
 /* empathy-ft-handler.c */
 
 #include "config.h"
+#include "empathy-ft-handler.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-ft-handler.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c
index 3659b372..37973000 100644
--- a/libempathy/empathy-goa-auth-handler.c
+++ b/libempathy/empathy-goa-auth-handler.c
@@ -19,14 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-goa-auth-handler.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
 
+#include "empathy-sasl-mechanisms.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-goa-auth-handler.h"
-#include "empathy-sasl-mechanisms.h"
 
 struct _EmpathyGoaAuthHandlerPriv
 {
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index f3c7565a..71960b5d 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-manager.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 3c2a3154..3f53a49a 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-manager.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index e0bc84f7..e01116e9 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-network.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 5457f23a..75eb016d 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-server.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index 837b2d51..e7872f1b 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -17,11 +17,9 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-keyring.h"
 
+#include <glib/gi18n-lib.h>
 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index e19f69b0..1115eddd 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -23,11 +23,11 @@
  */
 
 #include "config.h"
+#include "empathy-message.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-message.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index c00ae52a..21f703b6 100644
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-pkg-kit.h"
 
 typedef struct
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index cdc45fbe..1c288fb9 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-presence-manager.h"
 
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index d7b53c82..c5f693f0 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index 303bf9e3..a6829c45 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-sasl-mechanisms.h"
 
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
 #include "empathy-utils.h"
-#include "empathy-sasl-mechanisms.h"
 
 #define MECH_FACEBOOK "X-FACEBOOK-PLATFORM"
 #define MECH_WLM "X-MESSENGER-OAUTH2"
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index b9b908ed..b18d1a73 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-sasl-handler.h"
 
+#include "empathy-keyring.h"
+#include "empathy-sasl-mechanisms.h"
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-keyring.h"
-#include "empathy-sasl-mechanisms.h"
 
 enum {
   PROP_CHANNEL = 1,
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index 78be2f0a..34c3147a 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -19,15 +19,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-tls-handler.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-utils.h"
-
 #include "extensions.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
+
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
 enum {
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 1de36d81..0e651f07 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
+#include "empathy-status-presets.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-status-presets.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index cbb6b3bd..d14f2c4c 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
+#include "empathy-time.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-time.h"
-
 /* Note: EmpathyTime is always in UTC. */
 
 gint64
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 00447cc4..fcbc559b 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier,
     G_TYPE_OBJECT)
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index e15a8c41..4711affc 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-tp-chat.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index a57dd633..7e17b708 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-auth-handler.h"
 
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.h>
@@ -29,14 +30,14 @@
 #include <libsignon-glib/signon-identity.h>
 #include <libsignon-glib/signon-auth-session.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "empathy-debug.h"
 #include "empathy-keyring.h"
 #include "empathy-utils.h"
-#include "empathy-uoa-auth-handler.h"
 #include "empathy-uoa-utils.h"
 #include "empathy-sasl-mechanisms.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+
 struct _EmpathyUoaAuthHandlerPriv
 {
   AgManager *manager;
diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c
index f63a1519..6032d36b 100644
--- a/libempathy/empathy-uoa-utils.c
+++ b/libempathy/empathy-uoa-utils.c
@@ -19,10 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
-#include "empathy-uoa-utils.h"
 
 static AgManager *singleton = NULL;
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index f62d1e5f..962246f5 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,16 +27,14 @@
  */
 
 #include "config.h"
+#include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
-
 #include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-utils.h"
 #include "empathy-presence-manager.h"
-
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 2480d756..bd6b2f86 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -23,11 +23,10 @@
  */
 
 #include "config.h"
+#include "empathy-about-dialog.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-about-dialog.h"
-
 #define WEB_SITE "http://live.gnome.org/Empathy"
 
 static const char *authors[] = {
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index f84f28db..ccbaab9d 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -25,11 +25,10 @@
  */
 
 #include "config.h"
-
-#include "empathy-ui-utils.h"
-
 #include "empathy-accounts-common.h"
+
 #include "empathy-accounts-dialog.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index 39d094d2..e4a4a662 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -22,6 +22,11 @@
 #ifndef __EMPATHY_ACCOUNTS_COMMON_H__
 #define __EMPATHY_ACCOUNTS_COMMON_H__
 
+#include <glib.h>
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
 gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager);
 
 gboolean empathy_accounts_has_accounts (TpAccountManager *manager);
@@ -30,4 +35,6 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
     GApplication *app);
 
+G_END_DECLS
+
 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 421357c8..27f41d37 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -25,22 +25,20 @@
  */
 
 #include "config.h"
+#include "empathy-accounts-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-utils.h"
-#include "empathy-pkg-kit.h"
-
-#include "empathy-ui-utils.h"
-#include "empathy-account-widget-sip.h"
-#include "empathy-user-info.h"
-#include "empathy-local-xmpp-assistant-widget.h"
-#include "empathy-new-account-dialog.h"
-
 #include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
+#include "empathy-account-widget-sip.h"
 #include "empathy-import-dialog.h"
 #include "empathy-import-utils.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-ui-utils.h"
+#include "empathy-user-info.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 0cf4c957..8e9ce989 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "empathy-accounts.h"
 
 #include <glib/gi18n.h>
 
@@ -32,10 +33,9 @@
 #include <cheese-gtk.h>
 #endif
 
-#include "empathy-utils.h"
-#include "empathy-ui-utils.h"
-
 #include "empathy-accounts-common.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 0147b870..985a1fa3 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-audio-sink.h"
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
@@ -27,7 +28,6 @@
 #endif
 
 #include "empathy-audio-utils.h"
-#include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index bdb25f80..bc3aa50c 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-audio-src.h"
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
@@ -26,11 +27,9 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
-#include "empathy-utils.h"
 #include "empathy-audio-utils.h"
-
-#include "empathy-audio-src.h"
 #include "empathy-mic-monitor.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c
index e1f9ec56..f7a00378 100644
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-audio-utils.h"
 
 #include <pulse/pulseaudio.h>
 
-#include "empathy-audio-utils.h"
-
 #include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 6da46566..be5b13a0 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -22,21 +22,19 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
+#include <gnutls/gnutls.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-auth-factory.h"
-#include "empathy-server-tls-handler.h"
-#include "empathy-tls-verifier.h"
-
 #include "empathy-bad-password-dialog.h"
 #include "empathy-password-dialog.h"
+#include "empathy-sanity-cleaning.h"
+#include "empathy-server-tls-handler.h"
 #include "empathy-tls-dialog.h"
+#include "empathy-tls-verifier.h"
 #include "empathy-ui-utils.h"
 
-#include "empathy-sanity-cleaning.h"
-
-#include <gnutls/gnutls.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 #define TIMEOUT 60
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 865aeace..60700ac0 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -19,12 +19,11 @@
  */
 
 #include "config.h"
-
 #include "empathy-client-factory.h"
-#include "empathy-request-util.h"
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index 174fbf4b..c400fc2f 100644
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -22,6 +22,7 @@
 #define __EMPATHY_CALL_FACTORY_H__
 
 #include <glib-object.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 28e8cda8..1c4939af 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -19,14 +19,12 @@
  */
 
 #include "config.h"
+#include "empathy-call-handler.h"
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
-#include "empathy-utils.h"
-
 #include "empathy-call-utils.h"
-
-#include "empathy-call-handler.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 2a60f6fe..41e9bdfc 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-call-observer.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-images.h"
 #include "empathy-notify-manager.h"
 
-#include "empathy-call-observer.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
 
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index 6da478fb..e6dca486 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -22,10 +22,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "empathy-call-window-fullscreen.h"
 
-#include "empathy-utils.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 9b67bba4..979d7e3b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -19,38 +19,35 @@
  */
 
 #include "config.h"
+#include "empathy-call-window.h"
 
 #include <glib/gi18n.h>
-
 #include <telepathy-farstream/telepathy-farstream.h>
-
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
 
+#include "empathy-about-dialog.h"
+#include "empathy-audio-sink.h"
+#include "empathy-call-utils.h"
+#include "empathy-call-window-fullscreen.h"
+#include "empathy-camera-menu.h"
 #include "empathy-camera-monitor.h"
-#include "empathy-gsettings.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-
 #include "empathy-dialpad-widget.h"
-#include "empathy-ui-utils.h"
-#include "empathy-sound-manager.h"
 #include "empathy-geometry.h"
+#include "empathy-gsettings.h"
 #include "empathy-images.h"
-#include "empathy-call-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "empathy-debug.h"
-
-#include "empathy-call-window-fullscreen.h"
-#include "empathy-about-dialog.h"
-#include "empathy-audio-sink.h"
 #include "empathy-mic-menu.h"
 #include "empathy-preferences.h"
+#include "empathy-request-util.h"
 #include "empathy-rounded-actor.h"
 #include "empathy-rounded-rectangle.h"
 #include "empathy-rounded-texture.h"
-#include "empathy-camera-menu.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include "empathy-debug.h"
 
 #define CONTENT_HBOX_SPACING 3
 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 9fccb565..8a554969 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
@@ -31,10 +30,9 @@
 #include <X11/Xlib.h>
 #endif
 
-#include "empathy-ui-utils.h"
-
-#include "empathy-call-window.h"
 #include "empathy-call-factory.h"
+#include "empathy-call-window.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index 0674e707..8dc037bd 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -20,12 +20,11 @@
  */
 
 #include "config.h"
+#include "empathy-camera-menu.h"
 
 #include "empathy-camera-monitor.h"
 #include "empathy-gsettings.h"
 
-#include "empathy-camera-menu.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index bc64cefc..89f230dc 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -18,24 +18,20 @@
  */
 
 #include "config.h"
+#include "empathy-chat-manager.h"
 
 #include <telepathy-glib/proxy-subclass.h>
 
 #include "empathy-chatroom-manager.h"
-#include "empathy-request-util.h"
+#include "empathy-chat-window.h"
 #include "empathy-individual-manager.h"
-
+#include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
-
-#include "empathy-chat-window.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-#include "empathy-chat-manager.h"
-
-#include "extensions.h"
-
 enum {
   CLOSED_CHATS_CHANGED,
   DISPLAYED_CHATS_CHANGED,
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 47f588f0..9dafa5fe 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -26,28 +26,26 @@
  */
 
 #include "config.h"
+#include "empathy-chat-window.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "empathy-client-factory.h"
+#include "empathy-about-dialog.h"
+#include "empathy-chat-manager.h"
 #include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-geometry.h"
 #include "empathy-gsettings.h"
-#include "empathy-utils.h"
-#include "empathy-request-util.h"
-#include "empathy-individual-manager.h"
-
 #include "empathy-images.h"
-#include "empathy-geometry.h"
+#include "empathy-individual-manager.h"
+#include "empathy-invite-participant-dialog.h"
+#include "empathy-notify-manager.h"
+#include "empathy-request-util.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-sound-manager.h"
 #include "empathy-ui-utils.h"
-#include "empathy-notify-manager.h"
-
-#include "empathy-chat-manager.h"
-#include "empathy-chat-window.h"
-#include "empathy-about-dialog.h"
-#include "empathy-invite-participant-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "empathy-debug.h"
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index cfd82a12..8c595597 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -29,10 +29,10 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chat.h"
+#include "empathy-individual-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 9919b6ed..e6e8b1b3 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -23,17 +23,14 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-
 #include <libnotify/notify.h>
 
+#include "empathy-chat-manager.h"
+#include "empathy-chat-resources.h"
 #include "empathy-presence-manager.h"
-
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
 
-#include "empathy-chat-manager.h"
-#include "empathy-chat-resources.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "empathy-debug.h"
 
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index ff45bed9..553c9129 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -24,16 +24,14 @@
  */
 
 #include "config.h"
+#include "empathy-chatrooms-window.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-chatroom-manager.h"
-#include "empathy-utils.h"
-
 #include "empathy-account-chooser.h"
+#include "empathy-chatroom-manager.h"
 #include "empathy-ui-utils.h"
-
-#include "empathy-chatrooms-window.h"
+#include "empathy-utils.h"
 
 typedef struct {
 	EmpathyChatroomManager *manager;
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 546e1740..6cc60098 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -20,18 +20,17 @@
 */
 
 #include "config.h"
+#include "empathy-debug-window.h"
 
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-#include "empathy-utils.h"
-
 #include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include "empathy-debug-window.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
     GTK_TYPE_WINDOW)
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 42bb43ef..5269bcfc 100644
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -21,11 +21,11 @@
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 
-G_BEGIN_DECLS
-
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 #define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ())
 #define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \
         ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow))
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index ca348f3c..abb73ac4 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,9 +21,8 @@
 
 #include <glib/gi18n.h>
 
-#include "empathy-ui-utils.h"
-
 #include "empathy-debug-window.h"
+#include "empathy-ui-utils.h"
 
 #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c0b802d3..a0171858 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -20,23 +20,21 @@
  */
 
 #include "config.h"
+#include "empathy-event-manager.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-presence-manager.h"
+#include "empathy-call-utils.h"
 #include "empathy-connection-aggregator.h"
-#include "empathy-tp-chat.h"
-#include "empathy-utils.h"
 #include "empathy-gsettings.h"
-#include "empathy-sasl-mechanisms.h"
-
 #include "empathy-images.h"
+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"
 #include "empathy-sound-manager.h"
-#include "empathy-ui-utils.h"
-#include "empathy-call-utils.h"
 #include "empathy-subscription-dialog.h"
-
-#include "empathy-event-manager.h"
+#include "empathy-tp-chat.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #include "empathy-debug.h"
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 9098250b..18e05dc1 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -28,17 +28,16 @@
 /* The original file transfer manager code was copied from Epiphany */
 
 #include "config.h"
+#include "empathy-ft-manager.h"
 
 #include <glib/gi18n.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include "empathy-debug.h"
-#include "empathy-utils.h"
-
-#include "empathy-ui-utils.h"
 #include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include "empathy-ft-manager.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_FT
+#include "empathy-debug.h"
 
 enum
 {
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index ea1ce184..5e6fa8d5 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -21,15 +21,15 @@
  */
 
 #include "config.h"
+#include "empathy-import-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 enum {
   PROP_PARENT = 1,
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 22116648..92adb861 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -20,16 +20,16 @@
  * */
 
 #include "config.h"
+#include "empathy-import-pidgin.h"
 
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-import-utils.h"
-#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 /* Pidgin to CM map */
 typedef struct
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 718c7d1e..c3823364 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,11 +19,12 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include "empathy-connection-managers.h"
-#include "empathy-utils.h"
-
+#include "config.h"
 #include "empathy-import-utils.h"
+
+#include "empathy-connection-managers.h"
 #include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
 
 EmpathyImportAccountData *
 empathy_import_account_data_new (const gchar *source)
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 68a71d5f..a572ad0c 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -23,17 +23,16 @@
 /* empathy-import-widget.c */
 
 #include "config.h"
-
-#include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-#include "empathy-utils.h"
+#include <glib/gi18n-lib.h>
 
+#include "empathy-import-dialog.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include <glib/gi18n-lib.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
 
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 225350e6..508706fb 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -26,9 +26,9 @@
 #define __EMPATHY_IMPORT_WIDGET_H__
 
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 #include "empathy-connection-managers.h"
-
 #include "empathy-import-utils.h"
 
 G_BEGIN_DECLS
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index f78052f8..e562dc56 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -10,14 +10,12 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n.h>
-
 #include "empathy-invite-participant-dialog.h"
 
-#include "empathy-utils.h"
+#include <glib/gi18n.h>
 
 #include "empathy-contact-chooser.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index 0c6ed23a..612ff34b 100644
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-mic-menu.h"
+
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index afc526ff..90d1088f 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
+#include "empathy-mic-monitor.h"
 
 #include <gtk/gtk.h>
 #include <pulse/glib-mainloop.h>
 
-#include "empathy-mic-monitor.h"
-
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h
index 4ad4a28f..6d545483 100644
--- a/src/empathy-mic-monitor.h
+++ b/src/empathy-mic-monitor.h
@@ -20,7 +20,7 @@
 #define __EMPATHY_MIC_MONITOR_H__
 
 #include <glib-object.h>
-
+#include <gio/gio.h>
 #include <pulse/pulseaudio.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index cca729df..f0b6ec64 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -22,17 +22,15 @@
  */
 
 #include "config.h"
+#include "empathy-new-chatroom-dialog.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-utils.h"
-#include "empathy-request-util.h"
-#include "empathy-gsettings.h"
-
 #include "empathy-account-chooser.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
-
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h
index 02bf3b2a..9f7796db 100644
--- a/src/empathy-new-chatroom-dialog.h
+++ b/src/empathy-new-chatroom-dialog.h
@@ -25,6 +25,7 @@
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 
 #include <glib-object.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index 7e06da1b..fb36f2ac 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -18,19 +18,17 @@
  */
 
 #include "config.h"
+#include "empathy-notifications-approver.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-notify-manager.h"
 #include "empathy-call-utils.h"
-
 #include "empathy-event-manager.h"
+#include "empathy-notify-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-#include "empathy-notifications-approver.h"
-
 struct _EmpathyNotificationsApproverPrivate
 {
   EmpathyEventManager *event_mgr;
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 735ba217..c2be935b 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -24,18 +24,16 @@
  */
 
 #include "config.h"
+#include "empathy-preferences.h"
 
 #include <glib/gi18n.h>
 
 #include "empathy-client-factory.h"
 #include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
-#include "empathy-ui-utils.h"
-#include "empathy-theme-manager.h"
 #include "empathy-spell.h"
-
-#include "empathy-preferences.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 2f64d877..c09094eb 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -22,41 +22,39 @@
  */
 
 #include "config.h"
+#include "empathy-roster-window.h"
 
 #include <sys/stat.h>
 #include <glib/gi18n.h>
 
-#include "empathy-utils.h"
-#include "empathy-request-util.h"
+#include "empathy-about-dialog.h"
+#include "empathy-accounts-dialog.h"
+#include "empathy-call-observer.h"
+#include "empathy-chat-manager.h"
 #include "empathy-chatroom-manager.h"
-#include "empathy-gsettings.h"
-#include "empathy-gsettings.h"
-#include "empathy-status-presets.h"
-#include "empathy-presence-manager.h"
-
+#include "empathy-chatrooms-window.h"
 #include "empathy-contact-blocking-dialog.h"
 #include "empathy-contact-search-dialog.h"
+#include "empathy-event-manager.h"
+#include "empathy-ft-manager.h"
 #include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-individual-dialogs.h"
-#include "empathy-roster-model-manager.h"
-#include "empathy-roster-view.h"
-#include "empathy-new-message-dialog.h"
-#include "empathy-new-call-dialog.h"
 #include "empathy-log-window.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-chatroom-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-preferences.h"
 #include "empathy-presence-chooser.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-status-presets.h"
 #include "empathy-ui-utils.h"
-
-#include "empathy-accounts-dialog.h"
-#include "empathy-call-observer.h"
-#include "empathy-chat-manager.h"
-#include "empathy-roster-window.h"
-#include "empathy-preferences.h"
-#include "empathy-about-dialog.h"
-#include "empathy-new-chatroom-dialog.h"
-#include "empathy-chatrooms-window.h"
-#include "empathy-event-manager.h"
-#include "empathy-ft-manager.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 038cb495..89e3144c 100644
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-rounded-actor.h"
 
 G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index 67c0e27c..810fa0df 100644
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-rounded-rectangle.h"
 
 #include <math.h>
 
-#include "empathy-rounded-rectangle.h"
-
 G_DEFINE_TYPE (EmpathyRoundedRectangle,
     empathy_rounded_rectangle,
     CLUTTER_TYPE_CAIRO_TEXTURE)
diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c
index 7ac7d040..46c0b213 100644
--- a/src/empathy-rounded-texture.c
+++ b/src/empathy-rounded-texture.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "empathy-rounded-texture.h"
 
 G_DEFINE_TYPE (EmpathyRoundedTexture,
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 025c9b84..5af3ff45 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -22,22 +22,20 @@
  */
 
 #include "config.h"
-
 #include "empathy-sanity-cleaning.h"
 
-#include "empathy-gsettings.h"
-
-#include "empathy-theme-manager.h"
-
 #ifdef HAVE_UOA
-#include "empathy-pkg-kit.h"
-#include "empathy-uoa-utils.h"
-
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
+
+#include "empathy-pkg-kit.h"
+#include "empathy-uoa-utils.h"
 #endif
 
+#include "empathy-gsettings.h"
+#include "empathy-theme-manager.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index b40ebed7..917fab38 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -20,17 +20,15 @@
  */
 
 #include "config.h"
+#include "empathy-status-icon.h"
 
+#include "empathy-event-manager.h"
 #include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-message-dialog.h"
 #include "empathy-presence-chooser.h"
 #include "empathy-ui-utils.h"
-#include "empathy-new-message-dialog.h"
-#include "empathy-new-call-dialog.h"
-
-#include "empathy-status-icon.h"
-#include "empathy-event-manager.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #include "empathy-debug.h"
diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h
index ca21af83..44a0b125 100644
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -23,6 +23,7 @@
 #define __EMPATHY_STATUS_ICON_H__
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index b3b84d3e..9856efed 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-video-src.h"
 
 #ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
@@ -29,8 +30,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
 
-#include "empathy-video-src.h"
-
 G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN)
 
 /* Keep in sync with EmpathyGstVideoSrcChannel */
diff --git a/src/empathy.c b/src/empathy.c
index 610150bb..a8f23e82 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -23,31 +23,28 @@
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
+#include <libnotify/notify.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
-#include <libnotify/notify.h>
-
+#include "empathy-accounts-common.h"
+#include "empathy-accounts-dialog.h"
+#include "empathy-chatroom-manager.h"
 #include "empathy-client-factory.h"
 #include "empathy-connection-aggregator.h"
-#include "empathy-presence-manager.h"
-#include "empathy-utils.h"
-#include "empathy-chatroom-manager.h"
-#include "empathy-request-util.h"
 #include "empathy-ft-factory.h"
+#include "empathy-ft-manager.h"
 #include "empathy-gsettings.h"
-
-#include "empathy-ui-utils.h"
 #include "empathy-location-manager.h"
-
+#include "empathy-notifications-approver.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
 #include "empathy-roster-window.h"
-#include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
 #include "empathy-status-icon.h"
-#include "empathy-ft-manager.h"
-#include "empathy-notifications-approver.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index e6e82583..323bbb98 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 4a0f655e..a64fd2ce 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 9a3c46af..7fb195f0 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 d22e04f0..5ca4fba7 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 291a34de..225d57bc 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 0934fe4c..10f0346f 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 24cd5d67..0cf03744 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 03cc9d7a..3e5706c6 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 4a440f9e..613bf751 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 8a4d08fc..159f8fcf 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 d4a76933..185f4e95 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 d7c54a64..74bb59f1 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 5710fb14..208c9a12 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 f91cb120..ca548a85 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 bb319502..478b4e6c 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 ff5de0fd..f814d965 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 db9cd361..2494d78b 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 4b1219f2..997b3311 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 f6fc0ffd..8d7be5f4 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 ade247f3..6fafac80 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
diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
index 439bbda6..761e2215 100644
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
@@ -1,13 +1,10 @@
 #include "config.h"
+#include "empathy-webcredentials-monitor.h"
 
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
-
 #include <libaccounts-glib/ag-account.h>
 
-#include "empathy-webcredentials-monitor.h"
-
 G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT)
 
 #define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials"
diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
index 8919065e..0607b9e2 100644
--- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
+++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
@@ -20,12 +20,10 @@
 #include "mcp-account-manager-uoa.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
-
 #include <string.h>
 #include <ctype.h>
 
diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
index d7a33fd4..3e61dc3b 100644
--- a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
+++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
@@ -22,6 +22,8 @@
  * Authors: Xavier Claessens <xavier.claessens@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <mission-control-plugins/mission-control-plugins.h>
 
 #include "mcp-account-manager-uoa.h"