What model is your car? Water stains could be removed by using a compound, cleaner, polish. You could try this link http://groups.msn.com/pinasdetailing to learn more about detailing.
It highly depends on the actual condition of your car... without seeing it in person, I cannot give a fair assesment of whether the car needs to be compounded then polished or just polishing will do the trick.