prevent creation of empty arrays of includes
Merge pull request #1480 from overlookmotel/include-all-improvement

include all improvement