Clean up #include directives in headers

Reorder some inclusions and remove a few blank lines.

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

27 files changed, 9 insertions, 29 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