Stop abusing forward declarations.

35 files changed, 261 insertions, 276 deletions

diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 81c3bc634a..01f8b9c733 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -91,34 +91,34 @@ typedef struct _EMAccountEditorService {
 	EMAccountEditor *emae;	/* parent pointer, for callbacks */
 
 	/* NOTE: keep all widgets together, first frame last check_dialog */
-	struct _GtkWidget *frame;
-	struct _GtkWidget *container;
-
-	struct _GtkComboBox *providers;
-
-	struct _GtkLabel *description;
-	struct _GtkLabel *hostlabel;
-	struct _GtkEntry *hostname;
-	struct _GtkLabel *userlabel;
-	struct _GtkEntry *username;
-	struct _GtkEntry *path;
-	struct _GtkLabel *pathlabel;
-	struct _GtkWidget *pathentry;
-
-	struct _GtkWidget *ssl_frame;
-	struct _GtkComboBox *use_ssl;
-	struct _GtkWidget *ssl_hbox;
-	struct _GtkWidget *no_ssl;
-
-	struct _GtkWidget *auth_frame;
-	struct _GtkComboBox *authtype;
-
-	struct _GtkWidget *authitem;
-	struct _GtkToggleButton *remember;
-	struct _GtkButton *check_supported;
-	struct _GtkToggleButton *needs_auth;
-
-	struct _GtkWidget *check_dialog;
+	GtkWidget *frame;
+	GtkWidget *container;
+
+	GtkComboBox *providers;
+
+	GtkLabel *description;
+	GtkLabel *hostlabel;
+	GtkEntry *hostname;
+	GtkLabel *userlabel;
+	GtkEntry *username;
+	GtkEntry *path;
+	GtkLabel *pathlabel;
+	GtkWidget *pathentry;
+
+	GtkWidget *ssl_frame;
+	GtkComboBox *use_ssl;
+	GtkWidget *ssl_hbox;
+	GtkWidget *no_ssl;
+
+	GtkWidget *auth_frame;
+	GtkComboBox *authtype;
+
+	GtkWidget *authitem;
+	GtkToggleButton *remember;
+	GtkButton *check_supported;
+	GtkToggleButton *needs_auth;
+
+	GtkWidget *check_dialog;
 	gint check_id;
 
 	GList *authtypes;	/* if "Check supported" */
@@ -128,12 +128,12 @@ typedef struct _EMAccountEditorService {
 	gint auth_changed_id;
 } EMAccountEditorService;
 
-typedef struct _EMAccountEditorPrivate {
+struct _EMAccountEditorPrivate {
 	struct _EMConfig *config;
 	GList *providers;
 
 	/* signatures */
-	struct _GtkComboBox *signatures_dropdown;
+	GtkComboBox *signatures_dropdown;
 	guint sig_added_id;
 	guint sig_removed_id;
 	guint sig_changed_id;
@@ -151,31 +151,31 @@ typedef struct _EMAccountEditorPrivate {
 
 	/* account management */
 	GtkEntry *identity_entries[5];
-	struct _GtkToggleButton *default_account;
-	struct _GtkWidget *management_frame;
+	GtkToggleButton *default_account;
+	GtkWidget *management_frame;
 
 	/* special folders */
-	struct _GtkButton *drafts_folder_button;
-	struct _GtkButton *sent_folder_button;
-	struct _GtkButton *restore_folders_button;
+	GtkButton *drafts_folder_button;
+	GtkButton *sent_folder_button;
+	GtkButton *restore_folders_button;
 
 	/* Security */
-	struct _GtkEntry *pgp_key;
-	struct _GtkToggleButton *pgp_encrypt_to_self;
-	struct _GtkToggleButton *pgp_always_sign;
-	struct _GtkToggleButton *pgp_no_imip_sign;
-	struct _GtkToggleButton *pgp_always_trust;
-
-	struct _GtkToggleButton *smime_sign_default;
-	struct _GtkEntry *smime_sign_key;
-	struct _GtkButton *smime_sign_key_select;
-	struct _GtkButton *smime_sign_key_clear;
-	struct _GtkButton *smime_sign_select;
-	struct _GtkToggleButton *smime_encrypt_default;
-	struct _GtkToggleButton *smime_encrypt_to_self;
-	struct _GtkEntry *smime_encrypt_key;
-	struct _GtkButton *smime_encrypt_key_select;
-	struct _GtkButton *smime_encrypt_key_clear;
+	GtkEntry *pgp_key;
+	GtkToggleButton *pgp_encrypt_to_self;
+	GtkToggleButton *pgp_always_sign;
+	GtkToggleButton *pgp_no_imip_sign;
+	GtkToggleButton *pgp_always_trust;
+
+	GtkToggleButton *smime_sign_default;
+	GtkEntry *smime_sign_key;
+	GtkButton *smime_sign_key_select;
+	GtkButton *smime_sign_key_clear;
+	GtkButton *smime_sign_select;
+	GtkToggleButton *smime_encrypt_default;
+	GtkToggleButton *smime_encrypt_to_self;
+	GtkEntry *smime_encrypt_key;
+	GtkButton *smime_encrypt_key_select;
+	GtkButton *smime_encrypt_key_clear;
 
 	/* for e-config callbacks, each page sets up its widgets, then they are dealed out by the get_widget callback in order*/
 	GtkWidget *widgets[5];
@@ -186,7 +186,7 @@ typedef struct _EMAccountEditorPrivate {
 	guint identity_set:1;
 	guint receive_set:1;
 	guint management_set:1;
-} EMAccountEditorPrivate;
+};
 
 static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service);
 static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id);
@@ -1809,7 +1809,7 @@ emae_queue_widgets(EMAccountEditor *emae, GladeXML *xml, const gchar *first, ...
 }
 
 static GtkWidget *
-emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_identity_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *gui = emae->priv;
@@ -1882,7 +1882,7 @@ emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
 }
 
 static GtkWidget *
-emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_receive_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *gui = emae->priv;
@@ -2177,7 +2177,7 @@ emae_option_options (EMAccountEditorService *service, CamelURL *url, const gchar
 }
 
 static GtkWidget *
-emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_receive_options_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	GtkWidget *w, *box, *spin;
@@ -2214,7 +2214,7 @@ emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *par
 }
 
 static GtkWidget *
-emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	struct _receive_options_item *item = (struct _receive_options_item *)eitem;
@@ -2348,7 +2348,7 @@ section:
 }
 
 static GtkWidget *
-emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_send_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *gui = emae->priv;
@@ -2403,7 +2403,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct
 }
 
 static GtkWidget *
-emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_defaults_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *gui = emae->priv;
@@ -2461,7 +2461,7 @@ emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
 }
 
 static GtkWidget *
-emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_security_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 #if defined (HAVE_NSS)
@@ -2525,7 +2525,7 @@ emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st
 }
 
 static GtkWidget *
-emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	gint i;
@@ -2576,7 +2576,7 @@ static EMConfigItem emae_editor_items[] = {
 static gboolean emae_editor_items_translated = FALSE;
 
 static GtkWidget *
-emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_management_page(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMAccountEditor *emae = data;
 	EMAccountEditorPrivate *gui = emae->priv;
@@ -2606,7 +2606,7 @@ emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 }
 
 static GtkWidget *
-emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emae_widget_druid_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	GladeXML *druidxml;
 	GtkWidget *w;
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 01d9dbd221..d8d96f58f0 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -26,12 +26,13 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
+#include <mail/em-config.h>
 
-struct _EAccount;
+G_BEGIN_DECLS
 
 typedef struct _EMAccountEditor EMAccountEditor;
 typedef struct _EMAccountEditorClass EMAccountEditorClass;
+typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate;
 
 typedef enum {
 	EMAE_NOTEBOOK,
@@ -42,15 +43,15 @@ typedef enum {
 struct _EMAccountEditor {
 	GObject gobject;
 
-	struct _EMAccountEditorPrivate *priv;
+	EMAccountEditorPrivate *priv;
 
 	em_account_editor_t type;
-	struct _GtkWidget *editor; /* gtknotebook or druid, depending on type */
+	GtkWidget *editor; /* gtknotebook or druid, depending on type */
 
-	struct _EMConfig *config; /* driver object */
+	EMConfig *config; /* driver object */
 
-	struct _EAccount *account; /* working account, must instant apply to this */
-	struct _EAccount *original; /* original account, not changed unless commit is invoked */
+	EAccount *account; /* working account, must instant apply to this */
+	EAccount *original; /* original account, not changed unless commit is invoked */
 
 	GtkWidget **pages; /* Pages for Anjal's page type editor */
 
@@ -63,18 +64,18 @@ struct _EMAccountEditorClass {
 
 GType em_account_editor_get_type(void);
 
-EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const gchar *id);
-EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, gchar *id, struct _GtkWidget **pages);
+EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id);
+EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages);
 void em_account_editor_commit (EMAccountEditor *emae);
 void em_account_editor_check (EMAccountEditor *emae, const gchar *page);
 
 gboolean em_account_editor_save (EMAccountEditor *gui);
 void em_account_editor_destroy (EMAccountEditor *gui);
 
-gboolean em_account_editor_identity_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete);
-gboolean em_account_editor_source_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete);
-gboolean em_account_editor_transport_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete);
-gboolean em_account_editor_management_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete);
+gboolean em_account_editor_identity_complete (EMAccountEditor *gui, GtkWidget **incomplete);
+gboolean em_account_editor_source_complete (EMAccountEditor *gui, GtkWidget **incomplete);
+gboolean em_account_editor_transport_complete (EMAccountEditor *gui, GtkWidget **incomplete);
+gboolean em_account_editor_management_complete (EMAccountEditor *gui, GtkWidget **incomplete);
 
 void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url);
 
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index 83560b13d9..3b848f1a2f 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -25,6 +25,8 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <gtkhtml/gtkhtml.h>
+
 #include <shell/e-shell.h>
 
 /* Standard GObject macros */
@@ -70,7 +72,7 @@ struct _EMComposerPrefs {
 	GtkComboBox *reply_style;
 
 	/* Signatures */
-	struct _GtkHTML *sig_preview;
+	GtkHTML *sig_preview;
 };
 
 struct _EMComposerPrefsClass {
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 31d3d507da..b16a1e56b3 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -25,42 +25,36 @@
 #define __EM_COMPOSER_UTILS_H__
 
 #include <glib.h>
+#include <camel/camel-nntp-address.h>
 
-G_BEGIN_DECLS
+#include <em-format/em-format.h>
+#include <composer/e-msg-composer.h>
 
-struct _CamelFolder;
-struct _CamelMimeMessage;
-struct _CamelException;
-struct _CamelInternetAddress;
-struct _CamelNNTPAddress;
-struct _EMsgComposer;
-struct _EMFormat;
-struct _EAccount;
-struct _EDestination;
+G_BEGIN_DECLS
 
 void em_utils_compose_new_message (const gchar *fromuri);
-struct _EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
+EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri);
 
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri);
 
-void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder);
-void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace);
+void em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder);
+void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace);
 
-void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
-void em_utils_forward_inline (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
-void em_utils_forward_quoted (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
+void em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
+void em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
+void em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
 
-void em_utils_forward_message (struct _CamelMimeMessage *msg, const gchar *fromuri);
-void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
+void em_utils_forward_message (CamelMimeMessage *msg, const gchar *fromuri);
+void em_utils_forward_messages (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri);
 
-void em_utils_redirect_message (struct _CamelMimeMessage *message);
-void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const gchar *uid);
+void em_utils_redirect_message (CamelMimeMessage *message);
+void em_utils_redirect_message_by_uid (CamelFolder *folder, const gchar *uid);
 
-void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *address, struct _CamelException *ex);
+void em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex);
 
