Added missing headers from last commit