[evolution/camel-gobject: 2/4] Include Camel's top-level header only.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution/camel-gobject: 2/4] Include Camel's top-level header only.
- Date: Wed, 18 Nov 2009 00:31:07 +0000 (UTC)
commit 98d336119c8ef646b5ddb4579a46835168aee4ff
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Oct 9 17:04:21 2009 -0500
Include Camel's top-level header only.
addressbook/gui/widgets/eab-gui-util.c | 4 +--
calendar/gui/alarm-notify/notify-main.c | 2 +-
calendar/gui/dialogs/comp-editor.c | 9 +-------
calendar/gui/e-cal-component-preview.c | 2 +-
calendar/gui/itip-utils.c | 2 +-
composer/e-composer-autosave.c | 3 +-
composer/e-composer-header-table.c | 2 +-
composer/e-composer-post-header.c | 2 +-
composer/e-composer-private.h | 2 -
composer/e-msg-composer.c | 21 +------------------
composer/e-msg-composer.h | 4 +--
e-util/e-signature-utils.c | 2 +-
e-util/e-unicode.c | 2 +-
e-util/e-util.c | 2 +
e-util/e-util.h | 2 +-
em-format/em-format-quote.c | 16 +--------------
em-format/em-format-quote.h | 1 -
em-format/em-format.c | 18 +---------------
em-format/em-format.h | 10 +-------
em-format/em-stripsig-filter.h | 2 +-
mail/e-mail-browser.c | 2 +-
mail/e-mail-label-list-store.c | 2 +-
mail/e-mail-local.h | 4 +--
mail/e-mail-reader-utils.c | 4 +--
mail/e-mail-reader.h | 3 +-
mail/e-mail-store.c | 4 +--
mail/e-mail-store.h | 2 +-
mail/em-composer-utils.c | 8 +------
mail/em-composer-utils.h | 3 +-
mail/em-config.c | 12 +----------
mail/em-config.h | 3 +-
mail/em-event.c | 13 +-----------
mail/em-filter-source-element.c | 2 +-
mail/em-folder-properties.c | 5 +---
mail/em-folder-properties.h | 2 +-
mail/em-folder-selector.c | 6 +---
mail/em-folder-tree-model.c | 6 +----
mail/em-folder-tree-model.h | 2 +-
mail/em-folder-tree.c | 9 +-------
mail/em-folder-tree.h | 2 +-
mail/em-folder-utils.c | 7 +-----
mail/em-folder-utils.h | 3 +-
mail/em-format-html-display.c | 16 +-------------
mail/em-format-html-print.c | 3 +-
mail/em-format-html.c | 20 +------------------
mail/em-format-html.h | 10 +++-----
mail/em-inline-filter.c | 4 +--
mail/em-inline-filter.h | 4 +--
mail/em-junk.h | 3 +-
mail/em-subscribe-editor.c | 5 +--
mail/em-sync-stream.c | 2 +-
mail/em-sync-stream.h | 3 +-
mail/em-utils.c | 11 +--------
mail/em-utils.h | 7 +-----
mail/em-vfolder-rule.c | 3 +-
mail/importers/elm-importer.c | 2 +-
mail/importers/evolution-mbox-importer.c | 2 +-
mail/importers/mail-importer.c | 7 +-----
mail/importers/mail-importer.h | 2 +-
mail/importers/pine-importer.c | 3 +-
mail/mail-autofilter.c | 4 +--
mail/mail-autofilter.h | 2 +-
mail/mail-config.c | 7 +-----
mail/mail-config.h | 2 +-
mail/mail-folder-cache.c | 9 +------
mail/mail-folder-cache.h | 2 +-
mail/mail-mt.c | 3 +-
mail/mail-mt.h | 4 +--
mail/mail-ops.c | 15 +-------------
mail/mail-ops.h | 6 -----
mail/mail-send-recv.c | 5 +---
mail/mail-send-recv.h | 2 +-
mail/mail-session.c | 5 +---
mail/mail-session.h | 2 +-
mail/mail-tools.c | 8 +-----
mail/mail-tools.h | 4 +--
mail/mail-vfolder.c | 4 +--
mail/mail-vfolder.h | 3 +-
mail/message-list.c | 9 +-------
mail/message-list.h | 4 +--
modules/calendar/e-cal-attachment-handler.c | 2 +-
modules/calendar/e-memo-shell-migrate.c | 2 +-
modules/mail/e-mail-attachment-handler.c | 3 +-
modules/mail/e-mail-junk-hook.c | 2 +-
modules/mail/e-mail-shell-backend.c | 5 +---
modules/mail/e-mail-shell-backend.h | 3 +-
modules/mail/e-mail-shell-content.c | 2 +-
modules/mail/e-mail-shell-migrate.c | 8 +------
modules/mail/e-mail-shell-view-private.h | 5 +---
modules/mail/em-account-prefs.c | 3 +-
modules/mail/em-composer-prefs.c | 2 +-
modules/mail/em-mailer-prefs.c | 2 +-
plugins/attachment-reminder/attachment-reminder.c | 9 +-------
plugins/audio-inline/audio-inline.c | 6 +---
plugins/bbdb/bbdb.c | 4 +-
plugins/bogo-junk-plugin/bf-junk-filter.c | 9 ++-----
plugins/external-editor/external-editor.c | 3 +-
plugins/groupwise-features/camel-gw-listener.c | 1 -
plugins/groupwise-features/camel-gw-listener.h | 6 ++--
plugins/groupwise-features/install-shared.c | 10 +-------
plugins/groupwise-features/junk-settings.h | 2 +-
plugins/groupwise-features/mail-retract.c | 3 +-
plugins/groupwise-features/proxy-login.c | 3 +-
plugins/groupwise-features/proxy.c | 3 +-
plugins/groupwise-features/send-options.c | 5 ++-
plugins/groupwise-features/share-folder-common.c | 7 +----
plugins/groupwise-features/share-folder.h | 2 +-
plugins/groupwise-features/status-track.c | 9 ++-----
plugins/hula-account-setup/camel-hula-listener.c | 3 +-
plugins/hula-account-setup/camel-hula-listener.h | 6 ++--
plugins/hula-account-setup/hula-account-setup.c | 2 +-
plugins/imap-features/imap-headers.c | 9 +------
plugins/itip-formatter/itip-formatter.c | 12 +----------
plugins/itip-formatter/itip-view.c | 5 +---
plugins/mail-notification/mail-notification.c | 3 +-
plugins/mail-to-task/mail-to-task.c | 9 +-------
.../mailing-list-actions/mailing-list-actions.c | 5 +---
plugins/mark-all-read/mark-all-read.c | 3 +-
plugins/prefer-plain/prefer-plain.c | 3 +-
plugins/pst-import/pst-importer.c | 13 +----------
plugins/sa-junk-plugin/em-junk-filter.c | 11 ++-------
plugins/templates/templates.c | 5 +---
plugins/tnef-attachments/tnef-plugin.c | 6 +----
plugins/vcard-inline/vcard-inline.c | 4 +--
widgets/misc/e-account-combo-box.c | 2 +-
widgets/misc/e-account-combo-box.h | 2 +-
widgets/misc/e-account-tree-view.c | 2 +-
widgets/misc/e-attachment-view.c | 2 +-
widgets/misc/e-attachment.c | 9 +-------
widgets/misc/e-attachment.h | 5 +---
widgets/misc/e-web-view.c | 4 +--
131 files changed, 163 insertions(+), 502 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index e445b05..1323f69 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserverui/e-source-selector.h>
#include <e-util/e-util.h>
@@ -42,9 +43,6 @@
#include <e-util/e-icon-factory.h>
#include "eab-contact-merging.h"
-/* we link to camel for decoding quoted printable email addresses */
-#include <camel/camel-mime-utils.h>
-
#include "addressbook/util/addressbook.h"
/* the NULL's in this table correspond to the status codes
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index e001409..871d98b 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -30,8 +30,8 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <unique/unique.h>
-#include <camel/camel-object.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-passwords.h>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9ff5006..2de3a54 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
@@ -41,14 +42,6 @@
#include <e-util/gconf-bridge.h>
#include <shell/e-shell.h>
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
#include "mail/mail-tools.h"
#include "../print.h"
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index b0ba329..b4f0619 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -27,6 +27,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-categories.h>
#include <gtkhtml/gtkhtml-stream.h>
@@ -34,7 +35,6 @@
#include <e-util/e-util.h>
#include <e-util/e-categories-config.h>
#include "calendar-config.h"
-#include <camel/camel-mime-filter-tohtml.h>
#define E_CAL_COMPONENT_PREVIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 5bbd4af..b856ee1 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -27,6 +27,7 @@
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <libical/ical.h>
#include <e-util/e-dialog-utils.h>
#include <libecal/e-cal-time-util.h>
@@ -38,7 +39,6 @@
#include "dialogs/comp-editor-util.h"
#include <composer/e-msg-composer.h>
-#include <camel/camel-mime-filter-tohtml.h>
static const gchar *itip_methods[] = {
"PUBLISH",
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index 786b3e6..8c1ff86 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -21,11 +21,10 @@
#include <sys/stat.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <camel/camel.h>
#include <e-util/e-error.h>
#include <e-util/e-util.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
#define AUTOSAVE_PREFIX ".evolution-composer.autosave"
#define AUTOSAVE_SEED AUTOSAVE_PREFIX "-XXXXXX"
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 4315297..b8317ae 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -18,8 +18,8 @@
#include "e-composer-header-table.h"
#include <string.h>
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include <camel/camel-internet-address.h>
#include <libedataserverui/e-name-selector.h>
#include "e-util/e-binding.h"
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index cb297fe..7fd26aa 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#define E_COMPOSER_POST_HEADER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index df215d0..f1e3549 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -25,8 +25,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include <camel/camel-iconv.h>
-
#include "e-composer-actions.h"
#include "e-composer-autosave.h"
#include "e-composer-header-table.h"
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d1985d7..f73f385 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -46,6 +46,8 @@
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
+#include <camel/camel.h>
+
#include "e-util/e-dialog-utils.h"
#include "e-util/e-error.h"
#include "e-util/e-mktemp.h"
@@ -58,25 +60,6 @@
#include "em-format/em-format.h"
#include "em-format/em-format-quote.h"
-#include <camel/camel-charset-map.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-canon.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-string-utils.h>
-#if defined (HAVE_NSS)
-#include <camel/camel-smime-context.h>
-#endif
-
#include "e-msg-composer.h"
#include "e-attachment.h"
#include "e-composer-autosave.h"
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 74128e0..924d18f 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -24,9 +24,7 @@
#ifndef E_MSG_COMPOSER_H
#define E_MSG_COMPOSER_H
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
#include <libedataserver/e-account.h>
#include <libebook/e-destination.h>
#include <gtkhtml-editor.h>
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index 9efc61b..f1c5282 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -20,9 +20,9 @@
#include "e-signature-utils.h"
#include <errno.h>
+#include <camel/camel.h>
#include <glib/gstdio.h>
#include <gconf/gconf-client.h>
-#include <camel.h>
#ifndef G_OS_WIN32
#include <sys/wait.h>
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index cc9139d..bcada1f 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -37,7 +37,7 @@
#include <gtk/gtk.h>
#include <libxml/xmlmemory.h>
-#include <camel/camel-iconv.h>
+#include <camel/camel.h>
#include <glib/gi18n.h>
#include "e-unicode.h"
diff --git a/e-util/e-util.c b/e-util/e-util.c
index cbb9963..0925afc 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -39,6 +39,8 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <camel/camel.h>
+
#ifdef G_OS_WIN32
#include <windows.h>
#endif
diff --git a/e-util/e-util.h b/e-util/e-util.h
index fbf257b..09bd6f4 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -31,8 +31,8 @@
#include <sys/types.h>
#include <gtk/gtk.h>
#include <limits.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include <cairo.h>
#include <e-util/e-marshal.h>
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index a82d254..0162206 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -26,17 +26,8 @@
#endif
#include <string.h>
-
-#include <camel/camel-iconv.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-linewrap.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-url.h>
-
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
#include "em-stripsig-filter.h"
@@ -478,11 +469,6 @@ emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
}
}
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-url.h>
-
static void
emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
{
diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index afc3675..100e59d 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -23,7 +23,6 @@
#ifndef EM_FORMAT_QUOTE_H
#define EM_FORMAT_QUOTE_H
-#include <camel/camel-stream.h>
#include "em-format.h"
/* Standard GObject macros */
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 3520252..fb13c0d 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -31,22 +31,8 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-smime-context.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-windows.h>
-#include <camel/camel-mime-filter-pgp.h>
+#include <camel/camel.h>
+#include <libedataserver/e-msgport.h>
#include "em-format.h"
#include "e-util/e-util.h"
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 4d8beaa..beea159 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -28,14 +28,8 @@
#ifndef EM_FORMAT_H
#define EM_FORMAT_H
-#include <glib-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-session.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
+#include <camel/camel.h>
+#include <libedataserver/e-msgport.h>
/* Standard GObject macros */
#define EM_TYPE_FORMAT \
diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h
index 39493e5..25ea239 100644
--- a/em-format/em-stripsig-filter.h
+++ b/em-format/em-stripsig-filter.h
@@ -23,7 +23,7 @@
#ifndef __EM_STRIPSIG_FILTER_H__
#define __EM_STRIPSIG_FILTER_H__
-#include <camel/camel-mime-filter.h>
+#include <camel/camel.h>
G_BEGIN_DECLS
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index e605e27..55ca359 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
#include "e-util/e-util.h"
#include "e-util/e-plugin-ui.h"
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index ba9bf41..9ac4843 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -22,7 +22,7 @@
#include "e-mail-label-list-store.h"
#include <glib/gi18n.h>
-#include <camel/camel-utf8.h>
+#include <camel/camel.h>
#include "e-util/gconf-bridge.h"
#define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h
index b8dda29..473f807 100644
--- a/mail/e-mail-local.h
+++ b/mail/e-mail-local.h
@@ -22,9 +22,7 @@
#ifndef E_MAIL_LOCAL_H
#define E_MAIL_LOCAL_H
-#include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
G_BEGIN_DECLS
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 3cfc3b3..7ef1c43 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -24,10 +24,8 @@
#include "e-mail-reader-utils.h"
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
#include "e-util/e-error.h"
#include "filter/e-filter-rule.h"
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index e9f9a3a..8b30985 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -23,7 +23,8 @@
#define E_MAIL_READER_H
#include <gtk/gtk.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
+
#include <mail/em-format-html-display.h>
#include <mail/message-list.h>
#include <shell/e-shell-backend.h>
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 676c270..581ac43 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -22,9 +22,7 @@
#include "e-mail-store.h"
#include <glib/gi18n.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index bfd1ab4..7d42fc3 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -23,7 +23,7 @@
#define E_MAIL_STORE_H
#include <glib.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
G_BEGIN_DECLS
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 8cd0e52..6874491 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
#include <glib/gi18n.h>
@@ -59,13 +60,6 @@
#include "em-format-quote.h"
#include "em-event.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-nntp-address.h>
-#include <camel/camel-vee-folder.h>
-
#ifdef G_OS_WIN32
/* Undef the similar macro from pthread.h, it doesn't check if
* gmtime() returns NULL.
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index be29a7a..70ee0fe 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -24,8 +24,7 @@
#ifndef __EM_COMPOSER_UTILS_H__
#define __EM_COMPOSER_UTILS_H__
-#include <glib.h>
-#include <camel/camel-nntp-address.h>
+#include <camel/camel.h>
#include <em-format/em-format.h>
#include <composer/e-msg-composer.h>
diff --git a/mail/em-config.c b/mail/em-config.c
index 359307b..a74c9c1 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -28,22 +28,12 @@
#include <stdlib.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include "em-config.h"
#include "em-utils.h"
#include "em-composer-utils.h"
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
diff --git a/mail/em-config.h b/mail/em-config.h
index 62e74be..003498d 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -23,9 +23,8 @@
#ifndef __EM_CONFIG_H__
#define __EM_CONFIG_H__
-#include <glib-object.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-folder.h>
#include <libedataserver/e-account.h>
#include "e-util/e-config.h"
diff --git a/mail/em-event.c b/mail/em-event.c
index bfba660..6a4a962 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -27,22 +27,11 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
+#include <camel/camel.h>
#include "em-event.h"
#include "composer/e-msg-composer.h"
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
static GObjectClass *eme_parent;
static EMEvent *em_event;
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index d080076..432227c 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -30,9 +30,9 @@
#include "em-filter-source-element.h"
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <libedataserver/e-sexp.h>
#include <libedataserver/e-account-list.h>
-#include <camel/camel-url.h>
#include "filter/e-filter-part.h"
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 38ba820..2e6f2ce 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -30,11 +30,8 @@
#include <gconf/gconf-client.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-folder.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include "em-folder-properties.h"
#include "em-config.h"
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 330be15..d080935 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -24,7 +24,7 @@
#ifndef __EM_FOLDER_PROPERTIES_H__
#define __EM_FOLDER_PROPERTIES_H__
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
#include <shell/e-shell-view.h>
G_BEGIN_DECLS
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 693c096..38e0e8f 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -23,13 +23,11 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
+
#include <e-util/e-util.h>
#include <misc/e-gui-utils.h>
-#include <camel/camel-url.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-
#include "em-folder-tree.h"
#include "em-folder-selector.h"
#include "em-folder-utils.h"
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index fd57d48..c6e96b7 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -34,8 +34,7 @@
#include "e-util/e-account-utils.h"
#include <glib/gi18n.h>
-
-#include <camel/camel-file-utils.h>
+#include <camel/camel.h>
#include "mail-config.h"
#include "mail-session.h"
@@ -49,9 +48,6 @@
#include "em-folder-utils.h"
#include "em-event.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-
#include "e-mail-local.h"
#define d(x)
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 00e2d39..a208eed 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -24,7 +24,7 @@
#define EM_FOLDER_TREE_MODEL_H
#include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <libedataserver/e-account-list.h>
/* Standard GObject macros */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index ace89f5..166c33c 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -39,14 +39,7 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
+#include <camel/camel.h>
#include "e-util/e-account-utils.h"
#include "e-util/e-mktemp.h"
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 02730cb..65bc008 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -25,7 +25,7 @@
#define EM_FOLDER_TREE_H
#include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <mail/em-folder-tree-model.h>
/* Standard GObject macros */
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index d89afc9..d96b827 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -39,12 +39,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gi18n.h>
-#include <camel/camel-session.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
+#include <camel/camel.h>
#include "e-util/e-mktemp.h"
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index ec150f3..ec5882d 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -25,8 +25,7 @@
#define EM_FOLDER_UTILS_H
#include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <mail/em-folder-tree.h>
G_BEGIN_DECLS
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 44668b1..08d2e18 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -27,6 +27,7 @@
#include <string.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
@@ -41,20 +42,7 @@
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-embedded.h>
-#include <glib/gi18n.h>
-
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-operation.h>
+#include <camel/camel.h>
#include <e-util/e-util.h>
#include <e-util/e-util-private.h>
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index fb9b1a7..79183ca 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -27,9 +27,10 @@
#include <string.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
+#include <glib/gi18n-lib.h>
#include <gtkhtml/gtkhtml.h>
-#include <camel/camel-i18n.h>
#include "mail-ops.h"
#include "mail-mt.h"
#include "em-format-html-print.h"
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 59f2bc8..a84f808 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -53,24 +53,7 @@
#include <glib/gi18n.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-url.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-http-stream.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-file-utils.h>
+#include <camel/camel.h>
#include "mail-config.h"
#include "mail-mt.h"
@@ -1527,7 +1510,6 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh)
/* ********************************************************************** */
#include "em-inline-filter.h"
-#include <camel/camel-stream-null.h>
/* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */
static const struct {
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 9d96c40..bd70f99 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -28,15 +28,13 @@
#ifndef EM_FORMAT_HTML_H
#define EM_FORMAT_HTML_H
-#include <em-format/em-format.h>
-#include <mail/mail-config.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-embedded.h>
+#include <em-format/em-format.h>
+#include <mail/mail-config.h>
+
/* Standard GObject macros */
#define EM_TYPE_FORMAT_HTML \
(em_format_html_get_type ())
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 94aefb0..1b2e590 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -25,11 +25,9 @@
#endif
#include <string.h>
+#include <camel/camel.h>
#include "em-inline-filter.h"
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
#include "em-utils.h"
#include "em-format/em-format.h"
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index ac1779f..11aaa7f 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -24,9 +24,7 @@
#ifndef EM_INLINE_FILTER_H
#define EM_INLINE_FILTER_H
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
#define EM_INLINE_FILTER_TYPE (em_inline_filter_get_type ())
#define EM_INLINE_FILTER(obj) (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter))
diff --git a/mail/em-junk.h b/mail/em-junk.h
index 79493ca..978f5ec 100644
--- a/mail/em-junk.h
+++ b/mail/em-junk.h
@@ -25,9 +25,8 @@
#ifndef EM_JUNK_H
#define EM_JUNK_H
+#include <camel/camel.h>
#include <e-util/e-plugin.h>
-#include <camel/camel-junk-plugin.h>
-#include <camel/camel-mime-message.h>
#define EM_JUNK_ERROR (em_junk_error_quark ())
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 9e7bc02..f187d1c 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -26,13 +26,12 @@
#include <string.h>
+#include <camel/camel.h>
+
#include "mail-tools.h"
#include "mail-ops.h"
#include "mail-mt.h"
/*#include "mail-folder-cache.h"*/
-#include "camel/camel-exception.h"
-#include "camel/camel-store.h"
-#include "camel/camel-session.h"
#include "e-util/e-util.h"
#include "e-util/e-account-utils.h"
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 97c12ed..7786977 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
-#include <camel/camel-object.h>
+#include <camel/camel.h>
#include <libedataserver/e-flag.h>
#include "mail-mt.h"
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index 3d74a02..2c35f2a 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -30,8 +30,7 @@ requests are always handled in the main gui thread in the correct order.
#ifndef EM_SYNC_STREAM_H
#define EM_SYNC_STREAM_H
-#include <glib.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
#define EM_SYNC_STREAM_TYPE \
(em_sync_stream_get_type ())
diff --git a/mail/em-utils.c b/mail/em-utils.c
index b431519..13c06e3 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -32,6 +32,7 @@
#include <time.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
@@ -42,16 +43,12 @@
#undef interface
#endif
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-url-scanner.h>
-#include <camel/camel-file-utils.h>
+#include <camel/camel.h>
#include <libebook/e-book.h>
#include "em-filter-editor.h"
-#include <glib/gi18n.h>
-
#include <gio/gio.h>
#include "mail-mt.h"
@@ -533,10 +530,6 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP
em_utils_uids_free (uids);
}
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-mime-filter-from.h"
-
/* This kind of sucks, because for various reasons most callers need to run synchronously
in the gui thread, however this could take a long, blocking time, to run */
static gint
diff --git a/mail/em-utils.h b/mail/em-utils.h
index b61dce3..06cbbf3 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -25,12 +25,7 @@
#include <gtk/gtk.h>
#include <sys/types.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
#include <mail/e-mail-reader.h>
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 4b44ffc..5ab466b 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -29,8 +29,9 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
+#include <glade/glade.h>
-#include "camel/camel-url.h"
#include "em-vfolder-context.h"
#include "em-vfolder-rule.h"
#include "mail/e-mail-store.h"
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index e6cfa6a..4d26696 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -38,7 +38,7 @@
#include <gconf/gconf-client.h>
-#include <camel/camel-operation.h>
+#include <camel/camel.h>
#include "mail-importer.h"
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 0112947..3adc629 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -38,7 +38,7 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <camel/camel-exception.h>
+#include <camel/camel.h>
#include "shell/e-shell.h"
#include "shell/e-shell-window.h"
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index b8926d2..3ed336a 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -37,12 +37,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-stream-mem.h>
+#include <camel/camel.h>
#include "e-util/e-util-private.h"
#include "shell/e-shell-backend.h"
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 7758c0e..dbd2e7e 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -24,8 +24,8 @@
#ifndef __MAIL_IMPORTER_H__
#define __MAIL_IMPORTER_H__
+#include <camel/camel.h>
#include <e-util/e-import.h>
-#include <camel/camel-folder.h>
EImportImporter *mbox_importer_peek(void);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index d00394f..66dfaa7 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -36,13 +36,12 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
#include <libebook/e-book.h>
#include <libebook/e-destination.h>
-#include <camel/camel-operation.h>
-
#include "mail-importer.h"
#include "mail/mail-mt.h"
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index d64a4ae..c78a850 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -29,6 +29,7 @@
#include <glib.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include "mail-vfolder.h"
#include "mail-autofilter.h"
@@ -45,9 +46,6 @@
#include "em-filter-editor.h"
#include "filter/e-filter-option.h"
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-
#define d(x)
static void
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index fb474ab..2d14120 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -24,7 +24,7 @@
#ifndef _MAIL_AUTOFILTER_H
#define _MAIL_AUTOFILTER_H
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
#include <filter/e-filter-rule.h>
#include <mail/em-filter-context.h>
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 7f0fa42..1ec9627 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -39,6 +39,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml.h>
#include <libxml/tree.h>
@@ -50,12 +51,6 @@
#include "e-util/e-account-utils.h"
#include "e-util/e-signature-utils.h"
-#include <camel/camel-service.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-stream-filter.h>
-
#include <libedataserverui/e-passwords.h>
#include "mail-session.h"
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 6f127ec..d86b4eb 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -24,7 +24,7 @@
#define MAIL_CONFIG_H
#include <gtk/gtk.h>
-#include <camel/camel-provider.h>
+#include <camel/camel.h>
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 4e904d1..438d026 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -34,15 +34,10 @@
#include <time.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-disco-store.h>
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
#include "e-util/e-util.h"
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index 41f36ac..a3ab5c3 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -26,7 +26,7 @@
#ifndef _MAIL_FOLDER_CACHE_H
#define _MAIL_FOLDER_CACHE_H
-#include <camel/camel-store.h>
+#include <camel/camel.h>
/* Add a store whose folders should appear in the shell
The folders are scanned from the store, and/or added at
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index d1aea41..11bb6a6 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -30,8 +30,7 @@
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-flag.h>
-#include <camel/camel-url.h>
-#include <camel/camel-operation.h>
+#include <camel/camel.h>
#include "shell/e-shell.h"
#include "misc/e-gui-utils.h"
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index 64641ee..ae9f6ab 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -23,9 +23,7 @@
#ifndef _MAIL_MT
#define _MAIL_MT
-#include "camel/camel-exception.h"
-#include "camel/camel-object.h"
-#include "camel/camel-operation.h"
+#include <camel/camel.h>
typedef struct _MailMsg MailMsg;
typedef struct _MailMsgInfo MailMsgInfo;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 61f591c..740e42c 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -38,20 +38,7 @@
#include <glib/gi18n.h>
-#include <camel/camel-mime-filter-from.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-disco-folder.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-operation.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-transport.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
#include "composer/e-msg-composer.h"
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 843ada5..b2c8bfb 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -28,12 +28,6 @@ G_BEGIN_DECLS
#include "mail-mt.h"
-#include "camel/camel-store.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-
#include "libedataserver/e-account.h"
void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 36b3632..3b35a85 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -28,14 +28,11 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include "libedataserver/e-account-list.h"
#include "em-filter-rule.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-store.h"
#include "mail-mt.h"
#include "mail-config.h"
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 2ba1f01..7949ae1 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,7 +24,7 @@
#define MAIL_SEND_RECV_H
#include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
#include <shell/e-shell-backend.h>
G_BEGIN_DECLS
diff --git a/mail/mail-session.c b/mail/mail-session.c
index d0b321e..cf8a968 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -31,6 +31,7 @@
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
#ifdef HAVE_CANBERRA
@@ -40,10 +41,6 @@
#include <libedataserverui/e-passwords.h>
#include <libedataserver/e-flag.h>
-#include <camel/camel.h> /* FIXME: this is where camel_init is defined, it shouldn't include everything else */
-#include <camel/camel-filter-driver.h>
-#include <camel/camel-i18n.h>
-
#include "e-util/e-util.h"
#include "e-util/e-error.h"
#include "e-util/e-util-private.h"
diff --git a/mail/mail-session.h b/mail/mail-session.h
index b127440..20a5da2 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -24,7 +24,7 @@
#define MAIL_SESSION_H
#include <glib.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
#include <shell/e-shell-backend.h>
G_BEGIN_DECLS
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 890bebf..60f02ec 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -32,17 +32,13 @@
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
-#include <glib/gi18n.h>
-
-#include <camel/camel-file-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-movemail.h>
-#include <camel/camel-vee-folder.h>
+#include <camel/camel.h>
#include "filter/e-filter-option.h"
#include "filter/e-filter-input.h"
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index ceb3ce8..74f07e4 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -23,9 +23,7 @@
#ifndef MAIL_TOOLS_H
#define MAIL_TOOLS_H
-#include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
/* Get the "inbox" for a url (uses global session) */
CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 20b8c72..c3425f1 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -27,9 +27,7 @@
#include <glib/gi18n.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
+#include <camel/camel.h>
#include <libedataserver/e-account-list.h>
#include "e-util/e-error.h"
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index 725f7ec..a6e946f 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -22,8 +22,7 @@
#ifndef _MAIL_VFOLDER_H
#define _MAIL_VFOLDER_H
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
#include <filter/e-filter-part.h>
#include <filter/e-filter-rule.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index d9af8a5..aa0d546 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -34,16 +34,9 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-thread.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-string-utils.h>
-
#include <libedataserver/e-memory.h>
#include "e-util/e-icon-factory.h"
diff --git a/mail/message-list.h b/mail/message-list.h
index 4c3e1e4..1531bef 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -24,11 +24,9 @@
#define _MESSAGE_LIST_H_
#include <gtk/gtk.h>
-#include <camel/camel-folder-thread.h>
+#include <camel/camel.h>
#include <table/e-tree-scrolled.h>
-
-#include <camel/camel-folder.h>
#include <shell/e-shell-backend.h>
G_BEGIN_DECLS
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index b02ad72..cf8e1d5 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -22,9 +22,9 @@
#include "e-cal-attachment-handler.h"
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <libical/ical.h>
#include <libecal/e-cal.h>
-#include <camel/camel-stream-mem.h>
#include <libedataserverui/e-source-selector.h>
#include "calendar/common/authentication.h"
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index c2e4689..ec2c190 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
#include <libedataserver/e-source.h>
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 01f53c8..55fb8b7 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -22,8 +22,7 @@
#include "e-mail-attachment-handler.h"
#include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
+#include <camel/camel.h>
#include "e-util/e-error.h"
#include "mail/em-composer-utils.h"
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index 870ffe8..6e96a8a 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -22,7 +22,7 @@
#include "e-mail-junk-hook.h"
#include <glib/gi18n.h>
-#include <camel/camel-junk-plugin.h>
+#include <camel/camel.h>
#include "e-util/e-error.h"
#include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 0572cfd..3b8daa3 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -22,10 +22,7 @@
#include "e-mail-shell-backend.h"
#include <glib/gi18n.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#include "e-util/e-account-utils.h"
#include "e-util/e-binding.h"
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 73ef10e..6020562 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -24,8 +24,7 @@
#include <shell/e-shell-backend.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <e-util/e-signature-list.h>
#include <libedataserver/e-account-list.h>
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 465022a..ab7d153 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -22,7 +22,7 @@
#include "e-mail-shell-content.h"
#include <glib/gi18n.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
#include "e-util/e-binding.h"
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index 6abeaa2..ba7840c 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -38,14 +38,8 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
-
-#include <gconf/gconf-client.h>
-
#include <camel/camel.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-disco-folder.h>
+#include <gconf/gconf-client.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 6142b6e..7d995da 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -25,11 +25,8 @@
#include "e-mail-shell-view.h"
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-search-private.h> /* for camel_search_word */
#include "e-util/e-util.h"
#include "e-util/e-binding.h"
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 0f86cd8..de64ec8 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -30,9 +30,8 @@
#include <config.h>
#endif
-#include <camel/camel-url.h>
-
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include "e-util/e-error.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 57ce4dd..efd75bf 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -37,7 +37,7 @@
#include "em-composer-prefs.h"
#include "composer/e-msg-composer.h"
-#include <camel/camel-iconv.h>
+#include <camel/camel.h>
#include <misc/e-gui-utils.h>
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 93829bb..9cce95c 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -30,7 +30,7 @@
#include "em-mailer-prefs.h"
#include "em-format/em-format.h"
-#include <camel/camel-iconv.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml-properties.h>
#include <libxml/tree.h>
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 7ed7467..2f7b046 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -24,6 +24,7 @@
#include <glib/gi18n.h>
#include <string.h>
+#include <camel/camel.h>
#include <glade/glade-xml.h>
#include <gconf/gconf-client.h>
@@ -31,14 +32,6 @@
#include <e-util/e-config.h>
#include <mail/em-config.h>
#include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
#include <e-util/e-error.h>
#include <e-util/e-plugin.h>
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 3228ae0..7ef7df5 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -26,11 +26,9 @@
#include <gtk/gtk.h>
#include <glib/gstdio.h>
+#include <camel/camel.h>
+
#include "e-util/e-mktemp.h"
-#include "camel/camel-medium.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-stream.h"
-#include "camel/camel-stream-fs.h"
#include "mail/em-format-hook.h"
#include "mail/em-format-html.h"
#include "gtkhtml/gtkhtml-embedded.h"
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index a6bba6e..e6dc097 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -24,9 +24,10 @@
#include <config.h>
#endif
+#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <string.h>
+#include <camel/camel.h>
#include <libebook/e-book.h>
#include <libedataserverui/e-source-combo-box.h>
@@ -34,7 +35,6 @@
#include <e-util/e-config.h>
#include <mail/em-config.h>
#include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
#include <composer/e-msg-composer.h>
#include "bbdb.h"
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 202c563..d668eba 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -40,16 +40,13 @@
# include <windows.h>
#endif
-#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <camel/camel.h>
+
#include <e-util/e-plugin.h>
#include "mail/em-config.h"
#include <mail/em-junk.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-debug.h>
#include <gconf/gconf-client.h>
#ifndef BOGOFILTER_BINARY
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index adc9678..3c98df3 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -26,12 +26,13 @@
#include <config.h>
#endif
+#include <camel/camel.h>
+
#include <mail/em-config.h>
#include <mail/em-composer-utils.h>
#include <mail/mail-config.h>
#include <e-util/e-error.h>
#include <e-msg-composer.h>
-#include <camel/camel-mime-filter-tohtml.h>
#include <glib/gi18n-lib.h>
#include <glib-object.h>
diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index 52b37fc..88d2ae3 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -26,7 +26,6 @@
#include "camel-gw-listener.h"
#include <string.h>
-#include <camel/camel-i18n.h>
#include <e-gw-connection.h>
#include <libedataserverui/e-passwords.h>
#include "e-util/e-error.h"
diff --git a/plugins/groupwise-features/camel-gw-listener.h b/plugins/groupwise-features/camel-gw-listener.h
index 1c4cedb..4377eec 100644
--- a/plugins/groupwise-features/camel-gw-listener.h
+++ b/plugins/groupwise-features/camel-gw-listener.h
@@ -24,10 +24,10 @@
#ifndef CAMEL_GW_LISTENER_H
#define CAMEL_GW_LISTENER_H
+#include <camel/camel.h>
#include <libedataserver/e-account-list.h>
-#include<libedataserver/e-source.h>
-#include<libedataserver/e-source-list.h>
-#include <camel/camel-url.h>
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-source-list.h>
G_BEGIN_DECLS
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index f864649..a44540a 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -28,22 +28,16 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
+
#include <e-util/e-config.h>
#include <shell/e-shell.h>
#include <mail/em-config.h>
#include <mail/em-event.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-multipart.h>
#include <mail/em-folder-tree.h>
#include <mail/mail-config.h>
#include <mail/em-folder-selector.h>
-#include <camel/camel-medium.h>
#include <e-gw-connection.h>
#include <share-folder.h>
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index d4b59ae..dfd90f8 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -25,7 +25,7 @@
#define __JUNK_SETTINGS_H__
#include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <e-gw-connection.h>
#define _JUNK_SETTINGS_TYPE (junk_settings_get_type ())
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 1de2dfd..cc11001 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -24,10 +24,9 @@
#include <config.h>
#endif
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
#include <e-gw-connection.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
#include <e-util/e-error.h>
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 8a8c103..b049c6b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -27,14 +27,13 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <libedataserverui/e-passwords.h>
#include <mail/em-folder-tree.h>
#include <mail/mail-config.h>
#include <mail/em-folder-selector.h>
#include <mail/em-account-editor.h>
-#include <camel/camel-url.h>
-#include <camel/camel-store.h>
#include <mail/mail-ops.h>
#include <libedataserver/e-account.h>
#include <e-util/e-util.h>
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 9d7427e..d322331 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -45,8 +45,7 @@
#include <libedataserver/e-account-list.h>
#include <e-util/e-icon-factory.h>
-#include <camel/camel-url.h>
-#include <camel/camel-offline-store.h>
+#include <camel/camel.h>
#include <libedataserverui/e-passwords.h>
#include <libedataserverui/e-name-selector.h>
#include <proxy.h>
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index f819501..4b82a0a 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -25,15 +25,16 @@
#endif
#include <string.h>
-#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <camel/camel.h>
+
#include "mail/em-account-editor.h"
#include "mail/em-config.h"
#include "libedataserver/e-account.h"
#include <misc/e-send-options.h>
#include <mail/em-config.h>
#include <e-gw-connection.h>
-#include <camel/camel-url.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-source-list.h>
#include <libedataserverui/e-passwords.h>
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 2cda1ab..4306c7c 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -28,6 +28,8 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
+
#include <e-util/e-config.h>
#include <mail/em-config.h>
#include <mail/em-folder-properties.h>
@@ -38,11 +40,6 @@
#include <mail/mail-vfolder.h>
#include <mail/em-vfolder-rule.h>
#include <filter/e-filter-rule.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-folder.h>
#include <e-gw-container.h>
#include <e-gw-connection.h>
#include <shell/e-shell-sidebar.h>
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 138266c..4df979d 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -25,7 +25,7 @@
#define __SHARE_FOLDER_H__
#include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include <e-gw-connection.h>
#include <libedataserverui/e-name-selector.h>
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index e384978..aa973dd 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -26,16 +26,13 @@
#include "config.h"
#endif
-#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
-#include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
+#include <gtk/gtk.h>
+#include <camel/camel.h>
+#include <glib/gi18n-lib.h>
#include <mail/e-mail-reader.h>
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 23e0dbe..7593d45 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -25,11 +25,10 @@
#endif
#include <string.h>
-#include <camel/camel-i18n.h>
+#include <camel/camel.h>
#include <libedataserverui/e-passwords.h>
#include <e-util/e-error.h>
#include <libedataserver/e-account.h>
-#include "camel-hula-listener.h"
static GList *hula_accounts = NULL;
diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index 97c1b33..e049b7a 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.h
@@ -24,10 +24,10 @@
#ifndef CAMEL_HULA_LISTENER_H
#define CAMEL_HULA_LISTENER_H
+#include <camel/camel.h>
#include <libedataserver/e-account-list.h>
-#include<libedataserver/e-source.h>
-#include<libedataserver/e-source-list.h>
-#include <camel/camel-url.h>
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-source-list.h>
G_BEGIN_DECLS
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 34427f3..5a62195 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -21,8 +21,8 @@
*
*/
-#include "camel-hula-listener.h"
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include "mail/em-config.h"
static CamelHulaListener *config_listener = NULL;
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index df567aa..1a3d35f 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -26,18 +26,13 @@
#include <string.h>
-#include <mail/em-config.h>
-#include <mail/mail-config.h>
-
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <e-util/e-util.h>
#include <e-util/e-account-utils.h>
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-
-#include <glib/gi18n.h>
+#include <camel/camel.h>
typedef struct _epif_data EPImapFeaturesData;
struct _epif_data {
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 2e413fe..1909cea 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -28,18 +28,8 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store.h>
-#include <camel/camel-db.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserverui/e-source-selector.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 648d35e..e9e2264 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -26,11 +26,8 @@
#include <string.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
#include <libedataserver/e-time-utils.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserverui/e-source-combo-box.h>
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 22b0eea..89662be 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -28,6 +28,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
#ifdef HAVE_CANBERRA
@@ -39,8 +40,6 @@
#include <time.h>
-#include <camel/camel-folder.h>
-
#include <e-util/e-binding.h>
#include <e-util/e-config.h>
#include <e-util/gconf-bridge.h>
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 7163c6a..8229b8b 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -32,20 +32,13 @@
#include <string.h>
#include <stdio.h>
+#include <camel/camel.h>
#include <gtkhtml/gtkhtml.h>
#include <gconf/gconf-client.h>
#include <libecal/e-cal.h>
#include <libedataserver/e-account.h>
#include <libedataserverui/e-source-selector-dialog.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-utf8.h>
-
#include <mail/e-mail-browser.h>
#include <mail/em-utils.h>
#include <mail/em-format-html.h>
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 428bb18..4dc4144 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -28,12 +28,9 @@
#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
-#include "camel/camel-multipart.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-folder.h"
#include "composer/e-msg-composer.h"
#include "mail/e-mail-browser.h"
#include "mail/e-mail-reader.h"
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index cb36dc0..d5036c0 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -28,11 +28,12 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
+
#include <e-util/e-plugin-ui.h>
#include <mail/em-folder-tree.h>
#include <mail/mail-ops.h>
#include <mail/mail-mt.h>
-#include <camel/camel-vee-folder.h>
#include "e-util/e-error.h"
#include <shell/e-shell-sidebar.h>
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index bd77e83..f203407 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -30,8 +30,7 @@
#include <string.h>
#include <stdio.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-part.h>
+#include <camel/camel.h>
#include <em-format/em-format.h>
#include <mail/em-config.h>
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 6fa4801..ad9ee0c 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -34,11 +34,12 @@
#include <unistd.h>
#include <errno.h>
-#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <glib/gprintf.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <e-util/e-import.h>
#include <e-util/e-plugin.h>
@@ -52,16 +53,6 @@
#include <libedataserver/e-data-server-util.h>
#include <libedataserverui/e-source-selector-dialog.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-file-utils.h>
-
#include <mail/e-mail-local.h>
#include <mail/mail-mt.h>
#include <mail/mail-tools.h>
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index d37bb4e..94d3109 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -34,18 +34,13 @@
#include <signal.h>
#include <time.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-debug.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-i18n.h>
+#include <gtk/gtk.h>
+#include <camel/camel.h>
+
#include <mail/em-junk.h>
#include <mail/em-utils.h>
#include <e-util/e-mktemp.h>
-#include <gtk/gtk.h>
#include "mail/em-config.h"
#include <gconf/gconf-client.h>
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index efdbd14..a8e98d6 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -27,13 +27,10 @@
#include <glib/gi18n.h>
#include <string.h>
+#include <camel/camel.h>
#include <gconf/gconf-client.h>
#include <e-util/e-config.h>
-#include <camel/camel-url.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-string-utils.h>
#include <mail/e-mail-local.h>
#include <mail/e-mail-reader.h>
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index c17b57d..764347e 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -40,11 +40,7 @@
#include <libytnef/ytnef.h>
#endif
-#include <camel/camel-mime-part.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-fs.h>
+#include <camel/camel.h>
#include <em-format/em-format.h>
#include <mail/em-format-hook.h>
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 5cd0bff..a5a46b0 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -21,12 +21,10 @@
#endif
#include <gtk/gtk.h>
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-mem.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include "addressbook/gui/merging/eab-contact-merging.h"
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 9d3771a..c650761 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -22,7 +22,7 @@
#include "e-account-combo-box.h"
#include <string.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#define E_ACCOUNT_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 12d4be6..3c442f1 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -23,7 +23,7 @@
#define E_ACCOUNT_COMBO_BOX_H
#include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 8e57dfc..c16edae 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -22,7 +22,7 @@
#include "e-account-tree-view.h"
#include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
#define E_ACCOUNT_TREE_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index bd04a27..735414a 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -23,8 +23,8 @@
#include <config.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <gdk/gdkkeysyms.h>
-#include <camel/camel-stream-mem.h>
#include "e-util/e-binding.h"
#include "e-util/e-util.h"
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 75ed353..bd43c58 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -24,14 +24,7 @@
#include <errno.h>
#include <config.h>
#include <glib/gi18n.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-stream-fs.h>
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index d7cfb5b..33e96a2 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -23,10 +23,7 @@
#define E_ATTACHMENT_H
#include <gtk/gtk.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
/* Standard GObject macros */
#define E_TYPE_ATTACHMENT \
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 21b2e2d..b28ccbb 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -23,11 +23,9 @@
#include <config.h>
#include <string.h>
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-url.h>
-
#include "e-util/e-util.h"
#include "e-util/e-binding.h"
#include "e-util/e-plugin-ui.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
