A question for nutritionists.?

No, coffee and tea do not count towards a water intake. They pull water out of your body because of the caffeine. Salt causes your body to hold water, that is why you feel swollen the next day.

If you drink coffee or tea, you should drink an extra cup of water for each cup you drink. I would also drink extra water when you have salty foods.

I doubt if coffee and tea can be included. Why don't you mention the surgery that you had? There is probably more than enough salt in the food you eat without adding any. If salt makes you feel swollen, it sounds like you have some kind of digestive problem. Supply more info next time. Note that most bottled water has elements etc. in it. Buy some Poland Spring in the clear container and test it by taste; i.e. you rub your tongue against the roof of your mouth while you drink it. Good water has no taste. That water is practically laboratory water, which is the best. Compare it to what you are drinking.