refact and delete some unneeded includes
Merge pull request #210 from aginika/remove-unneeded-includes

refact and delete some unneeded includes