Merge pull request #3370 from wenningerk/fix_cib_compat
Fix: cib.h: conditionally include cib_compat.h