Added missing headers init