Haiku Build fixes

Here's fixes for https://google-melange.appspot.com/gci/task/view/google/gci2013/5816676893327360

License is not yet known, I've mailed the creator.