[stream] Finish off commit 2cf872c90d85163f297e3a0fd56866a29849e0bf
[stream] Remove unused includes
[stream] More fixups

Towards an abstract file descriptor.