Revert "Revert "Match up to new gps.h""

This reverts commit 6c0ac0e82a8f63f0cb43a7618a530d2903607546.
Now I remember what that was for...