Or actually I would like to keep it in my branch since it allows me to compile. But could you cherry-pick the commits that you need from it?