Sync with upstream r1.8

"sys/types.h rather than sys/param.h, where applicable.  avoid
overreach."

/deraadt@/