A fresh checkout from svn trunk fixed my problem, giving me a working build. Interestingly, running svn export and building from a separate directly wasn't enough; a full svn checkout proved necessary to fix this.