Fix some C++ stuff and now we can compile!