How can I get rid of water spots from car finish and glass?

I tried washing, rinsing and drying my car before letting it air dry on on it’s own. But I was a little slow in some areas and it was so hot even in deep shade, that the water dried before I could wipe it off and dry the car with a chamois. Now I have water spots on the glass and paint. I tried re-washing and the spots just won’t come off. Help, any suggestions?