Index: usr.bin/hdrtest/Makefile
===================================================================
--- /dev/null
+++ usr.bin/hdrtest/Makefile
@@ -0,0 +1,185 @@
+#
+# The following headers are known to be independent
+#
+# It's about a 50/50 split right now, so this list is far too long. In the
+# future, having an opt-out list might be better.
+#
+HDRS= \
+	sys/_bitset.h \
+	sys/_bus_dma.h \
+	sys/_clock_id.h \
+	sys/_cpuset.h \
+	sys/_domainset.h \
+	sys/_eventhandler.h \
+	sys/_iovec.h \
+	sys/_null.h \
+	sys/_pthreadtypes.h \
+	sys/_stdarg.h \
+	sys/_termios.h \
+	sys/_timespec.h \
+	sys/_timeval.h \
+	sys/_types.h \
+	sys/_uio.h \
+	sys/_umtx.h \
+	sys/_winsize.h \
+	sys/abi_compat.h \
+	sys/acl.h \
+	sys/aio.h \
+	sys/arb.h \
+	sys/asan.h \
+	sys/assym.h \
+	sys/auxv.h \
+	sys/bitset.h \
+	sys/bitstring.h \
+	sys/blockcount.h \
+	sys/boot.h \
+	sys/bufobj.h \
+	sys/capsicum.h \
+	sys/cdefs.h \
+	sys/cdio.h \
+	sys/chio.h \
+	sys/ck.h \
+	sys/clock.h \
+	sys/cnv.h \
+	sys/compressor.h \
+	sys/condvar.h \
+	sys/consio.h \
+	sys/copyright.h \
+	sys/csan.h \
+	sys/ctype.h \
+	sys/devicestat.h \
+	sys/dirent.h \
+	sys/disk.h \
+	sys/disklabel.h \
+	sys/dkstat.h \
+	sys/dnv.h \
+	sys/elf.h \
+	sys/endian.h \
+	sys/errno.h \
+	sys/event.h \
+	sys/eventfd.h \
+	sys/fbio.h \
+	sys/fcntl.h \
+	sys/fdcio.h \
+	sys/file.h \
+	sys/filio.h \
+	sys/gsb_crc32.h \
+	sys/hash.h \
+	sys/imgact_binmisc.h \
+	sys/ioccom.h \
+	sys/ioctl.h \
+	sys/ipc.h \
+	sys/joystick.h \
+	sys/kbio.h \
+	sys/kcov.h \
+	sys/kenv.h \
+	sys/kern_prefetch.h \
+	sys/kerneldump.h \
+	sys/kpilite.h \
+	sys/kthread.h \
+	sys/ktr.h \
+	sys/ktr_class.h \
+	sys/limits.h \
+	sys/link_elf.h \
+	sys/lockstat.h \
+	sys/malloc.h \
+	sys/mchain.h \
+	sys/mman.h \
+	sys/mount.h \
+	sys/mouse.h \
+	sys/mqueue.h \
+	sys/msan.h \
+	sys/msg.h \
+	sys/mtio.h \
+	sys/nlist_aout.h \
+	sys/nv.h \
+	sys/param.h \
+	sys/pcpu.h \
+	sys/pidctrl.h \
+	sys/poll.h \
+	sys/priv.h \
+	sys/procctl.h \
+	sys/procdesc.h \
+	sys/procfs.h \
+	sys/protosw.h \
+	sys/ptio.h \
+	sys/ptrace.h \
+	sys/queue.h \
+	sys/random.h \
+	sys/rangelock.h \
+	sys/rangeset.h \
+	sys/rctl.h \
+	sys/reboot.h \
+	sys/reg.h \
+	sys/regression.h \
+	sys/resource.h \
+	sys/sched.h \
+	sys/sdt.h \
+	sys/select.h \
+	sys/selinfo.h \
+	sys/sem.h \
+	sys/seqc.h \
+	sys/serial.h \
+	sys/shm.h \
+	sys/signal.h \
+	sys/sleepqueue.h \
+	sys/slicer.h \
+	sys/smp.h \
+	sys/sndstat.h \
+	sys/snoop.h \
+	sys/sockbuf.h \
+	sys/socket.h \
+	sys/sockio.h \
+	sys/soundcard.h \
+	sys/specialfd.h \
+	sys/spigenio.h \
+	sys/stat.h \
+	sys/statvfs.h \
+	sys/stdatomic.h \
+	sys/stddef.h \
+	sys/stdint.h \
+	sys/syscall.h \
+	sys/sysctl.h \
+	sys/sysent.h \
+	sys/syslog.h \
+	sys/sysproto.h \
+	sys/termios.h \
+	sys/thr.h \
+	sys/tim_filter.h \
+	sys/time.h \
+	sys/timeb.h \
+	sys/timers.h \
+	sys/times.h \
+	sys/timespec.h \
+	sys/timex.h \
+	sys/tree.h \
+	sys/tslog.h \
+	sys/tty.h \
+	sys/ttycom.h \
+	sys/ttydefaults.h \
+	sys/turnstile.h \
+	sys/types.h \
+	sys/ucontext.h \
+	sys/ucred.h \
+	sys/uio.h \
+	sys/umtxvar.h \
+	sys/un.h \
+	sys/unistd.h \
+	sys/utsname.h \
+	sys/vmem.h \
+	sys/wait.h \
+	sys/watchdog.h
+
+all:
+	@set -e; \
+	for h in ${HDRS}; do \
+		echo "#include <$$h>" | ${CC} ${CFLAGS} -xc - -c -o /dev/null 2> /dev/null; \
+	done
+
+# Extra tests for headers that need to be clean in multiple ways
+.PHONY:	event
+event:
+	@echo "#include <sys/event.h>" | \
+	${CC} ${CFLAGS} -D_WANT_KEVENT32 -D_WANT_FREEBSD11_KEVENT -xc - -c -o /dev/null
+
+depend obj includes install clean: