Merge pull request #3071 from nrwahl2/nrwahl2-fixes
Refactor: libcib: Static-ize a bunch of functions