breaking out includes, changing dep structure to be less boneheaded