Like Stepinwolfe I'm very proactive on hydrating. I rarely pass a water source without topping off. Either my containers or me. I carry 2 liters of water most of the time but I have 2 more 1 liter collapsible containers in the pack if needed.
Of my water containers three are collapsible and one a titanium bottle. Although I usually filter the bottle gives me the ability to boil just in case. If I'm out in real cold temps I don't use a filter due to freezing issues.