Missing includes
Minor work towards converting stream