Attempting a Haiku Puzzler

Puzzle set by Chevrefeuille at Carpe Diem

Rules of the game:

The goal is to re-create the scrambled haiku of three haiku poets, but to make it somewhat more difficult, I have used four scrambled haiku.

Below you find an image in which you can find all the lines of these three haiku. To find the three haiku you get three hints:

1. This haiku poet brought haiku into the 20th century by mentioning a modern invention.

2. This haiku is renown all over the globe.

3. At the end of the life of a haiku poet the custom was to write a Jisei (death-poem). This is the jisei of a famous female poet.

To make the "haiku puzzler" complete you have to submit the three found haiku including the name of the haiku poet.

Scrambled lines:

I can get 2 and 3

2.
old pond

frogs jump into

water sound

by Basho

This is indeed world-renowned.

3. I am guessing that this is the jisei, though only the middle line is certain (and I don't know who wrote it):

having gazed at the moon

I depart from this life
with a blessing

Google tells me I got this right and that the author is Chiyo-ni. 

Which leaves my guesses at the other two as:

young foliage

after the passage of a train

smoke whirls

morning dew

evaporates in the early sunlight

spirit climbs to the sky

I am further guessing that the first of them is number 1 in the puzzle, because of the mention of a train – but again I don't know the author.

Google  tells me I got that right too, and that the author is Shiki – which I half-guessed because I knew he lived into the twentieth century. (Only, his version had my first and third lines reversed!)

I did rather guess that the fourth haiku might be by Chevrefeuille himself, and Google tells me that is so. But as he wrote it, in the version I found, it reads: 

in the early sunlight

morning dew evaporates

spirits climb to the sky

It was great fun playing this game, and I think I did quite well despite my ignorance. (Smile.)