include of various streams removed from library code