Remove superfluous #includes