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