First crack at fixing double-linking issues in build system.