netbsd header cleanup