-EXTERN S16 cmUnpkSystemId ARGS((SystemId *systemId, Buffer *mBuf));
-EXTERN S16 cmUnpkAddrs ARGS((Addrs *addrs, Buffer *mBuf));
-EXTERN S16 cmUnpkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf));
-EXTERN S16 cmUnpkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf));
-EXTERN S16 cmUnpkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf));
-EXTERN S16 cmUnpkAddrMask ARGS((uint8_t *mask, Buffer *mBuf));
-EXTERN S16 cmUnpkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf));
-EXTERN S16 cmUnpkPst ARGS((Pst *pst, Buffer *mBuf));
-EXTERN S16 cmUnpkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf));
-EXTERN S16 cmUnpkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf));
-EXTERN S16 cmUnpkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf));
-EXTERN S16 cmUnpkTknUInt16 ARGS((TknUInt16 *tknUInt16, Buffer *mBuf));
-EXTERN S16 cmUnpkTknUInt32 ARGS((TknUInt32 *tknUInt32, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr ARGS((TknStr *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf));
-
-EXTERN S16 cmUnpkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf));
+S16 cmUnpkSystemId ARGS((SystemId *systemId, Buffer *mBuf));
+S16 cmUnpkAddrs ARGS((Addrs *addrs, Buffer *mBuf));
+S16 cmUnpkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf));
+S16 cmUnpkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf));
+S16 cmUnpkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf));
+S16 cmUnpkAddrMask ARGS((uint8_t *mask, Buffer *mBuf));
+S16 cmUnpkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf));
+S16 cmUnpkPst ARGS((Pst *pst, Buffer *mBuf));
+S16 cmUnpkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf));
+S16 cmUnpkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf));
+S16 cmUnpkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf));
+S16 cmUnpkTknUInt16 ARGS((TknUInt16 *tknU16, Buffer *mBuf));
+S16 cmUnpkTknUInt32 ARGS((TknUInt32 *tknU32, Buffer *mBuf));
+S16 cmUnpkTknStr ARGS((TknStr *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf));
+
+S16 cmUnpkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf));
+S16 cmUnpkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf));