2 files changed, 4 insertions, 4 deletions
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index c0e7bc4705..99bc315db0 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -45,8 +45,6 @@
 
 #include <gal/util/e-xml-utils.h>
 
-#include "mail-component.h"
-
 #include "em-migrate.h"
 
 
@@ -530,7 +528,7 @@ em_migrate_uri (const char *uri)
 	}
 }
 
-int
+static int
 em_migrate_filter_file (const char *evolution_dir, const char *filename, CamelException *ex)
 {
 	char *path, *uri, *new;
diff --git a/mail/em-migrate.h b/mail/em-migrate.h
index b4cf51e725..2ea2b8420e 100644
--- a/mail/em-migrate.h
+++ b/mail/em-migrate.h
@@ -24,6 +24,8 @@
 #ifndef __EM_MIGRATE_H__
 #define __EM_MIGRATE_H__
 
+#include "mail-component.h"
+
 #include <camel/camel-exception.h>
 
 #ifdef __cplusplus
@@ -31,7 +33,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-int em_migrate (struct _MailComponent *component, CamelException *ex);
+int em_migrate (MailComponent *component, CamelException *ex);
 
 #ifdef __cplusplus
 }