includes: AROS_UFIxx -> AROS_INTxx change