Issue #4669 - Class generator should return uses from file generator

Propagate file generator uses to class generator. Fixes issue #4669.