Use double quotes for all internal headers

This makes a bit more obvious which headers come from public libraries
and which ones come from uninstalled utility libraries.

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

44 files changed, 188 insertions, 188 deletions

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 537b43e3d..fcd331aec 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -26,13 +26,13 @@
 
 #include "config.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 gboolean
 empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index f0a2db9a2..acfd9c290 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -28,14 +28,14 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-pkg-kit.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-pkg-kit.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-account-widget-sip.h>
-#include <libempathy-gtk/empathy-user-info.h>
-#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
-#include <libempathy-gtk/empathy-new-account-dialog.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-account-widget-sip.h"
+#include "libempathy-gtk/empathy-user-info.h"
+#include "libempathy-gtk/empathy-local-xmpp-assistant-widget.h"
+#include "libempathy-gtk/empathy-new-account-dialog.h"
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
@@ -43,7 +43,7 @@
 #include "empathy-import-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 90d7947e9..57f6968c8 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -32,13 +32,13 @@
 #include <cheese-gtk.h>
 #endif
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-accounts-common.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
 
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 0c3693b6f..01bc80f53 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -30,7 +30,7 @@
 #include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
 
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index fe62a6c4b..2f919533e 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -26,14 +26,14 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
 #include "empathy-audio-utils.h"
 
 #include "empathy-audio-src.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
 
diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c
index 323ef8edf..89202f541 100644
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -24,10 +24,10 @@
 
 #include "empathy-audio-utils.h"
 
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 void
 empathy_audio_set_stream_properties (GstElement *element,
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index f1d42b74c..3636142cc 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -24,15 +24,15 @@
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-auth-factory.h>
-#include <libempathy/empathy-server-tls-handler.h>
-#include <libempathy/empathy-tls-verifier.h>
-
-#include <libempathy-gtk/empathy-bad-password-dialog.h>
-#include <libempathy-gtk/empathy-password-dialog.h>
-#include <libempathy-gtk/empathy-tls-dialog.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-auth-factory.h"
+#include "libempathy/empathy-server-tls-handler.h"
+#include "libempathy/empathy-tls-verifier.h"
+
+#include "libempathy-gtk/empathy-bad-password-dialog.h"
+#include "libempathy-gtk/empathy-password-dialog.h"
+#include "libempathy-gtk/empathy-tls-dialog.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-sanity-cleaning.h"
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index dbd5ecf77..42bd46f50 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -20,14 +20,14 @@
 
 #include "config.h"
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-request-util.h>
+#include "libempathy/empathy-client-factory.h"
+#include "libempathy/empathy-request-util.h"
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index b1d4f2977..88b166f1f 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -22,14 +22,14 @@
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-call-utils.h>
+#include "libempathy-gtk/empathy-call-utils.h"
 
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
 
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 36c6cfdc2..55e489782 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -28,7 +28,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index bf42b055a..c0aa04170 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -22,13 +22,13 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
+#include "libempathy-gtk/empathy-images.h"
+#include "libempathy-gtk/empathy-notify-manager.h"
 
 #include "empathy-call-observer.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 struct _EmpathyCallObserverPriv {
   EmpathyNotifyManager *notify_mgr;
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index ca2914724..b678c0a42 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -24,8 +24,8 @@
 
 #include "empathy-call-window-fullscreen.h"
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy-gtk/empathy-ui-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 37090319b..5a24fbcd3 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -27,20 +27,20 @@
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
 
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-dialpad-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-call-utils.h>
+#include "libempathy/empathy-camera-monitor.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-utils.h"
+
+#include "libempathy-gtk/empathy-dialpad-widget.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-sound-manager.h"
+#include "libempathy-gtk/empathy-geometry.h"
+#include "libempathy-gtk/empathy-images.h"
+#include "libempathy-gtk/empathy-call-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #include "empathy-call-window-fullscreen.h"
 #include "empathy-about-dialog.h"
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 9d5ab8a83..47e3f3a83 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -31,13 +31,13 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-call-window.h"
 #include "empathy-call-factory.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index a6f8d3d12..2bfef6cb7 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -21,13 +21,13 @@
 
 #include "config.h"
 
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-camera-monitor.h"
+#include "libempathy/empathy-gsettings.h"
 
 #include "empathy-camera-menu.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 struct _EmpathyCameraMenuPrivate
 {
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 15a4e7a4f..50292fbd7 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -21,20 +21,20 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
+#include "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-individual-manager.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-chat-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #include "empathy-chat-manager.h"
 
-#include <extensions/extensions.h>
+#include "extensions/extensions.h"
 
 enum {
   CLOSED_CHATS_CHANGED,
diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index 7dfd53480..5082e7337 100644
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <libempathy-gtk/empathy-chat.h>
+#include "libempathy-gtk/empathy-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 292c1a9a7..59814bdf4 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -30,19 +30,19 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-smiley-manager.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
+#include "libempathy/empathy-client-factory.h"
+#include "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-individual-manager.h"
+
+#include "libempathy-gtk/empathy-images.h"
+#include "libempathy-gtk/empathy-geometry.h"
+#include "libempathy-gtk/empathy-smiley-manager.h"
+#include "libempathy-gtk/empathy-sound-manager.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-notify-manager.h"
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-window.h"
@@ -50,7 +50,7 @@
 #include "empathy-invite-participant-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Macro to compare guint32 X timestamps, while accounting for wrapping around
  */
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 2041634aa..62f49988f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -32,7 +32,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy-gtk/empathy-chat.h>
+#include "libempathy-gtk/empathy-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 0e70885d7..1af26b230 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -26,16 +26,16 @@
 
 #include <libnotify/notify.h>
 
-#include <libempathy/empathy-presence-manager.h>
+#include "libempathy/empathy-presence-manager.h"
 
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-theme-manager.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index a18cccb1f..83f6b99d7 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -27,11 +27,11 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-account-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-chatrooms-window.h"
 
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 7d56b6849..c5514b73a 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -25,11 +25,11 @@
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-geometry.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-debug-window.h"
 
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 00dc98c8d..cb17e3c71 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,7 +21,7 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-debug-window.h"
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f652c2164..f95e76baf 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -23,23 +23,23 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-sasl-mechanisms.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-#include <libempathy-gtk/empathy-subscription-dialog.h>
+#include "libempathy/empathy-presence-manager.h"
+#include "libempathy/empathy-connection-aggregator.h"
+#include "libempathy/empathy-tp-chat.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-sasl-mechanisms.h"
+
+#include "libempathy-gtk/empathy-images.h"
+#include "libempathy-gtk/empathy-sound-manager.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-call-utils.h"
+#include "libempathy-gtk/empathy-subscription-dialog.h"
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 
diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 70af9a1c2..ee5daf404 100644
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index f89004f32..3cf874420 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -32,11 +32,11 @@
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-geometry.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-geometry.h"
 
 #include "empathy-ft-manager.h"
 
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 0ff820f06..8d81c7661 100644
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -29,7 +29,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <libempathy/empathy-ft-handler.h>
+#include "libempathy/empathy-ft-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index d4dd70d01..33c408444 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -28,8 +28,8 @@
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
 
 enum {
   PROP_PARENT = 1,
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a412037d1..a074d7a7f 100644
--- a/src/empathy-import-dialog.h
+++ b/src/empathy-import-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
 
-#include <libempathy/empathy-connection-managers.h>
+#include "libempathy/empathy-connection-managers.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 8fd7eaef4..394caede4 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -28,8 +28,8 @@
 #include "empathy-import-pidgin.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
 
 /* Pidgin to CM map */
 typedef struct
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 7007dee57..768d493fe 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,8 +19,8 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-connection-managers.h"
+#include "libempathy/empathy-utils.h"
 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 77048a4b7..938a8f126 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -28,10 +28,10 @@
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 14a01d79d..f3e552cd2 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-connection-managers.h>
+#include "libempathy/empathy-connection-managers.h"
 
 #include "empathy-import-utils.h"
 
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 0b42ab4a7..783c83240 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -15,9 +15,9 @@
 
 #include "empathy-invite-participant-dialog.h"
 
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-contact-chooser.h>
+#include "libempathy-gtk/empathy-contact-chooser.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 b86aec4be..da7f800f4 100644
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -25,7 +25,7 @@
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 struct _EmpathyMicMenuPrivate
 {
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index c06e786ed..ef5b93d0d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -24,10 +24,10 @@
 
 #include "empathy-mic-monitor.h"
 
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 enum
 {
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 5de844bd4..a255bbcab 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -25,17 +25,17 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-gsettings.h"
 
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-account-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-new-chatroom-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
     GTK_TYPE_DIALOG)
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index c3c996bd6..b4f77eebb 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -21,13 +21,13 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-notify-manager.h>
-#include <libempathy-gtk/empathy-call-utils.h>
+#include "libempathy-gtk/empathy-notify-manager.h"
+#include "libempathy-gtk/empathy-call-utils.h"
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #include "empathy-notifications-approver.h"
 
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index bfeef61b6..73d2dcc10 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -27,18 +27,18 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-client-factory.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-spell.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-theme-manager.h"
+#include "libempathy-gtk/empathy-spell.h"
 
 #include "empathy-preferences.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
 
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 05d2a1fba..155009022 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -26,26 +26,26 @@
 #include <sys/stat.h>
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-status-presets.h>
-#include <libempathy/empathy-presence-manager.h>
-
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
-#include <libempathy-gtk/empathy-contact-search-dialog.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-gtk-enum-types.h>
-#include <libempathy-gtk/empathy-individual-dialogs.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-status-presets.h"
+#include "libempathy/empathy-presence-manager.h"
+
+#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
+#include "libempathy-gtk/empathy-contact-search-dialog.h"
+#include "libempathy-gtk/empathy-geometry.h"
+#include "libempathy-gtk/empathy-gtk-enum-types.h"
+#include "libempathy-gtk/empathy-individual-dialogs.h"
+#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "libempathy-gtk/empathy-roster-view.h"
+#include "libempathy-gtk/empathy-new-message-dialog.h"
+#include "libempathy-gtk/empathy-new-call-dialog.h"
+#include "libempathy-gtk/empathy-log-window.h"
+#include "libempathy-gtk/empathy-presence-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-call-observer.h"
@@ -59,7 +59,7 @@
 #include "empathy-ft-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index f7ac7d996..8e2234fe1 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -25,13 +25,13 @@
 
 #include "empathy-sanity-cleaning.h"
 
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-gsettings.h"
 
-#include <libempathy-gtk/empathy-theme-manager.h>
+#include "libempathy-gtk/empathy-theme-manager.h"
 
 #ifdef HAVE_UOA
-#include <libempathy/empathy-pkg-kit.h>
-#include <libempathy/empathy-uoa-utils.h>
+#include "libempathy/empathy-pkg-kit.h"
+#include "libempathy/empathy-uoa-utils.h"
 
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
@@ -39,7 +39,7 @@
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /*
  * This number has to be increased each time a new task is added or modified.
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 54e49a30e..eef1f48a4 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -21,19 +21,19 @@
 
 #include "config.h"
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"
 
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
+#include "libempathy-gtk/empathy-presence-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-new-message-dialog.h"
+#include "libempathy-gtk/empathy-new-call-dialog.h"
 
 #include "empathy-status-icon.h"
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 12f8d6b47..b81960230 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -27,7 +27,7 @@
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #include "empathy-video-src.h"
 
diff --git a/src/empathy.c b/src/empathy.c
index 90370e621..622dec61d 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -30,17 +30,17 @@
 
 #include <libnotify/notify.h>
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-ft-factory.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-location-manager.h>
+#include "libempathy/empathy-client-factory.h"
+#include "libempathy/empathy-connection-aggregator.h"
+#include "libempathy/empathy-presence-manager.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-ft-factory.h"
+#include "libempathy/empathy-gsettings.h"
+
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-location-manager.h"
 
 #include "empathy-roster-window.h"
 #include "empathy-accounts-common.h"
@@ -50,7 +50,7 @@
 #include "empathy-notifications-approver.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"