Fix building of trunk.