Index: tools/build/Makefile
===================================================================
--- tools/build/Makefile
+++ tools/build/Makefile
@@ -4,10 +4,11 @@
 
 LIB=		egacy
 SRC=
-INCSGROUPS=	INCS SYSINCS
+INCSGROUPS=	INCS SYSINCS CASPERINC
 INCS=
 
 SYSINCSDIR=	${INCLUDEDIR}/sys
+CASPERINCDIR=	${INCLUDEDIR}/casper
 
 BOOTSTRAPPING?=	0
 
@@ -58,6 +59,10 @@
 INCS+=		libcasper.h
 .endif
 
+.if !exists(/usr/include/casper/cap_fileargs.h)
+CASPERINC+=	${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h
+.endif
+
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif
@@ -116,7 +121,7 @@
 # and cross-tools stages. We do this here using mkdir since mtree may not exist
 # yet (this happens if we are crossbuilding from Linux/Mac).
 installdirs:
-.for _dir in bin usr/lib usr/include lib/geom lib/casper
+.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper
 	mkdir -p "${DESTDIR}/${_dir}"
 .endfor
 # Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a