-int mdoc_argv_lookup(int, const char *);
-int mdoc_argv_parse(struct mdoc *, int,
- int, struct mdoc_arg *, int *, char *);
+int mdoc_valid(struct mdoc *, int, int,
+ int, const char *[],
+ int, const struct mdoc_arg *);
+
+int mdoc_argv(struct mdoc *, int,
+ struct mdoc_arg *, int *, char *);