I encountered exactly the same issue with my wife Estima 2-3 mths ago, bought the water stain mark removal liquid and applied on side windows + windscreen.

And voila, I hit the jackpot for the windscreen that the white mart was so so apparent where I could hardly see clearly when driving at night. Then there was a guy in Skudai (I am from JB) offered to solve the problem for me. He used 3-4 diff type of compounds to polish the windscreen for me. Spent RM130 and my problem settled.

Expensive lesson. I hope your problem is not too serious that not the entire windscreen is infected. Else the glass specialist will charged quite a lot. Mine was only infected at drivers area, about 10% of the total windscreen (estima has a BIG windscreen) and yet paid RM130 for the job done.

yup, that's why I said you need GLASS polish, not normal polish.