Zaino Glass polish should do the trick.... I experimented with it on my uncles van... apparently he doesn't know the value of drying your car! so he basically had waterspots like mad... Zaino+ a little bit of elbow grease, should take it right off.
------------------
2001 Granite Green EX-L
1999 Toyota Tacoma
1998 Toyota Camry