Auto-include propagates correctly #7680

Merged

bsclifton merged 2 commits into brave:master from NejcZdovc:hotfix/#7451-autoinclude

Mar 20, 2017