28 files changed, 254 insertions, 159 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e80f4ddee4..eefe0837a7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,25 @@
+2004-05-03  Not Zed  <NotZed@Ximian.com>
+
+	* mail-send-recv.c (receive_update_done): removed.
+
+	* em-mailer-prefs.h:
+	* message-tag-followup.h:
+	* mail-config-druid.h:
+	* mail-tools.h: clean up & use forward decls.  Fix users with
+	busted includes.
+
+	* em-composer-utils.c (em_utils_compose_new_message)
+	(em_utils_compose_new_message_with_mailto)
+	(em_utils_post_to_folder, em_utils_post_to_url)
+	(em_utils_edit_message, em_utils_edit_messages)
+	(em_utils_forward_attached, em_utils_forward_inline)
+	(em_utils_forward_quoted, em_utils_forward_message)
+	(em_utils_forward_messages, em_utils_redirect_message)
+	(em_utils_redirect_message_by_uid) :
+	(em_utils_reply_to_message, em_utils_reply_to_message_by_uid)
+	(em_utils_post_reply_to_message_by_uid): Moved these here from
+	em-utils.c.
+
 2004-04-30  Priit Laes  <amd@tt.ee>
 
 	* mail-config.glade: fix typo. #53466.
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index f5499a6195..348fb5fd83 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -28,6 +28,9 @@
 
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeselection.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtkcellrenderertext.h>
 
 #include "mail-component.h"
 #include "mail-config.h"
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 3e5d7c930e..3c7783ea20 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -45,6 +45,19 @@
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeview.h>
+#include <gtk/gtkdialog.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkstock.h>
+
+#include <libgnomeui/gnome-file-entry.h>
+#include <libgnomeui/gnome-color-picker.h>
+
+#include <gtkhtml/gtkhtml.h>
 
 #include "widgets/misc/e-charset-picker.h"
 #include "widgets/misc/e-error.h"
@@ -52,7 +65,7 @@
 #include <e-util/e-icon-factory.h>
 
 #include "mail-config.h"
-
+#include "mail-signature-editor.h"
 
 #define d(x)
 
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index 75a4201205..e24825477b 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -29,19 +29,8 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <gtkhtml/gtkhtml.h>
-
-#include <libgnomeui/gnome-color-picker.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <gconf/gconf-client.h>
-
-#include "mail-signature-editor.h"
-
-#include "evolution-config-control.h"
-
-#include <shell/Evolution.h>
+#include <glib.h>
+#include <gtk/gtkvbox.h>
 #include "Spell.h"
 
 #define EM_COMPOSER_PREFS_TYPE        (em_composer_prefs_get_type ())
@@ -54,50 +43,60 @@ typedef struct _EMComposerPrefs EMComposerPrefs;
 typedef struct _EMComposerPrefsClass EMComposerPrefsClass;
 
 struct _ESignature;
