Drop unnecessary #includes

Change-Id: I9659279233067a8946a9e54be2f22439854a961e