Fix imports of unused files