removing unneeded includes
pull from upstream
some cosmetics