-void em_utils_handle_receipt (struct _CamelFolder *folder, const gchar *uid, struct _CamelMimeMessage *msg);
-void em_utils_send_receipt   (struct _CamelFolder *folder, struct _CamelMimeMessage *message);
+void em_utils_handle_receipt (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg);
+void em_utils_send_receipt   (CamelFolder *folder, CamelMimeMessage *message);
 
 enum {
 	REPLY_MODE_SENDER,
@@ -68,11 +62,11 @@ enum {
 	REPLY_MODE_LIST
 };
 
-gchar *em_utils_construct_composer_text (struct _CamelMimeMessage *message, struct _EMFormat *source);
-void em_utils_get_reply_sender (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelNNTPAddress *postto);
-void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelInternetAddress *cc, struct _CamelNNTPAddress *postto);
-struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source);
-struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr);
+gchar *em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source);
+void em_utils_get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto);
+void em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto);
+EMsgComposer * em_utils_reply_to_message (CamelFolder *, const gchar *uid, CamelMimeMessage *message, gint mode, EMFormat *source);
+EDestination ** em_utils_camel_address_to_destination (CamelInternetAddress *iaddr);
 
 void em_configure_new_composer (struct _EMsgComposer *composer);
 
diff --git a/mail/em-config.c b/mail/em-config.c
index 985a02d56c..a44554b800 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -190,7 +190,7 @@ EMConfig *em_config_new(gint type, const gchar *menuid)
 }
 
 EMConfigTargetFolder *
-em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri)
+em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri)
 {
 	EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t));
 
diff --git a/mail/em-config.h b/mail/em-config.h
index b2d3bde691..656a40ec38 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -24,15 +24,17 @@
 #define __EM_CONFIG_H__
 
 #include <glib-object.h>
+#include <gconf/gconf-client.h>
+#include <camel/camel-folder.h>
+#include <libedataserver/e-account.h>
 
 #include "e-util/e-config.h"
 
 G_BEGIN_DECLS
 
-struct _GConfClient;
-
 typedef struct _EMConfig EMConfig;
 typedef struct _EMConfigClass EMConfigClass;
+typedef struct _EMConfigPrivate EMConfigPrivate;
 
 /* Current target description */
 /* Types of popup tagets */
@@ -49,7 +51,7 @@ typedef struct _EMConfigTargetAccount EMConfigTargetAccount;
 struct _EMConfigTargetFolder {
 	EConfigTarget target;
 
-	struct _CamelFolder *folder;
+	CamelFolder *folder;
 	gchar *uri;
 };
 
@@ -57,13 +59,13 @@ struct _EMConfigTargetPrefs {
 	EConfigTarget target;
 
 	/* preferences are global from gconf */
-	struct _GConfClient *gconf;
+	GConfClient *gconf;
 };
 
 struct _EMConfigTargetAccount {
 	EConfigTarget target;
 
-	struct _EAccount *account;
+	EAccount *account;
 	/* Need also: working account, not just real account, so changes can be propagated around
 	   And some mechamism for controlling the gui if we're running inside a druid, e.g. enabling 'next' */
 };
@@ -74,7 +76,7 @@ typedef struct _EConfigItem EMConfigItem;
 struct _EMConfig {
 	EConfig config;
 
-	struct _EMConfigPrivate *priv;
+	EMConfigPrivate *priv;
 };
 
 struct _EMConfigClass {
@@ -85,9 +87,9 @@ GType em_config_get_type(void);
 
 EMConfig *em_config_new(gint type, const gchar *menuid);
 
-EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri);
-EMConfigTargetPrefs *em_config_target_new_prefs(EMConfig *emp, struct _GConfClient *gconf);
-EMConfigTargetAccount *em_config_target_new_account(EMConfig *emp, struct _EAccount *account);
+EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri);
+EMConfigTargetPrefs *em_config_target_new_prefs(EMConfig *emp, GConfClient *gconf);
+EMConfigTargetAccount *em_config_target_new_account(EMConfig *emp, EAccount *account);
 
 /* ********************************************************************** */
 
diff --git a/mail/em-event.h b/mail/em-event.h
index b58a0f2cfc..770daa72f2 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -27,15 +27,11 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
+#include "composer/e-msg-composer.h"
 #include "mail/em-folder-browser.h"
 
 G_BEGIN_DECLS
 
-struct _CamelFolder;
-struct _CamelMimeMessage;
-struct _EMsgComposer;
-struct _GtkWidget;
-
 typedef struct _EMEvent EMEvent;
 typedef struct _EMEventClass EMEventClass;
 
@@ -93,9 +89,9 @@ typedef struct _EMEventTargetMessage EMEventTargetMessage;
 
 struct _EMEventTargetMessage {
 	EEventTarget              target;
-	struct _CamelFolder      *folder;
+	CamelFolder      *folder;
 	gchar                     *uid;
-	struct _CamelMimeMessage *message;
+	CamelMimeMessage *message;
 };
 
 typedef struct _EMEventTargetComposer EMEventTargetComposer;
@@ -103,7 +99,7 @@ typedef struct _EMEventTargetComposer EMEventTargetComposer;
 struct _EMEventTargetComposer {
 	EEventTarget target;
 
-	struct _EMsgComposer *composer;
+	EMsgComposer *composer;
 };
 
 typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser;
@@ -111,7 +107,7 @@ typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser;
 struct _EMEventTargetFolderBrowser {
 	EEventTarget target;
 
-	struct _EMFolderBrowser *emfb;
+	EMFolderBrowser *emfb;
 };
 
 
@@ -120,7 +116,7 @@ typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive;
 struct _EMEventTargetSendReceive {
 	EEventTarget target;
 
-	struct _GtkWidget *table;
+	GtkWidget *table;
 	gpointer data;
 	gint row;
 };
@@ -154,9 +150,9 @@ EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags);
 EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
-EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
-EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *uid, guint32 flags);
-EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, gint row, guint32 flags);
+EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags);
+EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags);
+EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags);
 EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *uri, guint32 flags);
 
 /* ********************************************************************** */
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 70cdf88350..1c07f4f5a2 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -155,7 +155,7 @@ add_numbered_row (GtkTable *table, gint row, const gchar *description, const gch
 }
 
 static GtkWidget *
-emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emfp_get_folder_item(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	GtkWidget *w, *table, *label;
 	struct _prop_data *prop_data = data;
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index c700ce0344..131c4a4574 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -57,7 +57,7 @@ struct _EMFolderSelector {
 	guint32 flags;
 	struct _EMFolderTree *emft;
 
-	struct _GtkEntry *name_entry;
+	GtkEntry *name_entry;
 	gchar *selected_path;
 	gchar *selected_uri;
 
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index 4a5de110f8..2c276914c0 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -24,8 +24,13 @@
 #define EM_FOLDER_VIEW_H
 
 #include <gtk/gtk.h>
+#include <bonobo/bonobo-ui-component.h>
+
+#include "mail/em-format-html-display.h"
+#include "mail/em-menu.h"
 #include "mail/em-popup.h"
-#include "message-list.h"
+#include "mail/mail-mt.h"
+#include "mail/message-list.h"
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_VIEW \
@@ -48,10 +53,6 @@
 
 G_BEGIN_DECLS
 
-struct _EMFormatHTMLDisplay;
-struct _CamelFolder;
-struct _CamelMedium;
-
 typedef struct _EMFolderView EMFolderView;
 typedef struct _EMFolderViewClass EMFolderViewClass;
 
@@ -82,9 +83,9 @@ struct _EMFolderView {
 
 	MessageList *list;
 
-	struct _EMFormatHTMLDisplay *preview;
+	EMFormatHTMLDisplay *preview;
 
-	struct _CamelFolder *folder;
+	CamelFolder *folder;
 	gchar *folder_uri;
 
 	gchar *displayed_uid;	/* only used to stop re-loads, don't use it to represent any selection state */
@@ -94,12 +95,12 @@ struct _EMFolderView {
 	const gchar *ui_app_name;
 
 	/* used to manage some menus, particularly plugins */
-	struct _EMMenu *menu;
+	EMMenu *menu;
 
 	/* for proxying jobs to main or other threads */
-	struct _MailAsyncEvent *async;
+	MailAsyncEvent *async;
 
-	struct _BonoboUIComponent *uic;	/* if we're active, this will be set */
+	BonoboUIComponent *uic;	/* if we're active, this will be set */
 	GSList *enable_map;	/* bonobo menu enable map, entries are 0-terminated EMFolderViewEnable arryas
 				   TODO: should this be on class? */
 
@@ -118,10 +119,10 @@ struct _EMFolderViewClass {
 	guint update_message_style:1;
 
 	/* if used as a control, used to activate/deactivate custom menu's */
-	void (*activate)(EMFolderView *, struct _BonoboUIComponent *uic, gint state);
+	void (*activate)(EMFolderView *, BonoboUIComponent *uic, gint state);
 
 	void (*set_folder_uri)(EMFolderView *emfv, const gchar *uri);
-	void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const gchar *uri);
+	void (*set_folder)(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
 	void (*set_message)(EMFolderView *emfv, const gchar *uid, gint nomarkseen);
 
 	void (*show_search_bar)(EMFolderView *emfv);
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 61cc515684..dd61fd6520 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -64,7 +64,7 @@ static const EPluginHookTargetKey emfh_flag_map[] = {
 };
 
 static void
-emfh_format_format(EMFormat *md, struct _CamelStream *stream, struct _CamelMimePart *part, const EMFormatHandler *info)
+emfh_format_format(EMFormat *md, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
 {
 	struct _EMFormatHookItem *item = (EMFormatHookItem *)info;
 
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index 07e6aec24a..e0560f4994 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -43,8 +43,8 @@ typedef void (*EMFormatHookFunc)(struct _EPlugin *plugin, EMFormatHookTarget *da
 
 struct _EMFormatHookTarget {
 	struct _EMFormat *format;
-	struct _CamelStream *stream;
-	struct _CamelMimePart *part;
+	CamelStream *stream;
+	CamelMimePart *part;
 	struct _EMFormatHookItem *item;
 };
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 0d1b6c545a..9da3484f99 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -96,7 +96,7 @@ struct _EMFormatHTMLCache {
 };
 
 struct _EMFormatHTMLPrivate {
-	struct _CamelMimeMessage *last_part;	/* not reffed, DO NOT dereference */
+	CamelMimeMessage *last_part;	/* not reffed, DO NOT dereference */
 	volatile gint format_id;		/* format thread id */
 	guint format_timeout_id;
 	struct _format_msg *format_timeout_msg;
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 384d79846f..563853adcf 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -238,7 +238,7 @@ emis_sync_close(CamelStream *stream)
 }
 
 static void
-emis_image_destroy(struct _GtkImage *image, EMIconStream *emis)
+emis_image_destroy(GtkImage *image, EMIconStream *emis)
 {
 	emis_cleanup(emis);
 }
diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h
index 17d4246059..a06b30d4de 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -23,17 +23,14 @@
 #ifndef EM_ICON_STREAM_H
 #define EM_ICON_STREAM_H
 
-G_BEGIN_DECLS
+#include "mail/em-sync-stream.h"
 
 #define EM_ICON_STREAM_TYPE     (em_icon_stream_get_type ())
 #define EM_ICON_STREAM(obj)     (CAMEL_CHECK_CAST((obj), EM_ICON_STREAM_TYPE, EMIconStream))
 #define EM_ICON_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_ICON_STREAM_TYPE, EMIconStreamClass))
 #define EM_IS_ICON_STREAM(o)    (CAMEL_CHECK_TYPE((o), EM_ICON_STREAM_TYPE))
 
-struct _GtkHTML;
-struct _GtkIconStream;
-
-#include "mail/em-sync-stream.h"
+G_BEGIN_DECLS
 
 typedef struct _EMIconStream {
 	EMSyncStream sync;
@@ -41,7 +38,7 @@ typedef struct _EMIconStream {
 	guint width, height;
 	guint destroy_id;
 	struct _GdkPixbufLoader *loader;
-	struct _GtkImage *image;
+	GtkImage *image;
 	gchar *key;
 
 	guint keep:1;
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index 2a7a18b4d4..ac1779f8f0 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -24,15 +24,16 @@
 #ifndef EM_INLINE_FILTER_H
 #define EM_INLINE_FILTER_H
 
-G_BEGIN_DECLS
+#include <camel/camel-mime-filter.h>
+#include <camel/camel-mime-utils.h>
+#include <camel/camel-multipart.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))
 #define EM_INLINE_FILTER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_INLINE_FILTER_TYPE, EMInlineFilterClass))
 #define EM_IS_INLINE_FILTER(o)    (CAMEL_CHECK_TYPE((o), EM_INLINE_FILTER_TYPE))
 
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-utils.h>
+G_BEGIN_DECLS
 
 typedef struct _EMInlineFilter {
 	CamelMimeFilter filter;
@@ -53,7 +54,7 @@ typedef struct _EMInlineFilterClass {
 
 CamelType    em_inline_filter_get_type(void);
 EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *type);
-struct _CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif);
+CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif);
 
 G_END_DECLS
 
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 1f66518e96..39d18421ef 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -27,6 +27,7 @@
 #include "e-util/e-plugin.h"
 
 #include <camel/camel-junk-plugin.h>
+#include <camel/camel-mime-message.h>
 
 G_BEGIN_DECLS
 
@@ -46,7 +47,7 @@ GQuark em_junk_error_quark (void);
 #define EM_JUNK_ERROR em_junk_error_quark ()
 
 struct _EMJunkHookTarget {
-	struct _CamelMimeMessage *m;
+	CamelMimeMessage *m;
 	GError *error;
 };
 
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 79648a3170..fa450dc2ee 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -696,7 +696,7 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs)
 
 
 static GtkWidget *
-emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMMailerPrefs *prefs = data;
 
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index abef616c69..b33e620392 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -72,9 +72,9 @@ struct _EMMailerPrefs {
 	GtkOptionMenu *charset;
 
 	/* Deleting Mail */
-	struct _GtkToggleButton *empty_trash;
-	struct _GtkComboBox *empty_trash_days;
-	struct _GtkToggleButton *confirm_expunge;
+	GtkToggleButton *empty_trash;
+	GtkComboBox *empty_trash_days;
+	GtkToggleButton *confirm_expunge;
 
 	/* HTML Mail tab */
 	GtkFontButton *font_variable;
diff --git a/mail/em-menu.c b/mail/em-menu.c
index f0da9c8820..bb8063e7dc 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -134,7 +134,7 @@ EMMenu *em_menu_new(const gchar *menuid)
  * Return value:
  **/
 EMMenuTargetSelect *
-em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids)
+em_menu_target_new_select(EMMenu *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids)
 {
 	EMMenuTargetSelect *t = e_menu_target_new(&emp->popup, EM_MENU_TARGET_SELECT, sizeof(*t));
 	guint32 mask = ~0;
@@ -231,7 +231,7 @@ em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar
  * Return value:
  **/
 EMMenuTargetWidget *
-em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w)
+em_menu_target_new_widget(EMMenu *emp, GtkWidget *w)
 {
 	EMMenuTargetWidget *t = e_menu_target_new(&emp->popup, EM_MENU_TARGET_WIDGET, sizeof(*t));
 	guint32 mask = ~0;
diff --git a/mail/em-menu.h b/mail/em-menu.h
index 3e7ca19aed..b2e66916e3 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -25,6 +25,7 @@
 #define __EM_MENU_H__
 
 #include <glib-object.h>
+#include <camel/camel-folder.h>
 
 #include "e-util/e-menu.h"
 
@@ -69,7 +70,7 @@ typedef struct _EMMenuTargetSelect EMMenuTargetSelect;
 
 struct _EMMenuTargetSelect {
 	EMenuTarget target;
-	struct _CamelFolder *folder;
+	CamelFolder *folder;
 	gchar *uri;
 	GPtrArray *uids;
 };
@@ -97,8 +98,8 @@ GType em_menu_get_type(void);
 
 EMMenu *em_menu_new(const gchar *menuid);
 
-EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids);
-EMMenuTargetWidget *em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w);
+EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids);
+EMMenuTargetWidget *em_menu_target_new_widget(EMMenu *emp, GtkWidget *w);
 
 /* ********************************************************************** */
 
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index c9a597c6ed..e530d4d076 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -159,7 +159,7 @@ toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar
 }
 
 static GtkWidget *
-emnp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data)
+emnp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMNetworkPrefs *prefs = data;
 
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index bd4e9e7c8e..057247b750 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -82,8 +82,6 @@ struct _EMNetworkPrefs {
 	GtkLabel *lbl_http_port;
 	GtkLabel *lbl_https_host;
 	GtkLabel *lbl_https_port;
-	GtkLabel *lbl_socks_host;
-	GtkLabel *lbl_socks_port;
 	GtkLabel *lbl_ignore_hosts;
 	GtkLabel *lbl_auth_user;
 	GtkLabel *lbl_auth_pwd;
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 8b26a59f08..f9caf9de0c 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -151,7 +151,7 @@ EMPopup *em_popup_new(const gchar *menuid)
  * Return value:
  **/
 EMPopupTargetSelect *
-em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids)
+em_popup_target_new_select(EMPopup *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids)
 {
 	EMPopupTargetSelect *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_SELECT, sizeof(*t));
 	CamelStore *store = CAMEL_STORE (folder->parent_store);
@@ -269,7 +269,7 @@ em_popup_target_new_uri(EMPopup *emp, const gchar *uri)
 }
 
 EMPopupTargetPart *
-em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type)
+em_popup_target_new_part(EMPopup *emp, CamelMimePart *part, const gchar *mime_type)
 {
 	EMPopupTargetPart *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_PART, sizeof(*t));
 	guint32 mask = ~0;
diff --git a/mail/em-popup.h b/mail/em-popup.h
index cdac00becc..f7182e9358 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -25,6 +25,7 @@
 #define __EM_POPUP_H__
 
 #include <glib-object.h>
+#include <camel/camel-folder.h>
 
 #include "e-util/e-popup.h"
 
@@ -183,7 +184,7 @@ struct _EMPopupTargetURI {
  **/
 struct _EMPopupTargetSelect {
 	EPopupTarget target;
-	struct _CamelFolder *folder;
+	CamelFolder *folder;
 	gchar *uri;
 	GPtrArray *uids;
 };
@@ -202,7 +203,7 @@ struct _EMPopupTargetSelect {
 struct _EMPopupTargetPart {
 	EPopupTarget target;
 	gchar *mime_type;
-	struct _CamelMimePart *part;
+	CamelMimePart *part;
 };
 
 /**
@@ -236,8 +237,8 @@ GType em_popup_get_type(void);
 EMPopup *em_popup_new(const gchar *menuid);
 
 EMPopupTargetURI *em_popup_target_new_uri(EMPopup *emp, const gchar *uri);
-EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids);
-EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type);
+EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids);
+EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, CamelMimePart *part, const gchar *mime_type);
 EMPopupTargetFolder *em_popup_target_new_folder(EMPopup *emp, const gchar *uri, guint32 info_flags, guint32 popup_flags);
 
 /* ********************************************************************** */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 6617b041d2..e2af699898 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2176,8 +2176,8 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 	return found;
 }
 
-struct _CamelMimePart *
-em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
+CamelMimePart *
+em_utils_contact_photo (CamelInternetAddress *cia, gboolean local)
 {
 	const gchar *addr;
 	gint stop = FALSE, found = FALSE;
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 92f555cf75..7759a4e4e7 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -24,10 +24,15 @@
 #ifndef __MAIL_IMPORTER_H__
 #define __MAIL_IMPORTER_H__
 
+#include <bonobo/bonobo-generic-factory.h>
+#include <camel/camel-folder.h>
+
+#include <e-util/e-import.h>
+
 typedef struct _MailImporter MailImporter;
 struct _MailImporter {
-	struct _CamelFolder *folder;
-	struct _CamelStreamMem *mstream;
+	CamelFolder *folder;
+	CamelStreamMem *mstream;
 
 	gboolean frozen; /* Is folder frozen? */
 };
@@ -47,15 +52,10 @@ void mail_importer_create_folder (const gchar *parent_path,
 /* creates a folder at folderpath on the local storage */
 gchar *mail_importer_make_local_folder(const gchar *folderpath);
 
-struct _BonoboObject;
-struct _BonoboGenericFactory;
-struct _CamelOperation;
-struct _CamelException;
-
-struct _EImportImporter *mbox_importer_peek(void);
+EImportImporter *mbox_importer_peek(void);
 
-struct _EImportImporter *elm_importer_peek(void);
-struct _EImportImporter *pine_importer_peek(void);
+EImportImporter *elm_importer_peek(void);
+EImportImporter *pine_importer_peek(void);
 
 #define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:" BASE_VERSION
 #define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:" BASE_VERSION
@@ -64,14 +64,14 @@ struct _EImportImporter *pine_importer_peek(void);
 #define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION
 #define OUTLOOK_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Outlook_Importer:" BASE_VERSION
 
-struct _BonoboObject *elm_intelligent_importer_new(void);
-struct _BonoboObject *pine_intelligent_importer_new(void);
-struct _BonoboObject *netscape_intelligent_importer_new(void);
+BonoboObject *elm_intelligent_importer_new(void);
+BonoboObject *pine_intelligent_importer_new(void);
+BonoboObject *netscape_intelligent_importer_new(void);
 
-struct _BonoboObject *mbox_importer_new(void);
-struct _BonoboObject *outlook_importer_new(void);
+BonoboObject *mbox_importer_new(void);
+BonoboObject *outlook_importer_new(void);
 
-struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data);
+BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data);
 
 
 /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */
@@ -81,8 +81,8 @@ struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *fac
 #define MSG_FLAG_MARKED 0x0004
 #define MSG_FLAG_EXPUNGED 0x0008
 
-gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel, void (*done)(gpointer data, struct _CamelException *), gpointer data);
-void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel);
+gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, CamelOperation *cancel, void (*done)(gpointer data, CamelException *), gpointer data);
+void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, CamelOperation *cancel);
 
 struct _MailImporterSpecial {
 	const gchar *orig, *new;
@@ -93,6 +93,6 @@ typedef struct _MailImporterSpecial MailImporterSpecial;
 #define MAIL_IMPORTER_MOZFMT (1<<0)
 
 /* api in flux */
-void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, struct _CamelOperation *cancel);
+void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, CamelOperation *cancel);
 
 #endif
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 67ff5d6310..8ad98589ef 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -24,12 +24,11 @@
 #ifndef _MAIL_AUTOFILTER_H
 #define _MAIL_AUTOFILTER_H
 
