Lint kernels define DIAGNOSTIC and depend on RB_COLOR in subr_stats.c. Provide an RB_COLOR macro for them.
I think this is fine as an interim solution if it fixes the build. I don't see any problem with modifying the stats code as you see fit, though. It was added to FreeBSD only quite recently.