Replace wildcard import with individual imports