removed unnecessary includes
fixes conflict