Add back some implicit imports where needed

- I took a gamble on how far we can go, now need to remedy
4 jobs for 111-explicit-relative in 1 minute and 38 seconds