Fix some spirit/phoenix includes