Excess roth contribution in 2018

When filling my 2018 taxes I found I was ineligible for roth and had made excess contributions.  I worked with the brokerage house to remove the excess.  The excess was removed to a traditional in early 2019.  I have 1099's for this but they state 2019 on the top.

 

Late in 2019 I made a traditional ira contribution that I later rolled over to a roth IRA.  I have 1099's for these.  How do i report the 2018 excess?  Do i even add the 1099r's to my 2019 filing or just amend the 2018 return?