Adding some missing headers