Haiku: Add in missing build-time types, fix module usage Working through the few final remaining build issues for the Haiku target.