upstream now generates headers in private includes which get installed