fix linking errors with multiply defined functions
3 files changed