Add missing includes.

Change-Id: I0abe45677d9a5f43aa1db754102701093ff19204
4 files changed