Make compilation work on R16A.
Merged bug25431 into stable