WIP: resolved linking errors for c++ build
WIP: resolved linking errors for c++ build