Many fruits and berries also have diuretic properties, not to argue with you BD, just wanted to say diuretics can be hard to avoid.

Another thing, drink cold water as warm water is better a quenching thirst. You could also do what most drink companies do, a a tiny bit of salt to whatever you are drinking. Not enough to taste though. It will make you want to drink more water.