header mismatches

[Petri Helenius]

Recent changes in -CURRENT headers seem to have caused some desync:
 /usr/include/machine/types.h:50: redefinition of `vm_offset_t'
/usr/include/sys/types.h:250: `vm_offset_t' previously declared here
/usr/include/machine/types.h:51: redefinition of `vm_ooffset_t'
/usr/include/sys/types.h:251: `vm_ooffset_t' previously declared here
/usr/include/machine/types.h:52: conflicting types for `vm_pindex_t'
/usr/include/sys/types.h:253: previous declaration of `vm_pindex_t'
/usr/include/machine/types.h:53: redefinition of `vm_size_t'
/usr/include/sys/types.h:254: `vm_size_t' previously declared here
/usr/include/machine/types.h:55: redefinition of `register_t'
/usr/include/sys/types.h:203: `register_t' previously declared here
/usr/include/machine/types.h:56: redefinition of `u_register_t'
/usr/include/sys/types.h:237: `u_register_t' previously declared here

Should those headers agree? For example net-snmp port is broken.

Pete