[chore] minor updates for common-header