Revert "But we don't want to put the whole repo in the include path"

This reverts commit 876337e9b490ebd6200fb365e2b82da3f1dda13f.