Reintroduced some accidentally deleted imports.
Authored by: bugman 2012-05-18
Parent: [r16339]
Child: [r16341]