Berkeley header; add include of <sys/types.h>; remove define of