What are your best tips on staying hydrated?

For those of us that have to work in the heat, what are some tips? Are there any foods that help or tricks like adding a bit of salt to your water?