Merge "Fix build: include what you use."