nyacc: working on cpp-include fix