Moved more members of public struct odr (ODR*) to struct Odr_private.