diff -durN libgsf-1.14.23.orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c
--- libgsf-1.14.23.orig/tests/test-cp-msole.c	2012-04-02 18:44:04.000000000 +0400
+++ libgsf-1.14.23/tests/test-cp-msole.c	2012-04-06 16:09:28.373741005 +0400
@@ -34,7 +34,7 @@
 static void clone_dir (GsfInfile *in, GsfOutfile *out);
 
 static void
-clone (GsfInput *input, GsfOutput *output)
+test_clone (GsfInput *input, GsfOutput *output)
 {
 	if (gsf_input_size (input) > 0) {
 		guint8 const *data;
@@ -87,7 +87,7 @@
 				gsf_infile_name_by_index  (in, i),
 				is_dir);
 
-		clone (new_input, new_output);
+		test_clone (new_input, new_output);
 	}
 	/* An observation: when you think about the explanation to is_dir
 	 * above, you realize that clone_dir is called even for regular files.
@@ -137,7 +137,7 @@
 
 	outfile = gsf_outfile_msole_new (output);
 	g_object_unref (G_OBJECT (output));
-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+	test_clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
 
 	return 0;
 }
diff -durN libgsf-1.14.23.orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c
--- libgsf-1.14.23.orig/tests/test-cp-zip.c	2012-04-02 18:44:04.000000000 +0400
+++ libgsf-1.14.23/tests/test-cp-zip.c	2012-04-06 16:09:28.425739666 +0400
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 static void
-clone (GsfInfile *in, GsfOutfile *out)
+test_clone (GsfInfile *in, GsfOutfile *out)
 {
 	GsfInput *input = GSF_INPUT (in);
 	GsfOutput *output = GSF_OUTPUT (out);
@@ -85,7 +85,7 @@
 			output = gsf_outfile_new_child_full  (out, name, is_dir,
 							      "compression-level", level,
 							      NULL);
-			clone (GSF_INFILE (input), GSF_OUTFILE (output));
+			test_clone (GSF_INFILE (input), GSF_OUTFILE (output));
 		}
 	}
 	gsf_output_close (GSF_OUTPUT (out));
@@ -137,7 +137,7 @@
 
 	outfile = gsf_outfile_zip_new (output, &err);
 	g_object_unref (G_OBJECT (output));
-	clone (infile, outfile);
+	test_clone (infile, outfile);
 
 	return 0;
 }
diff -durN libgsf-1.14.23.orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c
--- libgsf-1.14.23.orig/tests/test-dump-msole.c	2012-04-02 18:44:04.000000000 +0400
+++ libgsf-1.14.23/tests/test-dump-msole.c	2012-04-06 16:09:28.525737091 +0400
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 static void
-clone (GsfInput *input, GsfOutput *output)
+test_clone (GsfInput *input, GsfOutput *output)
 {
 	guint8 const *data;
 	size_t len;
@@ -72,7 +72,7 @@
 			dst = gsf_outfile_new_child  (out,
 				gsf_infile_name_by_index  (in, i),
 				is_dir);
-			clone (src, dst);
+			test_clone (src, dst);
 		}
 	}
 
@@ -118,7 +118,7 @@
 		g_error_free (err);
 		return 1;
 	}
-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+	test_clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
 
 	return 0;
 }
diff -durN libgsf-1.14.23.orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c
--- libgsf-1.14.23.orig/tests/test-restore-msole.c	2012-04-02 18:44:04.000000000 +0400
+++ libgsf-1.14.23/tests/test-restore-msole.c	2012-04-06 16:09:29.317716705 +0400
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 static void
-clone (GsfInput *input, GsfOutput *output)
+test_clone (GsfInput *input, GsfOutput *output)
 {
 	guint8 const *data;
 	size_t len;
@@ -72,7 +72,7 @@
 			dst = gsf_outfile_new_child  (out,
 				gsf_infile_name_by_index (in, i),
 				is_dir);
-			clone (src, dst);
+			test_clone (src, dst);
 		}
 	}
 
@@ -111,7 +111,7 @@
 
 	outfile = gsf_outfile_msole_new (output);
 	g_object_unref (G_OBJECT (output));
-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+	test_clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
 
 	return 0;
 }