*/
#include "config.h"
+#include "empathy-new-message-dialog.h"
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-request-util.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-message-dialog.h"
-#include "empathy-account-chooser.h"
+#include "empathy-debug.h"
static EmpathyNewMessageDialog *dialog_singleton = NULL;