Added use statements in various places

Hi,

This should fix #2144.


Thank you.