Add use statements

It's an addition to the work done in #4643 and #4640.