undelete a few accidentally removed imports

also the git diff is terrible to look at.