Remove some more using directives from the .h files
Merge branch 'master' of github.com:OpenLightingProject/ola