Index: a11y/calendar/ea-gnome-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/a11y/calendar/ea-gnome-calendar.c,v
retrieving revision 1.6
diff -u -p -r1.6 ea-gnome-calendar.c
--- a11y/calendar/ea-gnome-calendar.c	29 Oct 2004 09:56:35 -0000	1.6
+++ a11y/calendar/ea-gnome-calendar.c	6 Sep 2006 19:46:36 -0000
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <gtk/gtknotebook.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
Index: addressbook/gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.129
diff -u -p -r1.129 e-minicard.c
--- addressbook/gui/widgets/e-minicard.c	19 Jul 2006 10:40:42 -0000	1.129
+++ addressbook/gui/widgets/e-minicard.c	6 Sep 2006 19:46:37 -0000
@@ -39,6 +39,7 @@
 #include "e-minicard-label.h"
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
+#include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
 #include "a11y/addressbook/ea-addressbook.h"
Index: calendar/gui/cal-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/cal-search-bar.c,v
retrieving revision 1.29
diff -u -p -r1.29 cal-search-bar.c
--- calendar/gui/cal-search-bar.c	21 Aug 2006 05:58:09 -0000	1.29
+++ calendar/gui/cal-search-bar.c	6 Sep 2006 19:46:37 -0000
@@ -31,6 +31,7 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-icon-factory.h>
+#include <libedataserver/e-categories.h>
 #include "cal-search-bar.h"
 
 typedef struct CALSearchBarItem {
Index: calendar/gui/e-cal-model-tasks.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.h,v
retrieving revision 1.4
diff -u -p -r1.4 e-cal-model-tasks.h
--- calendar/gui/e-cal-model-tasks.h	3 Oct 2005 06:16:51 -0000	1.4
+++ calendar/gui/e-cal-model-tasks.h	6 Sep 2006 19:46:37 -0000
@@ -62,6 +62,7 @@ GType           e_cal_model_tasks_get_ty
 ECalModelTasks *e_cal_model_tasks_new (void);
 
 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);
 
 G_END_DECLS
Index: calendar/gui/e-calendar-view.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.h,v
retrieving revision 1.33
diff -u -p -r1.33 e-calendar-view.h
--- calendar/gui/e-calendar-view.h	28 Jul 2006 09:25:19 -0000	1.33
+++ calendar/gui/e-calendar-view.h	6 Sep 2006 19:46:37 -0000
@@ -166,6 +166,18 @@ void           e_calendar_view_modify_an
 					       gboolean new);
 
 gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
+
+void           e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
+
+#ifdef ENABLE_CAIRO
+void           draw_curved_rectangle (cairo_t *cr,
+                                      double x0,
+                                      double y0,
+                                      double rect_width,
+                                      double rect_height,
+                                      double radius);
+#endif
+
 G_END_DECLS
 
 #endif
Index: calendar/gui/gnome-cal.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.h,v
retrieving revision 1.106
diff -u -p -r1.106 gnome-cal.h
--- calendar/gui/gnome-cal.h	22 Jul 2006 10:16:00 -0000	1.106
+++ calendar/gui/gnome-cal.h	6 Sep 2006 19:46:37 -0000
@@ -198,6 +198,8 @@ void       gnome_calendar_edit_appointme
 						 const char* comp_uid,
 						 const char* comp_rid);
 
+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
+
 G_END_DECLS
 
 #endif
Index: calendar/gui/dialogs/memo-page.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-page.h,v
retrieving revision 1.3
diff -u -p -r1.3 memo-page.h
--- calendar/gui/dialogs/memo-page.h	22 Jul 2006 10:16:01 -0000	1.3
+++ calendar/gui/dialogs/memo-page.h	6 Sep 2006 19:46:38 -0000
@@ -53,6 +53,8 @@ typedef struct {
 GtkType   memo_page_get_type  (void);
 MemoPage *memo_page_construct (MemoPage *epage);
 MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
+void      memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
+void      memo_page_set_show_categories (MemoPage *page, gboolean state);
 
 G_END_DECLS
 
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.540
diff -u -p -r1.540 e-msg-composer.c
--- composer/e-msg-composer.c	6 Aug 2006 13:59:04 -0000	1.540
+++ composer/e-msg-composer.c	6 Sep 2006 19:46:42 -0000
@@ -62,6 +62,7 @@
 #include <gconf/gconf-client.h>
 
 #include <libgnome/gnome-exec.h>
+#include <libgnome/gnome-help.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.159
diff -u -p -r1.159 em-folder-view.c
--- mail/em-folder-view.c	28 Aug 2006 15:09:43 -0000	1.159
+++ mail/em-folder-view.c	6 Sep 2006 19:46:45 -0000
@@ -69,6 +69,8 @@
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
+#include <libedataserver/e-data-server-util.h>
+
 #include "menus/gal-view-etable.h"
 #include "menus/gal-view-factory-etable.h"
 #include "menus/gal-view-instance.h"
Index: mail/em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.104
diff -u -p -r1.104 em-format-html-display.c
--- mail/em-format-html-display.c	23 Aug 2006 07:59:00 -0000	1.104
+++ mail/em-format-html-display.c	6 Sep 2006 19:46:46 -0000
@@ -62,6 +62,7 @@
 #include <gtk/gtktoolbutton.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkcheckbutton.h>
+#include <gtk/gtksignal.h>
 
 #include <glade/glade.h>
 
Index: shell/e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.53
diff -u -p -r1.53 e-shell-window.c
--- shell/e-shell-window.c	23 Aug 2006 09:02:48 -0000	1.53
+++ shell/e-shell-window.c	6 Sep 2006 19:46:48 -0000
@@ -58,6 +58,13 @@
 
 #include <string.h>
 
+#ifdef NM_SUPPORT_GLIB
+void e_shell_nm_glib_initialise (EShellWindow *window);
+void e_shell_nm_glib_dispose (EShellWindow *window);
+#elif NM_SUPPORT
+void e_shell_dbus_initialise (EShellWindow *window);
+void e_shell_dbus_dispose (EShellWindow *window);
+#endif
 
 /* A view for each component.  These are all created when EShellWindow is
    instantiated, but with the widget pointers to NULL and the page number set
Index: widgets/misc/e-attachment-bar.h
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-attachment-bar.h,v
retrieving revision 1.7
diff -u -p -r1.7 e-attachment-bar.h
--- widgets/misc/e-attachment-bar.h	26 May 2006 20:51:51 -0000	1.7
+++ widgets/misc/e-attachment-bar.h	6 Sep 2006 19:46:48 -0000
@@ -82,6 +82,7 @@ GSList *e_attachment_bar_get_parts (EAtt
 GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
 void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
 GSList * e_attachment_bar_get_all_attachments (EAttachmentBar *bar);
+void e_attachment_bar_create_attachment_cache (EAttachment *attachment);
 
 #ifdef __cplusplus
 }
