Added missing headers