optimize include logic. Fixes #2