adding missing macro prefixes in public headers
Merge branch 'master' into 1.0