Index: trunk/ppMerge/src/ppMergeData.c
===================================================================
--- trunk/ppMerge/src/ppMergeData.c	(revision 7061)
+++ trunk/ppMerge/src/ppMergeData.c	(revision 7067)
@@ -2,4 +2,5 @@
 #include <pslib.h>
 
+#include "ppMerge.h"
 #include "ppMergeData.h"
 
@@ -20,5 +21,5 @@
 {
     ppMergeData *data = psAlloc(sizeof(ppMergeData)); // The data, to return
-    psMemSetFreeFunction(data, (psFreeFunc)mergeDataFree);
+    psMemSetDeallocator(data, (psFreeFunc)mergeDataFree);
 
     data->format = NULL;