Merge "Add missing #includes."