-int mbox_strict_cmp_headers (const HEADER *, const HEADER *);
-int mutt_reopen_mailbox (CONTEXT *, int *);
+int mx_close_mailbox (CONTEXT *, int *);
+int mx_sync_mailbox (CONTEXT *, int *);
+int mx_commit_message (MESSAGE *, CONTEXT *);
+int mx_close_message (MESSAGE **);
+int mx_get_magic (const char *);
+int mx_set_magic (const char *);
+int mx_check_mailbox (CONTEXT *, int *, int);
+
+#ifdef USE_IMAP
+int mx_is_imap (const char *);
+#endif
+#ifdef USE_POP
+int mx_is_pop (const char *);
+#endif
+#ifdef USE_NNTP
+int mx_is_nntp (const char *);
+#endif
+
+int mx_access (const char *, int);
+int mx_check_empty (const char *);