rq: fix redefinition created by mpdec merge and more by me

Change-Id: I117f6c7d7596f598e4a70256b2e09cdb0e9a21de