Add some more missing #includes