If I remember, the earlier C4 years 84-87 or 88 had nylon gears so they may need replacing as well. I replaced the bushings in mine last year.
Thanks for posting about the headlight replacements, Brian, I was thinking about that, but since I don't drive it much at night it hasn't been a concern.