Use forward declaration when it's possible

2 jobs for master in 7 minutes and 27 seconds (queued for 6 minutes and 30 seconds)