localize some imports
Merge pull request #2395 from MartinNowak/localizeImports

localize some imports