Fix "make distcheck" errors.

23 files changed, 80 insertions, 185 deletions

diff --git a/Makefile.am b/Makefile.am
index b14150ae5f..12e626866d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ MAINTAINERCLEANFILES =			\
 # Scrollkeeper must be disabled for distcheck to work because
 # distcheck uses a custom prefix.  See GNOME bug #354357.
 DISTCHECK_CONFIGURE_FLAGS =		\
+	--enable-gtk-doc		\
 	--disable-scrollkeeper		\
 	--enable-test-component
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 657d04a895..5df049dbe6 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -30,7 +30,7 @@
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <filter/rule-editor.h>
 #include <widgets/menus/gal-view-etable.h>
-#include <e-shell-sidebar.h>
+#include <shell/e-shell-sidebar.h>
 
 #include "addressbook/printing/e-contact-print.h"
 #include "a11y/ea-addressbook.h"
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index ab168ec8b7..4e0f82eeb0 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -23,11 +23,12 @@
 #ifndef E_ADDRESSBOOK_VIEW_H
 #define E_ADDRESSBOOK_VIEW_H
 
-#include <e-shell-view.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
-#include <widgets/menus/gal-view-instance.h>
-#include <widgets/misc/e-selection-model.h>
+
+#include <menus/gal-view-instance.h>
+#include <misc/e-selection-model.h>
+#include <shell/e-shell-view.h>
 
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 53d58d785d..8c6c98f61f 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -51,7 +51,6 @@ privsolib_LTLIBRARIES = libcal-gui.la
 #	cal-search-bar.c
 # 	cal-search-bar.h
 # 	gnome-cal.c
-# 	gnome-cal.h
 
 libcal_gui_la_SOURCES =		\
 	e-attachment-handler-calendar.c		\
@@ -165,6 +164,7 @@ libcal_gui_la_SOURCES =		\
 	e-timezone-entry.h			\
 	goto.c					\
 	goto.h					\
+	gnome-cal.h				\
 	itip-utils.c				\
 	itip-utils.h				\
 	misc.c					\
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index fc3e85ba34..26edef8bcd 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "e-cal-list-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <time.h>
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 330bd0eb68..03d6e6991f 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -40,7 +40,6 @@
 #include <shell/e-shell.h>
 
 #include "common/authentication.h"
-#include "calendar-commands.h"
 #include "calendar-config.h"
 #include "comp-util.h"
 #include "e-cal-model-calendar.h"
@@ -55,7 +54,7 @@
 #include "dialogs/select-source-dialog.h"
 #include "print.h"
 #include "goto.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 #include "e-cal-popup.h"
 #include "misc.h"
 
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index c97db277d8..bcd1ca705e 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -32,7 +32,7 @@
 #include "e-util/e-categories-config.h"
 #include "e-day-view-layout.h"
 #include "e-day-view-main-item.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 #include "e-calendar-view.h"
 #include "comp-util.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5ee20f249c..802ddd8f8b 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "e-day-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <time.h>
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index aee26922ea..bfc95ebe2e 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include "e-week-view-main-item.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 static void e_week_view_main_item_set_property	(GObject	 *object,
 						 guint		  property_id,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c939d280de..1e84aeaea3 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "e-week-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index 39482b33f2..39d5608222 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -25,9 +25,7 @@
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "gnome-cal.h"
-
-
+#include "calendar/gui/gnome-cal.h"
 
 typedef enum {
 	PRINT_VIEW_DAY,
diff --git a/configure.ac b/configure.ac
index 32c4e6c94b..6a902f406a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1788,7 +1788,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline"
+plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline"
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
diff --git a/iconv-detect.c b/iconv-detect.c
index 908250c763..4eb6597225 100644
--- a/iconv-detect.c
+++ b/iconv-detect.c
@@ -92,7 +92,7 @@ static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo);
 
 int main (int argc, char **argv)
 {
-	guint iso8859, iso2022, iso10646;
+	unsigned int iso8859, iso2022, iso10646;
 	CharInfo *info;
 	iconv_t cd;
 	FILE *fp;
diff --git a/mail/e-mail-shell-content.c b/mail/e-mail-shell-content.c
index abb7e8fa26..b801093116 100644
--- a/mail/e-mail-shell-content.c
+++ b/mail/e-mail-shell-content.c
@@ -29,7 +29,6 @@
 #include "widgets/menus/gal-view-etable.h"
 #include "widgets/menus/gal-view-instance.h"
 
-#include "em-folder-view.h"
 #include "em-search-context.h"
 #include "em-utils.h"
 #include "mail-config.h"
diff --git a/mail/em-event.c b/mail/em-event.c
index b1bf7a7d05..5bc03ac875 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -147,16 +147,6 @@ em_event_target_new_folder (EMEvent *eme, const gchar *uri, guint new)
 	return t;
 }
 
