Updated everything to compile with C++, gets weird include errors tho!