Eliminated linker errors.

svn path=; revision=84446