more include changes after re-generating all proto files.