Bug 1110212 - Fix missing includes.