Fix missing imports introduced in 023e1217b32385ba