Bug 1699 - Fix redefinition of uInt by replacing 2nd def with inclusion of 1st. Also fixed numerous other over qualification of method name and token pasting issues which cause GCCE errors.

/* Generated automatically */
static int isnumglob _((void));
static int gettokstr _((int c,int sub));
static int dquote_parse _((char endchar,int sub));
static int skipcomm _((void));