-extern char *mangle __P((const struct vol *, char *, char *, int));
-extern char *demangle __P((const struct vol *, char *));
+extern char *mangle __P((const struct vol *, char *, size_t, char *, cnid_t, int));
+extern char *demangle __P((const struct vol *, char *, cnid_t did));
+extern char *demangle_osx __P((const struct vol *, char *, cnid_t did, cnid_t *fileid));