Swap the defines to be the ones we want to use, compat ones are defined from the preferred.
Swap the defines to be the ones we want to use, compat ones are defined
from the preferred.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars