refactorings

* remove Stream from dependencies
* specialize MatchingStream
* optimize includes