fix usage of std::rint for older compilers
move more inclusion stuff out
Merge branch 'master' into benchmark_ownmaterialmodel