Fix a bunch of ODR violations.
5 files changed