this is an old school thread but any polish will work on glass...whenever i do the paint i clean, polish, and wax the windows at the same time. takes out all the fine scratches and water runs right off...you just have to be careful not to get wax near/on rubber or you'll have a fun time trying to get it off.

you can use the plastic polish or even the metal polish creme on headlights & taillights too.