[#2216] Backporting some missing use statements