7 files changed, 0 insertions, 18 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 9907ce2c68..c28c9b5148 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -137,8 +137,6 @@ libevolution_mail_la_SOURCES =			\
 	mail-config-factory.h			\
 	mail-folder-cache.c			\
 	mail-folder-cache.h			\
-	mail-importer.c				\
-	mail-importer.h				\
 	mail-mt.c				\
 	mail-mt.h				\
 	mail-offline-handler.c			\
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index cd3416de85..d2130ef7ce 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -37,8 +37,6 @@
 #include "mail-config.h"
 #include "mail-mt.h"
 
-#include "shell/evolution-shell-client.h"
-
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-shlib-factory.h>
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 4e64adbe06..a034c743da 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -47,8 +47,6 @@
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
 
-#include <shell/evolution-shell-client.h>
-
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <e-util/e-url.h>
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 081e1a1425..142052277d 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -38,7 +38,6 @@ extern "C" {
 
 #include "message-list.h"
 
-#include "evolution-storage.h"	/*EvolutionStorage */
 #include "e-util/e-msgport.h"
 #include "e-util/e-account.h"
 
@@ -125,13 +124,6 @@ int mail_send_mail (const char *uri, CamelMimeMessage *message,
 		    void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data),
 		    void *data);
 
-/* scan subfolders and add them to the storage, synchronous */
-/* FIXME: Move this to component-factory.c */
-void mail_scan_subfolders (CamelStore *store, EvolutionStorage *storage);
-/* not sure about this one though */
-int mail_update_subfolders (CamelStore *store, EvolutionStorage *storage,
-			    void (*done)(CamelStore *, void *data),
-			    void *data);
 
 /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
 void mail_send_queue (CamelFolder *queue, const char *destination,
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 23b52789b4..84a278957a 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -30,7 +30,6 @@
 
 #include "Evolution.h"
 
-#include "evolution-shell-component.h"
 #include "mail-component.h"
 #include "mail-vfolder.h"
 #include "mail-tools.h"
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index 50c0dc5d93..d945454c5e 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -3,8 +3,6 @@
 #define _MAIL_VFOLDER_H
 
 #include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
 
 #include "camel/camel-folder.h"
 #include "camel/camel-mime-message.h"
diff --git a/mail/mail.h b/mail/mail.h
index 16ad3e0136..52d1b720a5 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -23,7 +23,6 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel.h>
 #include <composer/e-msg-composer.h>
-#include <shell/evolution-storage.h>
 #include "mail-config.h"
 #include "mail-session.h"
 #include "mail-types.h"