WIP: oclint: trying to fix it after rebase

FIXME: still not close to building...