diff --git a/manifest b/manifest
index 44911a6d0e..9e7f8c7095 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\ssqlite3_freemem\sAPI\sfunction\sto\sjust\ssqlite3_free.\s(CVS\s1512)
-D 2004-05-31T19:34:33
+C Synchronize\slemon.c\sto\sthe\sversion\son\sthe\s2.8\sbranch.\s(CVS\s1513)
+D 2004-05-31T23:13:45
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -165,7 +165,7 @@ F test/version.test 2ba212ba06380e65e476bdf2fcd390e8b05af5a0
 F test/view.test 1ee12c6f8f4791a2c0655120d5562a49400cfe53
 F test/where.test 9c5752b807b78078fab8da6f52e689832579ca20
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
-F tool/lemon.c f4fb7226c930435e994441a470ed60a7c540f518
+F tool/lemon.c db6a3bfaf3388c0f7aea3adb5e05acddcd427016
 F tool/lempar.c 0b5e7a58634e0d448929b8e85f7981c2aa708d57
 F tool/memleak.awk b744b6109566206c746d826f6ecdba34662216bc
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
@@ -212,7 +212,7 @@ F www/support.tcl 67682848d6ddd283370451dc3da2e56cded9fc9a
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P adf7e29ff60dc559f64832fadb09f0b9decc0e76
-R 35dba1e1591a2b1e6f000ae81b864894
+P f3b80bbb97ed0b0c1cf634068f28f23802ec71a8
+R d129c1da630241ec087f33fd2514dd7b
 U drh
-Z 43fbc82bf31fc6953836ccd5c4550934
+Z da82754f0587159beaceb9f3b45617ea
diff --git a/manifest.uuid b/manifest.uuid
index 17f834c45c..6a9759bd11 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3b80bbb97ed0b0c1cf634068f28f23802ec71a8
\ No newline at end of file
+6ab3af8847a7b0f1508824c9d8e0ec9685219371
\ No newline at end of file
diff --git a/tool/lemon.c b/tool/lemon.c
index 45f010d232..5940950f83 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -12,13 +12,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-extern void qsort();
-extern double strtod();
-extern long strtol();
-extern void free();
-extern int access();
-extern int atoi();
-
 #ifndef __WIN32__
 #   if defined(_WIN32) || defined(WIN32)
 #	define __WIN32__
@@ -40,7 +33,6 @@ extern void *malloc();
 /******** From the file "action.h" *************************************/
 struct action *Action_new();
 struct action *Action_sort();
-void Action_add();
 
 /********* From the file "assert.h" ************************************/
 void myassert();
@@ -374,7 +366,7 @@ struct action *ap2;
 struct action *Action_sort(ap)
 struct action *ap;
 {
-  ap = (struct action *)msort(ap,&ap->next,actioncmp);
+  ap = (struct action *)msort((char *)ap,(char **)&ap->next,actioncmp);
   return ap;
 }
 
@@ -811,7 +803,7 @@ struct state *stp;     /* The state from which successors are computed */
 
     /* The state "newstp" is reached from the state "stp" by a shift action
     ** on the symbol "sp" */
-    Action_add(&stp->ap,SHIFT,sp,newstp);
+    Action_add(&stp->ap,SHIFT,sp,(char *)newstp);
   }
 }
 
@@ -912,7 +904,7 @@ struct lemon *lemp;
           if( SetFind(cfp->fws,j) ){
             /* Add a reduce action to the state "stp" which will reduce by the
             ** rule "cfp->rp" if the lookahead symbol is "lemp->symbols[j]" */
-            Action_add(&stp->ap,REDUCE,lemp->symbols[j],cfp->rp);
+            Action_add(&stp->ap,REDUCE,lemp->symbols[j],(char *)cfp->rp);
           }
 	}
       }
@@ -1188,14 +1180,14 @@ struct lemon *lemp;
 
 /* Sort the configuration list */
 void Configlist_sort(){
-  current = (struct config *)msort(current,&(current->next),Configcmp);
+  current = (struct config *)msort((char *)current,(char **)&(current->next),Configcmp);
   currentend = 0;
   return;
 }
 
 /* Sort the basis configuration list */
 void Configlist_sortbasis(){
-  basis = (struct config *)msort(current,&(current->bp),Configcmp);
+  basis = (struct config *)msort((char *)current,(char **)&(current->bp),Configcmp);
   basisend = 0;
   return;
 }
@@ -1447,6 +1439,7 @@ char **argv;
     fprintf(stderr,"%d parsing conflicts.\n",lem.nconflict);
   }
   exit(lem.errorcnt + lem.nconflict);
+  return (lem.errorcnt + lem.nconflict);
 }
 /******************** From the file "msort.c" *******************************/
 /*