Fix "make distcheck" errors and other build cleanups.

86 files changed, 95 insertions, 97 deletions

diff --git a/Makefile.am b/Makefile.am
index d7c022c4ed..61c0a220a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,11 @@ EXTRA_DIST = 			\
 	$(pkgconfig_DATA:.pc=.pc.in)
 
 if ENABLE_SMIME
-SMIME_DIR=smime
+SMIME_SUBDIR=smime
+endif
+
+if WITH_HELP
+HELP_SUBDIR=help
 endif
 
 SUBDIRS = 			\
@@ -43,7 +47,7 @@ SUBDIRS = 			\
 	filter			\
 	widgets			\
 	shell			\
-	$(SMIME_DIR)		\
+	$(SMIME_SUBDIR)		\
 	em-format		\
 	composer		\
 	addressbook		\
@@ -57,11 +61,8 @@ SUBDIRS = 			\
 	views			\
 	tools			\
 	po			\
-	sounds
-
-if WITH_HELP
-SUBDIRS += help
-endif
+	sounds			\
+	$(HELP_SUBDIR)
 
 DISTCLEANFILES = 			\
 	$(builddir)/doltcompile		\
@@ -89,6 +90,7 @@ MAINTAINERCLEANFILES =			\
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc		\
 	--disable-scrollkeeper		\
-	--enable-test-component
+	--enable-test-component		\
+	--with-help
 
 -include $(top_srcdir)/git.mk
diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index 772a96937f..1af91a6fb6 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -3,7 +3,7 @@
 
 privsolib_LTLIBRARIES = libevolution-a11y.la
 
-INCLUDES =				\
+AM_CPPFLAGS =				\
 	$(A11Y_CFLAGS)
 
 libevolution_a11y_la_SOURCES =		\
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index de18057981..2b02156274 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	-I$(top_srcdir)/widgets/misc		\
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 681836f07b..ccd40deebb 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 87fd18ca90..491c1ba62b 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index ebec465d16..fd13c9779e 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"eab-contact-merging\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-I$(top_srcdir)					\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index e940065833..58d1e1b1d1 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,7 +1,7 @@
 ruledir = $(privdatadir)
 rule_DATA = addresstypes.xml
 
-INCLUDES =										\
+AM_CPPFLAGS =										\
 	-DG_LOG_DOMAIN=\"eab-widgets\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 2d5b0e50ca..27c463b7b3 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -2,7 +2,7 @@
 privsolib_LTLIBRARIES = 				\
 	libevolution-addressbook-importers.la
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index f3090d6a09..5304e21c01 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -4,7 +4,7 @@ ecps_DATA  =				\
 	medbook.ecps			\
 	phonelist.ecps
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
 	-I$(top_srcdir)/addressbook		\
 	-I$(top_srcdir)				\
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index ea1dc3867b..4444d018f8 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -5,7 +5,7 @@ privlibexec_SCRIPTS =					\
 privlibexec_PROGRAMS =			\
 	evolution-addressbook-export	
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook-tools\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index cc78518f40..50d5d430e2 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DPREFIX=\"$(prefix)\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
 	-DDATADIR=\"$(datadir)\"			\
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am
index b8c5d181fb..af2b8e8a5a 100644
--- a/calendar/common/Makefile.am
+++ b/calendar/common/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libevolution-calendarprivate.la
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"calendar-gui\"			\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 4a957633e7..c3eca002a3 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	-I$(top_srcdir)/widgets/misc		\
diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am
index 59e4b5aa1f..457d4eb77d 100644
--- a/calendar/conduits/common/Makefile.am
+++ b/calendar/conduits/common/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
index 01a04579f7..b8502cba89 100644
--- a/calendar/conduits/memo/Makefile.am
+++ b/calendar/conduits/memo/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	-I$(top_srcdir)/widgets/misc		\
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 5141393c91..f17535f6de 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	-I$(top_srcdir)/widgets/misc		\
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b919da8cf3..e460d3d5ff 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -16,7 +16,7 @@ search_files = tasktypes.xml memotypes.xml caltypes.xml
 ruledir = $(privdatadir)
 rule_DATA = $(search_files)
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"calendar-gui\"			\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 9b001a0da0..680c5e95e5 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -17,7 +17,7 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 privlibexec_PROGRAMS = evolution-alarm-notify
 
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 8e7a1bf916..a9c752701d 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-DG_LOG_DOMAIN=\"calendar-gui\"					\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/widgets						\
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 16a3fee232..8fa711b035 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -1,6 +1,6 @@
 privsolib_LTLIBRARIES = libevolution-calendar-importers.la
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"		\
 	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
 	-I$(top_srcdir)					\
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 12ad680bcf..e20f3f007e 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -19,7 +19,7 @@ libcomposerinclude_HEADERS = 			\
 	e-composer-autosave.h			\
 	e-msg-composer.h
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/composer					\
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index d47b1c67cf..a0ae5436a6 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -62,7 +62,7 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES= \
+AM_CPPFLAGS= \
 	-I$(top_srcdir)							\
 	-I$(SHELL_CFLAGS)
 GTKDOC_LIBS=								\
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 934c20b593..60507ec82d 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -7,7 +7,7 @@ if OS_WIN32
 PLATFORM_SOURCES = e-win32-reloc.c
 endif
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)/widgets						\
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index e5d0fca3b6..2c758d068e 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
 
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 43e5bcd73b..0a94811d46 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -1,7 +1,7 @@
 
 glade_DATA = filter.glade
 
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I $(top_srcdir)			\
 	-I $(top_srcdir)/e-util			\
 	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"	\
diff --git a/mail/Makefile.am b/mail/Makefile.am
index e3b43ec494..5f8372f691 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . default importers
 
 mailincludedir = $(privincludedir)/mail
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)					\
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index ecd883cd8b..bd38762ea2 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -5,7 +5,7 @@ endif
 
 privsolib_LTLIBRARIES = libevolution-mail-importers.la
 
