[pmc2c] WIP - rurban's patch to correct headers. GH #1083