+struct _GtkToggleButton;
+struct _GtkOptionMenu;
+struct _GdkPixbuf;
+struct _GtkWidget;
+struct _GladeXML;
+struct _GnomeColorPicker;
+struct _GConfClient;
+struct _GtkButton;
+struct _GtkTreeView;
+struct _GtkWindow;
 
 struct _EMComposerPrefs {
 	GtkVBox parent_object;
 	
-	GConfClient *gconf;
+	struct _GConfClient *gconf;
 	
-	GladeXML *gui;
+	struct _GladeXML *gui;
 	
 	/* General tab */
 	
 	/* Default Behavior */
-	GtkToggleButton *send_html;
-	GtkToggleButton *auto_smileys;
-	GtkToggleButton *prompt_empty_subject;
-	GtkToggleButton *prompt_bcc_only;
-	GtkOptionMenu *charset;
+	struct _GtkToggleButton *send_html;
+	struct _GtkToggleButton *auto_smileys;
+	struct _GtkToggleButton *prompt_empty_subject;
+	struct _GtkToggleButton *prompt_bcc_only;
+	struct _GtkOptionMenu *charset;
 	
-	GtkToggleButton *spell_check;
-	GnomeColorPicker *colour;
-	GtkTreeView *language;
+	struct _GtkToggleButton *spell_check;
+	struct _GnomeColorPicker *colour;
+	struct _GtkTreeView *language;
 	CORBA_sequence_GNOME_Spell_Language *language_seq;
 	gboolean spell_active;
 	
-	GdkPixbuf *enabled_pixbuf;
-	GtkWidget *spell_able_button;
+	struct _GdkPixbuf *enabled_pixbuf;
+	struct _GtkWidget *spell_able_button;
 	
 	/* Forwards and Replies */
-	GtkOptionMenu *forward_style;
-	GtkOptionMenu *reply_style;
+	struct _GtkOptionMenu *forward_style;
+	struct _GtkOptionMenu *reply_style;
 	
 	/* Keyboard Shortcuts */
-	GtkOptionMenu *shortcuts_type;
+	struct _GtkOptionMenu *shortcuts_type;
 	
 	/* Signatures */
-	GtkTreeView *sig_list;
+	struct _GtkTreeView *sig_list;
 	GHashTable *sig_hash;
-	GtkButton *sig_add;
-	GtkButton *sig_add_script;
-	GtkButton *sig_edit;
-	GtkButton *sig_delete;
-	GtkHTML *sig_preview;
+	struct _GtkButton *sig_add;
+	struct _GtkButton *sig_add_script;
+	struct _GtkButton *sig_edit;
+	struct _GtkButton *sig_delete;
+	struct _GtkHTML *sig_preview;
 	
-	GladeXML *sig_script_gui;
-	GtkWidget *sig_script_dialog;
+	struct _GladeXML *sig_script_gui;
+	struct _GtkWidget *sig_script_dialog;
 	
 	guint sig_added_id;
 	guint sig_removed_id;
@@ -111,12 +110,11 @@ struct _EMComposerPrefsClass {
 	
 };
 
-
 GType em_composer_prefs_get_type (void);
 
-GtkWidget *em_composer_prefs_new (void);
+struct _GtkWidget *em_composer_prefs_new (void);
 
-void em_composer_prefs_new_signature (GtkWindow *parent, gboolean html, const char *script);
+void em_composer_prefs_new_signature (struct _GtkWindow *parent, gboolean html, const char *script);
 
 /* needed by global config */
 #define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl:" BASE_VERSION
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 5422cab731..b3e9ca92fe 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -21,11 +21,14 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <string.h>
 
 #include <gtk/gtkvbox.h>
@@ -78,6 +81,7 @@
 
 #include "e-util/e-dialog-utils.h"
 #include "em-utils.h"
+#include "em-composer-utils.h"
 #include "em-format-html-display.h"
 #include "em-format-html-print.h"
 #include "em-folder-browser.h"
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 00732ef635..8c81be9735 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #include <libxml/parser.h>
 
@@ -51,6 +52,8 @@
 
 #include "em-utils.h"
 
+#include <camel/camel-folder.h>
+
 #include "em-marshal.h"
 #include "em-folder-tree-model.h"
 
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index bb8fcea781..e91cfc4a3f 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -31,12 +31,12 @@
 #include <gtk/gtkvpaned.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <gtkhtml/gtkhtml.h>
-
 #include <libgnome/gnome-url.h>
 
 #include <libgnomeprintui/gnome-print-dialog.h>
 
+#include <gconf/gconf-client.h>
+
 #include <camel/camel-mime-message.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-stream-filter.h>
@@ -67,6 +67,7 @@
 #include "em-message-browser.h"
 #include "message-list.h"
 #include "em-utils.h"
+#include "em-composer-utils.h"
 #include "em-marshal.h"
 
 #include <gtkhtml/gtkhtml.h>
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 9ca583e5c9..24369942e9 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -28,6 +27,7 @@
 #include <string.h>
 
 #include "em-mailer-prefs.h"
+#include "em-format.h"
 
 #include <gal/util/e-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
@@ -35,8 +35,25 @@
 #include "widgets/misc/e-charset-picker.h"
 #include <bonobo/bonobo-generic-factory.h>
 
-#include "mail-config.h"
+#include <libgnomeui/gnome-color-picker.h>
+#include <libgnomeui/gnome-font-picker.h>
+#include <libgnomeui/gnome-file-entry.h>
+
+#include <glade/glade.h>
 
+#include <gconf/gconf-client.h>
+
+#include <gtk/gtkentry.h>
+#include <gtk/gtktreeview.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkmenuitem.h>
+
+#include "mail-config.h"
 
 static void em_mailer_prefs_class_init (EMMailerPrefsClass *class);
 static void em_mailer_prefs_init       (EMMailerPrefs *dialog);
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 065343b48a..3a5f444b51 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __EM_MAILER_PREFS_H__
 #define __EM_MAILER_PREFS_H__
 
@@ -29,18 +28,23 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <libgnomeui/gnome-font-picker.h>
-
-#include "evolution-config-control.h"
-#include "em-format.h"
-
+#include <gtk/gtkvbox.h>
 #include <shell/Evolution.h>
 
+struct _ESignature;
+struct _GtkToggleButton;
+struct _GtkOptionMenu;
+struct _GdkPixbuf;
+struct _GtkWidget;
+struct _GladeXML;
+struct _GnomeColorPicker;
+struct _GnomeFileEntry;
+struct _GnomeFontPicker;
+struct _GConfClient;
+struct _GtkButton;
+struct _GtkTreeView;
+struct _GtkWindow;
+
 #define EM_MAILER_PREFS_TYPE        (em_mailer_prefs_get_type ())
 #define EM_MAILER_PREFS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_MAILER_PREFS_TYPE, EMMailerPrefs))
 #define EM_MAILER_PREFS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EM_MAILER_PREFS_TYPE, EMMailerPrefsClass))
@@ -62,61 +66,61 @@ struct _EMMailerPrefs {
 	
 	GNOME_Evolution_Shell shell;
 	
-	GladeXML *gui;
-	GConfClient *gconf;
+	struct _GladeXML *gui;
+	struct _GConfClient *gconf;
 	
 	/* General tab */
 	
 	/* Message Display */
-	GtkToggleButton *timeout_toggle;
-	GtkSpinButton *timeout;
-	GtkOptionMenu *charset;
-	GtkToggleButton *citation_highlight;
-	GnomeColorPicker *citation_color;
+	struct _GtkToggleButton *timeout_toggle;
+	struct _GtkSpinButton *timeout;
+	struct _GtkOptionMenu *charset;
+	struct _GtkToggleButton *citation_highlight;
+	struct _GnomeColorPicker *citation_color;
 	
 	/* Deleting Mail */
-	GtkToggleButton *empty_trash;
-	GtkOptionMenu *empty_trash_days;
-	GtkToggleButton *confirm_expunge;
+	struct _GtkToggleButton *empty_trash;
+	struct _GtkOptionMenu *empty_trash_days;
+	struct _GtkToggleButton *confirm_expunge;
 	
 	/* New Mail Notification */
-	GtkToggleButton *notify_not;
-	GtkToggleButton *notify_beep;
-	GtkToggleButton *notify_play_sound;
-	GnomeFileEntry *notify_sound_file;
+	struct _GtkToggleButton *notify_not;
+	struct _GtkToggleButton *notify_beep;
+	struct _GtkToggleButton *notify_play_sound;
+	struct _GnomeFileEntry *notify_sound_file;
 	
 	/* HTML Mail tab */
-	GnomeFontPicker *font_variable;
-	GnomeFontPicker *font_fixed;
-	GtkToggleButton *font_share;
+	struct _GnomeFontPicker *font_variable;
+	struct _GnomeFontPicker *font_fixed;
+	struct _GtkToggleButton *font_share;
 	
 	/* Loading Images */
-	GtkToggleButton *images_always;
-	GtkToggleButton *images_sometimes;
-	GtkToggleButton *images_never;
+	struct _GtkToggleButton *images_always;
+	struct _GtkToggleButton *images_sometimes;
+	struct _GtkToggleButton *images_never;
 	
-	GtkToggleButton *show_animated;
-	GtkToggleButton *autodetect_links;
-	GtkToggleButton *prompt_unwanted_html;
+	struct _GtkToggleButton *show_animated;
+	struct _GtkToggleButton *autodetect_links;
+	struct _GtkToggleButton *prompt_unwanted_html;
 
 	/* Labels and Colours tab */
 	struct {
-		GtkEntry *name;
-		GnomeColorPicker *color;
+		struct _GtkEntry *name;
+		struct _GnomeColorPicker *color;
 	} labels[5];
-	GtkButton *restore_labels;
+	struct _GtkButton *restore_labels;
 
 	/* Headers tab */
-	GtkButton *add_header;
-	GtkButton *remove_header;
-	GtkEntry *entry_header;
-	GtkTreeView *header_list;
-	GtkListStore *header_list_store;
+	struct _GtkButton *add_header;
+	struct _GtkButton *remove_header;
+	struct _GtkEntry *entry_header;
+	struct _GtkTreeView *header_list;
+	struct _GtkListStore *header_list_store;
 
 	/* Junk prefs */
-	GtkToggleButton *check_incoming;
-	GtkToggleButton *sa_local_tests_only;
-	GtkToggleButton *sa_use_daemon;
+	struct _GtkToggleButton *check_incoming;
+	struct _GtkToggleButton *sa_local_tests_only;
+	struct _GtkToggleButton *sa_use_daemon;
 };
 
 struct _EMMailerPrefsClass {
@@ -126,10 +130,9 @@ struct _EMMailerPrefsClass {
 	
 };
 
-
 GtkType em_mailer_prefs_get_type (void);
 
-GtkWidget *em_mailer_prefs_new (void);
+struct _GtkWidget *em_mailer_prefs_new (void);
 
 EMMailerPrefsHeader *em_mailer_prefs_header_from_xml(const char *xml);
 char *em_mailer_prefs_header_to_xml(EMMailerPrefsHeader *header);
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 258f94090c..70d324740f 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -46,6 +45,7 @@
 #include "e-util/e-msgport.h"
 #include <e-util/e-icon-factory.h>
 #include "em-utils.h"
+#include "em-composer-utils.h"
 
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 800d318e76..a2c6d035e6 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -45,6 +45,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-store.h>
+#include <camel/camel-mime-message.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index ea28ff3a7b..937b53f937 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -29,6 +29,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
 #include <gmodule.h>
 #include <libgnome/gnome-util.h>
 #include <camel/camel-folder.h>
@@ -36,6 +41,7 @@
 #include <camel/camel-mime-message.h>
 #include <camel/camel-mime-parser.h>
 #include <camel/camel-exception.h>
+#include <camel/camel-stream-mem.h>
 #include <e-util/e-path.h>
 
 #include "mail/mail-mt.h"
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index bc3eaba006..419e47bb60 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -31,9 +31,19 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <gtk/gtkentry.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextview.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtknotebook.h>
+#include <gtk/gtkhbox.h>
+
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 3091abc032..71443f431c 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -41,8 +41,7 @@
 #include "mail-autofilter.h"
 #include "mail-component.h"
 #include "em-utils.h"
-
-#include "camel/camel.h"
+#include "widgets/misc/e-error.h"
 
 #include "filter/vfolder-context.h"
 #include "filter/vfolder-rule.h"
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index ef7e8e85b8..77d1501d10 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -20,17 +20,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include "em-utils.h"
+#include "em-composer-utils.h"
 #include "evolution-composer.h"
 #include "mail-component.h"
 #include "em-account-prefs.h"
-#include "em-composer-prefs.h"
 #include "em-mailer-prefs.h"
+#include "em-composer-prefs.h"
 
 #include "mail-config-druid.h"
 #include "mail-config-factory.h"
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 6227f113e0..102a012523 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -37,6 +37,7 @@
 
 #include "em-popup.h"
 #include "em-utils.h"
+#include "em-composer-utils.h"
 #include "em-format.h"
 #include "em-folder-tree.h"
 #include "em-folder-browser.h"
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index c973362286..65e397f368 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -46,6 +46,7 @@
 #include "mail-config.h"
 #include "mail-ops.h"
 #include "mail-session.h"
+#include "mail-account-gui.h"
 
 #include <evolution-wizard.h>
 #include <e-util/e-account.h>
@@ -77,9 +78,6 @@ typedef struct {
 	MailConfigWizardPage page;
 } MailConfigWizard;
 
-
-
-
 static void
 config_wizard_set_buttons_sensitive (MailConfigWizard *mcw,
 				     gboolean prev_sensitive,
diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h
index f429e98acf..e2145c33d2 100644
--- a/mail/mail-config-druid.h
+++ b/mail/mail-config-druid.h
@@ -28,19 +28,9 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <camel.h>
-#include <glade/glade.h>
-#include <libgnomeui/gnome-druid.h>
-#include <libgnomeui/gnome-file-entry.h>
-#include <bonobo/bonobo-listener.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-widget.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-context.h>
-#include "shell/Evolution.h"
-#include "mail-account-gui.h"
+#include <glib.h>
 
-typedef GtkWindow MailConfigDruid;
+typedef struct _GtkWindow MailConfigDruid;
 
 MailConfigDruid *mail_config_druid_new (void);
 
@@ -58,8 +48,7 @@ char *mail_config_druid_get_transport_url (MailConfigDruid *druid);
 gboolean mail_config_druid_get_save_transport_password (MailConfigDruid *druid);
 gboolean mail_config_druid_get_transport_requires_auth (MailConfigDruid *druid);
 
-
-BonoboObject *evolution_mail_config_wizard_new (void);
+struct _BonoboObject *evolution_mail_config_wizard_new (void);
 
 #ifdef __cplusplus
 }
diff --git a/mail/mail-config.c b/mail/mail-config.c
index ba81899dc7..f6f61198dc 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -25,12 +25,17 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <pwd.h>
-#include <ctype.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
+
 #include <string.h>
+#include <ctype.h>
 
 #include <glib.h>
 #include <gtk/gtkdialog.h>
@@ -54,6 +59,12 @@
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.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 "mail-component.h"
 #include "mail-session.h"
 #include "mail-config.h"
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 008ff84767..fc54aa9c82 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -28,15 +28,26 @@
 #include <config.h>
 #endif
 
-/* #include <ctype.h> */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <string.h>
 #include <errno.h>
 #include <libgnome/gnome-exec.h>
 #include <gal/util/e-util.h>
+
 #include <camel/camel-mime-filter-from.h>
+#include <camel/camel-stream-filter.h>
+#include <camel/camel-stream-fs.h>
+#include <camel/camel-mime-filter-charset.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 "mail-component.h"
 #include "mail-config.h"
 #include "mail-tools.h"
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 09c1605a9e..7d98874bdf 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -636,13 +636,6 @@ receive_done (char *uri, void *data)
 	free_send_info(NULL, info, NULL);
 }
 
-/* same for updating */
-static void
-receive_update_done(CamelStore *store, CamelFolderInfo *info, void *data)
-{
-	receive_done("", data);
-}
-
 /* although we dont do anythign smart here yet, there is no need for this interface to
    be available to anyone else.
    This can also be used to hook into which folders are being updated, and occasionally
diff --git a/mail/mail-session.c b/mail/mail-session.c
index f54996820a..9b16b99b82 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -19,7 +19,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -40,7 +39,9 @@
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-sound.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 "filter/filter-context.h"
 #include "filter/filter-filter.h"
 #include "mail-component.h"
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 60474d2cfb..e53e6172bd 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <ctype.h>
@@ -35,9 +37,9 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <camel/camel.h>
 #include <camel/camel-vee-folder.h>
 #include <camel/camel-file-utils.h>
+#include <camel/camel-movemail.h>
 
 #include <filter/vfolder-rule.h>
 #include <filter/vfolder-context.h>
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index 1603ae6d34..295a30d832 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -1,6 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ * 
  * Author : 
  *  Peter Williams <peterw@ximian.com>
  *
@@ -24,8 +23,12 @@
 #ifndef MAIL_TOOLS_H
 #define MAIL_TOOLS_H
 
-#include <camel/camel.h>
-#include <camel/camel-filter-driver.h> /*eek*/
+#include <glib.h>
+
+struct _CamelFolder;
+struct _CamelException;
+struct _CamelMimeMessage;
+struct _CamelMimePart;
 
 typedef struct _xevolution {
 	char *flags;
@@ -38,35 +41,32 @@ typedef struct _xevolution {
 } XEvolution;
 
 /* Get the "inbox" for a url (uses global session) */
-CamelFolder *mail_tool_get_inbox (const char *url, CamelException *ex);
+struct _CamelFolder *mail_tool_get_inbox (const char *url, struct _CamelException *ex);
 
 /* Get the "trash" for a url (uses global session) */
-CamelFolder *mail_tool_get_trash (const char *url, int connect, CamelException *ex);
+struct _CamelFolder *mail_tool_get_trash (const char *url, int connect, struct _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 */
-char *mail_tool_do_movemail (const char *source_url, CamelException *ex);
+char *mail_tool_do_movemail (const char *source_url, struct _CamelException *ex);
 
-XEvolution *mail_tool_remove_xevolution_headers (CamelMimeMessage *message);
-void mail_tool_restore_xevolution_headers (CamelMimeMessage *message, XEvolution *xev);
+XEvolution *mail_tool_remove_xevolution_headers (struct _CamelMimeMessage *message);
+void mail_tool_restore_xevolution_headers (struct _CamelMimeMessage *message, XEvolution *xev);
 void mail_tool_destroy_xevolution (XEvolution *xev);
 
 /* Generates the subject for a message forwarding @msg */
-gchar *mail_tool_generate_forward_subject (CamelMimeMessage *msg);
+gchar *mail_tool_generate_forward_subject (struct _CamelMimeMessage *msg);
 
 /* Make a message into an attachment */
-CamelMimePart *mail_tool_make_message_attachment (CamelMimeMessage *message);
-
-/* Parse the ui into a real CamelFolder any way we know how. */
-CamelFolder *mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex);
+struct _CamelMimePart *mail_tool_make_message_attachment (struct _CamelMimeMessage *message);
 
-GHashTable *mail_lookup_url_table (CamelMimeMessage *mime_message);
+/* Parse the ui into a real struct _CamelFolder any way we know how. */
+struct _CamelFolder *mail_tool_uri_to_folder (const char *uri, guint32 flags, struct _CamelException *ex);
 
-CamelFolder *mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids);
+GHashTable *mail_lookup_url_table (struct _CamelMimeMessage *mime_message);
 
-char *mail_tools_folder_to_url (CamelFolder *folder);
+struct _CamelFolder *mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids);
 
