Missing includes

Change-Id: I08750fdaab137665205a6e55891d845b39b0147d