Add missing file; remove obsolete import.