#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"
#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
*/