Windows side covered.
Mac side covered.
Linux side covered.

Had to remove a forward declare though.
Right. Put this on both.
Merge branch 'rage-ns' into sm6