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