Fixed missing and obsolete #imports.