Add some missing #includes