Follow-up to r9335, add missing imports.
Authored by: cboos 2010-03-22
Parent: [r9390]
Child: [r9392]