Emergency build fix to add missing headers after a cleanup.