Add some missing includes

Change-Id: I720eb5226017bd588ba9dc441f8a34674a533285
2 files changed