Make includes work.

There are still a few things that need to be reworked in the
stream (ast) side.