Add missing includes.
Merge fixes.