Clean up #include directives in headers

Reorder some inclusions and remove a few blank lines.

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

56 files changed, 16 insertions, 64 deletions

diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index d58fcf12f..5302ad702 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNT_CHOOSER_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index eba469e82..4be6d61a9 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -22,6 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #include <gtk/gtk.h>
+
 #include "empathy-account-widget.h"
 #include "empathy-irc-network-chooser.h"
 
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 8da22bdad..4fc9a3197 100644
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,10 +22,11 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
-#include "empathy-account-widget.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "empathy-account-widget.h"
+
 G_BEGIN_DECLS
 
 struct _EmpathyAccountWidgetUIDetails {
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 438ee8372..807d57dff 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -22,6 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #include <gtk/gtk.h>
+
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index cbd69a343..2a983622b 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -31,9 +31,8 @@
 #include <gtk/gtk.h>
 
 #include "empathy-contact.h"
-#include "empathy-tp-chat.h"
-
 #include "empathy-theme-adium.h"
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 9f1f1a70f..5f44adb6b 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-contact.h"
 #include "empathy-account-chooser.h"
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index 80c18ffae..c102c5dd0 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h
index cca96f3b2..cd312bda1 100644
--- a/libempathy-gtk/empathy-dialpad-button.h
+++ b/libempathy-gtk/empathy-dialpad-button.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_DIALPAD_BUTTON_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h
index 1085fac4f..2b59db62c 100644
--- a/libempathy-gtk/empathy-groups-widget.h
+++ b/libempathy-gtk/empathy-groups-widget.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_GROUPS_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h
index e07105676..b603c5765 100644
--- a/libempathy-gtk/empathy-individual-dialogs.h
+++ b/libempathy-gtk/empathy-individual-dialogs.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_DIALOGS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h
index 4f580fb03..747e6824f 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.h
+++ b/libempathy-gtk/empathy-individual-edit-dialog.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h
index cdba07a61..58c229577 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.h
+++ b/libempathy-gtk/empathy-individual-information-dialog.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index fac0f31d6..8726c1fd1 100644
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include "empathy-individual-manager.h"
-
 #include "empathy-individual-store.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index baac701ed..e942a42b5 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -28,12 +28,11 @@
 #define __EMPATHY_INDIVIDUAL_VIEW_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
-#include "empathy-live-search.h"
 #include "empathy-individual-menu.h"
 #include "empathy-individual-store.h"
+#include "empathy-live-search.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_VIEW         (empathy_individual_view_get_type ())
diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index b8156c48a..fd63377f2 100644
--- a/libempathy-gtk/empathy-individual-widget.h
+++ b/libempathy-gtk/empathy-individual-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_INDIVIDUAL_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index dafd7fb2a..efea64d29 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h
index 525e490bb..6ea8b7bf9 100644
--- a/libempathy-gtk/empathy-location-manager.h
+++ b/libempathy-gtk/empathy-location-manager.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_LOCATION_MANAGER         (empathy_location_manager_get_type ())
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index ca8996f7d..ee01e7ab9 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -22,11 +22,10 @@
 #define __EMPATHY_NOTIFY_MANAGER_H__
 
 #include <glib-object.h>
+#include <libnotify/notification.h>
 
 #include "empathy-contact.h"
 
-#include <libnotify/notification.h>
-
 G_BEGIN_DECLS
 
 #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS             "actions"
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index 9ae16b281..fe84019f3 100644
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -23,9 +23,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "empathy-server-sasl-handler.h"
-
 #include "empathy-base-password-dialog.h"
+#include "empathy-server-sasl-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 47e4592ed..efa3089e5 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-account-settings.h"
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h
index e29e36eb0..3b9c0202b 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.h
+++ b/libempathy-gtk/empathy-roster-model-aggregator.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <folks/folks.h>
 
 #include "empathy-roster-model.h"
diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 27c5482f3..9a211946d 100644
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -21,7 +21,6 @@
 #define __EMPATHY_ROSTER_MODEL_H__
 
 #include <glib-object.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 45e240844..c09d09c3a 100644
--- a/libempathy-gtk/empathy-roster-view.h
+++ b/libempathy-gtk/empathy-roster-view.h
@@ -4,7 +4,6 @@
 
 #include "egg-list-box/egg-list-box.h"
 #include "empathy-live-search.h"
-
 #include "empathy-roster-model.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 99e96c571..5e592186b 100644
--- a/libempathy-gtk/empathy-sound-manager.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_SOUND_MANAGER_H__
 
 #include <gtk/gtk.h>
-
 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h
index a9c37ad5e..6b08ee399 100644
--- a/libempathy-gtk/empathy-tls-dialog.h
+++ b/libempathy-gtk/empathy-tls-dialog.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index a7d86e0bb..baf250e32 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -33,7 +33,6 @@
 #define __EMPATHY_UI_UTILS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h
index 117bfd325..a06c72911 100644
--- a/libempathy-gtk/empathy-user-info.h
+++ b/libempathy-gtk/empathy-user-info.h
@@ -21,7 +21,6 @@
 #define __EMPATHY_USER_INFO_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 162def48c..6e4713c4c 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 16d6ad34f..73e905782 100644
--- a/libempathy/empathy-auth-factory.h
+++ b/libempathy/empathy-auth-factory.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_AUTH_FACTORY_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index b8232dc64..498d225ad 100644
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_CHATROOM_MANAGER_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 6701e568f..98ed04b96 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_CHATROOM_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-tp-chat.h"
diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h
index 71e6e4392..267b20937 100644
--- a/libempathy/empathy-connection-aggregator.h
+++ b/libempathy/empathy-connection-aggregator.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_CONNECTION_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index d8bcb390a..0ed20c934 100644
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 14c3f6440..e7ce10e4b 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_CONTACT_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index e6b93cc7a..5a600602b 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -21,9 +21,6 @@
 #ifndef __EMPATHY_DEBUG_H__
 #define __EMPATHY_DEBUG_H__
 
-#include "config.h"
-
-
 #include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index a120f241b..2fc1b609f 100644
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -26,7 +26,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 7e945dc02..6471099f9 100644
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -20,7 +20,6 @@
 #define __EMPATHY_KEYRING_H__
 
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 6357aeecd..f616647ad 100644
--- a/libempathy/empathy-presence-manager.h
+++ b/libempathy/empathy-presence-manager.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_PRESENCE_MANAGER_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 497c65ee5..9c168d7a3 100644
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index d25d90ab7..8bf7e3b7f 100644
--- a/libempathy/empathy-server-sasl-handler.h
+++ b/libempathy/empathy-server-sasl-handler.h
@@ -22,7 +22,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h
index f4caf3539..ed19c72ff 100644
--- a/libempathy/empathy-server-tls-handler.h
+++ b/libempathy/empathy-server-tls-handler.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 59bd9269b..fc7af28e3 100644
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -24,7 +24,6 @@
 #define __USE_XOPEN
 #endif
 #include <time.h>
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h
index 2f66acb9c..c25d9756c 100644
--- a/libempathy/empathy-tls-verifier.h
+++ b/libempathy/empathy-tls-verifier.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d8d4ac31d..20fb4e1e0 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_TP_CHAT_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 935b501a4..440fe8350 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
 #include <gnutls/x509.h>
 #include <libxml/tree.h>
 #include <folks/folks.h>
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index d436fed04..070cd02e9 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNTS_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 0f42209c2..face00887 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -22,10 +22,8 @@
 #define __EMPATHY_CALL_HANDLER_H__
 
 #include <glib-object.h>
-
 #include <gst/gst.h>
 #include <farstream/fs-conference.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index a5df2dac4..d4d1b7cb3 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -24,8 +24,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "empathy-call-handler.h"
 #include "empathy-audio-src.h"
+#include "empathy-call-handler.h"
 #include "empathy-video-src.h"
 
 G_BEGIN_DECLS
diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index da121a49e..daa3448d2 100644
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -13,7 +13,6 @@
 #define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-tp-chat.h"
diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h
index 32000163f..f72993257 100644
--- a/src/empathy-sanity-cleaning.h
+++ b/src/empathy-sanity-cleaning.h
@@ -24,10 +24,14 @@
 
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 void empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
     gpointer user_data);
 
 gboolean empathy_sanity_checking_run_finish (GAsyncResult *result,
     GError **error);
 
+G_END_DECLS
+
 #endif
diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h
index 67d94bef3..11b219d48 100644
--- a/tests/mock-pkcs11.h
+++ b/tests/mock-pkcs11.h
@@ -19,11 +19,9 @@
  */
 
 #include <glib.h>
-
+#include <gck/pkcs11x.h>
 #include <gcr/gcr.h>
-
 #include <p11-kit/pkcs11.h>
-#include <gck/pkcs11x.h>
 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index 04271715b..ed7a6924e 100644
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "empathy-irc-server.h"
 #include "empathy-irc-network.h"
 #include "empathy-irc-network-manager.h"
+#include "empathy-irc-server.h"
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
index 17963e656..27d114c0e 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 #define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
index b1bfb28cd..aa9d3a204 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__
 #define __EMPATHY_APP_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
index 0167c851e..679639670 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_APP_PLUGIN_H__
 
 #include <glib-object.h>
-
 #include <libaccount-plugin/application-plugin.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
index cf373a2d4..1c96f3368 100644
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
@@ -2,7 +2,6 @@
 #define __EMPATHY_WEBCREDENTIALS_MONITOR_H__
 
 #include <glib-object.h>
-
 #include <libaccounts-glib/ag-manager.h>
 
 G_BEGIN_DECLS