Merge branch 'path-norm'

* pre-processing: strip leading "./" from include paths