[CDF-268] CDF refactor assumes existing public/cdf/includes, which may n...

...ot happen