* Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
+#include "empathy-contactinfo-utils.h"
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-request-util.h>
-
-#include "empathy-contactinfo-utils.h"
+#include "empathy-request-util.h"
#include "empathy-string-parser.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
static gchar *