Add more missing headers