netbsd header cleanup - fixes