remove unneeded include
remove c++11ism