Fix compilation with trunk.

@kaylank @tiagovignatti