Fix missing imports in pull request #485.