Clean up some require calls in legacy code

[Duckwhale]

Only a small step on the way to a more organized codebase, but it's probably best to consolidate imports.