Fix out-of-source-tree builds.
Some files now expect to be able to use paths relative to the top of the source tree.
Merge pull request #397 from jhps/srcdir-fix

Fix out-of-source-tree builds.