-struct _FilterRule;
-struct _EMVFolderContext;
-struct _EMFilterContext;
-struct _CamelMimeMessage;
-struct _CamelInternetAddress;
-struct _CamelStore;
+#include <camel/camel-mime-message.h>
+
+#include <filter/filter-rule.h>
+#include <mail/em-filter-context.h>
+#include <mail/em-vfolder-context.h>
 
 enum {
 	AUTO_SUBJECT = 1,
@@ -38,15 +37,15 @@ enum {
 	AUTO_MLIST = 8
 };
 
-struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, gint flags, const gchar *source);
-struct _FilterRule *filter_rule_from_message(struct _EMFilterContext *context, struct _CamelMimeMessage *msg, gint flags);
-struct _FilterRule *em_vfolder_rule_from_address(struct _EMVFolderContext *context, struct _CamelInternetAddress *addr, gint flags, const gchar *source);
+FilterRule *em_vfolder_rule_from_message(EMVFolderContext *context, CamelMimeMessage *msg, gint flags, const gchar *source);
+FilterRule *filter_rule_from_message(EMFilterContext *context, CamelMimeMessage *msg, gint flags);
+FilterRule *em_vfolder_rule_from_address(EMVFolderContext *context, CamelInternetAddress *addr, gint flags, const gchar *source);
 
 /* easiest place to put this */