-struct _EMeta *mail_tool_get_meta_data(const char *uri);
-void mail_tool_delete_meta_data(const char *uri);
+char *mail_tools_folder_to_url (struct _CamelFolder *folder);
 
 #endif
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 45e542b936..b4c2920c8b 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -41,7 +41,6 @@
 #include "e-util/e-account-list.h"
 #include "widgets/misc/e-error.h"
 
-#include "camel/camel.h"
 #include "camel/camel-vee-folder.h"
 #include "camel/camel-vee-store.h"
 #include "camel/camel-vtrash-folder.h"
diff --git a/mail/message-list.c b/mail/message-list.c
index c2d9531999..c34a1444b1 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -26,6 +26,10 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <string.h>
 #include <ctype.h>
 
@@ -51,6 +55,7 @@
 #include <camel/camel-file-utils.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-thread.h>
+#include <camel/camel-vee-folder.h>
 #include <e-util/e-memory.h>
 
 #include "filter/filter-label.h"
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 481e99f140..681b0a8d72 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -36,7 +36,17 @@
 #include <gtk/gtkcombo.h>
 #include <gtk/gtklist.h>
 #define GTK_ENABLE_DEPRECATED
-#endif /* GTK_DISABLE_DEPRECATED */
+#else
+#include <gtk/gtkcombo.h>
+#include <gtk/gtklist.h>
+#endif /* !GTK_DISABLE_DEPRECATED */
+
+#include <gtk/gtkentry.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtktreeview.h>
+#include <gtk/gtkliststore.h>
+#include <gtk/gtkcellrenderertext.h>
 
 #include <glade/glade.h>
 
