-int mutt_cmp_addr (const address_t * a, const address_t * b);
-int mutt_cmp_list (const string_list_t * a, const string_list_t * b);
-int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2);
-int mutt_cmp_body (const BODY * b1, const BODY * b2);
-
-time_t mutt_decrease_mtime (const char *, struct stat *);
-void mutt_set_mtime (const char*, const char*);
-int is_from (const char *, char *, ssize_t, time_t *);
-
-const char *mutt_charset_hook (const char *);
-const char *mutt_iconv_hook (const char *);
-char *mutt_expand_path (char *, ssize_t);
-char *_mutt_expand_path (char *, ssize_t, int);
-char *mutt_find_hook (int, const char *);
-char *mutt_gen_msgid (void);
+
+ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
+#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)
+