Fixed missing headers