What I did as a quick solution was replacing the one in extended with the one in the new vanilla, but we'll work it out in the makefile and in the project for the future ;)

cheers