--- buffer.h.orig	2004-02-19 20:35:06.000000000 +0000
+++ buffer.h	2010-08-07 06:29:32.000000000 +0000
@@ -14,6 +14,8 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#define buffer_free buffer_free_conflicts_with_dovecot
+
 typedef struct {
 	u_char	*buf;		/* Buffer for data. */
 	u_int	 alloc;		/* Number of bytes allocated for data. */