diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c
--- evolution-2.8.1.orig/a11y/calendar/ea-gnome-calendar.c	2006-09-30 01:24:35.000000000 -0400
+++ evolution-2.8.1/a11y/calendar/ea-gnome-calendar.c	2006-10-13 12:12:10.000000000 -0400
@@ -30,6 +30,7 @@
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libgnome/gnome-i18n.h>
+#include <libedataserver/e-data-server-util.h>
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
 
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c evolution-2.8.1/addressbook/gui/widgets/e-minicard.c
--- evolution-2.8.1.orig/addressbook/gui/widgets/e-minicard.c	2006-10-02 02:25:24.000000000 -0400
+++ evolution-2.8.1/addressbook/gui/widgets/e-minicard.c	2006-10-13 12:12:10.000000000 -0400
@@ -41,6 +41,7 @@
 #include "e-contact-editor.h"
 #include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-html-utils.h>
 #include <libebook/e-destination.h>
 #include "a11y/addressbook/ea-addressbook.h"
 
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h evolution-2.8.1/calendar/gui/e-cal-model-tasks.h
--- evolution-2.8.1.orig/calendar/gui/e-cal-model-tasks.h	2006-09-30 01:24:36.000000000 -0400
+++ evolution-2.8.1/calendar/gui/e-cal-model-tasks.h	2006-10-13 12:12:10.000000000 -0400
@@ -64,6 +64,7 @@
 void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
 void            e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
 void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
+void e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
 
 G_END_DECLS
 
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-day-view.c evolution-2.8.1/calendar/gui/e-day-view.c
--- evolution-2.8.1.orig/calendar/gui/e-day-view.c	2006-08-07 00:47:43.000000000 -0400
+++ evolution-2.8.1/calendar/gui/e-day-view.c	2006-10-13 12:12:10.000000000 -0400
@@ -65,6 +65,7 @@
 #include "calendar-commands.h"
 #include "calendar-config.h"
 #include "goto.h"
+#include "e-calendar-view.h"
 #include "e-cal-model-calendar.h"
 #include "e-day-view-time-item.h"
 #include "e-day-view-top-item.h"
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-meeting-store.c evolution-2.8.1/calendar/gui/e-meeting-store.c
--- evolution-2.8.1.orig/calendar/gui/e-meeting-store.c	2006-04-22 00:39:20.000000000 -0400
+++ evolution-2.8.1/calendar/gui/e-meeting-store.c	2006-10-13 12:12:10.000000000 -0400
@@ -1472,7 +1472,7 @@
 guint
 e_meeting_store_get_num_queries (EMeetingStore *store)
 {
-	g_return_if_fail (E_IS_MEETING_STORE (store));
+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
 
 	return store->priv->num_queries;
 }
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/e-week-view.c evolution-2.8.1/calendar/gui/e-week-view.c
--- evolution-2.8.1.orig/calendar/gui/e-week-view.c	2006-09-30 01:24:36.000000000 -0400
+++ evolution-2.8.1/calendar/gui/e-week-view.c	2006-10-13 12:12:10.000000000 -0400
@@ -69,6 +69,7 @@
 #include "e-week-view-layout.h"
 #include "e-week-view-main-item.h"
 #include "e-week-view-titles-item.h"
+#include "e-calendar-view.h"
 #include "misc.h"
 #include <e-util/e-icon-factory.h>
 
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/calendar/gui/gnome-cal.h evolution-2.8.1/calendar/gui/gnome-cal.h
--- evolution-2.8.1.orig/calendar/gui/gnome-cal.h	2006-09-30 01:24:36.000000000 -0400
+++ evolution-2.8.1/calendar/gui/gnome-cal.h	2006-10-13 12:12:10.000000000 -0400
@@ -200,6 +200,7 @@
 
 GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
 
+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
 G_END_DECLS
 
 #endif
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/composer/e-msg-composer.c evolution-2.8.1/composer/e-msg-composer.c
--- evolution-2.8.1.orig/composer/e-msg-composer.c	2006-09-30 01:24:40.000000000 -0400
+++ evolution-2.8.1/composer/e-msg-composer.c	2006-10-13 12:12:10.000000000 -0400
@@ -64,6 +64,7 @@
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-help.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-help.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
 
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-profile-event.c evolution-2.8.1/e-util/e-profile-event.c
--- evolution-2.8.1.orig/e-util/e-profile-event.c	2006-02-08 06:43:02.000000000 -0500
+++ evolution-2.8.1/e-util/e-profile-event.c	2006-10-13 12:12:10.000000000 -0400
@@ -133,12 +133,6 @@
 
 	e_event_emit((EEvent *)epe, "event", (EEventTarget *)t);
 }
-#else
-#undef e_profile_event_emit
-void
-e_profile_event_emit(const char *id, const char *uid, guint32 flags)
-{
-}
 #endif
 
 /* ********************************************************************** */
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/e-util/e-util.h evolution-2.8.1/e-util/e-util.h
--- evolution-2.8.1.orig/e-util/e-util.h	2006-09-02 02:42:18.000000000 -0400
+++ evolution-2.8.1/e-util/e-util.h	2006-10-13 12:12:10.000000000 -0400
@@ -29,6 +29,7 @@
 #include <limits.h>
 #include <gconf/gconf-client.h>
 #include <cairo.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/mail/em-format-html-display.c evolution-2.8.1/mail/em-format-html-display.c
--- evolution-2.8.1.orig/mail/em-format-html-display.c	2006-09-30 02:22:49.000000000 -0400
+++ evolution-2.8.1/mail/em-format-html-display.c	2006-10-13 12:12:14.000000000 -0400
@@ -42,6 +42,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-search.h>
 
+#include <gtk/gtk.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkhbox.h>
diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-2.8.1.orig/plugins/mono/mono-plugin.c evolution-2.8.1/plugins/mono/mono-plugin.c
--- evolution-2.8.1.orig/plugins/mono/mono-plugin.c	2005-12-17 13:47:10.000000000 -0500
+++ evolution-2.8.1/plugins/mono/mono-plugin.c	2006-10-13 12:12:14.000000000 -0400
@@ -8,6 +8,7 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/threads.h>
 #include <mono/jit/jit.h>
 
 #define d(x)
