rename to build as C++ interim commit
more C++ guards and fix build