I have developed something rather useful in my personal life.

Every time that I have a thought about water, as in, "should I get a glass now?", I simply stop what I'm doing and drink a glass of water, fill up the glass again and go back to what I was doing.

That trick has made me drinking way more water that before, and it is great.