Merge "Add missing #includes"