-void  filter_gui_add_from_message(struct _CamelMimeMessage *msg, const gchar *source, gint flags);
+void  filter_gui_add_from_message(CamelMimeMessage *msg, const gchar *source, gint flags);
 
 /* Also easiest place for these, we should really share a global rule context for this stuff ... */
-void mail_filter_rename_uri(struct _CamelStore *store, const gchar *olduri, const gchar *newuri);
-void mail_filter_delete_uri(struct _CamelStore *store, const gchar *uri);
+void mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newuri);
+void mail_filter_delete_uri(CamelStore *store, const gchar *uri);
 
 #endif
diff --git a/mail/mail-component.h b/mail/mail-component.h
index a7885fd50a..f5e2ad0f6d 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -28,8 +28,9 @@
 #include <bonobo/bonobo-object.h>
 #include "shell/evolution-component.h"
 #include "mail/Evolution-Mail.h"
-
-struct _CamelStore;
+#include "mail/em-folder-tree-model.h"
+#include "filter/rule-context.h"
+#include "misc/e-activity-handler.h"
 
 #define MAIL_TYPE_COMPONENT			(mail_component_get_type ())
 #define MAIL_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_COMPONENT, MailComponent))
@@ -68,18 +69,18 @@ MailComponent *mail_component_peek  (void);
 
 /* NOTE: Using NULL as the component implies using the default component */
 const gchar       *mail_component_peek_base_directory    (MailComponent *component);
