Fix more Haiku build errors