-INCLUDES = -I.. 					\
+AM_CPPFLAGS = -I.. 					\
 	-I$(srcdir)/..					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 960df59e09..d7cd8c7c4e 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -2,7 +2,7 @@ if OS_WIN32
 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
 endif
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 9c2d41dc38..fa63bf53e4 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"calendar-modules\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index d3728a4db3..866a137b08 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/mail						\
 	-I$(top_srcdir)/widgets						\
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index b195514b66..013e453635 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)		
 
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index b3c1799455..8fb3c30ad2 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index a8f591ec1f..0437d0471d 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(GSTREAMER_CFLAGS)
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index 1db60cd625..c1792abb64 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index ac42633ed6..51811eaaf9 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 9d51b4d89d..00453ef090 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" 	\
 	$(EVOLUTION_MAIL_CFLAGS)
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index cb18c5b0be..243338e243 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	-I .						\
 	-I$(top_srcdir)	                                \
 	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index 7d40192c6f..aadb4b5927 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(SOURCE_SEL_CFLAGS)
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 4edd28c8a0..89c17be4af 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(SOURCE_SEL_CFLAGS)
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 4404dedcde..8ba5fdf2cd 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -1,6 +1,6 @@
 eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
 
-INCLUDES =									\
+AM_CPPFLAGS =									\
 	-I$(top_srcdir)								\
 	-I$(top_builddir)/shell							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index d54107f973..ccb8071a99 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index 235f615251..dda1edfa9a 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)          \
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index c9467fe925..2ab28fad67 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I. 						\
+AM_CPPFLAGS = -I. 						\
 	-I$(top_srcdir)	                                \
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 2e4a825771..933da521a1 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I .						\
+AM_CPPFLAGS = -I .						\
 	-I$(top_srcdir)	                                \
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/calendar			\
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index b5ec612403..c05b22a3c5 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 6ac6dd9850..07cbb8199d 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I. 						\
+AM_CPPFLAGS = -I. 						\
 	-I$(top_srcdir)	                                \
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index d8153a9c5b..ed452c0bc7 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
 	-I .						\
 	-I$(top_srcdir)	                                \
 	-DCALDAV_GLADEDIR=\""$(gladedir)"\"		\
diff --git a/plugins/groupwise-account-setup/Makefile.am b/plugins/groupwise-account-setup/Makefile.am
index 9770782d69..ddf3161f8b 100644
--- a/plugins/groupwise-account-setup/Makefile.am
+++ b/plugins/groupwise-account-setup/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 57b37fd522..3bab9f6596 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am
index 205a3a7d30..e0d89ce407 100644
--- a/plugins/hula-account-setup/Makefile.am
+++ b/plugins/hula-account-setup/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index e6b6559c63..a090848cad 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am
index 218dd933dd..b19fcff84b 100644
--- a/plugins/ipod-sync/Makefile.am
+++ b/plugins/ipod-sync/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index cbbc061833..80b70cc6c9 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 2055cce572..62e8f72320 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,11 +1,11 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	$(EVOLUTION_MAIL_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			
 
 if ENABLE_DBUS
-INCLUDES += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
+AM_CPPFLAGS += 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
 		-DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION)          \
 		$(NMN_CFLAGS)
 endif
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 4c7db0682c..b7eb5ed749 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 49b67a528a..3613694985 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -49,7 +49,6 @@
 #include <mail/em-menu.h>
 #include <mail/em-popup.h>
 #include <mail/em-utils.h>
-#include <mail/em-folder-view.h>
 #include <mail/em-format-html.h>
 #include <mail/mail-config.h>
 #include <e-util/e-account-utils.h>
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index e90c608a5b..80dc122e40 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/composer 			\
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index f1bbbcbb18..c44c5dc0cb 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)\
 	$(EVOLUTION_MAIL_CFLAGS)
 
diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am
index 6404920982..4f7a935179 100644
--- a/plugins/mono/Makefile.am
+++ b/plugins/mono/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(E_UTIL_CFLAGS)				\
 	$(MONO_CFLAGS)
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index ab3c2ceb98..bd284c659c 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
 
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index 37a49a38e7..baee242074 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
 
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index 4a8a45910b..21f63af33f 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(SHELL_CFLAGS)
 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index b4b4f482aa..8720e252df 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(EVOLUTION_SOURCE)				\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index c8119f48bb..274c14f290 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	-I$(top_builddir)/shell			\
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 51cc65dcc2..6f62036a1d 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(E_UTIL_CFLAGS)				\
 	$(PY_INCLUDES) 
diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am
index a57ed573c1..cc14dc94d9 100644
--- a/plugins/python/example/Makefile.am
+++ b/plugins/python/example/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	
 
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index d7ba3e7d51..66e31a0d6b 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 8336dd12ec..1ed1654350 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am
index fc91ab3f1f..5dec1f86a5 100644
--- a/plugins/startup-wizard/Makefile.am
+++ b/plugins/startup-wizard/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I .						\
+AM_CPPFLAGS = -I .						\
 	-I$(top_srcdir)	                                \
 	-I$(top_builddir)/shell				\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index 751e0eee15..e27b08bfbe 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
 
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 3c1ff2052e..b2be91f2ed 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index b0d4a8a678..262096ee87 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index df143ce9d4..e26b46879b 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
 	$(EVOLUTION_MAIL_CFLAGS)
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index c143b8f667..761cd69363 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I .				\
 	-I$(top_srcdir)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b5d94bc34c..29f914e636 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -172,6 +172,7 @@ mail/e-mail-reader-utils.c
 mail/e-mail-reader.c
 mail/e-mail-search-bar.c
 mail/e-mail-store.c
+mail/em-account-editor.c
 mail/em-composer-utils.c
 mail/em-filter-editor.c
 mail/em-filter-folder-element.c
@@ -255,7 +256,6 @@ modules/mail/e-mail-shell-migrate.c
 modules/mail/e-mail-shell-view-actions.c
 modules/mail/e-mail-shell-view-private.c
 modules/mail/e-mail-shell-view.c
-modules/mail/em-account-editor.c
 modules/mail/em-account-prefs.c
 modules/mail/em-composer-prefs.c
 modules/mail/em-mailer-prefs.c
@@ -328,8 +328,6 @@ plugins/external-editor/org-gnome-external-editor.eplug.xml
 plugins/external-editor/org-gnome-external-editor.error.xml
 plugins/face/face.c
 plugins/face/org-gnome-face.eplug.xml
-plugins/folder-unsubscribe/folder-unsubscribe.c
-plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
 plugins/google-account-setup/google-contacts-source.c
 plugins/google-account-setup/google-source.c
 plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
@@ -374,7 +372,6 @@ plugins/mail-notification/mail-notification.c
 plugins/mail-notification/org-gnome-mail-notification.eplug.xml
 plugins/mail-to-task/mail-to-task.c
 plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
-plugins/mail-to-task/org-gnome-mail-to-task.xml
 plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml
 plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
 plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2403264094..8df302be77 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_TEST_COMPONENT
 SUBDIRS = . test
 endif
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
 	-I$(top_srcdir)/e-util					\
 	-I$(top_srcdir)/widgets					\
 	-I$(top_srcdir)/widgets/menus				\
diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am
index 0a7188921a..10b1bfb81b 100644
--- a/shell/test/Makefile.am
+++ b/shell/test/Makefile.am
@@ -1,6 +1,6 @@
 module_LTLIBRARIES = libevolution-module-test.la
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/shell			\
 	-I$(top_srcdir)/widgets			\
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 807e71ff51..092928bf2c 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-smime\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index c43da4ea10..8cd547a15b 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-smime\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/shell				\
diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am
index da284b0206..777d3278d6 100644
--- a/smime/tests/Makefile.am
+++ b/smime/tests/Makefile.am
@@ -1,7 +1,7 @@
 
 noinst_PROGRAMS=import-cert
 
-INCLUDES=						\
+AM_CPPFLAGS=						\
 	-I$(top_srcdir)/smime/lib			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CERT_UI_CFLAGS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4860746fd7..d16cd7a4a2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,7 +7,7 @@ endif
 privlibexec_PROGRAMS =		\
 	$(PLATFORM_DEP_TOOLS)
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-tools\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 64594fd889..cdc88e3b08 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 4c214038ee..f07ae41d14 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -1,6 +1,6 @@
 privsolib_LTLIBRARIES = libmenus.la
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"  \
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index c7123d6977..69f9cf6f12 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index c4fc858a74..7a8a5c7fab 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -2,7 +2,7 @@ glade_DATA = 					\
 	e-table-config.glade			\
 	e-table-field-chooser.glade
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	$(E_UTIL_CFLAGS)			\
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 70adbfec39..f20041a7d0 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
 	$(E_UTIL_CFLAGS)			\