*/
#include <limits.h>
-#include <messages.h>
-#include <email.h>
+#include <msg.h>
+#include <msg_transport.h>
+#include <msg_storage.h>
+#include <dbus/dbus.h>
+#include <email-api.h>
#include <FMsgEmailMessage.h>
#include <FIoFile.h>
#include <FBaseSysLog.h>