Modified files:
           dkbad.h
   Log Message:
   Multiple inclusion protection.

This is wrong.

The problem is that we've changed disklabel.h to include dkbad.h, but
only on *some* architectures.  So we're left with an inconsistency,
where not including dkbad.h explicitly will cause some things to
break, and including it explicitly will cause some other things to
break.

This should be fixed by either *not* including dkbad.h from
disklabel.h, or by *always* including it from disklabel.h.