include-, extend_reorient fix