-#include <gtk/gtk.h>
-#include <tny-stream-iface.h>
-#include <tny-msg-iface.h>
-#include <tny-mime-part-iface.h>
-#include <modest-conf.h>
+#include <tny-stream.h>
+#include <tny-msg.h>
+#include <tny-mime-part.h>
+#include <tny-msg-view.h>
+#include <widgets/modest-recpt-view.h>