I think plugins/pppd.h shouldn't be bundled as it is available from the ppp project. The attached patch is what we used in Fedora.
It isn't bundled currently. Make sure you are comparing vs. the git repo.
Agreed, a change like this is already merged in git. Plaese use the code in git.