change boost includes
remove useless includes
[bugfix] comma position