Make it compile with last 5.80

2 jobs for master in 15 minutes and 31 seconds (queued for 2 seconds)