Making it easier to read what include values are going where

[AsherGlick]

The old pattern made it hard to tell when we stopped adding includes to one type of include set and started adding them to another. This pattern makes is very obvious that we are putting includes into different buckets.