out of tree build fixes

[Jani Nikula]

On Thu, 20 Mar 2014, David Bremner <david at tethera.net> wrote:
> Apparently we've neglected the out of tree builds even more than
> usual. I originally thought this is what was causing the test failures
> on buildbot. I'm less sure now, but I think these fixes don't hurt
> anything, and they do unbreak out of tree builds for me.

Did not have the time for reviewing this one, but it seems to work for
me.

Jani.