-struct _RuleContext      *mail_component_peek_search_context    (MailComponent *component);
-struct _EActivityHandler *mail_component_peek_activity_handler  (MailComponent *component);
+RuleContext      *mail_component_peek_search_context    (MailComponent *component);
+EActivityHandler *mail_component_peek_activity_handler  (MailComponent *component);
 
 void        mail_component_add_store            (MailComponent *component,
-						 struct _CamelStore    *store,
+						 CamelStore    *store,
 						 const gchar    *name);
-struct _CamelStore *mail_component_load_store_by_uri    (MailComponent *component,
+CamelStore *mail_component_load_store_by_uri    (MailComponent *component,
 						 const gchar    *uri,
 						 const gchar    *name);
 
 void        mail_component_remove_store         (MailComponent *component,
-						 struct _CamelStore    *store);
+						 CamelStore    *store);
 void        mail_component_remove_store_by_uri  (MailComponent *component,
 						 const gchar    *uri);
 
@@ -88,12 +89,12 @@ void         mail_component_stores_foreach   (MailComponent *component,
 					      GHFunc         func,
 					      void          *data);
 
-void mail_component_remove_folder (MailComponent *component, struct _CamelStore *store, const gchar *path);
+void mail_component_remove_folder (MailComponent *component, CamelStore *store, const gchar *path);
 
-struct _EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component);
+EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component);
 
-struct _CamelStore *mail_component_peek_local_store (MailComponent *mc);
-struct _CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id);
+CamelStore *mail_component_peek_local_store (MailComponent *mc);
+CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id);
 const gchar *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id);
 
 gint status_check (GNOME_Evolution_ShellState shell_state);
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 1026927b8c..cc5878456c 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -23,19 +23,13 @@
 #ifndef MAIL_CONFIG_H
 #define MAIL_CONFIG_H
 
-#include <glib-object.h>
-#include <camel/camel-folder.h>
+#include <gtk/gtk.h>
 #include <camel/camel-provider.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-account-list.h>
 
-struct _EAccount;
-struct _EAccountList;
-struct _EAccountService;
-
-struct _ESignature;
-struct _ESignatureList;
-
-struct _GConfClient;
-struct _GtkWindow;
+#include <e-util/e-signature.h>
+#include <e-util/e-signature-list.h>
 
 G_BEGIN_DECLS
 
@@ -78,22 +72,22 @@ void mail_config_clear (void);
 void mail_config_write (void);
 void mail_config_write_on_exit (void);
 
-struct _GConfClient *mail_config_get_gconf_client (void);
+GConfClient *mail_config_get_gconf_client (void);
 
 /* General Accessor functions */
 const gchar **mail_config_get_allowable_mime_types (void);
 
-void mail_config_service_set_save_passwd (struct _EAccountService *service, gboolean save_passwd);
+void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd);
 
 /* accounts */
-struct _EAccount *mail_config_get_account_by_source_url (const gchar *url);
-struct _EAccount *mail_config_get_account_by_transport_url (const gchar *url);
+EAccount *mail_config_get_account_by_source_url (const gchar *url);
+EAccount *mail_config_get_account_by_transport_url (const gchar *url);
 
 gint mail_config_get_address_count (void);
 gint mail_config_get_message_limit (void);
 gboolean mail_config_get_enable_magic_spacebar (void);
 
-struct _EAccountService  *mail_config_get_default_transport (void);
+EAccountService  *mail_config_get_default_transport (void);
 
 /* uri's got changed by the store, etc */
 void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gchar *new);
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 4920ab9e80..ade31e56b9 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -51,7 +51,7 @@
 #define d(x)
 
 static void set_stop(gint sensitive);
-static void mail_operation_status(struct _CamelOperation *op, const gchar *what, gint pc, gpointer data);
+static void mail_operation_status(CamelOperation *op, const gchar *what, gint pc, gpointer data);
 
 #ifdef LOG_LOCKS
 #define MAIL_MT_LOCK(x) (log_locks?fprintf(log, "%" G_GINT64_MODIFIER "x: lock " # x "\n", e_util_pthread_id(pthread_self())):0, pthread_mutex_lock(&x))
@@ -932,7 +932,7 @@ void mail_disable_stop(void)
 struct _op_status_msg {
 	MailMsg base;
 
-	struct _CamelOperation *op;
+	CamelOperation *op;
 	gchar *what;
 	gint pc;
 	gpointer data;
@@ -1047,7 +1047,7 @@ static MailMsgInfo op_status_info = {
 };
 
 static void
-mail_operation_status (struct _CamelOperation *op, const gchar *what, gint pc, gpointer data)
+mail_operation_status (CamelOperation *op, const gchar *what, gint pc, gpointer data)
 {
 	struct _op_status_msg *m;
 
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index 11e7c87dcd..ceb3ce8fb0 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -24,39 +24,35 @@
 #define MAIL_TOOLS_H
 
 #include <glib.h>
-
-struct _CamelFolder;
-struct _CamelException;
-struct _CamelMimeMessage;
-struct _CamelMimePart;
-struct _camel_header_raw;
+#include <camel/camel-folder.h>
+#include <camel/camel-mime-message.h>
 
 /* Get the "inbox" for a url (uses global session) */
-struct _CamelFolder *mail_tool_get_inbox (const gchar *url, struct _CamelException *ex);
+CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex);
 
 /* Get the "trash" for a url (uses global session) */
-struct _CamelFolder *mail_tool_get_trash (const gchar *url, gint connect, struct _CamelException *ex);
+CamelFolder *mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex);
 
 /* Does a camel_movemail into the local movemail folder
  * and returns the path to the new movemail folder that was created. which shoudl be freed later */
