Log Message:
Added four patches that replace reserved identifiers with allowed ones.
Fixes the build on NetBSD, which also defines the same identifiers, but
is allowed to.