Out-of-tree builds broke again, fix.
Merge pull request #435 from jimis/misc

Out-of-tree builds broke again, fix.