A better description of the last commit, is that I switched away from chained includes.
I like the approach of no chained includes.