diff -ru evolution-2.3.5.1.orig/addressbook/gui/component/Makefile.am evolution-2.3.5.1/addressbook/gui/component/Makefile.am
--- evolution-2.3.5.1.orig/addressbook/gui/component/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/addressbook/gui/component/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -2,6 +2,7 @@
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
+	-I$(top_srcdir)/shell					\
 	-I$(top_builddir)/shell					\
 	-I$(top_srcdir)/widgets/misc				\
 	-I$(top_srcdir)/addressbook/util			\
diff -ru evolution-2.3.5.1.orig/mail/importers/Makefile.am evolution-2.3.5.1/mail/importers/Makefile.am
--- evolution-2.3.5.1.orig/mail/importers/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/mail/importers/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -7,6 +7,7 @@
 	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
 	-I$(top_srcdir)/addressbook/backend             \
 	-I$(top_builddir)/addressbook/backend           \
+	-I$(top_builddir)/shell                         \
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(IMPORTERS_CFLAGS)
 
diff -ru evolution-2.3.5.1.orig/plugins/calendar-weather/Makefile.am evolution-2.3.5.1/plugins/calendar-weather/Makefile.am
--- evolution-2.3.5.1.orig/plugins/calendar-weather/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/calendar-weather/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -2,7 +2,9 @@
 weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
 
 INCLUDES =									\
+	-I$(top_srcdir)								\
 	-I$(top_srcdir)/shell							\
+	-I$(top_builddir)/shell							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
 	$(SOURCE_SEL_CFLAGS)							\
 	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"				\
diff -ru evolution-2.3.5.1.orig/plugins/groupwise-features/Makefile.am evolution-2.3.5.1/plugins/groupwise-features/Makefile.am
--- evolution-2.3.5.1.orig/plugins/groupwise-features/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/groupwise-features/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -2,6 +2,9 @@
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/camel                           \
+	-I$(top_builddir)/shell                         \
+	-I$(top_builddir)/mail                          \
+	-I$(top_builddir)/composer                      \
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
diff -ru evolution-2.3.5.1.orig/plugins/mail-account-disable/Makefile.am evolution-2.3.5.1/plugins/mail-account-disable/Makefile.am
--- evolution-2.3.5.1.orig/plugins/mail-account-disable/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/mail-account-disable/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -1,7 +1,8 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
+	-I$(top_builddir)/shell				\
+	-I$(top_builddir)/mail				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
 
 @EVO_PLUGIN_RULE@
diff -ru evolution-2.3.5.1.orig/plugins/mailing-list-actions/Makefile.am evolution-2.3.5.1/plugins/mailing-list-actions/Makefile.am
--- evolution-2.3.5.1.orig/plugins/mailing-list-actions/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/mailing-list-actions/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/composer			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff -ru evolution-2.3.5.1.orig/plugins/print-message/Makefile.am evolution-2.3.5.1/plugins/print-message/Makefile.am
--- evolution-2.3.5.1.orig/plugins/print-message/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/print-message/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_builddir)/composer			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff -ru evolution-2.3.5.1.orig/plugins/proxy/Makefile.am evolution-2.3.5.1/plugins/proxy/Makefile.am
--- evolution-2.3.5.1.orig/plugins/proxy/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/proxy/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -4,6 +4,8 @@
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(CAMEL_GROUPWISE_CFLAGS)			\
+	-I$(top_builddir)/shell				\
+	-I$(top_builddir)/mail				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		
 
diff -ru evolution-2.3.5.1.orig/plugins/proxy-login/Makefile.am evolution-2.3.5.1/plugins/proxy-login/Makefile.am
--- evolution-2.3.5.1.orig/plugins/proxy-login/Makefile.am	2005-07-28 09:44:03.000000000 -0700
+++ evolution-2.3.5.1/plugins/proxy-login/Makefile.am	2005-07-28 13:38:09.000000000 -0700
@@ -5,6 +5,8 @@
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CAMEL_GROUPWISE_CFLAGS)			\
+	-I$(top_builddir)/shell				\
+	-I$(top_builddir)/mail				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
 
 @EVO_PLUGIN_RULE@
