Remove ufo/ subdir from includes and fix problems