Index: addressbook/gui/widgets/e-minicard.c
===================================================================
--- addressbook/gui/widgets/e-minicard.c.orig
+++ addressbook/gui/widgets/e-minicard.c
@@ -30,6 +30,7 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
 #include <e-util/e-util.h>
+#include <e-util/e-html-utils.h>
 #include <misc/e-canvas-utils.h>
 #include <misc/e-canvas.h>
 #include <libebook/e-book.h>
Index: calendar/gui/calendar-component.c
===================================================================
--- calendar/gui/calendar-component.c.orig
+++ calendar/gui/calendar-component.c
@@ -1302,6 +1302,8 @@ create_local_item_cb (EUserCreatableItem
 		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
 }
 
+extern GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
+
 static CalendarComponentView *
 create_component_view (CalendarComponent *calendar_component)
 {
Index: calendar/gui/e-week-view-event-item.c
===================================================================
--- calendar/gui/e-week-view-event-item.c.orig
+++ calendar/gui/e-week-view-event-item.c
@@ -1097,6 +1097,9 @@ e_week_view_event_item_draw (GnomeCanvas
 			cairo_save (cr);
 			gdk_cairo_set_source_color (cr,  &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
 			cairo_set_line_width (cr, 0.7);
+			/*  XXX: rect_x2 needs to be initialized, this code is stolen and might
+				 not work at all.  */
+			rect_x2 = rect_x + rect_w - 1;
 			cairo_move_to (cr, rect_x2, y2);
 			cairo_line_to (cr, rect_x2, y2);
 			cairo_stroke (cr);
Index: mail/mail-send-recv.c
===================================================================
--- mail/mail-send-recv.c.orig
+++ mail/mail-send-recv.c
@@ -325,6 +325,8 @@ dialog_map (GtkWidget *window, GdkEvent 
 	if (h > 400)
 		h = 400;
 	gtk_widget_set_usize (window, w, h);
+
+	return TRUE;
 }
 
 static struct _send_data *