CXX_BUILD - Fix some undefined reference linker errors