WIP: Resolved linking errors for c++ build