Add missing includes.

Change-Id: I041a5ea84b82155b0a7a8c4e7dc416c2c2b5e251
6 files changed