@@ -48,6 +58,7 @@
 #include "message-tag-followup.h"
 #include "mail-config.h"
 #include <e-util/e-icon-factory.h>
+#include "widgets/misc/e-dateedit.h"
 
 static void message_tag_followup_class_init (MessageTagFollowUpClass *class);
 static void message_tag_followup_init (MessageTagFollowUp *followup);
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index c6a292c19e..e3fac124d6 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -20,15 +20,10 @@
  *
  */
 
-
 #ifndef __MESSAGE_TAG_FOLLOWUP_H__
 #define __MESSAGE_TAG_FOLLOWUP_H__
 
-#include <gtk/gtk.h>
 #include <mail/message-tag-editor.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
-#include <widgets/misc/e-dateedit.h>
 #include <time.h>
 
 #ifdef __cplusplus
@@ -49,13 +44,13 @@ typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass;
 struct _MessageTagFollowUp {
 	MessageTagEditor parent;
 	
-	GtkTreeView *message_list;
+	struct _GtkTreeView *message_list;
 	
-	GtkCombo *combo;
+	struct _GtkCombo *combo;
 	
-	EDateEdit *target_date;
-	GtkToggleButton *completed;
-	GtkButton *clear;
+	struct _EDateEdit *target_date;
+	struct _GtkToggleButton *completed;
+	struct _GtkButton *clear;
 	
 	time_t completed_date;
 };