Surfing around in the Meguiar's Forum I learned something interesting. I found that using chrome polish on the exterior of the windows will get ride of water spots. So I tried it... and it worked GREAT! There isn't one spot remaining on any of my windows and a bonus... it doesn't leave any streaks.

Hope this helps those of you who bought a XF that was sitting on the lot for a while as mine was.