Fixed greedy includes with predeclaration replacing include
Merge branch 'master' of https://github.com/heidi-ann/zygote