Support nested includes

The long sought support for nested includes - See test files for examples.