Simplify the include graph after work to split out classes.
see #33413. More details there. Built from https://develop.svn.wordpress.org/trunk@35718 git-svn-id: http://core.svn.wordpress.org/trunk@35682 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in: