the +pkg forms of the rules and getting the headers via the paths in descr, rather than depending on the +headers version.