-EMEventTargetFolderBrowser *
-em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb)
-{
-	EMEventTargetFolderBrowser *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_FOLDER_BROWSER, sizeof(*t));
-
-	t->emfb = emfb;
-
-	return t;
-}
-
 EMEventTargetComposer *
 em_event_target_new_composer (EMEvent *eme, const EMsgComposer *composer, guint32 flags)
 {
@@ -221,11 +211,6 @@ static const EEventHookTargetMask emeh_folder_masks[] = {
 	{ NULL }
 };
 
-static const EEventHookTargetMask emeh_folder_browser_masks[] = {
-	{ "folderbrowser", EM_EVENT_FOLDER_BROWSER },
-	{ NULL }
-};
-
 static const EEventHookTargetMask emeh_composer_masks[] = {
 	{ "sendoption", EM_EVENT_COMPOSER_SEND_OPTION },
 	{ NULL }
@@ -248,7 +233,6 @@ static const EEventHookTargetMask emeh_custom_icon_masks[] = {
 
 static const EEventHookTargetMap emeh_targets[] = {
 	{ "folder", EM_EVENT_TARGET_FOLDER, emeh_folder_masks },
-	{ "folderbrowser", EM_EVENT_TARGET_FOLDER_BROWSER, emeh_folder_browser_masks },
 	{ "message", EM_EVENT_TARGET_MESSAGE, emeh_message_masks },
 	{ "composer", EM_EVENT_TARGET_COMPOSER, emeh_composer_masks},
 	{ "sendreceive", EM_EVENT_TARGET_SEND_RECEIVE, emeh_send_receive_masks},
diff --git a/mail/em-event.h b/mail/em-event.h
index 770daa72f2..6680e88982 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -28,7 +28,6 @@
 
 #include "e-util/e-event.h"
 #include "composer/e-msg-composer.h"
-#include "mail/em-folder-browser.h"
 
 G_BEGIN_DECLS
 
@@ -38,18 +37,12 @@ typedef struct _EMEventClass EMEventClass;
 /* Current target description */
 enum _em_event_target_t {
 	EM_EVENT_TARGET_FOLDER,
-	EM_EVENT_TARGET_FOLDER_BROWSER,
 	EM_EVENT_TARGET_MESSAGE,
 	EM_EVENT_TARGET_COMPOSER,
 	EM_EVENT_TARGET_SEND_RECEIVE,
 	EM_EVENT_TARGET_CUSTOM_ICON
 };
 
-/* Flags for FOLDER BROWSER Events*/
-enum {
-	EM_EVENT_FOLDER_BROWSER = 1<< 0
-};
-
 /* Flags that describe TARGET_FOLDER */
 enum {
 	EM_EVENT_FOLDER_NEWMAIL = 1<< 0
@@ -102,15 +95,6 @@ struct _EMEventTargetComposer {
 	EMsgComposer *composer;
 };
 
-typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser;
-
-struct _EMEventTargetFolderBrowser {
-	EEventTarget target;
-
-	EMFolderBrowser *emfb;
-};
-
-
 typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive;
 
 struct _EMEventTargetSendReceive {
@@ -149,7 +133,6 @@ GType em_event_get_type(void);
 EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags);
-EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index e2af699898..1c3c6be40e 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -75,7 +75,6 @@
 
 #include "em-utils.h"
 #include "em-composer-utils.h"
-#include "em-folder-view.h"
 #include "em-format-quote.h"
 #include "em-account-editor.h"
 #include "e-attachment.h"
@@ -775,59 +774,9 @@ em_utils_add_vcard (GtkWindow *parent, const gchar *vcard)
 /* ********************************************************************** */
 /* Flag-for-Followup... */
 
-/* tag-editor callback data */
-struct ted_t {
-	EMFolderView *emfv;
-	MessageTagEditor *editor;
-	CamelFolder *folder;
-	GPtrArray *uids;
-};
-
-static void
-ted_free (struct ted_t *ted)
-{
-	camel_object_unref (ted->folder);
-	em_utils_uids_free (ted->uids);
-	g_free (ted);
-}
-
-static void
-tag_editor_response (GtkWidget *dialog, gint button, struct ted_t *ted)
-{
-	CamelFolder *folder;
-	CamelTag *tags, *t;
-	GPtrArray *uids;
-	gint i;
-
-	if (button == GTK_RESPONSE_OK && (tags = message_tag_editor_get_tag_list (ted->editor))) {
-		folder = ted->folder;
-		uids = ted->uids;
-
-		camel_folder_freeze (folder);
-		for (i = 0; i < uids->len; i++) {
-			CamelMessageInfo *mi = camel_folder_get_message_info(folder, uids->pdata[i]);
-
-			if (mi) {
-				for (t = tags; t; t = t->next)
-					camel_message_info_set_user_tag(mi, t->name, t->value);
-
-				camel_message_info_free(mi);
-			}
-		}
-
-		camel_folder_thaw (folder);
-		camel_tag_list_free (&tags);
-
-		if (ted->emfv->preview)
-			em_format_redraw (EM_FORMAT (ted->emfv->preview));
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
 /**
  * em_utils_flag_for_followup:
- * @parent: parent window
+ * @reader: an #EMailReader
  * @folder: folder containing messages to flag
  * @uids: uids of messages to flag
  *
@@ -835,37 +784,38 @@ tag_editor_response (GtkWidget *dialog, gint button, struct ted_t *ted)
  * @folder and @uids.
  **/
 void
-em_utils_flag_for_followup (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids)
+em_utils_flag_for_followup (EMailReader *reader,
+                            CamelFolder *folder,
+                            GPtrArray *uids)
 {
-	GtkWidget *editor;
-	struct ted_t *ted;
+	EMFormatHTMLDisplay *html_display;
+	MessageTagEditor *editor;
+	GtkWindow *parent;
+	CamelTag *tags;
 	gint i;
 
-	g_return_if_fail (GTK_IS_WINDOW (parent));
+	g_return_if_fail (E_IS_MAIL_READER (reader));
 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
 	g_return_if_fail (uids != NULL);
 
-	editor = (GtkWidget *) message_tag_followup_new ();
+	editor = message_tag_followup_new ();
+	parent = e_mail_reader_get_window (reader);
 	gtk_window_set_transient_for (GTK_WINDOW (editor), parent);
 
-	camel_object_ref (folder);
-
-	ted = g_new (struct ted_t, 1);
-	ted->emfv = (EMFolderView *) parent;
-	ted->editor = MESSAGE_TAG_EDITOR (editor);
-	ted->folder = folder;
-	ted->uids = uids;
-
 	for (i = 0; i < uids->len; i++) {
 		CamelMessageInfo *info;
 
 		info = camel_folder_get_message_info (folder, uids->pdata[i]);
-		if (info) {
-			message_tag_followup_append_message (MESSAGE_TAG_FOLLOWUP (editor),
-							     camel_message_info_from (info),
-							     camel_message_info_subject (info));
-			camel_message_info_free(info);
-		}
+
+		if (info == NULL)
+			continue;
+
+		message_tag_followup_append_message (
+			MESSAGE_TAG_FOLLOWUP (editor),
+			camel_message_info_from (info),
+			camel_message_info_subject (info));
+
+		camel_message_info_free(info);
 	}
 
 	/* special-case... */
@@ -874,18 +824,49 @@ em_utils_flag_for_followup (GtkWindow *parent, CamelFolder *folder, GPtrArray *u
 
 		info = camel_folder_get_message_info (folder, uids->pdata[0]);
 		if (info) {
-			const CamelTag *tags = camel_message_info_user_tags(info);
+			tags = (CamelTag *) camel_message_info_user_tags (info);
 
 			if (tags)
-				message_tag_editor_set_tag_list (MESSAGE_TAG_EDITOR (editor), (CamelTag *)tags);
-			camel_message_info_free(info);
+				message_tag_editor_set_tag_list (editor, tags);
+			camel_message_info_free (info);
 		}
 	}
 
-	g_signal_connect (editor, "response", G_CALLBACK (tag_editor_response), ted);
-	g_object_weak_ref ((GObject *) editor, (GWeakNotify) ted_free, ted);
+	if (gtk_dialog_run (GTK_DIALOG (editor)) != GTK_RESPONSE_OK)
+		goto exit;
+
+	tags = message_tag_editor_get_tag_list (editor);
+	if (tags == NULL)
+		goto exit;
+
+	camel_folder_freeze (folder);
+	for (i = 0; i < uids->len; i++) {
+		CamelMessageInfo *info;
+		CamelTag *iter;
+
+		info = camel_folder_get_message_info(folder, uids->pdata[i]);
+
+		if (info == NULL)
+			continue;
+
+		for (iter = tags; iter != NULL; iter = iter->next)
+			camel_message_info_set_user_tag (
+				info, iter->name, iter->value);
+
+		camel_message_info_free (info);
+	}
+
+	camel_folder_thaw (folder);
+	camel_tag_list_free (&tags);
+
+	html_display = e_mail_reader_get_html_display (reader);
+	em_format_redraw (EM_FORMAT (html_display));
+
+exit:
+	/* XXX We shouldn't be freeing this. */
+	em_utils_uids_free (uids);
 
-	gtk_widget_show (editor);
+	gtk_widget_destroy (GTK_WIDGET (editor));
 }
 
 /**
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 63056b28f4..64c4d7aba7 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -32,6 +32,8 @@
 #include <camel/camel-mime-part.h>
 #include <camel/camel-stream.h>
 
+#include <mail/e-mail-reader.h>
+
 G_BEGIN_DECLS
 
 struct _EMFormat;
@@ -55,7 +57,7 @@ void em_utils_save_messages (GtkWindow *parent, CamelFolder *folder, GPtrArray *
 void em_utils_add_address(GtkWindow *parent, const gchar *email);
 void em_utils_add_vcard(GtkWindow *parent, const gchar *vcard);
 
-void em_utils_flag_for_followup (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids);
+void em_utils_flag_for_followup (EMailReader *reader, CamelFolder *folder, GPtrArray *uids);
 void em_utils_flag_for_followup_clear (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids);
 void em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids);
 
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index dfbddb45e3..7d82ad396d 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index d473f15af0..b0d4a8a678 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(localedir)\""			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2dd31891f4..6cc1741ac3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,15 +54,6 @@ calendar/common/authentication.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/memo/memo-conduit.c
 calendar/conduits/todo/todo-conduit.c
-calendar/gui/GNOME_Evolution_Calendar.server.in.in
-calendar/gui/a11y/ea-cal-view-event.c
-calendar/gui/a11y/ea-cal-view.c
-calendar/gui/a11y/ea-day-view-main-item.c
-calendar/gui/a11y/ea-day-view.c
-calendar/gui/a11y/ea-gnome-calendar.c
-calendar/gui/a11y/ea-jump-button.c
-calendar/gui/a11y/ea-week-view-main-item.c
-calendar/gui/a11y/ea-week-view.c
 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
 calendar/gui/alarm-notify/alarm-notify-dialog.c
 calendar/gui/alarm-notify/alarm-notify.glade
@@ -70,9 +61,6 @@ calendar/gui/alarm-notify/alarm-queue.c
 calendar/gui/alarm-notify/notify-main.c
 calendar/gui/alarm-notify/util.c
 calendar/gui/apps_evolution_calendar.schemas.in
-calendar/gui/cal-search-bar.c
-calendar/gui/calendar-commands.c
-calendar/gui/calendar-component.c
 calendar/gui/calendar-view-factory.c
 calendar/gui/caltypes.xml
 calendar/gui/dialogs/alarm-dialog.c
@@ -136,21 +124,15 @@ calendar/gui/e-meeting-time-sel.c
 calendar/gui/e-meeting-time-sel.etspec
 calendar/gui/e-memo-table.c
 calendar/gui/e-memo-table.etspec
-calendar/gui/e-memos.c
-calendar/gui/e-tasks.c
 calendar/gui/e-timezone-entry.c
 calendar/gui/e-week-view-main-item.c
 calendar/gui/e-week-view.c
-calendar/gui/gnome-cal.c
 calendar/gui/goto-dialog.glade
 calendar/gui/goto.c
 calendar/gui/itip-utils.c
-calendar/gui/memos-component.c
 calendar/gui/memotypes.xml
 calendar/gui/misc.c
 calendar/gui/print.c
-calendar/gui/tasks-component.c
-calendar/gui/tasks-control.c
 calendar/gui/tasktypes.xml
 calendar/gui/weekday-picker.c
 calendar/importers/icalendar-importer.c
@@ -212,7 +194,6 @@ filter/filter.error.xml
 filter/filter.glade
 filter/rule-context.c
 filter/rule-editor.c
-mail/GNOME_Evolution_Mail.server.in.in
 mail/e-attachment-handler-mail.c
 mail/e-mail-attachment-bar.c
 mail/e-mail-browser.c
@@ -238,14 +219,12 @@ mail/em-filter-editor.c
 mail/em-filter-folder-element.c
 mail/em-filter-i18n.h
 mail/em-filter-rule.c
-mail/em-folder-browser.c
 mail/em-folder-properties.c
 mail/em-folder-selection-button.c
 mail/em-folder-selector.c
 mail/em-folder-tree-model.c
 mail/em-folder-tree.c
 mail/em-folder-utils.c
-mail/em-folder-view.c
 mail/em-format-html-display.c
 mail/em-format-html-print.c
 mail/em-format-html.c
@@ -262,7 +241,6 @@ mail/importers/evolution-mbox-importer.c
 mail/importers/mail-importer.c
 mail/importers/pine-importer.c
 mail/mail-autofilter.c
-mail/mail-component.c
 mail/mail-config.c
 mail/mail-config.glade
 mail/mail-dialogs.glade
@@ -303,7 +281,6 @@ plugins/calendar-http/calendar-http.c
 plugins/calendar-http/org-gnome-calendar-http.eplug.xml
 plugins/calendar-weather/calendar-weather.c
 plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
-plugins/copy-tool/org-gnome-copy-tool.eplug.xml
 plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in
 plugins/default-mailer/org-gnome-default-mailer.eplug.xml
 plugins/default-mailer/org-gnome-default-mailer.error.xml
@@ -439,7 +416,6 @@ plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
 plugins/vcard-inline/vcard-inline.c
 plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
 plugins/webdav-account-setup/webdav-contacts-source.c
-shell/GNOME_Evolution_Shell.server.in.in
 shell/apps_evolution_shell.schemas.in
 shell/e-config-upgrade.c
 shell/e-shell-backend.c
@@ -509,18 +485,12 @@ widgets/misc/e-canvas-background.c
 widgets/misc/e-canvas-vbox.c
 widgets/misc/e-charset-picker.c
 widgets/misc/e-dateedit.c
-widgets/misc/e-filter-bar.c
-widgets/misc/e-filter-bar.h
 widgets/misc/e-image-chooser.c
 widgets/misc/e-map.c
 widgets/misc/e-online-button.c
 widgets/misc/e-pilot-settings.c
 widgets/misc/e-popup-action.c
 widgets/misc/e-preferences-window.c
-widgets/misc/e-search-bar.c
-widgets/misc/e-search-bar.c.BASE.11732.c
-widgets/misc/e-search-bar.c.LOCAL.11732.c
-widgets/misc/e-search-bar.c.REMOTE.11732.c
 widgets/misc/e-selection-model-array.c
 widgets/misc/e-selection-model.c
 widgets/misc/e-send-options.c
diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in
deleted file mode 100644
index b055f3000d..0000000000
--- a/shell/GNOME_Evolution_Shell.server.in.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<oaf_info>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell:@VERSION@"
-	      type="exe"
-	      location="@BINDIR_IN_SERVER_FILE@/evolution@EXEEXT@">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/Shell:@VERSION@"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="name" type="string"
-		   _value="Evolution Shell"/>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@"
-	      type="exe"
-	      location="@BINDIR_IN_SERVER_FILE@/evolution-@VERSION@@EXEEXT@">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="name" type="string" _value="Evolution Shell Config factory"/>
-  </oaf_server>
-
-</oaf_info>
diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am
index 7982e29f17..0a7188921a 100644
--- a/shell/test/Makefile.am
+++ b/shell/test/Makefile.am
@@ -1,6 +1,7 @@
 module_LTLIBRARIES = libevolution-module-test.la
 
 INCLUDES =					\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/shell			\
 	-I$(top_srcdir)/widgets			\
 	-I$(top_srcdir)/widgets/menus		\