Get the multi-inclusion code right this time. This broke mac68k builds, as found by Takeshi Morimoto <takeshim@kyoto.zaq.ne.jp>
Get the multi-inclusion code right this time. This broke mac68k builds,
as found by Takeshi Morimoto <takeshim@kyoto.zaq.ne.jp>

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