Merge pull request #4321
699fe63 remove wrong ; in chainparams.h and order includes (Philip Kaufmann)