-#include "config.h"
-#include "modest-conf.h"
-#include "modest-account-mgr.h"
-#include "modest-ui.h"
-#include "modest-icon-factory.h"
-#include "modest-tny-account-store.h"
-#include "modest-tny-platform-factory.h"
-#include "modest-mail-operation.h"
-
-
-#if MODEST_PLATFORM_ID==2
+#include <modest-defs.h>
+#include <modest-conf.h>
+#include <modest-account-mgr.h>
+#include <modest-ui.h>
+#include <modest-debug.h>
+#include <modest-icon-factory.h>
+#include <modest-tny-account-store.h>
+#include <modest-tny-platform-factory.h>
+#include <modest-mail-operation.h>
+
+#if MODEST_PLATFORM_ID==2 /* maemo */