Add some missing headers