More include cleanups