#include <errno.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "charset.h"
#include "ascii.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#ifndef EILSEQ
*tlen = ob - buf;
- mem_realloc (&buf, ob - buf + 1);
+ p_realloc(&buf, ob - buf + 1);
*t = buf;
iconv_close (cd);