Given our --with-package-dir model of checking all kinds of possibilities I don't see why that extra include would be required part? Isn't it just one possibility?

 What is the argument about, just have cusp.py check more possibilities.

What's the status on this? I haven't seen a changeset that fixes this yet.