Include curvecpr.h directly now that it has been fixed.