Fix a few imports.
Merge remote-tracking branch 'origin/fix-imports' into 3.4.12