Can you reorganize the imports? 
In all your new files?