I hear alot of people say that Elijah and Enoch are the two witnesses spoken of in the book of Revelation....

And I will give power unto my two witnesses, and they shall prophesy a thousand two hundred and threescore days, clothed in sackcloth. These are the two olive trees, and the two menorahs standing before the Elohiym of the earth. And if any man will hurt them, fire proceeds out of their mouth, and devours their enemies: and if any man will hurt them, he must in this manner be killed. These have power to shut heaven, that it rain not in the days of their prophecy: and have power over waters to turn them to blood, and to smite the earth with all plagues, as often as they will. And when they shall have finished their testimony, the beast that ascends out of the bottomless pit shall make war against them, and shall overcome them, and kill them. And their dead bodies shall lie in the street of the great city, which spiritually is called Cedom and Mitsrayim, where also our Yah was crucified. CHIZAYON (REVELATION) 11:3-8 את CEPHER

However, this is what Yahusha said...
And his Talmidiym asked him, saying, Why then say the scribes that Eliyahu must first come? And Yahusha answered and said unto them, Eliyahu truly shall first come, and restore all things. But I say unto you, That Eliyahu is come already, and they knew him not, but have done unto him whatsoever they willed. Likewise shall also the Son of A'dam suffer of them. Then the Talmidiym understood that he spoke unto them of Yahuchanon the Baptizer. MATTITHYAHU (MATTHEW) 17:10-13 את CEPHER

is this the fulfillment of the prophecy that was spoken by the prophet Malachi....?

Behold, I will send you את Eliyahu the prophet before the coming of the great and dreadful day of Yahuah: MAL`AKIY (MALACHI) 4:5 את CEPHER

If what Yahusha spoke was the fulfillment of the prophecy of Malachi then is Elijah one of the two witnesses?