4 files changed, 22 insertions, 11 deletions
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index aa701d9f25..b1677161c7 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -25,20 +25,20 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
+
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
 
-#include <stdio.h>
+#include <camel/camel-exception.h>
+#include <camel/camel-mime-message.h>
+#include <camel/camel-mime-parser.h>
+#include <camel/camel-mime-part.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
-#include "mail-importer.h"
-
-#include <camel/camel-exception.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
+#include "mail/mail-importer.h"
 #include "mail-tools.h"
 
 #define IMPORTER_DEBUG
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c
index 7f8a361697..06267992b5 100644
--- a/mail/importers/evolution-outlook-importer.c
+++ b/mail/importers/evolution-outlook-importer.c
@@ -34,9 +34,13 @@
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
+#include <camel/camel-exception.h>
+
+#include "e-util/e-memory.h"
+
 #include "mail-importer.h"
+#include "mail-tools.h"
 
-#include <camel/camel-exception.h>
 
 #define OUTLOOK_FACTORY_IID "OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
 
@@ -63,6 +67,10 @@ struct oe_msg_segmentheader {
 
 typedef struct oe_msg_segmentheader oe_msg_segmentheader;
 
+/* Prototype */
+
+void mail_importer_module_init (void);
+
 
 /* EvolutionImporter methods */
 
@@ -260,7 +268,7 @@ load_file_fn (EvolutionImporter *eimporter,
 	if (folderpath == NULL)
 		importer->folder = mail_tool_get_local_inbox (NULL);
 	else
-		importer->folder = mail_tool_uri_to_folder (folderpath);
+		importer->folder = mail_tool_uri_to_folder (folderpath, NULL);
 
 	if (importer->folder == NULL){
 		g_warning ("Bad folder");
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 9a6ec5eac9..64effc7b4d 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -34,7 +34,6 @@
 #include <dirent.h>
 
 #include <glib.h>
-#include <gnome.h>
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index cfc32b1975..310eea3483 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -34,7 +34,6 @@
 #include <dirent.h>
 
 #include <glib.h>
-#include <gnome.h>
 
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
@@ -74,6 +73,11 @@ typedef struct {
 	char *path;
 } PineFolder;
 
+/* Prototype */
+
+void mail_importer_module_init (void);
+
+
 static gboolean
 pine_is_mbox (const char *filename)
 {