PJ: fix prototypes for marqi.
PJ: fix prototypes for mask.