After you go through passport control their a shops and vendors (mostly duty free), but a whole bunch of places you can buy water.

When you go past security (which is after passport control) and are heading towards the American gates (somewhere in the mid to high 40's if I remember correctly) you will see at least two little places you can buy water. The first one is a coffee shop bar that is near gate 6 on the left.