Fix nested includes.

Fix for issue #136, along with test case update.