Adding missing headers