Also add includes to cmd/golang-nw/build
gofmt