Replace include to be more C++ like
Add replace all method