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

46 files changed, 194 insertions, 190 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b52e9ad8f..0766d9580 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,11 @@ include $(top_srcdir)/tools/flymake.mk
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy-gtk			\
+	-I$(top_srcdir)/libempathy			\
+	-I$(top_srcdir)/extensions			\
+	-I$(top_builddir)/libempathy-gtk		\
+	-I$(top_builddir)/libempathy			\
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DBIN_DIR=\"$(bindir)\"                         \
 	$(DISABLE_DEPRECATED)				\
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index fcd331aec..f84f28dba 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 "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 "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 acfd9c290..421357c84 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 "empathy-utils.h"
+#include "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 "empathy-ui-utils.h"
+#include "empathy-account-widget-sip.h"
+#include "empathy-user-info.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
@@ -43,7 +43,7 @@
 #include "empathy-import-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "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 57f6968c8..0cf4c9572 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 "empathy-utils.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-accounts-common.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "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 01bc80f53..0147b8706 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 "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 2f919533e..bdb25f80c 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 "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 "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 89202f541..e1f9ec56f 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 "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "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 3636142cc..6da465665 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 "empathy-debug.h"
+#include "empathy-auth-factory.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-verifier.h"
+
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-sanity-cleaning.h"
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 42bd46f50..865aeace2 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 "empathy-client-factory.h"
+#include "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 "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 88b166f1f..28e8cda83 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 "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-call-utils.h"
 
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "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 55e489782..0f42209c2 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 "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index c0aa04170..2a60f6fe2 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 "empathy-images.h"
+#include "empathy-notify-manager.h"
 
 #include "empathy-call-observer.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "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 b678c0a42..6da478fbd 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 "empathy-utils.h"
+#include "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 5a24fbcd3..9b67bba4a 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 "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"
+
+#include "empathy-dialpad-widget.h"
+#include "empathy-ui-utils.h"
+#include "empathy-sound-manager.h"
+#include "empathy-geometry.h"
+#include "empathy-images.h"
+#include "empathy-call-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "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 47e3f3a83..9fccb5650 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 "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 "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 2bfef6cb7..0674e7076 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 "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
 
 #include "empathy-camera-menu.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 struct _EmpathyCameraMenuPrivate
 {
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 50292fbd7..bc64cefc8 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 "empathy-chatroom-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
 
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-chat-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-chat-manager.h"
 
-#include "extensions/extensions.h"
+#include "extensions.h"
 
 enum {
   CLOSED_CHATS_CHANGED,
diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index 5082e7337..ab3817ea9 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 "empathy-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 59814bdf4..47f588f08 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 "empathy-client-factory.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
+
+#include "empathy-images.h"
+#include "empathy-geometry.h"
+#include "empathy-smiley-manager.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-notify-manager.h"
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-window.h"
@@ -50,7 +50,7 @@
 #include "empathy-invite-participant-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "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 62f49988f..cfd82a128 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 "empathy-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 1af26b230..9919b6edd 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 "empathy-presence-manager.h"
 
-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include "libempathy/empathy-debug.h"
+#include "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 83f6b99d7..ff45bed9c 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 "empathy-chatroom-manager.h"
+#include "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-account-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-chatrooms-window.h"
 
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index c5514b73a..546e17406 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 "empathy-debug.h"
+#include "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-debug-window.h"
 
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index cb17e3c71..ca348f3cd 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 "empathy-ui-utils.h"
 
 #include "empathy-debug-window.h"
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f95e76baf..c0b802d3b 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 "empathy-presence-manager.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-tp-chat.h"
+#include "empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-sasl-mechanisms.h"
+
+#include "empathy-images.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-call-utils.h"
+#include "empathy-subscription-dialog.h"
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include "libempathy/empathy-debug.h"
+#include "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 ee5daf404..511a5ed57 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 "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 3cf874420..9098250bf 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 "empathy-debug.h"
+#include "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-geometry.h"
 
 #include "empathy-ft-manager.h"
 
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 8d81c7661..22d47a76f 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 "empathy-ft-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 33c408444..ea1ce1841 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 "empathy-debug.h"
+#include "empathy-utils.h"
 
 enum {
   PROP_PARENT = 1,
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a074d7a7f..87f1198f1 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 "empathy-connection-managers.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 394caede4..22116648d 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 "empathy-debug.h"
+#include "empathy-utils.h"
 
 /* Pidgin to CM map */
 typedef struct
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 768d493fe..718c7d1e1 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 "empathy-connection-managers.h"
+#include "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 938a8f126..68a71d5ff 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 "empathy-debug.h"
+#include "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index f3e552cd2..225350e6e 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 "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 783c83240..f78052f8c 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 "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "empathy-contact-chooser.h"
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 7946fa001..da121a49e 100644
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -16,7 +16,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index da7f800f4..0c6ed23a9 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 "empathy-debug.h"
 
 struct _EmpathyMicMenuPrivate
 {
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index ef5b93d0d..afc526ffa 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 "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 enum
 {
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index a255bbcab..cca729df9 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 "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-gsettings.h"
 
-#include "libempathy-gtk/empathy-account-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
 
 #include "empathy-new-chatroom-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "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 b4f77eebb..7e06da1b7 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 "empathy-notify-manager.h"
+#include "empathy-call-utils.h"
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #include "empathy-notifications-approver.h"
 
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 73d2dcc10..735ba2175 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 "empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
 
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-spell.h"
+#include "empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-spell.h"
 
 #include "empathy-preferences.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "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 155009022..2f64d877c 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 "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-contact-search-dialog.h"
+#include "empathy-geometry.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-log-window.h"
+#include "empathy-presence-chooser.h"
+#include "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 "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 8e2234fe1..025c9b841 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 "empathy-gsettings.h"
 
-#include "libempathy-gtk/empathy-theme-manager.h"
+#include "empathy-theme-manager.h"
 
 #ifdef HAVE_UOA
-#include "libempathy/empathy-pkg-kit.h"
-#include "libempathy/empathy-uoa-utils.h"
+#include "empathy-pkg-kit.h"
+#include "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 "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 eef1f48a4..b40ebed7b 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 "empathy-gsettings.h"
+#include "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 "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"
 
 #include "empathy-status-icon.h"
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include "libempathy/empathy-debug.h"
+#include "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 b81960230..b3b84d3e7 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 "empathy-debug.h"
 
 #include "empathy-video-src.h"
 
diff --git a/src/empathy.c b/src/empathy.c
index 622dec61d..610150bbd 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 "empathy-client-factory.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ft-factory.h"
+#include "empathy-gsettings.h"
+
+#include "empathy-ui-utils.h"
+#include "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 "empathy-debug.h"
 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"