fix some instances of wrong pulic priviate ordering in header, GP 40