- remove a duplicate sys/wait.h include
- remove a stray vapi/voptget.h include
- move include in vsig.h to the right place