Merge "Add missing use statements"