[cvs-nhc98] patch applied (nhc98): -package flag now implies an extra cpphs include directory