fix build issues after removal of "using" directives