Take latest cpp-common and update #includes