While working on my other patch I noticed we already have some issues
with out-of-tree builds.  Resolved by this patch.