PIM-2558: Add missing use statements