More linker fixes from the OAuth refactor.