Merge "Add missing header"