-gchar *mail_tool_do_movemail (const gchar *source_url, struct _CamelException *ex);
+gchar *mail_tool_do_movemail (const gchar *source_url, CamelException *ex);
 
-struct _camel_header_raw *mail_tool_remove_xevolution_headers (struct _CamelMimeMessage *message);
-void mail_tool_restore_xevolution_headers (struct _CamelMimeMessage *message, struct _camel_header_raw *);
+struct _camel_header_raw *mail_tool_remove_xevolution_headers (CamelMimeMessage *message);
+void mail_tool_restore_xevolution_headers (CamelMimeMessage *message, struct _camel_header_raw *);
 
 /* Generates the subject for a message forwarding @msg */
-gchar *mail_tool_generate_forward_subject (struct _CamelMimeMessage *msg);
+gchar *mail_tool_generate_forward_subject (CamelMimeMessage *msg);
 
 /* Make a message into an attachment */
-struct _CamelMimePart *mail_tool_make_message_attachment (struct _CamelMimeMessage *message);
+CamelMimePart *mail_tool_make_message_attachment (CamelMimeMessage *message);
 
-/* Parse the ui into a real struct _CamelFolder any way we know how. */
-struct _CamelFolder *mail_tool_uri_to_folder (const gchar *uri, guint32 flags, struct _CamelException *ex);
+/* Parse the ui into a real CamelFolder any way we know how. */
+CamelFolder *mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex);
 
-GHashTable *mail_lookup_url_table (struct _CamelMimeMessage *mime_message);
+GHashTable *mail_lookup_url_table (CamelMimeMessage *mime_message);
 
-struct _CamelFolder *mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids);
+CamelFolder *mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids);
 
-gchar *mail_tools_folder_to_url (struct _CamelFolder *folder);
+gchar *mail_tools_folder_to_url (CamelFolder *folder);
 
 #endif
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index 6635127814..b3299ab834 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -22,37 +22,36 @@
 #ifndef _MAIL_VFOLDER_H
 #define _MAIL_VFOLDER_H
 
-#include <shell/e-shell-view.h>
+#include <camel/camel-internet-address.h>
+#include <camel/camel-mime-message.h>
 
-struct _CamelStore;
-struct _FilterPart;
-struct _FilterRule;
-struct _CamelMimeMessage;
-struct _EMVFolderRule;
-struct _CamelInternetAddress;
+#include <filter/filter-part.h>
+#include <filter/filter-rule.h>
+#include <mail/em-vfolder-rule.h>
+#include <shell/e-shell-view.h>
 
 void vfolder_load_storage(void);
 void vfolder_revert(void);
 
 void vfolder_edit (EShellView *shell_view);
 void vfolder_edit_rule(const gchar *name);
-struct _FilterPart *vfolder_create_part (const gchar *name);
-struct _FilterRule *vfolder_clone_rule (struct _FilterRule *in);
-void vfolder_gui_add_rule (struct _EMVFolderRule *rule);
-void vfolder_gui_add_from_message (struct _CamelMimeMessage *msg, gint flags, const gchar *source);
-void vfolder_gui_add_from_address (struct _CamelInternetAddress *addr, gint flags, const gchar *source);
+FilterPart *vfolder_create_part (const gchar *name);
+FilterRule *vfolder_clone_rule (FilterRule *in);
+void vfolder_gui_add_rule (EMVFolderRule *rule);
+void vfolder_gui_add_from_message (CamelMimeMessage *msg, gint flags, const gchar *source);
+void vfolder_gui_add_from_address (CamelInternetAddress *addr, gint flags, const gchar *source);
 
 GList * mail_vfolder_get_sources_local (void);
 GList * mail_vfolder_get_sources_remote (void);
 
 /* add a uri that is now (un)available to vfolders in a transient manner */
-void mail_vfolder_add_uri(struct _CamelStore *store, const gchar *uri, gint remove);
+void mail_vfolder_add_uri(CamelStore *store, const gchar *uri, gint remove);
 
 /* note that a folder has changed name (uri) */
-void mail_vfolder_rename_uri(struct _CamelStore *store, const gchar *from, const gchar *to);
+void mail_vfolder_rename_uri(CamelStore *store, const gchar *from, const gchar *to);
 
 /* remove a uri that should be removed from vfolders permanently */
-void mail_vfolder_delete_uri(struct _CamelStore *store, const gchar *uri);
+void mail_vfolder_delete_uri(CamelStore *store, const gchar *uri);
 
 /* close up, clean up */
 void mail_vfolder_shutdown (void);
diff --git a/mail/message-list.h b/mail/message-list.h
index 15ea286970..075c20afe3 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -24,6 +24,7 @@
 #define _MESSAGE_LIST_H_
 
 #include <gtk/gtk.h>
+#include <camel/camel-folder-thread.h>
 
 #include <table/e-table-simple.h>
 #include <table/e-tree-scrolled.h>
@@ -161,7 +162,7 @@ struct _MessageList {
 	gchar *frozen_search;	/* to save search took place while we were frozen */
 
 	/* the current camel folder thread tree, if any */
-	struct _CamelFolderThread *thread_tree;
+	CamelFolderThread *thread_tree;
 
 	/* for message/folder chagned event handling */
 	struct _MailAsyncEvent *async_event;
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index bc8c793eff..c7ed55c61a 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -42,13 +42,13 @@ typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass;
 struct _MessageTagFollowUp {
 	MessageTagEditor parent;
 
-	struct _GtkTreeView *message_list;
+	GtkTreeView *message_list;
 
-	struct _GtkComboBox *combo_entry;
+	GtkComboBox *combo_entry;
 
 	struct _EDateEdit *target_date;
-	struct _GtkToggleButton *completed;
-	struct _GtkButton *clear;
+	GtkToggleButton *completed;
+	GtkButton *clear;
 
 	time_t completed_date;
 };