more changes to make toon compile with clang
namespace and header corrections for clang