Should extract these package includes to yet another file, lest we be stuck maintaining two versions of our package deps.