Add some missing includes.

Change-Id: Ieec623c06bc32ec78334f628af25b00c2bccd2e7
6 files changed