Use new macros in common.h.
Merge branch 'master' into oc-kevent