--- util/error.c.orig	2007-10-29 23:28:26.000000000 +0100
+++ util/error.c	2007-10-29 23:29:40.000000000 +0100
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include "util.h"
 #include "error.h"
--- util/hash.c.orig	2007-10-29 23:27:57.000000000 +0100
+++ util/hash.c	2007-10-29 23:29:40.000000000 +0100
@@ -28,9 +28,13 @@
 Hash(void *bytes, unsigned length)
 {
 	unsigned	crc = CRC_INIT;
+   unsigned char byte;
+   unsigned len = 0;
 
-	while (length--)
-		crc = table[(crc ^ *((unsigned char *) bytes)++) & 0xFF] ^ (crc >> 8);
+   for(len=0; len<length; len++){
+      byte = ((unsigned char *)bytes)[len];
+		crc = table[(crc ^ byte) & 0xFF] ^ (crc >> 8);
+   }
 	return(crc ^ CRC_FINAL);
 }
 
--- util/names.c.orig	2007-10-29 23:28:43.000000000 +0100
+++ util/names.c	2007-10-29 23:29:40.000000000 +0100
@@ -6,6 +6,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "util.h"
 #include "error.h"
 #include "hash.h"
--- asm/emit.c.orig	2007-10-29 23:28:20.000000000 +0100
+++ asm/emit.c	2007-10-29 23:29:44.000000000 +0100
@@ -191,7 +191,7 @@
 
 /* Try to do zero page */
 
-	if (zmode >= 0 && CheckOp(ins, zmode) >= 0)
+	if (zmode >= 0 && CheckOp(ins, zmode) >= 0) {
 		if (ivalue->type == iSegRel
 				&& ivalue->u.segrel.segment == AbsSegment
 				&& (ivalue->u.segrel.offset & ~0xFF) == 0)
@@ -207,6 +207,7 @@
 			EmitIvalue(ivalue, FALSE, 0x01);
 			return;
 		}
+   }
 
 /* Can we ONLY do zero page (but didn't)? */
 
@@ -239,7 +240,7 @@
 
 /* Compute displacement to target address */
 
-	if (gPass == 2)
+	if (gPass == 2) {
 		if (ivalue->type != iSegRel || ivalue->u.segrel.segment != gSegment)
 			uerror("illegal branch address");
 		else
@@ -248,6 +249,7 @@
 			if (disp < -128 || disp > 127)
 				uerror("branch of %d bytes is out of range", disp);
 		}
+   }
 
 /* Done */