Charj: improve "include" formatting and add charm++.h by default