Merge "FwdLockConv.c: include what you use."