Index: head/lib/libmandoc/Makefile
===================================================================
--- head/lib/libmandoc/Makefile	(revision 274890)
+++ head/lib/libmandoc/Makefile	(revision 274891)
@@ -1,42 +1,44 @@
 # $FreeBSD$
 
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 .PATH: ${MDOCMLDIR}
 
 LIB=	mandoc
 #NO_PIC=
 INTERNALLIB=
 MAN=	mandoc.3
 LIBMAN_SRCS=	man.c \
 		man_hash.c \
 		man_macro.c \
 		man_validate.c
 LIBMDOC_SRCS=	arch.c \
 		att.c \
 		lib.c \
 		mdoc.c \
 		mdoc_argv.c \
 		mdoc_hash.c \
 		mdoc_macro.c \
 		mdoc_validate.c \
 		st.c \
 		vol.c
 LIBROFF_SRCS=	eqn.c \
 		roff.c \
 		tbl.c \
 		tbl_data.c \
 		tbl_layout.c \
 		tbl_opts.c
+COMPAT_SRCS=	compat_reallocarray.c
 SRCS=		${LIBMAN_SRCS} \
 		${LIBMDOC_SRCS} \
 		${LIBROFF_SRCS} \
+		${COMPAT_SRCS} \
 		chars.c \
 		mandoc.c \
 		mandoc_aux.c \
 		msec.c \
 		read.c
 
 WARNS?=	3
 CFLAGS+= -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>
Index: head/usr.bin/mandoc/Makefile
===================================================================
--- head/usr.bin/mandoc/Makefile	(revision 274890)
+++ head/usr.bin/mandoc/Makefile	(revision 274891)
@@ -1,24 +1,39 @@
 # $FreeBSD$
 
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 LIBMANDOC=	${.OBJDIR}/../../lib/libmandoc/libmandoc.a
 .PATH: ${MDOCMLDIR}
 
 PROG=	mandoc
 FILES=	example.style.css style.css
 FILESDIR=	${SHAREDIR}/mdocml
 LINKS=	mdocml
 MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 # man.7 mdoc.7 roff.7
 MLINKS= mandoc.1 mdocml.1
-SRCS=	main.c mdoc_term.c chars.c term.c tree.c man_term.c eqn_term.c \
-	mdoc_man.c
-SRCS+=	html.c mdoc_html.c man_html.c out.c eqn_html.c
-SRCS+=	term_ps.c term_ascii.c tbl_term.c tbl_html.c
-SRCS+=	manpath.c compat_reallocarray.c
+
+HTML_SRCS=	eqn_html.c \
+		html.c \
+		man_html.c \
+		mdoc_html.c \
+		tbl_html.c
+MAN_SRCS=	mdoc_man.c
+TERM_SRCS=	eqn_term.c \
+		man_term.c \
+		mdoc_term.c \
+		term.c \
+		term_ascii.c \
+		term_ps.c \
+		tbl_term.c
+SRCS=		${HTML_SRCS} \
+		${MAN_SRCS} \
+		${TERM_SRCS} \
+		main.c \
+		out.c \
+		tree.c
 
 WARNS?=	3
 CFLAGS+= -DHAVE_CONFIG_H
 DPADD=	${LIBMANDOC}
 LDADD=	${LIBMANDOC}
 
 .include <bsd.prog.mk>