Fix build issues (cyclic dependencies because cbc is confused with Cbc).