--- calendar/gui/e-calendar-view.c
+++ calendar/gui/e-calendar-view.c
@@ -41,6 +41,7 @@
 #include <libedataserver/e-time-utils.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-error.h>
 #include "e-calendar-marshal.h"
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
--- calendar/gui/e-meeting-list-view.c
+++ calendar/gui/e-meeting-list-view.c
@@ -45,6 +45,7 @@
 #include <misc/e-cell-renderer-combo.h>
 #include <libebook/e-destination.h>
 #include "e-select-names-renderer.h"
+#include "itip-utils.h"
 
 struct _EMeetingListViewPrivate {
 	EMeetingStore *store;
--- mail/message-list.c.orig	2006-09-02 08:43:04.000000000 +0200
+++ mail/message-list.c	2006-09-04 17:45:19.121891044 +0200
@@ -1718,7 +1718,7 @@ message_list_setup_etree (MessageList *m
 		d(printf ("folder name is '%s'\n", name));
 		
 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
-		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
+		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", GINT_TO_POINTER(1));
 
 		if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
 			/* build based on saved file */