[FOLD] Reshuffle includes