For vehicles with water spotting on the windows, I typically clay and then run the blue (no scratch) scrubbies across the windows. If that doesn`t take care of it, I`ll bump up to Meg`s 101 or the like on a cutting pad. Depending on the water spots, I have even had luck with the Rain-X or Invisible Glass glass polish. If that doesn`t do the trick, Carpro CeriGlass on a glass pad usually does the trick. I have even found that CeriGlass has a bit of correcting power as it minimizes the pitting on my 174k mile windshield, every time I polish it. With using all of these products, be sure to clean the residues off, a panel prep is great to use. Although pretty dang finicky, Rustolem Grease and Wax Remover does a pretty good job of removing polishing oils, it is very economical. I would suggest removing it with a wet towel and using a dry towel dry the window. After that, an IPA wipe down followed with a glass sealant of choice, is a great way to keep spotting off windows. For the price and availability, you cannot beat Rain-X for side windows or the rear windshield, the front windshield often requires a little more upkeep by way of re-application and also making sure that you are running the wash mitt between the windshield and wiper blades, every wash.