Change structure of includes per issue #8
Fix configure from prev commit.