Use a flat namespace for internal includes

Directly add the libempathy, libempathy-gtk and extensions directories
to the include search path. This decouples header inclusions from their
location and helps when reorganizing the source files layout.

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

80 files changed, 170 insertions, 170 deletions

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 4c8f54c1a..72c27b4b2 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -4,8 +4,8 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
 	$(ERROR_CFLAGS)					\
-	-I.                                             \
-	-I$(top_srcdir)                                 \
+	-I$(top_srcdir)/libempathy			\
+	-I$(top_srcdir)/extensions			\
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
@@ -245,7 +245,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
 			--ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \
-			--fprod '#include "libempathy-gtk/@filename@"\n' \
+			--fprod '#include "@filename@"\n' \
 			--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
 			--eprod "GType @enum_name@_get_type (void);\n" \
 		$(libempathy_gtk_headers) ) > xgen-gth \
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 0f3b5b470..a272309e5 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -29,7 +29,7 @@
 #include "empathy-account-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-account-chooser
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index fbc0c19cb..e0647a9b8 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -25,7 +25,7 @@
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 typedef struct {
   EmpathyAccountWidget *self;
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index c6e6dec01..eba469e82 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -22,8 +22,8 @@
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-account-widget.h"
-#include "libempathy-gtk/empathy-irc-network-chooser.h"
+#include "empathy-account-widget.h"
+#include "empathy-irc-network-chooser.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index d987abb7c..8da22bdad 100644
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 62b80da81..438ee8372 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -22,7 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index d8b5b7785..fb4ab8bf4 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include <dbus/dbus-protocol.h>
 
@@ -38,7 +38,7 @@
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
 
diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index 57eaa1a36..65de952c7 100644
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 240e2211d..30022c9df 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -24,9 +24,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-images.h"
@@ -37,7 +37,7 @@
 #endif /* HAVE_CHEESE */
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-avatar-chooser
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index 4b50eceef..f66827f64 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
 
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index 1e6cbbfd3..228a1497a 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index dc04d61bb..0b025af85 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "libempathy-gtk/empathy-base-password-dialog.h"
+#include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index 688bbe8c4..b47e5b59d 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -24,8 +24,8 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#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 eace02f8e..86cea89d7 100644
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -24,7 +24,7 @@
 #include "empathy-calendar-button.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
 
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 17c03cff2..44fce09e5 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -28,10 +28,10 @@
 
 #include "empathy-call-utils.h"
 
-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 static const gchar *
 get_error_display_message (GError *error)
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 7f0355901..6a8fe72ee 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-cell-renderer-activatable.h"
 
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index a72f09132..9887b7128 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,7 +21,7 @@
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-cell-renderer-expander.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index a4fe92b15..afefb2af5 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-cell-renderer-text.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f18256b97..f853fb3be 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -32,11 +32,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-keyring.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-client-factory.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"
@@ -49,10 +49,10 @@
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 #include "empathy-string-parser.h"
-#include "extensions/extensions.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
 #define COMPOSING_STOP_TIMEOUT 5
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index d5da3fe3c..cbd69a343 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -30,10 +30,10 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-contact.h"
+#include "empathy-tp-chat.h"
 
-#include "libempathy-gtk/empathy-theme-adium.h"
+#include "empathy-theme-adium.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 60ab43671..93f317f2a 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-account-chooser.h"
 #include "empathy-ui-utils.h"
@@ -33,7 +33,7 @@
 #include "empathy-contact-blocking-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv)
 #define DECLARE_CALLBACK(func) \
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 701ba66d0..d1368e956 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -13,8 +13,8 @@
 
 #include "empathy-contact-chooser.h"
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
 
 #include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index b563622c3..fd594e8c3 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -26,8 +26,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
 
 #include "empathy-account-chooser.h"
 #include "empathy-cell-renderer-text.h"
@@ -36,7 +36,7 @@
 #include "empathy-images.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-contact-search-dialog.h"
 
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index cbc034db5..fd4d783be 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-utils.h"
+#include "empathy-client-factory.h"
 
 #include "empathy-contact-widget.h"
 #include "empathy-avatar-image.h"
@@ -33,7 +33,7 @@
 #include "empathy-string-parser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-contact-widget
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index cb7079300..9f1f1a70f 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
 #include "empathy-account-chooser.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index fcf061943..3dca3740d 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -24,8 +24,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-request-util.h"
+#include "empathy-time.h"
+#include "empathy-request-util.h"
 
 #include "empathy-contactinfo-utils.h"
 #include "empathy-string-parser.h"
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 2c4b50188..1562001fb 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -25,12 +25,12 @@
 
 #include <sys/stat.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define GEOMETRY_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
 #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 2292cc53b..8b6665167 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-connection-aggregator.h"
+#include "empathy-utils.h"
+#include "empathy-connection-aggregator.h"
 
 #include "empathy-groups-widget.h"
 
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index a22ca28e4..9f0117753 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-individual-manager.h"
+#include "empathy-utils.h"
 
 #include "empathy-individual-dialogs.h"
 #include "empathy-contact-widget.h"
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index 21380a5ba..457dd9575 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-widget.h"
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 4059925de..f4f8bda92 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -25,16 +25,16 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-pkg-kit.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-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
 typedef struct {
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index cf67101ef..907c678b3 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -24,11 +24,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-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-images.h"
@@ -44,7 +44,7 @@
 #include "empathy-individual-information-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu)
 
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 8ceaf6e5b..5db93d5f1 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -25,12 +25,12 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-individual-store-channel.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 struct _EmpathyIndividualStoreChannelPriv
 {
diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 31a6abd8b..2cc6b5be4 100644
--- a/libempathy-gtk/empathy-individual-store-channel.h
+++ b/libempathy-gtk/empathy-individual-store-channel.h
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy-gtk/empathy-individual-store.h"
+#include "empathy-individual-store.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL         (empathy_individual_store_channel_get_type ())
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index 04c341e5a..ca0628717 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -28,7 +28,7 @@
 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 struct _EmpathyIndividualStoreManagerPriv
 {
diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 8b56b0c1b..fac0f31d6 100644
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -28,9 +28,9 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-individual-manager.h"
 
-#include "libempathy-gtk/empathy-individual-store.h"
+#include "empathy-individual-store.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER         (empathy_individual_store_manager_get_type ())
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 7223e2e9c..4055091f1 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -28,13 +28,13 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index b88fd253d..d02d3dea2 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -28,11 +28,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-contact-groups.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.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-images.h"
@@ -43,7 +43,7 @@
 #include "empathy-gtk-enum-types.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 87be31f26..371ddb1b0 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -28,9 +28,9 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-time.h"
+#include "empathy-utils.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
 
 #include "empathy-avatar-image.h"
 #include "empathy-contactinfo-utils.h"
@@ -39,7 +39,7 @@
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-individual-widget
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index c4c8e830f..cb937daa5 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -23,14 +23,14 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-utils.h"
+#include "empathy-irc-network-manager.h"
 
 #include "empathy-irc-network-dialog.h"
 #include "empathy-live-search.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-irc-network-chooser-dialog.h"
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
index 8ffb2cbe1..1e4654916 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-account-settings.h"
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 79b54e985..4945bb7c1 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -21,14 +21,14 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-utils.h"
+#include "empathy-irc-network-manager.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-irc-network-chooser-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-irc-network-chooser.h"
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h
index 23ecc92fe..f4c603288 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.h
+++ b/libempathy-gtk/empathy-irc-network-chooser.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-account-settings.h"
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index a10b2ca3c..8e4339cf9 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-ui-utils.h"
 #include "totem-subtitle-encoding.h"
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index 547e3d668..a49c63da9 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-irc-network.h"
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index fe3661276..3047612b0 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-live-search.h"
 
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index de2b7ba0d..dea29762d 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,13 +23,13 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-account-widget.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
     empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index ab72fff7d..bb6dfa6da 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -25,12 +25,12 @@
 
 #include "empathy-location-manager.h"
 
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-time.h"
+#include "empathy-gsettings.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Seconds before updating the location */
 #define TIMEOUT 10
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index d49dd5587..1f091f62d 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -29,13 +29,13 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 
-#include "extensions/extensions.h"
+#include "extensions.h"
 
-#include "libempathy/action-chain-internal.h"
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.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"
@@ -48,7 +48,7 @@
 #include "empathy-geometry.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define EMPATHY_NS "http://live.gnome.org/Empathy"
 
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index e70f59887..09f41a4e8 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"
diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index c68630d84..6a5d5c2d5 100644
--- a/libempathy-gtk/empathy-new-account-dialog.h
+++ b/libempathy-gtk/empathy-new-account-dialog.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 7a76750cd..61b3870de 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -22,11 +22,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 9aa641289..7308d1472 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -22,10 +22,10 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index aa5f0402e..b322ac7f9 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -21,13 +21,13 @@
 
 #include <libnotify/notify.h>
 
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
 
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-notify-manager.h"
 
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index b0100ccb7..ca8996f7d 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
 
 #include <libnotify/notification.h>
 
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index 90550f4f2..e06a72495 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index 7511cbda3..9ae16b281 100644
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -23,9 +23,9 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-server-sasl-handler.h"
+#include "empathy-server-sasl-handler.h"
 
-#include "libempathy-gtk/empathy-base-password-dialog.h"
+#include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cc9a48299..cf2dbdf77 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -28,12 +28,12 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-presence-chooser.h"
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 8b3a24731..4722462fe 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -24,14 +24,14 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-utils.h"
+#include "empathy-connection-managers.h"
 
 #include "empathy-protocol-chooser.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-protocol-chooser
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 469f89f32..47e4592ed 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -28,7 +28,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index f7c6f5550..a560f0953 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -4,7 +4,7 @@
 
 #include "empathy-roster-contact.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index ff3ff5347..99c929006 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
 
diff --git a/libempathy-gtk/empathy-roster-model-manager.h b/libempathy-gtk/empathy-roster-model-manager.h
index 5d5e12f0d..a38e6593a 100644
--- a/libempathy-gtk/empathy-roster-model-manager.h
+++ b/libempathy-gtk/empathy-roster-model-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-individual-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index d9b3c7bf2..336f629c7 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -4,7 +4,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-contact-groups.h"
+#include "empathy-contact-groups.h"
 
 #include "empathy-roster-contact.h"
 #include "empathy-roster-group.h"
diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 8a1b6d404..45e240844 100644
--- a/libempathy-gtk/empathy-roster-view.h
+++ b/libempathy-gtk/empathy-roster-view.h
@@ -2,10 +2,10 @@
 #ifndef __EMPATHY_ROSTER_VIEW_H__
 #define __EMPATHY_ROSTER_VIEW_H__
 
-#include "libempathy-gtk/egg-list-box/egg-list-box.h"
-#include "libempathy-gtk/empathy-live-search.h"
+#include "egg-list-box/egg-list-box.h"
+#include "empathy-live-search.h"
 
-#include "libempathy-gtk/empathy-roster-model.h"
+#include "empathy-roster-model.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 558a125b4..cfb595c27 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -21,7 +21,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 
 #include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 5a0737adc..78bf1472d 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-share-my-desktop.h"
 
diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h
index 4f11aa8af..5953e15e8 100644
--- a/libempathy-gtk/empathy-share-my-desktop.h
+++ b/libempathy-gtk/empathy-share-my-desktop.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__
 #define __EMPATHY_SHARE_MY_DESKTOP_H__
 
-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"
 
 void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact);
 
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 494ae7f6a..77ea5b33d 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 8bcca8bb1..a66e5f4cf 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -24,9 +24,9 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
 
 typedef struct {
   EmpathySound sound_id;
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 206edc192..409b41bd5 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -32,8 +32,8 @@
 #include "empathy-spell.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
+#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 6ba1e54d1..91c816076 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -38,11 +38,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-status-preset-dialog.h"
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 265ea13a2..9f8af521d 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -22,7 +22,7 @@
 
 #include "empathy-subscription-dialog.h"
 
-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"
 #include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 1762eabd6..851d7ad40 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -23,9 +23,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
 
 #include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
@@ -35,7 +35,7 @@
 #include "empathy-webkit-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define BORING_DPI_DEFAULT 96
 
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index dee5aef35..698d2846c 100644
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -23,7 +23,7 @@
 
 #include <webkit/webkitwebview.h>
 
-#include "libempathy/empathy-message.h"
+#include "empathy-message.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index bb4d22966..461aca35b 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -26,12 +26,12 @@
 
 #include <gtk/gtk.h>
 
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"
 
 #include "empathy-theme-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 struct _EmpathyThemeManagerPriv
 {
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 88f22d36d..ee4a943db 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -26,8 +26,8 @@
 #include <gcr/gcr.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#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 2ae011429..1cadaf417 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -41,9 +41,9 @@
 #include "empathy-live-search.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-ft-factory.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-ft-factory.h"
 
 void
 empathy_gtk_init (void)
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 7c505c668..a7d86e0bb 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -36,8 +36,8 @@
 
 #include <folks/folks.h>
 
-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-ft-handler.h"
+#include "empathy-contact.h"
+#include "empathy-ft-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 4c447772b..0bbb57652 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -23,9 +23,9 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"