These are included from spawn.h under Unix now.
Also fixes spawn.c including <sys/wait.h> without <sys/types.h>