remove m_ from POD struct + clean 3rdparty include