Dan, I can tell you for sure RQB 1984 was built with square headlight enclosures. I installed the round as that was the look I wanted. I can not tell you if it was an option. I seriously doubt it as there are very few Avanti II with round trim that I have ever seen.