Fix includes

More include simplifications.