Fix all build breakages caused by blurgh with cpp-common