huashan: remove cruft from GPS

also blocks extra includes that should not come from rhine-common