Switch to a more standard C++ setup