Index: trunk/i386/libsaio/fake_efi.c
===================================================================
--- trunk/i386/libsaio/fake_efi.c	(revision 2127)
+++ trunk/i386/libsaio/fake_efi.c	(revision 2128)
@@ -2,7 +2,7 @@
 /*
  * Copyright 2007 David F. Elliott.	 All rights reserved.
  */
-
+#include "saio_types.h"
 #include "libsaio.h"
 #include "boot.h"
 #include "bootstruct.h"
@@ -172,7 +172,7 @@
 	struct fake_efi_pages *fakeEfiPages = (struct fake_efi_pages*)AllocateKernelMemory(sizeof(struct fake_efi_pages));
 	
 	// Zero out all the tables in case fields are added later
-	bzero(fakeEfiPages, sizeof(struct fake_efi_pages));
+	//bzero(fakeEfiPages, sizeof(struct fake_efi_pages));
 	
 	// --------------------------------------------------------------------
 	// Initialize some machine code that will return EFI_UNSUPPORTED for
@@ -282,7 +282,7 @@
 	struct fake_efi_pages *fakeEfiPages = (struct fake_efi_pages*)AllocateKernelMemory(sizeof(struct fake_efi_pages));
 	
 	// Zero out all the tables in case fields are added later
-	bzero(fakeEfiPages, sizeof(struct fake_efi_pages));
+	//bzero(fakeEfiPages, sizeof(struct fake_efi_pages));
 	
 	// --------------------------------------------------------------------
 	// Initialize some machine code that will return EFI_UNSUPPORTED for
Index: trunk/i386/libsa/libsa.h
===================================================================
--- trunk/i386/libsa/libsa.h	(revision 2127)
+++ trunk/i386/libsa/libsa.h	(revision 2128)
@@ -84,6 +84,8 @@
 
 #ifndef bzero
 extern void   bzero(void * dst, size_t len);
+#else
+#error bzero is defined.
 #endif
 
 extern void * memset(void * dst, int c, size_t n);