4 files changed, 30 insertions, 25 deletions
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index 143fd7f4ad..6329ca289a 100644
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -1,29 +1,28 @@
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
-	-I$(includedir) \
-	-I$(top_srcdir)/camel/tests/lib \
-	-DG_LOG_DOMAIN=\"evolution-tests\"	
+INCLUDES =						\
+	-I$(includedir)					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/intl			 	\
+	-I$(top_srcdir)/e-util			 	\
+	-I$(top_srcdir)/camel				\
+	-I$(top_srcdir)/camel/tests/lib 		\
+	-DG_LOG_DOMAIN=\"evolution-tests\"		\
+	$(CAMEL_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
+	$(top_builddir)/camel/libcamel.la 		\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(GNOME_LIBDIR) 				\
+	$(top_builddir)/camel/tests/lib/libcameltest.a	\
+	$(GNOMEUI_LIBS) 				\
+	$(INTLLIBS) 					\
+	$(EVOLUTION_MAIL_LIBS)
 
 check_PROGRAMS =  	\
-	test1	test4	test5	\
-	test2	test6	test7	\
-	test3			\
-	test8			\
-	test9
-
-TESTS = test1 test4 test5 \
-	test2 test6 test7 \
-	test3		  \
-	test8		  \
-	test9
-
-
+	test1	test2	test3	\
+	test4	test5	test6	\
+	test7	test8	test9
 
+TESTS = test1 	test2 	test3 	\
+	test4 	test5 	test6 	\
+	test7	test8	test9
diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c
index dc2946956f..14be8ed570 100644
--- a/camel/tests/folder/test3.c
+++ b/camel/tests/folder/test3.c
@@ -2,6 +2,8 @@
 
 #include <gtk/gtk.h>
 
+#include <string.h>
+
 #include "camel-test.h"
 #include "messages.h"
 #include "folders.h"
@@ -215,7 +217,7 @@ int main(int argc, char **argv)
 				pull();
 
 				push("appending simple message %d", j);
-				camel_folder_append_message(folder, msg, NULL, ex);
+				camel_folder_append_message(folder, msg, NULL, NULL, ex);
 				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
 				pull();
 
diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c
index cf8a7ecc8a..c039af5eb0 100644
--- a/camel/tests/folder/test8.c
+++ b/camel/tests/folder/test8.c
@@ -1,5 +1,7 @@
 /* threaded folder testing */
 
+#include <string.h>
+
 #include "camel-test.h"
 #include "folders.h"
 #include "messages.h"
@@ -54,7 +56,7 @@ test_add_message(CamelFolder *folder, int j)
 	pull();
 
 	push("appending simple message %d", j);
-	camel_folder_append_message(folder, msg, NULL, &ex);
+	camel_folder_append_message(folder, msg, NULL, NULL, &ex);
 	check_msg(!camel_exception_is_set(&ex), "%s", camel_exception_get_description(&ex));
 	pull();
 
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index 974c2c7793..87efb2246c 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -1,5 +1,7 @@
 /* folder/index testing */
 
+#include <string.h>
+
 #include "camel-test.h"
 #include "messages.h"
 #include "folders.h"