More includes resolution support changes
Merge remote-tracking branch 'upstream-cwi/master'