Remove unused include, point at cpp-common/master