NAT-T changes. Matches changes to reference non-nonexistent structs in sys/netkey. I have no clue if this is correct, but it matches the style in sys/netkey, and (unlike the previous two revisions) it actually compiles...