===================================================================
RCS file: /cvs/mandoc/main.h,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- mandoc/main.h	2015/03/27 21:33:20	1.21
+++ mandoc/main.h	2016/07/08 22:29:05	1.25
@@ -1,4 +1,4 @@
-/*	$Id: main.h,v 1.21 2015/03/27 21:33:20 schwarze Exp $ */
+/*	$Id: main.h,v 1.25 2016/07/08 22:29:05 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -18,11 +18,7 @@
 
 #define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 
-__BEGIN_DECLS
-
-struct	mchars;
-struct	mdoc;
-struct	man;
+struct	roff_man;
 struct	manoutput;
 
 /*
@@ -32,34 +28,26 @@ struct	manoutput;
  * terminal output routines with different character settings.
  */
 
-void		 *html_alloc(const struct mchars *,
-			const struct manoutput *);
-void		  html_mdoc(void *, const struct mdoc *);
-void		  html_man(void *, const struct man *);
+void		 *html_alloc(const struct manoutput *);
+void		  html_mdoc(void *, const struct roff_man *);
+void		  html_man(void *, const struct roff_man *);
 void		  html_free(void *);
 
-void		  tree_mdoc(void *, const struct mdoc *);
-void		  tree_man(void *, const struct man *);
+void		  tree_mdoc(void *, const struct roff_man *);
+void		  tree_man(void *, const struct roff_man *);
 
-void		  man_mdoc(void *, const struct mdoc *);
-void		  man_man(void *, const struct man *);
+void		  man_mdoc(void *, const struct roff_man *);
+void		  man_man(void *, const struct roff_man *);
 
-void		 *locale_alloc(const struct mchars *,
-			const struct manoutput *);
-void		 *utf8_alloc(const struct mchars *,
-			const struct manoutput *);
-void		 *ascii_alloc(const struct mchars *,
-			const struct manoutput *);
+void		 *locale_alloc(const struct manoutput *);
+void		 *utf8_alloc(const struct manoutput *);
+void		 *ascii_alloc(const struct manoutput *);
 void		  ascii_free(void *);
-void		  ascii_sepline(void *);
 
-void		 *pdf_alloc(const struct mchars *,
-			const struct manoutput *);
-void		 *ps_alloc(const struct mchars *,
-			const struct manoutput *);
+void		 *pdf_alloc(const struct manoutput *);
+void		 *ps_alloc(const struct manoutput *);
 void		  pspdf_free(void *);
 
-void		  terminal_mdoc(void *, const struct mdoc *);
-void		  terminal_man(void *, const struct man *);
-
-__END_DECLS
+void		  terminal_mdoc(void *, const struct roff_man *);
+void		  terminal_man(void *, const struct roff_man *);
+void		  terminal_sepline(void *);