scope isolation for user includes
Merge pull request #2667 from nicolas-grekas/master

scope isolation for user includes