Partial revert build system. Fix errors.

Build system repair for C++11 implementation.