Missing includes

Change-Id: Ia9e8c05fedbb10eed347bbf357db73754e65a74c