removed useless includes
merge