Index: src/whereInt.h
==================================================================
--- src/whereInt.h
+++ src/whereInt.h
@@ -12,10 +12,12 @@
 **
 ** This file contains structure and macro definitions for the query
 ** planner logic in "where.c".  These definitions are broken out into
 ** a separate source file for easier editing.
 */
+#ifndef SQLITE_WHEREINT_H
+#define SQLITE_WHEREINT_H
 
 /*
 ** Trace output macros
 */
 #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
@@ -582,5 +584,7 @@
 #define WHERE_AUTO_INDEX   0x00004000  /* Uses an ephemeral index */
 #define WHERE_SKIPSCAN     0x00008000  /* Uses the skip-scan algorithm */
 #define WHERE_UNQ_WANTED   0x00010000  /* WHERE_ONEROW would have been helpful*/
 #define WHERE_PARTIALIDX   0x00020000  /* The automatic index is partial */
 #define WHERE_IN_EARLYOUT  0x00040000  /* Perhaps quit IN loops early */
+
+#endif /* !defined(SQLITE_WHEREINT_H) */

Index: tool/lemon.c
==================================================================
--- tool/lemon.c
+++ tool/lemon.c
@@ -481,26 +481,26 @@
 ** Routines processing parser actions in the LEMON parser generator.
 */
 
 /* Allocate a new parser action */
 static struct action *Action_new(void){
-  static struct action *freelist = 0;
+  static struct action *actionfreelist = 0;
   struct action *newaction;
 
-  if( freelist==0 ){
+  if( actionfreelist==0 ){
     int i;
     int amt = 100;
-    freelist = (struct action *)calloc(amt, sizeof(struct action));
-    if( freelist==0 ){
+    actionfreelist = (struct action *)calloc(amt, sizeof(struct action));
+    if( actionfreelist==0 ){
       fprintf(stderr,"Unable to allocate memory for a new parser action.");
       exit(1);
     }
-    for(i=0; i<amt-1; i++) freelist[i].next = &freelist[i+1];
-    freelist[amt-1].next = 0;
+    for(i=0; i<amt-1; i++) actionfreelist[i].next = &actionfreelist[i+1];
+    actionfreelist[amt-1].next = 0;
   }
-  newaction = freelist;
-  freelist = freelist->next;
+  newaction = actionfreelist;
+  actionfreelist = actionfreelist->next;
   return newaction;
 }
 
 /* Compare two actions for sorting purposes.  Return negative, zero, or
 ** positive if the first action is less than, equal to, or greater than
@@ -1905,11 +1905,11 @@
   ep = 0;
   for(i=0; i<LISTSIZE; i++) if( set[i] ) ep = merge(set[i],ep,cmp,offset);
   return ep;
 }
 /************************ From the file "option.c" **************************/
-static char **argv;
+static char **g_argv;
 static struct s_options *op;
 static FILE *errstream;
 
 #define ISOPT(X) ((X)[0]=='-'||(X)[0]=='+'||strchr((X),'=')!=0)
 
@@ -1918,18 +1918,18 @@
 ** of the n-th field.
 */
 static void errline(int n, int k, FILE *err)
 {
   int spcnt, i;
-  if( argv[0] ) fprintf(err,"%s",argv[0]);
-  spcnt = lemonStrlen(argv[0]) + 1;
-  for(i=1; i<n && argv[i]; i++){
-    fprintf(err," %s",argv[i]);
-    spcnt += lemonStrlen(argv[i])+1;
+  if( g_argv[0] ) fprintf(err,"%s",g_argv[0]);
+  spcnt = lemonStrlen(g_argv[0]) + 1;
+  for(i=1; i<n && g_argv[i]; i++){
+    fprintf(err," %s",g_argv[i]);
+    spcnt += lemonStrlen(g_argv[i])+1;
   }
   spcnt += k;
-  for(; argv[i]; i++) fprintf(err," %s",argv[i]);
+  for(; g_argv[i]; i++) fprintf(err," %s",g_argv[i]);
   if( spcnt<20 ){
     fprintf(err,"\n%*s^-- here\n",spcnt,"");
   }else{
     fprintf(err,"\n%*shere --^\n",spcnt-7,"");
   }
@@ -1941,17 +1941,17 @@
 */
 static int argindex(int n)
 {
   int i;
   int dashdash = 0;
-  if( argv!=0 && *argv!=0 ){
-    for(i=1; argv[i]; i++){
-      if( dashdash || !ISOPT(argv[i]) ){
+  if( g_argv!=0 && *g_argv!=0 ){
+    for(i=1; g_argv[i]; i++){
+      if( dashdash || !ISOPT(g_argv[i]) ){
         if( n==0 ) return i;
         n--;
       }
-      if( strcmp(argv[i],"--")==0 ) dashdash = 1;
+      if( strcmp(g_argv[i],"--")==0 ) dashdash = 1;
     }
   }
   return -1;
 }
 
@@ -1964,13 +1964,13 @@
 {
   int v;
   int errcnt = 0;
   int j;
   for(j=0; op[j].label; j++){
-    if( strncmp(&argv[i][1],op[j].label,lemonStrlen(op[j].label))==0 ) break;
+    if( strncmp(&g_argv[i][1],op[j].label,lemonStrlen(op[j].label))==0 ) break;
   }
-  v = argv[i][0]=='-' ? 1 : 0;
+  v = g_argv[i][0]=='-' ? 1 : 0;
   if( op[j].label==0 ){
     if( err ){
       fprintf(err,"%sundefined option.\n",emsg);
       errline(i,1,err);
     }
@@ -1980,11 +1980,11 @@
   }else if( op[j].type==OPT_FLAG ){
     *((int*)op[j].arg) = v;
   }else if( op[j].type==OPT_FFLAG ){
     (*(void(*)(int))(op[j].arg))(v);
   }else if( op[j].type==OPT_FSTR ){
-    (*(void(*)(char *))(op[j].arg))(&argv[i][2]);
+    (*(void(*)(char *))(op[j].arg))(&g_argv[i][2]);
   }else{
     if( err ){
       fprintf(err,"%smissing argument on switch.\n",emsg);
       errline(i,1,err);
     }
@@ -2002,15 +2002,15 @@
   double dv = 0.0;
   char *sv = 0, *end;
   char *cp;
   int j;
   int errcnt = 0;
-  cp = strchr(argv[i],'=');
+  cp = strchr(g_argv[i],'=');
   assert( cp!=0 );
   *cp = 0;
   for(j=0; op[j].label; j++){
-    if( strcmp(argv[i],op[j].label)==0 ) break;
+    if( strcmp(g_argv[i],op[j].label)==0 ) break;
   }
   *cp = '=';
   if( op[j].label==0 ){
     if( err ){
       fprintf(err,"%sundefined option.\n",emsg);
@@ -2033,11 +2033,11 @@
         dv = strtod(cp,&end);
         if( *end ){
           if( err ){
             fprintf(err,
                "%sillegal character in floating-point argument.\n",emsg);
-            errline(i,(int)((char*)end-(char*)argv[i]),err);
+            errline(i,(int)((char*)end-(char*)g_argv[i]),err);
           }
           errcnt++;
         }
         break;
       case OPT_INT:
@@ -2044,11 +2044,11 @@
       case OPT_FINT:
         lv = strtol(cp,&end,0);
         if( *end ){
           if( err ){
             fprintf(err,"%sillegal character in integer argument.\n",emsg);
-            errline(i,(int)((char*)end-(char*)argv[i]),err);
+            errline(i,(int)((char*)end-(char*)g_argv[i]),err);
           }
           errcnt++;
         }
         break;
       case OPT_STR:
@@ -2084,19 +2084,19 @@
 }
 
 int OptInit(char **a, struct s_options *o, FILE *err)
 {
   int errcnt = 0;
-  argv = a;
+  g_argv = a;
   op = o;
   errstream = err;
-  if( argv && *argv && op ){
+  if( g_argv && *g_argv && op ){
     int i;
-    for(i=1; argv[i]; i++){
-      if( argv[i][0]=='+' || argv[i][0]=='-' ){
+    for(i=1; g_argv[i]; i++){
+      if( g_argv[i][0]=='+' || g_argv[i][0]=='-' ){
         errcnt += handleflags(i,err);
-      }else if( strchr(argv[i],'=') ){
+      }else if( strchr(g_argv[i],'=') ){
         errcnt += handleswitch(i,err);
       }
     }
   }
   if( errcnt>0 ){
@@ -2109,24 +2109,24 @@
 
 int OptNArgs(void){
   int cnt = 0;
   int dashdash = 0;
   int i;
-  if( argv!=0 && argv[0]!=0 ){
-    for(i=1; argv[i]; i++){
-      if( dashdash || !ISOPT(argv[i]) ) cnt++;
-      if( strcmp(argv[i],"--")==0 ) dashdash = 1;
+  if( g_argv!=0 && g_argv[0]!=0 ){
+    for(i=1; g_argv[i]; i++){
+      if( dashdash || !ISOPT(g_argv[i]) ) cnt++;
+      if( strcmp(g_argv[i],"--")==0 ) dashdash = 1;
     }
   }
   return cnt;
 }
 
 char *OptArg(int n)
 {
   int i;
   i = argindex(n);
-  return i>=0 ? argv[i] : 0;
+  return i>=0 ? g_argv[i] : 0;
 }
 
 void OptErr(int n)
 {
   int i;
@@ -2726,11 +2726,11 @@
       }
       break;
     case WAITING_FOR_CLASS_ID:
       if( !ISLOWER(x[0]) ){
         ErrorMsg(psp->filename, psp->tokenlineno,
-          "%%token_class must be followed by an identifier: ", x);
+          "%%token_class must be followed by an identifier: %s", x);
         psp->errorcnt++;
         psp->state = RESYNC_AFTER_DECL_ERROR;
      }else if( Symbol_find(x) ){
         ErrorMsg(psp->filename, psp->tokenlineno,
           "Symbol \"%s\" already used", x);