More include fixes