fix build issues after removal of "using" directives
Merge branch 'master' into windows